From: Konrad Rosenbaum <Konrad.Rosenbaum@peergroup.com>
Date: Sat, 26 Sep 2015 21:22:49 +0000 (+0200)
Subject: use proper php opening tags
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=cbf94fdddd245e6d849058a456212a0294e9f3eb;p=konrad%2Fsmoke.git

use proper php opening tags
---

diff --git a/pack b/pack
index e06319c..057ae7c 160000
--- a/pack
+++ b/pack
@@ -1 +1 @@
-Subproject commit e06319c7261d4189e8bcef16ed50b9739e6e13a5
+Subproject commit 057ae7c5183e52efe4d5a972d878693613295b14
diff --git a/www/admin.php b/www/admin.php
index de726b2..f4b3b0c 100644
--- a/www/admin.php
+++ b/www/admin.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -31,36 +31,36 @@ include_once('./inc/classes/random.php');
 
 <h2>Checking DB</h2>
 
-<?
+<?php
 if(isset($_GET["CreateDB"])){
 	print("Creating Database...<p>");
 	$db->createDb();
 }
 ?>
 
-<?
+<?php
 $canUseDb=$db->canUseDb();
 if($canUseDb){
 ?>
 Database exists and is usable.<p>
 
-<? form() ?>
+<?php form() ?>
 <input type="submit" value="Show SQL Script to create DB." name="ShowCreateDB"/>
 </form>
 
-<?
+<?php
 }else{
 ?>
 Database is not usable. Create?<br>
-<? form() ?>
+<?php form() ?>
 <input type="submit" value="Yes, Create DB now." name="CreateDB"/>
 <input type="submit" value="Show SQL Script to create DB." name="ShowCreateDB"/>
 </form>
-<?
+<?php
 }
 ?>
 
-<?
+<?php
 if(isset($_GET["ShowCreateDB"])){
 	print("Creating Database...<p>");
 	$db->showCreateDb();
@@ -73,7 +73,7 @@ if(!$canUseDb)
 
 <h2>Restore Backups</h2>
 
-<? form("FILE") ?>
+<?php form("FILE") ?>
 Backup file to restore:
 <input type="file" name="restore"/><br/>
 <input type="checkbox" name="overwrite" value="ovr">Overwrite existing data<br>
@@ -81,7 +81,7 @@ Backup file to restore:
 </form><p>
 <font color="red"><b>Warning:</b></font> don't attempt to restore data unless you really lost it! Ideally restore should only be made on an empty database.<p>
 
-<?
+<?php
 if(isset($_POST["restorenow"])){
 	echo "<h3>Restoring Data...</h3>\n";
 	$ov=false;
@@ -95,26 +95,26 @@ if(isset($_POST["restorenow"])){
 
 <h2>Restore from Old Database (MagicSmoke 1.x)</h2>
 
-<? if(isset($olddb)){ ?>
-<? form() ?>
+<?php if(isset($olddb)){ ?>
+<?php form() ?>
 Enter "upgrade" here: <input type="text" name="olddbup"/>
 <input type="submit" value="Upgrade DB Now"/>
 </form><p>
 <font color="red"><b>Warning:</b></font> don't attempt to upgrade data unless you really mean it! Upgrade deletes all data from the new database (MagicSmoke2) and overwrites it with the old data (MagicSmoke1). This re-uses the credentials from the configuration.<p>
 
-<? if(isset($_GET["olddbup"]) && $_GET["olddbup"]=="upgrade"){
+<?php if(isset($_GET["olddbup"]) && $_GET["olddbup"]=="upgrade"){
 	echo "<h3>Upgrading Database...</h3>\n";
 	DBUpgrade::upgrade();
 } ?>
 
-<? }else{ //olddb not set ?>
+<?php }else{ //olddb not set ?>
 If you want to upgrade from an old database version, please uncomment the $olddb-configuration in config.php.<p>
-<? } ?>
+<?php } ?>
 
 
 <h2>Checking for Admin Users</h2>
 
-<?
+<?php
 do{
 if(isset($_POST["adminuser"])&&isset($_POST["adminpwd1"])&&isset($_POST["adminpwd2"])){
 	//do passwords match?
@@ -151,7 +151,7 @@ if(isset($_GET["addanyhost"])){
 
 List of Admins:
 <ul>
-<?
+<?php
 $admlst=$db->select("userrole","uname","role='_admin'");
 for($i=0;$i<count($admlst);$i++){
 	print("<li>".$admlst[$i][0]);
@@ -175,7 +175,7 @@ for($i=0;$i<count($admlst);$i++){
 
 <h2>Checking for Hosts</h2>
 
-<?
+<?php
 if(isset($_POST["updatehost"])){
 	if(!is_uploaded_file($_FILES["host"]["tmp_name"]))
 		die("Trying to work on non-uploaded file. Abort.");
@@ -207,7 +207,7 @@ if(isset($_POST["updatehost"])){
 
 List of Hosts:
 <ul>
-<?
+<?php
 $hlst=$db->select("host","hostname","");
 for($i=0;$i<count($hlst);$i++){
 	print("<li>".$hlst[$i][0]."</li>\n");
@@ -216,14 +216,14 @@ for($i=0;$i<count($hlst);$i++){
 </ul><p>
 
 <b>Import Host File:</b><br>
-<? form("FILE"); ?>
+<?php form("FILE"); ?>
 <input type="file" name="host"><br>
 <input type="submit" name="updatehost" value="Upload">
 </form>
 
 </html>
-<?
+<?php
 //done, thwart some stupid bots
 exit(0);
 //end of file
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/classes/autoload.php b/www/inc/classes/autoload.php
index 3545faa..85a69d5 100644
--- a/www/inc/classes/autoload.php
+++ b/www/inc/classes/autoload.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // (c) Peter Keller, 2007/8
 // protected under the GNU AGPL version 3 or at your option any newer
@@ -9,4 +9,4 @@ wob_autoclass('ConfigManager','./inc/classes/config_manager.php');
 wob_autoclass('BaseVars','./inc/classes/basevars.php');
 
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/classes/basevars.php b/www/inc/classes/basevars.php
index 8183721..23b40ec 100644
--- a/www/inc/classes/basevars.php
+++ b/www/inc/classes/basevars.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
diff --git a/www/inc/classes/random.php b/www/inc/classes/random.php
index f9fae28..43872d5 100644
--- a/www/inc/classes/random.php
+++ b/www/inc/classes/random.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -105,4 +105,4 @@ function getCode39ID($length,$range=RND_ANYRANGE)
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/db/autoload.php b/www/inc/db/autoload.php
index ff51e48..c76d9f2 100644
--- a/www/inc/db/autoload.php
+++ b/www/inc/db/autoload.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -10,4 +10,4 @@ include('./inc/db/db_scheme.php');
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/db/barcodetable.php b/www/inc/db/barcodetable.php
index 9cfd687..822e848 100644
--- a/www/inc/db/barcodetable.php
+++ b/www/inc/db/barcodetable.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -44,4 +44,4 @@ abstract class BarcodeTable extends WobTable
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/db/db_scheme.php b/www/inc/db/db_scheme.php
index 886a8a2..e4ffd74 100644
--- a/www/inc/db/db_scheme.php
+++ b/www/inc/db/db_scheme.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -7,4 +7,4 @@ $dbScheme=new WobSchema;
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/db/dbupgrade.php b/www/inc/db/dbupgrade.php
index 14451c9..fc826a7 100644
--- a/www/inc/db/dbupgrade.php
+++ b/www/inc/db/dbupgrade.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -393,4 +393,4 @@ class DBUpgrade
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/loader.php b/www/inc/loader.php
index fa5c434..2491b2a 100644
--- a/www/inc/loader.php
+++ b/www/inc/loader.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // (c) Peter Keller, 2007/8
 // protected under the GNU AGPL version 3 or at your option any newer
@@ -17,4 +17,4 @@ $db->tryConnect();
 include("./inc/machine/autoload.php");
 //move on in loader_nonadmin.php (or admin.php)
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/loader_nonadmin.php b/www/inc/loader_nonadmin.php
index 24a0e9b..b5f7deb 100644
--- a/www/inc/loader_nonadmin.php
+++ b/www/inc/loader_nonadmin.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // (c) Peter Keller, 2007/8
 // protected under the GNU AGPL version 3 or at your option any newer
@@ -20,4 +20,4 @@ include('inc/global_functions.php');
 
 //done
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/machine/autoload.php b/www/inc/machine/autoload.php
index 935ec2a..0335f51 100644
--- a/www/inc/machine/autoload.php
+++ b/www/inc/machine/autoload.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -11,4 +11,4 @@ wob_autoclass("MachineUser","./inc/machine/muser.php");
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/machine/muser.php b/www/inc/machine/muser.php
index 1fc9da5..97552a6 100644
--- a/www/inc/machine/muser.php
+++ b/www/inc/machine/muser.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -383,4 +383,4 @@ class MachineUser
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/machine/session.php b/www/inc/machine/session.php
index 46ec1ab..f305d29 100644
--- a/www/inc/machine/session.php
+++ b/www/inc/machine/session.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -290,4 +290,4 @@ class DummyWebSession extends Session
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/machine/translation.php b/www/inc/machine/translation.php
index caaeb8b..f5d8e09 100644
--- a/www/inc/machine/translation.php
+++ b/www/inc/machine/translation.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -42,4 +42,4 @@ class Translation
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/machine/version.php b/www/inc/machine/version.php
index 02d0ecf..770d2e7 100644
--- a/www/inc/machine/version.php
+++ b/www/inc/machine/version.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -15,4 +15,4 @@ public static function serverInfoXml($trans)
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/rendering/tcompiler.php b/www/inc/rendering/tcompiler.php
index 90d5f31..473143d 100644
--- a/www/inc/rendering/tcompiler.php
+++ b/www/inc/rendering/tcompiler.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // (c) Peter Keller, 2007/8
 // protected under the GNU AGPL version 3 or at your option any newer
@@ -67,4 +67,4 @@ class TemplateCompiler
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/rendering/twig_extensions.php b/www/inc/rendering/twig_extensions.php
index 744d4f3..ab32224 100644
--- a/www/inc/rendering/twig_extensions.php
+++ b/www/inc/rendering/twig_extensions.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -84,4 +84,4 @@ class SmokeFilterExtension extends Twig_Extension
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/artist.php b/www/inc/wext/artist.php
index 58349fc..e4f0fd6 100644
--- a/www/inc/wext/artist.php
+++ b/www/inc/wext/artist.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -34,4 +34,4 @@ class WOArtist extends WOArtistAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/autoload.php b/www/inc/wext/autoload.php
index 2779d4c..3768d3e 100644
--- a/www/inc/wext/autoload.php
+++ b/www/inc/wext/autoload.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -29,4 +29,4 @@ wob_autoclass("MSmokeTransaction","inc/wext/transaction.php");
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/cart.php b/www/inc/wext/cart.php
index f1f1d25..718d271 100644
--- a/www/inc/wext/cart.php
+++ b/www/inc/wext/cart.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -401,4 +401,4 @@ class WOCartOrder extends WOCartOrderAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/customer.php b/www/inc/wext/customer.php
index 89a8166..5c1b2c1 100644
--- a/www/inc/wext/customer.php
+++ b/www/inc/wext/customer.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -620,4 +620,4 @@ class WOCustomer extends WOCustomerAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/event.php b/www/inc/wext/event.php
index 119e95d..2603ad6 100644
--- a/www/inc/wext/event.php
+++ b/www/inc/wext/event.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -270,4 +270,4 @@ class WOEvent extends WOEventAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/format.php b/www/inc/wext/format.php
index 095e5aa..9162031 100644
--- a/www/inc/wext/format.php
+++ b/www/inc/wext/format.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -100,4 +100,4 @@ class WOServerFormat extends WOServerFormatAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/order.php b/www/inc/wext/order.php
index d7acd7d..64543cf 100644
--- a/www/inc/wext/order.php
+++ b/www/inc/wext/order.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -953,4 +953,4 @@ class WOOrder extends WOOrderAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/price.php b/www/inc/wext/price.php
index 8bdcf80..160c394 100644
--- a/www/inc/wext/price.php
+++ b/www/inc/wext/price.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -48,4 +48,4 @@ class WOPriceCategory extends WOPriceCategoryAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/role.php b/www/inc/wext/role.php
index 2c15dcf..082dd7e 100644
--- a/www/inc/wext/role.php
+++ b/www/inc/wext/role.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -20,4 +20,4 @@ class WORole extends WORoleAbstract{
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/room.php b/www/inc/wext/room.php
index f5594c6..156cd82 100644
--- a/www/inc/wext/room.php
+++ b/www/inc/wext/room.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -29,4 +29,4 @@ class WORoom extends WORoomAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/template.php b/www/inc/wext/template.php
index 7070c19..da676ff 100644
--- a/www/inc/wext/template.php
+++ b/www/inc/wext/template.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -84,4 +84,4 @@ class WOTemplate extends WOTemplateAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/ticket.php b/www/inc/wext/ticket.php
index f985f97..f121b5b 100644
--- a/www/inc/wext/ticket.php
+++ b/www/inc/wext/ticket.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -114,4 +114,4 @@ class WOTicketAudit extends WOTicketAuditAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/voucher.php b/www/inc/wext/voucher.php
index 23510de..bea50d7 100644
--- a/www/inc/wext/voucher.php
+++ b/www/inc/wext/voucher.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -42,4 +42,4 @@ class WOVoucher extends WOVoucherAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/webcart.php b/www/inc/wext/webcart.php
index 6e9a855..8418fcc 100644
--- a/www/inc/wext/webcart.php
+++ b/www/inc/wext/webcart.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -140,4 +140,4 @@ class WOCartVoucher extends WOCartVoucherAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/inc/wext/websession.php b/www/inc/wext/websession.php
index 87cfc7f..77d50f6 100644
--- a/www/inc/wext/websession.php
+++ b/www/inc/wext/websession.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // (c) Peter Keller, 2007/8
 // protected under the GNU AGPL version 3 or at your option any newer
@@ -64,4 +64,4 @@ class WOWebSession extends WOWebSessionAbstract
 
 //eof
 return;
-?>
\ No newline at end of file
+?>
diff --git a/www/index.php b/www/index.php
index d823865..610c12d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,4 +1,4 @@
-<? 
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // (c) Peter Keller, 2007/8
 // protected under the GNU AGPL version 3 or at your option any newer
diff --git a/www/machine.php b/www/machine.php
index 3caef30..ce642d1 100644
--- a/www/machine.php
+++ b/www/machine.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // (c) Konrad Rosenbaum, 2007-2011
 // protected under the GNU AGPL version 3 or at your option any newer
 // see COPYING.AGPL
@@ -19,4 +19,4 @@ WobTransaction::printDebug();
 
 //done
 exit(0);
-?>
\ No newline at end of file
+?>