From cbf94fdddd245e6d849058a456212a0294e9f3eb Mon Sep 17 00:00:00 2001 From: Konrad Rosenbaum Date: Sat, 26 Sep 2015 23:22:49 +0200 Subject: [PATCH] use proper php opening tags --- pack | 2 +- www/admin.php | 44 ++++++++++++++++---------------- www/inc/classes/autoload.php | 4 +- www/inc/classes/basevars.php | 2 +- www/inc/classes/random.php | 4 +- www/inc/db/autoload.php | 4 +- www/inc/db/barcodetable.php | 4 +- www/inc/db/db_scheme.php | 4 +- www/inc/db/dbupgrade.php | 4 +- www/inc/loader.php | 4 +- www/inc/loader_nonadmin.php | 4 +- www/inc/machine/autoload.php | 4 +- www/inc/machine/muser.php | 4 +- www/inc/machine/session.php | 4 +- www/inc/machine/translation.php | 4 +- www/inc/machine/version.php | 4 +- www/inc/rendering/tcompiler.php | 4 +- www/inc/rendering/twig_extensions.php | 4 +- www/inc/wext/artist.php | 4 +- www/inc/wext/autoload.php | 4 +- www/inc/wext/cart.php | 4 +- www/inc/wext/customer.php | 4 +- www/inc/wext/event.php | 4 +- www/inc/wext/format.php | 4 +- www/inc/wext/order.php | 4 +- www/inc/wext/price.php | 4 +- www/inc/wext/role.php | 4 +- www/inc/wext/room.php | 4 +- www/inc/wext/template.php | 4 +- www/inc/wext/ticket.php | 4 +- www/inc/wext/voucher.php | 4 +- www/inc/wext/webcart.php | 4 +- www/inc/wext/websession.php | 4 +- www/index.php | 2 +- www/machine.php | 4 +- 35 files changed, 87 insertions(+), 87 deletions(-) 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 @@ -Checking DB -"); $db->createDb(); } ?> -canUseDb(); if($canUseDb){ ?> Database exists and is usable.

- + - Database is not usable. Create?
- + - -"); $db->showCreateDb(); @@ -73,7 +73,7 @@ if(!$canUseDb)

Restore Backups

- + Backup file to restore:
Overwrite existing data
@@ -81,7 +81,7 @@ Backup file to restore:

Warning: don't attempt to restore data unless you really lost it! Ideally restore should only be made on an empty database.

-Restoring Data...\n"; $ov=false; @@ -95,26 +95,26 @@ if(isset($_POST["restorenow"])){

Restore from Old Database (MagicSmoke 1.x)

- - + + Enter "upgrade" here:

Warning: 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.

-Upgrading Database...\n"; DBUpgrade::upgrade(); } ?> - + If you want to upgrade from an old database version, please uncomment the $olddb-configuration in config.php.

- +

Checking for Admin Users

- -select("userrole","uname","role='_admin'"); for($i=0;$i".$admlst[$i][0]); @@ -175,7 +175,7 @@ for($i=0;$iChecking for Hosts - -select("host","hostname",""); for($i=0;$i".$hlst[$i][0]."\n"); @@ -216,14 +216,14 @@ for($i=0;$i

Import Host 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ -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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ 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 @@ - \ No newline at end of file +?> -- 1.7.2.5