Merge lp:~dangarner/xibo/bug-455630 into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

=== modified file 'server/install/database/7.sql'
--- server/install/database/7.sql	2009-09-26 12:09:58 +0000
+++ server/install/database/7.sql	2009-11-29 18:45:38 +0000
@@ -21,4 +21,8 @@
 
 UPDATE `version` SET `app_ver` = '1.0.3';
 UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+<<<<<<< TREE
 UPDATE `version` SET `DBVersion` = '7';
+=======
+UPDATE `version` SET `DBVersion` = '7';
+>>>>>>> MERGE-SOURCE
 
=== modified file 'server/install/database/8.sql'
--- server/install/database/8.sql	2009-10-04 17:40:01 +0000
+++ server/install/database/8.sql	2009-11-29 18:45:38 +0000
@@ -1,16 +1,36 @@
-ALTER TABLE `media` ADD `MD5` VARCHAR( 32 ) NULL AFTER `storedAs` ,
-ADD `FileSize` BIGINT NULL AFTER `MD5` ;
-
-ALTER TABLE `module` ADD `ValidExtensions` VARCHAR( 254 ) NULL ;
-
-UPDATE `module` SET `ValidExtensions` = 'jpg,jpeg,png,bmp,gif' WHERE `module`.`ModuleID` =1 LIMIT 1 ;
-
-UPDATE `module` SET `ValidExtensions` = 'wmv,avi,mpg,mpeg' WHERE `module`.`ModuleID` =2 LIMIT 1 ;
-
-UPDATE `module` SET `ValidExtensions` = 'swf' WHERE `module`.`ModuleID` =3 LIMIT 1 ;
-
-UPDATE `module` SET `ValidExtensions` = 'ppt,pps' WHERE `module`.`ModuleID` =4 LIMIT 1 ;
-
-UPDATE `version` SET `app_ver` = '1.0.4';
-UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
-UPDATE `version` SET `DBVersion` = '8';
+<<<<<<< TREE
+ALTER TABLE `media` ADD `MD5` VARCHAR( 32 ) NULL AFTER `storedAs` ,
+ADD `FileSize` BIGINT NULL AFTER `MD5` ;
+
+ALTER TABLE `module` ADD `ValidExtensions` VARCHAR( 254 ) NULL ;
+
+UPDATE `module` SET `ValidExtensions` = 'jpg,jpeg,png,bmp,gif' WHERE `module`.`ModuleID` =1 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'wmv,avi,mpg,mpeg' WHERE `module`.`ModuleID` =2 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'swf' WHERE `module`.`ModuleID` =3 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'ppt,pps' WHERE `module`.`ModuleID` =4 LIMIT 1 ;
+
+UPDATE `version` SET `app_ver` = '1.0.4';
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '8';
+=======
+ALTER TABLE `module` ADD `ValidExtensions` VARCHAR( 254 ) NULL ;
+
+UPDATE `module` SET `ValidExtensions` = 'jpg,jpeg,png,bmp,gif' WHERE `module`.`ModuleID` =1 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'wmv,avi,mpg,mpeg' WHERE `module`.`ModuleID` =2 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'swf' WHERE `module`.`ModuleID` =3 LIMIT 1 ;
+
+UPDATE `module` SET `ValidExtensions` = 'ppt,pps' WHERE `module`.`ModuleID` =4 LIMIT 1 ;
+
+/* Add the MD5 and FileSize as columns to the media table */
+ALTER TABLE `media` ADD `MD5` VARCHAR( 32 ) NULL AFTER `storedAs` ,
+ADD `FileSize` BIGINT NULL AFTER `MD5` ;
+
+UPDATE `version` SET `app_ver` = '1.0.4';
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '8';
+>>>>>>> MERGE-SOURCE
 
=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2009-10-04 17:40:01 +0000
+++ server/lib/modules/module.class.php	2009-11-29 18:45:38 +0000
@@ -516,8 +516,15 @@
 	 */
 	public function EditForm()
 	{
+<<<<<<< TREE
 		$form = '<p>' . __('Not yet implemented by this module.') . '</p>';
 
+=======
+		$form = <<<END
+		<p>Not yet implemented by this module.</p>
+END;
+
+>>>>>>> MERGE-SOURCE
 		$this->response->html 		 	= $form;
 		$this->response->dialogTitle 	= __('Add Item');
 		$this->response->dialogSize 	= true;
@@ -534,9 +541,15 @@
 	public function AddMedia()
 	{
 		// We want to load a new form
+<<<<<<< TREE
 		$this->response->message = __('Add Media has not been implemented for this module.');
 		
 		return $this->response;	
+=======
+		$this->response->message	= 'Add Media has not been implemented for this module.';
+
+		return $this->response;
+>>>>>>> MERGE-SOURCE
 	}
 
 	/**
@@ -546,9 +559,15 @@
 	public function EditMedia()
 	{
 		// We want to load a new form
+<<<<<<< TREE
 		$this->response->message = __('Edit Media has not been implemented for this module.');
 		
 		return $this->response;	
+=======
+		$this->response->message	= 'Edit Media has not been implemented for this module.';
+
+		return $this->response;
+>>>>>>> MERGE-SOURCE
 	}
 
 	/**
 
=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2009-10-09 20:27:08 +0000
+++ server/lib/pages/content.class.php	2009-11-29 18:45:38 +0000
@@ -27,22 +27,6 @@
 	private $isadmin = false;
 	private $has_permissions = true;
 	private $sub_page = "";
-	
-	//Table Fields
-	private $mediaid;
-	private $name = ""; 
-	private $filepath = ""; 
-	private $type = "";
-	private $length = "";
-	private $width = "";
-	private $height = "";
-	private $permissionid;
-	private $media_class = "";
-	private $retired;
-	
-	//are we redirecting to another page once we are done?
-	private $redirect = false;
-	private $redirect_addr = "";
 
 	function __construct(database $db, user $user) 
 	{
@@ -653,8 +637,8 @@
 		
 		if (isset($_FILES["media_file"]) && is_uploaded_file($_FILES["media_file"]["tmp_name"]) && $_FILES["media_file"]["error"] == 0) 
 		{
-			$error 			= 0;
-			$fileName 		= $_FILES["media_file"]["name"];
+			$error 		= 0;
+			$fileName 	= Kit::ValidateParam($_FILES["media_file"]["name"], _FILENAME);
 			$fileLocation 	= $libraryFolder."temp/".$fileId;
 			
 			// Save the FILE
@@ -697,6 +681,7 @@
 		
 		echo $complete_page;
 		
+		Debug::LogEntry($db, "audit", $complete_page, "FileUpload");
 		Debug::LogEntry($db, "audit", "[OUT]", "FileUpload");
 		exit;
 	}
 
=== modified file 'server/modules/flash.module.php'
--- server/modules/flash.module.php	2009-10-04 17:40:01 +0000
+++ server/modules/flash.module.php	2009-11-29 18:45:38 +0000
@@ -706,7 +706,7 @@
 		}
 
 		// Ensure the name is not already in the database
-		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
+		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d AND IsEdited = 0 ", $db->escape_string($name), $userid, $mediaid);
 
 		if(!$result = $db->query($SQL))
 		{
 
=== modified file 'server/modules/image.module.php'
--- server/modules/image.module.php	2009-10-04 17:40:01 +0000
+++ server/modules/image.module.php	2009-11-29 18:45:39 +0000
@@ -709,7 +709,7 @@
 		}
 
 		// Ensure the name is not already in the database
-		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
+		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d  AND IsEdited = 0", $db->escape_string($name), $userid, $mediaid);
 
 		if(!$result = $db->query($SQL))
 		{
 
=== modified file 'server/modules/powerpoint.module.php'
--- server/modules/powerpoint.module.php	2009-10-04 17:40:01 +0000
+++ server/modules/powerpoint.module.php	2009-11-29 18:45:39 +0000
@@ -599,9 +599,14 @@
 		$fileSize 	= filesize($databaseDir.$storedAs);
 
 		// Update the media record to include this information
-
-		$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
-
+<<<<<<< TREE
+
+		$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
+
+=======
+		$SQL = sprintf("UPDATE media SET storedAs = '%s', `MD5` = '%s', FileSize = %d WHERE mediaid = %d", $storedAs, $md5, $fileSize, $mediaid);
+
+>>>>>>> MERGE-SOURCE
 		if (!$db->query($SQL))
 		{
 			trigger_error($db->error());
@@ -663,8 +668,14 @@
 			$fileName		= Kit::GetParam('txtFileName', _POST, _STRING);
 			$fileName 		= basename($fileName);
 			$ext 			= strtolower(substr(strrchr($fileName, "."), 1));
-
-			if (!$this->IsValidExtension($ext))
+<<<<<<< TREE
+
+			if (!$this->IsValidExtension($ext))
+=======
+
+
+			if (!$this->IsValidExtension($ext))
+>>>>>>> MERGE-SOURCE
 			{
 				$this->response->SetError('Your file has an extension not supported by this Media Type.');
 				$this->response->keepOpen = true;
@@ -707,7 +718,7 @@
 		}
 
 		// Ensure the name is not already in the database
-		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
+		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d  AND IsEdited = 0", $db->escape_string($name), $userid, $mediaid);
 
 		if(!$result = $db->query($SQL))
 		{
 
=== modified file 'server/modules/video.module.php'
--- server/modules/video.module.php	2009-10-04 17:40:01 +0000
+++ server/modules/video.module.php	2009-11-29 18:45:39 +0000
@@ -693,7 +693,7 @@
 		}
 
 		// Ensure the name is not already in the database
-		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d ", $db->escape_string($name), $userid, $mediaid);
+		$SQL = sprintf("SELECT name FROM media WHERE name = '%s' AND userid = %d AND mediaid <> %d  AND IsEdited = 0", $db->escape_string($name), $userid, $mediaid);
 
 		if(!$result = $db->query($SQL))
 		{
 
=== added file 'server/upgrade.php.OTHER'
--- server/upgrade.php.OTHER	1970-01-01 00:00:00 +0000
+++ server/upgrade.php.OTHER	2009-11-29 18:45:38 +0000
@@ -0,0 +1,598 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Alex Harrington
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+
+DEFINE('XIBO', true);
+
+include('lib/app/kit.class.php');
+include('config/db_config.php');
+include('config/config.class.php');
+require('settings.php');
+
+// Once we've calculated the upgrade in step 2 below, we need
+// to have included the appropriate upgrade php files
+// before we restore the session, so objects get recreated properly.
+//
+// Check to see if we've passed that point, and if so look at what was posted
+// to include those classes.
+
+if (Kit::GetParam("includes", _POST, _BOOL)) {
+	foreach ($_POST as $key => $post) {
+		// $key should be like 1-2, 1-3 etc
+		// Split $key on - character.
+
+		$parts = explode('-', $key);
+		if (count($parts) == 2) {
+			$step = Kit::ValidateParam($parts[0], _INT);
+			if (file_exists('install/database/' . $step . '.php')) {
+				include_once('install/database/' . $step . '.php');
+			}
+		}
+	}
+}
+
+session_start();
+
+define('_CHECKBOX', "checkbox");
+define('_INPUTBOX', "inputbox");
+define('_PASSWORDBOX', "password");
+
+// create a database class instance
+$db = new database();
+
+if (!$db->connect_db($dbhost, $dbuser, $dbpass)) reportError(0, "Unable to connect to the MySQL database using the settings stored in settings.php.<br /><br />MySQL Error:<br />" . $db->error());
+if (!$db->select_db($dbname)) reportError(0, "Unable to select the MySQL database using the settings stored in settings.php.<br /><br />MySQL Error:<br />" . $db->error());
+
+include('install/header_upgrade.inc');
+
+if (! $_SESSION['step']) {
+	$_SESSION['step'] = 0;
+}
+
+if (Kit::GetParam('skipstep',_POST,_INT) == 1) {
+	// Cheat the $_SESSION['step'] variable if required
+	// Used if there are environment warnings and we want to retest.
+	$_SESSION['step'] = 1;
+}
+
+if ($_SESSION['step'] == 0) {
+
+  $_SESSION['step'] = 1;
+
+  # First step of the process.
+  # Show a welcome screen and authenticate the user
+  ?>
+  Welcome to the Xibo Upgrade!<br /><br />
+  The upgrade program will take you through the process one step at a time.<br /><br />
+  Lets get started!<br /><br />
+  Please enter your xibo_admin password:<br /><br />
+  <form action="upgrade.php" method="POST">
+    <div class="install_table">
+	<input type="password" name="password" length="12" />
+    </div>
+    <div class="loginbutton"><button type="submit">Next ></button></div>
+  </form>
+  <?php
+}
+elseif ($_SESSION['step'] == 1) {
+  $_SESSION['step'] = 2;
+  
+  if (! $_SESSION['auth']) {
+
+	# Check password
+
+	$password = Kit::GetParam('password',_POST,_PASSWORD);
+	$password_hash = md5($password);
+
+	$SQL = sprintf("SELECT `UserID` FROM `user` WHERE UserPassword='%s' AND UserName='xibo_admin'",
+        	            $db->escape_string($password_hash));
+    	if (! $result = $db->query($SQL)) {
+      	reportError("0", "An error occured checking your password.<br /><br />MySQL Error:<br />" . mysql_error());    
+    	}
+ 
+	if ($db->num_rows($result) == 0) {	
+      		$_SESSION['auth'] = false;
+       		reportError("0", "Password incorrect. Please try again.");
+   	}
+   	else {
+		$_SESSION['auth'] = true;
+		$_SESSION['db'] = $db;
+    	}
+
+   }
+## Check server meets specs (as specs might have changed in this release)
+  ?>
+  <p>First we need to check if your server meets Xibo's requirements.</p>
+  <?php
+    $db = new Database();
+    $cObj = new Config($db);
+    echo $cObj->CheckEnvironment();
+    if ($cObj->EnvironmentFault()) {
+	$_SESSION['step'] = 1;
+    ?>
+      <form action="upgrade.php" method="POST">
+        <div class="loginbutton"><button type="submit">Retest</button></div>
+      </form>
+    <?php
+    }
+    else if ($cObj->EnvironmentWarning()) {
+    ?>
+      <form action="upgrade.php" method="POST">
+	<input type="hidden" name="skipstep" value="1">
+        <div class="loginbutton"><button type="submit">Retest</button></div>
+      </form>
+      <form action="upgrade.php" method="POST">
+        <div class="loginbutton"><button type="submit">Next ></button></div>
+      </form>
+    <?php
+    }
+    else {
+    ?>
+      <form action="upgrade.php" method="POST">
+        <div class="loginbutton"><button type="submit">Next ></button></div>
+      </form>
+    <?php
+    }    
+}
+elseif ($_SESSION['step'] == 2) {
+	checkAuth();
+# Calculate the upgrade
+      
+	$_SESSION['upgradeFrom'] = Config::Version($db, 'DBVersion');
+
+	if ($_SESSION['upgradeFrom'] < 1) {
+		$_SESSION['upgradeFrom'] = 1;
+	}
+
+	// Get a list of .sql and .php files for the upgrade
+	$sql_files = ls('*.sql','install/database',false,array('return_files'));
+	$php_files = ls('*.php','install/database',false,array('return_files'));
+    
+	// Sort by natural filename (eg 10 is bigger than 2)
+	natcasesort($sql_files);
+	natcasesort($php_files);
+
+	$_SESSION['phpFiles'] = $php_files;
+	$_SESSION['sqlFiles'] = $sql_files;
+
+	$max_sql = Kit::ValidateParam(substr(end($sql_files),0,-4),_INT);
+	$max_php = Kit::ValidateParam(substr(end($php_files),0,-4),_INT);
+	$_SESSION['upgradeTo'] = max($max_sql, $max_php);
+
+	if (! $_SESSION['upgradeTo']) {
+		reportError("2", "Unable to calculate the upgradeTo value. Check for non-numeric SQL and PHP files in the 'install/datbase' directory.", "Retry");
+	}
+
+	echo '<div class="info">';
+	echo '<p>Upgrading from database version ' . $_SESSION['upgradeFrom'] . ' to ' . $_SESSION['upgradeTo'];
+	echo '</p></div><hr width="25%"/>';
+	echo '<form action="upgrade.php" method="POST">';
+
+	// Loop for $i between upgradeFrom + 1 and upgradeTo.
+	// If a php file exists for that upgrade, make an instance of it and call Questions so we can
+	// Ask the user for input.
+	for ($i=$_SESSION['upgradeFrom'] + 1; $i <= $_SESSION['upgradeTo']; $i++) {
+		if (file_exists('install/database/' . $i . '.php')) {
+			include_once('install/database/' . $i . '.php');
+			$stepName = 'Step' . $i;
+			
+			// Check that a class called Step$i exists
+			if (class_exists($stepName)) {
+				$_SESSION['Step' . $i] = new $stepName($db);
+				// Call Questions on the object and send the resulting hash to createQuestions routine
+				createQuestions($i, $_SESSION['Step' . $i]->Questions());
+			}
+			else {
+				print "Warning: We included $i.php, but it did not include a class of appropriate name.";
+			}						
+		}
+	}
+
+    echo '<div class="info"><p>';
+	echo "Perform automatic database upgrade?";
+	echo '</p></div><div class="install-table">';
+    echo '<input type="checkbox" name="doBackup" checked />';
+	echo '</div><hr width="25%" />';
+
+	$_SESSION['step'] = 3;
+	echo '<input type="hidden" name="includes" value="true" />';
+	echo '<p><input type="submit" value="Next >" /></p>';
+	echo '</form>';
+
+?>
+  <?php
+}
+elseif ($_SESSION['step'] == 3) {
+	// $_SESSION['step'] = 0;
+	$fault = false;
+	$fault_string = "";
+
+	foreach ($_POST as $key => $post) {
+		// $key should be like 1-2, 1-3 etc
+		// Split $key on - character.
+
+		$parts = explode('-', $key);
+		if (count($parts) == 2) {
+			$step_num = 'Step' . $parts[0];
+			include_once('install/database/' . $parts[0] . '.php');
+			// $_SESSION['q'][$step_num] = unserialize($_SESSION['q'][$step_num]);
+;
+			$response = $_SESSION[$step_num]->ValidateQuestion($parts[1], $post);
+			if (! $response == true) {
+				// The upgrade routine for this step wasn't happy.
+				$fault = true;
+				$fault_string .= $response . "<br />\n";
+			}
+		}
+	}
+
+	if ($fault) {
+		// Report the error, and a back button
+		echo "FAIL: " . $fault_string;
+	}
+	else {
+        $doBackup = Kit::GetParam("doBackup", $_POST, _BOOL);
+
+		set_time_limit(0);
+		// Backup the database
+		echo '<div class="info"><p>';
+        if ($doBackup) {
+		    echo 'Backing up your database';
+		    backup_tables($db, '*');
+        }
+        else {
+            echo 'Skipping database backup';
+        }
+		echo '</p>';
+
+		$sqlStatementCount = 0;
+		// Now loop over the entire upgrade. Run the SQLs and PHP interleaved.
+		for ($i=$_SESSION['upgradeFrom'] + 1; (($i <= $_SESSION['upgradeTo']) && ($fault==false)) ; $i++) {
+			if (file_exists('install/database/' . $i . '.sql')) {
+				echo '<p>' . $i . '.sql ';
+				flush();
+				$delimiter = ';';
+			        $sql_file = @file_get_contents('install/database/' . $i . '.sql');
+			        $sql_file = remove_remarks($sql_file);
+			        $sql_file = split_sql_file($sql_file, $delimiter);
+    
+			        foreach ($sql_file as $sql) {
+			          print ".";
+				  $sqlStatementCount++;
+			          flush();
+			          if (! $db->query($sql)) {
+			 	    $fault = true;
+			            reportError("0", "An error occured populating the database.<br /><br />MySQL Error:<br />" . $db->error() . "<br /><br />SQL executed:<br />" . $sql . "<br /><br />Statement number: " . $sqlStatementCount);
+			          }
+			        }
+				echo '</p>';
+			}
+			if (file_exists('install/database/' . $i . '.php')) {
+				$stepName = 'Step' . $i;
+				echo '<p>' . $i . '.php ';
+				flush();
+				if (! $_SESSION[$stepName]->Boot()) {
+					$fault = true;
+				}
+				echo '</p>';
+			}
+		}
+		echo '</div>';
+		if (! $fault) {
+			if (! unlink('install.php')) {
+    				echo "Unable to delete install.php. Please remove this file manually.";
+  			}
+			if (! unlink('upgrade.php')) {
+				echo "Unable to delete upgrade.php. Please remove this file manually.";
+			}
+
+			echo '<b>Upgrade is complete!</b><br /><br />';
+			echo '<form method="POST" action="index.php">';
+			echo '<input type="submit" value="Login" />';
+			echo '</form>';
+		}
+		else {
+			echo '<b>There was an error during the upgrade. Please take a screenshot of this page and seek help!</b>';
+		}
+		session_destroy();
+	}
+}
+else {
+  reportError("0","A required parameter was missing. Please go through the installer sequentially!","Start Again");
+}
+ 
+include('install/footer.inc');
+
+# Functions
+function checkPHP() {
+  # Check PHP version > 5
+  return (version_compare("5.1.0",phpversion(), "<="));
+}
+
+function reportError($step, $message, $button_text="&lt; Back") {
+	$_SESSION['step'] = $step;
+?>
+    <div class="info">
+      <?php print $message; ?>
+    </div>
+    <form action="upgrade.php" method="POST">
+      <button type="submit"><?php print $button_text; ?></button>
+    </form>
+  <?php
+  include('install/footer.inc');
+  die();
+} 
+
+function checkAuth() {
+	if (! $_SESSION['auth']) {
+		reportError(1, "You must authenticate to run the upgrade.");
+	}
+}
+
+// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
+// By Crackster 
+/**
+ * remove_remarks will strip the sql comment lines out of an uploaded sql file
+ */
+function remove_remarks($sql){
+  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^[-].*$/m', "\n", $sql));
+  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
+  return $sql;
+}
+
+// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
+// By Crackster              
+/**
+ * split_sql_file will split an uploaded sql file into single sql statements.
+ * Note: expects trim() to have already been run on $sql.
+ */
+function split_sql_file($sql, $delimiter){
+  $sql = str_replace("\r" , '', $sql);
+  $data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
+  $data = array_map('trim', $data);
+  // The empty case
+  $end_data = end($data);
+  if (empty($end_data))
+  {
+    unset($data[key($data)]);
+  }
+  return $data;
+}
+ 
+/**
+ * This funtion will take a pattern and a folder as the argument and go thru it(recursivly if needed)and return the list of 
+ *               all files in that folder.
+ * Link             : http://www.bin-co.com/php/scripts/filesystem/ls/
+ * License	: BSD
+ * Arguments     :  $pattern - The pattern to look out for [OPTIONAL]
+ *                    $folder - The path of the directory of which's directory list you want [OPTIONAL]
+ *                    $recursivly - The funtion will traverse the folder tree recursivly if this is true. Defaults to false. [OPTIONAL]
+ *                    $options - An array of values 'return_files' or 'return_folders' or both
+ * Returns       : A flat list with the path of all the files(no folders) that matches the condition given.
+ */
+function ls($pattern="*", $folder="", $recursivly=false, $options=array('return_files','return_folders')) {
+    if($folder) {
+        $current_folder = realpath('.');
+        if(in_array('quiet', $options)) { // If quiet is on, we will suppress the 'no such folder' error
+            if(!file_exists($folder)) return array();
+        }
+        
+        if(!chdir($folder)) return array();
+    }
+    
+    
+    $get_files    = in_array('return_files', $options);
+    $get_folders= in_array('return_folders', $options);
+    $both = array();
+    $folders = array();
+    
+    // Get the all files and folders in the given directory.
+    if($get_files) $both = glob($pattern, GLOB_BRACE + GLOB_MARK);
+    if($recursivly or $get_folders) $folders = glob("*", GLOB_ONLYDIR + GLOB_MARK);
+    
+    //If a pattern is specified, make sure even the folders match that pattern.
+    $matching_folders = array();
+    if($pattern !== '*') $matching_folders = glob($pattern, GLOB_ONLYDIR + GLOB_MARK);
+    
+    //Get just the files by removing the folders from the list of all files.
+    $all = array_values(array_diff($both,$folders));
+        
+    if($recursivly or $get_folders) {
+        foreach ($folders as $this_folder) {
+            if($get_folders) {
+                //If a pattern is specified, make sure even the folders match that pattern.
+                if($pattern !== '*') {
+                    if(in_array($this_folder, $matching_folders)) array_push($all, $this_folder);
+                }
+                else array_push($all, $this_folder);
+            }
+            
+            if($recursivly) {
+                // Continue calling this function for all the folders
+                $deep_items = ls($pattern, $this_folder, $recursivly, $options); # :RECURSION:
+                foreach ($deep_items as $item) {
+                    array_push($all, $this_folder . $item);
+                }
+            }
+        }
+    }
+    
+    if($folder) chdir($current_folder);
+    return $all;
+}
+
+// Taken from http://davidwalsh.name/backup-mysql-database-php
+// No explicit license. Assumed public domain.
+// Ammended to use a database object by Alex Harrington.
+// If this is your code, and wish for us to remove it, please contact
+// [e-mail]
+/* backup the db OR just a table */
+function backup_tables($db,$tables = '*')
+{
+	//get all of the tables
+	if($tables == '*')
+	{
+		$tables = array();
+		$result = $db->query('SHOW TABLES');
+		while($row = $db->get_row($result))
+		{
+			$tables[] = $row[0];
+		}
+	}
+	else
+	{
+		$tables = is_array($tables) ? $tables : explode(',',$tables);
+	}
+
+	// Open file for writing at length 0.
+	$handle = fopen(Config::GetSetting($db,'LIBRARY_LOCATION') . 'db-backup-'.time().'-'.(md5(implode(',',$tables))).'.sql','w+');
+	
+	//cycle through
+	foreach($tables as $table)
+	{
+		echo '.';
+		flush();
+		$result = $db->query('SELECT * FROM `'.$table .'`');
+		$num_fields = $db->num_fields($result);
+		
+		$return = 'DROP TABLE IF EXISTS `'.$table.'`;';
+		fwrite($handle, $return);
+
+		$row2 = $db->get_row($db->query('SHOW CREATE TABLE `'.$table.'`'));
+		$return = "\n\n".$row2[1].";\n\n";
+		fwrite($handle,$return);
+		
+		for ($i = 0; $i < $num_fields; $i++) 
+		{
+			while($row = $db->get_row($result))
+			{
+				$return = 'INSERT INTO `'.$table.'` VALUES(';
+				fwrite($handle, $return);
+				for($j=0; $j<$num_fields; $j++) 
+				{
+					$return = '';
+					$row[$j] = addslashes($row[$j]);
+					$row[$j] = ereg_replace("\n","\\n",$row[$j]);
+					if (isset($row[$j])) { $return.= '"'.$row[$j].'"' ; } else { $return.= '""'; }
+					if ($j<($num_fields-1)) { $return.= ','; }
+					fwrite($handle, $return);
+				}
+				$return = ");\n";
+				fwrite($handle, $return);
+			}
+		}
+		$return ="\n\n\n";
+		fwrite ($handle, $return);
+	}
+	
+	fclose($handle);
+}
+
+
+function gen_secret() {
+  # Generates a random 12 character alphanumeric string to use as a salt
+  mt_srand((double)microtime()*1000000);
+  $key = "";
+  for ($i=0; $i < 12; $i++) {
+    $c = mt_rand(0,2);
+    if ($c == 0) {
+      $key .= chr(mt_rand(65,90));
+    }
+    elseif ($c == 1) {
+      $key .= chr(mt_rand(97,122));
+    }
+    else {
+      $key .= chr(mt_rand(48,57));
+    }
+  } 
+  
+  return $key;
+}
+
+function createQuestions($step, $questions) {
+	// Takes a multi-dimensional array eg:
+	// $q[0]['question'] = "May we collect anonymous usage statistics?";
+	// $q[0]['type'] = _CHECKBOX;
+	// $q[0]['default'] = true;
+	//
+	// And turns it in to an HTML form for the user to complete.
+	foreach ($questions as $qnum => $question) {
+		echo '<div class="info"><p>';
+		echo $question['question'];
+		echo '</p></div><div class="install-table">';
+
+		if (($question['type'] == _INPUTBOX) || ($question['type'] == _PASSWORD)) {
+			echo '<input type="';
+			if ($question['type'] == _INPUTBOX) {
+				echo 'text';
+			}
+			else {
+				echo 'password';
+			}
+			echo '" name="' . $step . '-' . $qnum .'" value="'. $question['default'] .'" length="12" />';
+		}
+		elseif ($question['type'] == _CHECKBOX) {
+			echo '<input type="checkbox" name="' . $step . '-' . $qnum . '" ';
+			if ($question['default']) {
+				echo 'checked ';
+			}
+			echo '/>';
+		}
+		echo '</div><hr width="25%" />';
+	}
+}
+
+//function __autoload($class_name) {
+//    if (substr($class_name,0,4) == "Step") {
+//	    $class_name = substr($class_name,4);
+//	    require_once install/database/$class_name . '.php';
+//    }
+//}
+
+class UpgradeStep 
+{
+	protected $db;
+	protected $q;
+	protected $a;
+
+	public function __construct($db)
+	{
+		$this->db 	=& $db;
+		$this->q	= array();
+		$this->a	= array();
+	}
+
+	public function Boot()
+	{
+
+	}
+
+	public function Questions()
+	{
+		return array();
+	}
+
+	public function ValidateQuestion($questionNumber,$response)
+	{
+		return true;
+	}
+}
+
+?>
 
=== modified file 'server/xmds.php'
--- server/xmds.php	2009-11-26 20:03:41 +0000
+++ server/xmds.php	2009-11-29 18:45:38 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 <?php
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
@@ -1060,4 +1061,1065 @@
 
 //Debug::LogEntry($db, 'audit', $service->debug_str, "xmds", "NuSOAP");
 
+=======
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ DEFINE('XIBO', true);
+ include_once("lib/xmds.inc.php");
+
+/**
+ * Auths the hardwareKey
+ * @return True is licensed, False if not
+ * @param $hardwareKey Object
+ */
+function Auth($hardwareKey)
+{
+	global $db;
+
+	//check in the database for this hardwareKey
+	$SQL = "SELECT licensed, inc_schedule, isAuditing, displayID FROM display WHERE license = '$hardwareKey'";
+	if (!$result = $db->query($SQL))
+	{
+		trigger_error("License key query failed:" .$db->error());
+		return false;
+	}
+
+	//Is it there?
+	if ($db->num_rows($result) == 0)
+	{
+		return false;
+	}
+	else
+	{
+		//we have seen this display before, so check the licensed value
+		$row = $db->get_row($result);
+		if ($row[0] == 0)
+		{
+			return false;
+		}
+		else
+		{
+			$time = date("Y-m-d H:i:s", time());
+
+			//Set the last accessed flag on the display
+			$SQL = "UPDATE display SET lastaccessed = '$time', loggedin = 1 WHERE license = '$hardwareKey' ";
+			if (!$result = $db->query($SQL))
+			{
+				trigger_error("Display update access failure: " .$db->error());
+			}
+
+			//It is licensed
+			return array("licensed" => true, "inc_schedule" => $row[1], "isAuditing" => $row[2], "displayid" => $row[3]);
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Checks that the calling service is talking the correct version
+ * @return
+ * @param $version Object
+ */
+function CheckVersion($version)
+{
+	global $db;
+
+	// Look up the Service XMDS version from the Version table
+	$serverVersion = Config::Version($db, 'XmdsVersion');
+
+	if ($version != $serverVersion)
+	{
+		Debug::LogEntry($db, 'audit', sprintf('A Client with an incorrect version connected. Client Version: [%s] Server Version [%s]', $version, $serverVersion));
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Registers the Display with the server - if there is an available slot
+ * @return
+ * @param $serverKey Object
+ * @param $hardwareKey Object
+ * @param $displayName Object
+ */
+function RegisterDisplay($serverKey, $hardwareKey, $displayName, $version)
+{
+	global $db;
+
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$displayName 	= Kit::ValidateParam($displayName, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	define('SERVER_KEY', Config::GetSetting($db, 'SERVER_KEY'));
+
+	Debug::LogEntry($db, "audit", "[IN]", "xmds", "RegisterDisplay");
+	Debug::LogEntry($db, "audit", "serverKey [$serverKey], hardwareKey [$hardwareKey], displayName [$displayName]", "xmds", "RegisterDisplay");
+
+	//Check the serverKey matches the one we have stored in this servers lic.txt file
+	if ($serverKey != SERVER_KEY)
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "The Server key you entered does not match with the server key at this address", $serverKey);
+	}
+
+	// Check the Length of the hardwareKey
+	if (strlen($hardwareKey) > 40)
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "The Hardware Key you sent was too long. Only 40 characters are allowed (SHA1).", $hardwareKey);
+	}
+
+	//check in the database for this hardwareKey
+	$SQL = "SELECT licensed, display FROM display WHERE license = '$hardwareKey'";
+	if (!$result = $db->query($SQL))
+	{
+		trigger_error("License key query failed:" .$db->error());
+		return new soap_fault("SOAP-ENV:Server", "", "License Key Query Failed, see server errorlog", $db->error());
+	}
+
+	//Is it there?
+	if ($db->num_rows($result) == 0)
+	{
+		//Add this display record
+		$SQL = sprintf("INSERT INTO display (display, defaultlayoutid, license, licensed) VALUES ('%s', 1, '%s', 0)", $displayName, $hardwareKey);
+		if (!$displayid = $db->insert_query($SQL))
+		{
+			trigger_error($db->error());
+			return new soap_fault("SOAP-ENV:Server", "", "Error adding display");
+		}
+		$active = "Display added and is awaiting licensing approval from an Administrator";
+	}
+	else
+	{
+		//we have seen this display before, so check the licensed value
+		$row = $db->get_row($result);
+		if ($row[0] == 0)
+		{
+			//Its Not licensed
+			$active = "Display is awaiting licensing approval from an Administrator.";
+		}
+		else
+		{
+			//It is licensed
+			//Now check the names
+			if ($row[1] == $displayName)
+			{
+				$active = "Display is active and ready to start.";
+			}
+			else
+			{
+				//Update the name
+				$SQL = sprintf("UPDATE display SET display = '%s' WHERE license = '%s' ", $displayName, $hardwareKey);
+
+				if (!$db->query($SQL))
+				{
+					trigger_error($db->error());
+					return new soap_fault("SOAP-ENV:Server", "", "Error editing the display name");
+				}
+
+				$active = "Changed display name from '{$row[1]}' to '$displayName' Display is active and ready to start.";
+			}
+		}
+	}
+
+	Debug::LogEntry($db, "audit", "$active", "xmds", "RegisterDisplay");
+	Debug::LogEntry($db, "audit", "[OUT]", "xmds", "RegisterDisplay");
+
+	return $active;
+}
+
+/**
+ * Returns a string containing the required files xml for the requesting display
+ * @param string $hardwareKey Display Hardware Key
+ * @return string $requiredXml Xml Formatted String
+ */
+function RequiredFiles($serverKey, $hardwareKey, $version)
+{
+	global $db;
+
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	$libraryLocation = Config::GetSetting($db, "LIBRARY_LOCATION");
+
+	//auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		trigger_error("This display is not licensed [$hardwareKey]");
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed");
+	}
+
+	if ($displayInfo['isAuditing'] == 1)
+	{
+		Debug::LogEntry($db, "audit", "[IN]", "xmds", "RequiredFiles");
+		Debug::LogEntry($db, "audit", "$hardwareKey", "xmds", "RequiredFiles");
+	}
+
+	$requiredFilesXml = new DOMDocument("1.0");
+	$fileElements = $requiredFilesXml->createElement("files");
+
+	$requiredFilesXml->appendChild($fileElements);
+
+	$currentdate = date("Y-m-d H:i:s");
+	$time = time();
+	$plus4hours = date("Y-m-d H:i:s",$time + 86400);
+
+	//Add file nodes to the $fileElements
+	//Firstly get all the scheduled layouts
+	$SQL  = " SELECT layout.layoutID, schedule_detail.starttime, schedule_detail.endtime, layout.xml, layout.background ";
+	$SQL .= " FROM layout ";
+	$SQL .= " INNER JOIN schedule_detail ON schedule_detail.layoutID = layout.layoutID ";
+	$SQL .= " INNER JOIN display ON schedule_detail.displayID = display.displayID ";
+	$SQL .= sprintf(" WHERE display.license = '%s'  ", $hardwareKey);
+
+	$SQLBase = $SQL;
+
+	//Do we include the default display
+	if ($displayInfo['inc_schedule'] == 1)
+	{
+		$SQL .= sprintf(" AND ((schedule_detail.starttime < '%s' AND schedule_detail.endtime > '%s' )", $plus4hours, $currentdate);
+		$SQL .= " OR (schedule_detail.starttime = '2050-12-31 00:00:00' AND schedule_detail.endtime = '2050-12-31 00:00:00' ))";
+	}
+	else
+	{
+		$SQL .= sprintf(" AND (schedule_detail.starttime < '%s' AND schedule_detail.endtime > '%s' )", $plus4hours, $currentdate);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "$SQL", "xmds", "RequiredFiles");
+
+	if (!$results = $db->query($SQL))
+	{
+		trigger_error($db->error());
+		return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of files", $db->error());
+	}
+
+	// Was there anything?
+	if ($db->num_rows($results) == 0)
+	{
+		// No rows, run the query for default layout
+		$SQL  = $SQLBase;
+		$SQL .= sprintf(" AND ((schedule_detail.starttime < '%s' AND schedule_detail.endtime > '%s' )", $plus4hours, $currentdate);
+		$SQL .= " OR (schedule_detail.starttime = '2050-12-31 00:00:00' AND schedule_detail.endtime = '2050-12-31 00:00:00' ))";
+
+		if (!$results = $db->query($SQL))
+		{
+			trigger_error($db->error());
+			return new soap_fault("SOAP-ENV:Server", "", "Unable to get A list of layouts for the schedule", $db->error());
+		}
+	}
+
+	while ($row = $db->get_row($results))
+	{
+		$layoutid = $row[0];
+		$layoutXml = $row[3];
+		$background = $row[4];
+
+		// Add all the associated media first
+		$SQL = "SELECT storedAs, media.mediaID, media.`MD5`, media.FileSize
+				FROM media
+				INNER JOIN lklayoutmedia ON lklayoutmedia.mediaID = media.mediaID
+				WHERE storedAs IS NOT NULL
+					AND lklayoutmedia.layoutID = $layoutid
+					AND media.mediaID NOT IN (SELECT MediaID
+											  FROM blacklist
+											  WHERE DisplayID = " . $displayInfo['displayid'] . "
+											  AND isIgnored = 0 )";
+
+		if (!$mediaResults = $db->query($SQL))
+		{
+			trigger_error($db->error());
+			return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of media for the layout [$layoutid]");
+		}
+
+		while ($row = $db->get_row($mediaResults))
+		{
+			$storedAs	= Kit::ValidateParam($row[0], _STRING);
+			$mediaId	= Kit::ValidateParam($row[1], _INT);
+			$md5		= Kit::ValidateParam($row[2], _STRING);
+			$fileSize	= Kit::ValidateParam($row[3], _INT);
+
+			// If they are empty calculate them and save them back to the media.
+			if ($md5 == '' || $fileSize == 0)
+			{
+
+				$md5 		= md5_file($libraryLocation.$row[0]);
+				$fileSize	= filesize($libraryLocation.$row[0]);
+
+				// Update the media record with this information
+				$SQL = sprintf("UPDATE media SET `MD5` = '%s', FileSize = %d WHERE MediaID = %d", $md5, $fileSize, $mediaId);
+
+				if (!$db->query($SQL))
+					trigger_error($db->error());
+			}
+
+			//Add the file node
+			$file = $requiredFilesXml->createElement("file");
+
+			$file->setAttribute("type", "media");
+			$file->setAttribute("path", $storedAs);
+			$file->setAttribute("id",	$mediaId);
+			$file->setAttribute("size", $fileSize);
+			$file->setAttribute("md5", $md5);
+
+			$fileElements->appendChild($file);
+		}
+
+		//Also append another file node for the background image (if there is one)
+		if ($background != "")
+		{
+			//firstly add this as a node
+			$file = $requiredFilesXml->createElement("file");
+
+			$file->setAttribute("type", "media");
+			$file->setAttribute("path", $background);
+			$file->setAttribute("md5", md5_file($libraryLocation.$background));
+			$file->setAttribute("size", filesize($libraryLocation.$background));
+
+			$fileElements->appendChild($file);
+		}
+
+		// Add this layout as node
+		$file = $requiredFilesXml->createElement("file");
+
+		$file->setAttribute("type", "layout");
+		$file->setAttribute("path", $layoutid);
+		$file->setAttribute("md5", md5($layoutXml . "\n"));
+
+		$fileElements->appendChild($file);
+	}
+
+	//
+	// Add a blacklist node
+	//
+	$blackList = $requiredFilesXml->createElement("file");
+	$blackList->setAttribute("type", "blacklist");
+
+	$fileElements->appendChild($blackList);
+
+	// Populate
+	$SQL = "SELECT MediaID
+			FROM blacklist
+			WHERE DisplayID = " . $displayInfo['displayid'] . "
+			AND isIgnored = 0";
+
+	if (!$results = $db->query($SQL))
+	{
+		trigger_error($db->error());
+		return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of blacklisted files", $db->error());
+	}
+
+	// Add a black list element for each file
+	while ($row = $db->get_row($results))
+	{
+		$file = $requiredFilesXml->createElement("file");
+		$file->setAttribute("id", $row[0]);
+
+		$blackList->appendChild($file);
+	}
+
+	// PHONE_HOME if required.
+	if (Config::GetSetting($db,'PHONE_HOME') == 'On') {
+		// Find out when we last PHONED_HOME :D
+		// If it's been > 28 days since last PHONE_HOME then
+		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
+
+			if ($displayInfo['isAuditing'] == 1)
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [IN]", "xmds", "RequiredFiles");
+			}
+
+			// Retrieve number of displays
+			$SQL = "SELECT COUNT(*)
+					FROM `display`
+					WHERE `licensed` = '1'";
+			if (!$results = $db->query($SQL))
+			{
+				trigger_error($db->error());
+			}
+			while ($row = $db->get_row($results))
+			{
+				$PHONE_HOME_CLIENTS = Kit::ValidateParam($row[0],_INT);
+			}
+
+			// Retrieve version number
+			$PHONE_HOME_VERSION = Config::Version($db, 'app_ver');
+
+			$PHONE_HOME_URL = Config::GetSetting($db,'PHONE_HOME_URL') . "?id=" . urlencode(Config::GetSetting($db,'PHONE_HOME_KEY')) . "&version=" . urlencode($PHONE_HOME_VERSION) . "&numClients=" . urlencode($PHONE_HOME_CLIENTS);
+
+			if ($displayInfo['isAuditing'] == 1)
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME_URL " . $PHONE_HOME_URL , "xmds", "RequiredFiles");
+			}
+
+			// Set PHONE_HOME_TIME to NOW.
+			$SQL = "UPDATE `setting`
+					SET `value` = '" . time() . "'
+					WHERE `setting`.`setting` = 'PHONE_HOME_DATE' LIMIT 1";
+
+			if (!$results = $db->query($SQL))
+			{
+				trigger_error($db->error());
+			}
+
+			@file_get_contents($PHONE_HOME_URL);
+
+			if ($displayInfo['isAuditing'] == 1)
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [OUT]", "xmds", "RequiredFiles");
+			}
+		//endif
+		}
+	}
+	// END OF PHONE_HOME CODE
+
+	if ($displayInfo['isAuditing'] == 1)
+	{
+		Debug::LogEntry($db, "audit", $requiredFilesXml->saveXML(), "xmds", "RequiredFiles");
+		Debug::LogEntry($db, "audit", "[OUT]", "xmds", "RequiredFiles");
+	}
+
+	// Return the results of requiredFiles()
+	return $requiredFilesXml->saveXML();
+}
+
+/**
+ * Gets the specified file
+ * @return
+ * @param $hardwareKey Object
+ * @param $filePath Object
+ * @param $fileType Object
+ */
+function GetFile($serverKey, $hardwareKey, $filePath, $fileType, $chunkOffset, $chunkSize, $version)
+{
+	global $db;
+
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$fileType 		= Kit::ValidateParam($fileType, _WORD);
+	$chunkOffset 	= Kit::ValidateParam($chunkOffset, _INT);
+	$chunkSize 		= Kit::ValidateParam($chunkSize, _INT);
+	$version 		= Kit::ValidateParam($version, _STRING);
+
+	$libraryLocation = Config::GetSetting($db, "LIBRARY_LOCATION");
+
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	//auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed");
+	}
+
+	if ($displayInfo['isAuditing'] == 1)
+	{
+		Debug::LogEntry($db, "audit", "[IN]", "xmds", "GetFile");
+		Debug::LogEntry($db, "audit", "Params: [$hardwareKey] [$filePath] [$fileType] [$chunkOffset] [$chunkSize]", "xmds", "GetFile");
+	}
+
+	if ($fileType == "layout")
+	{
+		$filePath = Kit::ValidateParam($filePath, _INT);
+
+		$SQL = sprintf("SELECT xml FROM layout WHERE layoutid = %d", $filePath);
+		if (!$results = $db->query($SQL))
+		{
+			trigger_error($db->error());
+			return new soap_fault("SOAP-ENV:Server", "", "Unable to get a list of files", $db->error());
+		}
+
+		$row = $db->get_row($results);
+
+		$file = $row[0];
+	}
+	elseif ($fileType == "media")
+	{
+		$filePath = Kit::ValidateParam($filePath, _STRING);
+		
+		if (strstr($filePath, '/') || strstr($filePath, '\\'))
+		{
+			return new soap_fault("SOAP-ENV:Client", "", "Invalid file path.", $serverKey);
+		}
+
+		// Return the Chunk size specified
+		$f = fopen($libraryLocation.$filePath,"r");
+
+		fseek($f, $chunkOffset);
+
+		$file = fread($f, $chunkSize);
+	}
+	else
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Unknown FileType Requested.");
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "[OUT]", "xmds", "GetFile");
+
+	return base64_encode($file);
+}
+
+/**
+ * Returns the schedule for the hardware key specified
+ * @return
+ * @param $hardwareKey Object
+ */
+function Schedule($serverKey, $hardwareKey, $version)
+{
+	global $db;
+
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	//auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "[IN] $hardwareKey", "xmds", "Schedule");
+
+	$scheduleXml = new DOMDocument("1.0");
+	$layoutElements = $scheduleXml->createElement("schedule");
+
+	$scheduleXml->appendChild($layoutElements);
+
+	$currentdate = date("Y-m-d H:i:s");
+	$time = time();
+	$plus4hours = date("Y-m-d H:i:s",$time + 86400);
+
+	//Add file nodes to the $fileElements
+	//Firstly get all the scheduled layouts
+	$SQL  = " SELECT layout.layoutID, schedule_detail.starttime, schedule_detail.endtime, schedule_detail.eventID ";
+	$SQL .= " FROM layout ";
+	$SQL .= " INNER JOIN schedule_detail ON schedule_detail.layoutID = layout.layoutID ";
+	$SQL .= " INNER JOIN display ON schedule_detail.displayID = display.displayID ";
+	$SQL .= " WHERE display.license = '$hardwareKey'  ";
+	$SQL .= "   AND layout.retired = 0  ";
+
+	// Store the Base SQL for this display
+	$SQLBase = $SQL;
+
+	// Run the query
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "$SQL", "xmds", "Schedule");
+
+
+
+	// Do we include the default display
+	if ($displayInfo['inc_schedule'] == 1)
+	{
+		$SQL .= " AND ((schedule_detail.starttime < '$currentdate' AND schedule_detail.endtime > '$currentdate' )";
+		$SQL .= " OR (schedule_detail.starttime = '2050-12-31 00:00:00' AND schedule_detail.endtime = '2050-12-31 00:00:00' ))";
+	}
+	else
+	{
+		$SQL .= " AND (schedule_detail.starttime < '$currentdate' AND schedule_detail.endtime > '$currentdate' )";
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "$SQL", "xmds", "Schedule");
+
+
+	// Before we run the main query we should check to see if there are any priority layouts to deal with
+	$SQLp = " AND schedule_detail.is_priority = 1 ";
+
+	// Run the query
+	if (!$results = $db->query($SQL . $SQLp))
+	{
+		trigger_error($db->error());
+		return new soap_fault("SOAP-ENV:Server", "", "Unable to get A list of layouts for the schedule", $db->error());
+	}
+
+	// If there were no results then continue to get the full schedule
+	if ($db->num_rows($results) == 0)
+	{
+		// Run the query
+		if (!$results = $db->query($SQL))
+		{
+			trigger_error($db->error());
+			return new soap_fault("SOAP-ENV:Server", "", "Unable to get A list of layouts for the schedule", $db->error());
+		}
+
+		// Was there anything?
+		if ($db->num_rows($results) == 0)
+		{
+			// No rows, run the query for default layout
+			$SQL  = $SQLBase;
+			$SQL .= " AND ((schedule_detail.starttime < '$currentdate' AND schedule_detail.endtime > '$currentdate' )";
+			$SQL .= " OR (schedule_detail.starttime = '2050-12-31 00:00:00' AND schedule_detail.endtime = '2050-12-31 00:00:00' ))";
+
+			if (!$results = $db->query($SQL))
+			{
+				trigger_error($db->error());
+				return new soap_fault("SOAP-ENV:Server", "", "Unable to get A list of layouts for the schedule", $db->error());
+			}
+		}
+	}
+
+	// We must have some results in here by this point
+	while ($row = $db->get_row($results))
+	{
+		$layoutid 	= $row[0];
+		$fromdt 	= $row[1];
+		$todt		= $row[2];
+		$scheduleid = $row[3];
+
+		//firstly add this as a node
+		$layout = $scheduleXml->createElement("layout");
+
+		$layout->setAttribute("file", $layoutid);
+		$layout->setAttribute("fromdt", $fromdt);
+		$layout->setAttribute("todt", $todt);
+		$layout->setAttribute("scheduleid", $scheduleid);
+
+		$layoutElements->appendChild($layout);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", $scheduleXml->saveXML(), "xmds", "Schedule");
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry($db, "audit", "[OUT]", "xmds", "Schedule");
+
+	return $scheduleXml->saveXML();
+}
+
+/**
+ * Recieves the XmlLog from the display
+ * @return
+ * @param $hardwareKey String
+ * @param $xml String
+ */
+function RecieveXmlLog($serverKey, $hardwareKey, $xml, $version)
+{
+	global $db;
+
+	return new soap_fault("SOAP-ENV:Client", "", "This is a depricated service call. You should instead call either SubmitLog or SubmitStats", $serverKey);
+}
+
+define('BLACKLIST_ALL', "All");
+define('BLACKLIST_SINGLE', "Single");
+/**
+ *
+ * @return
+ * @param $hardwareKey Object
+ * @param $mediaId Object
+ * @param $type Object
+ */
+function BlackList($serverKey, $hardwareKey, $mediaId, $type, $reason, $version)
+{
+	global $db;
+
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$mediaId	 	= Kit::ValidateParam($mediaId, _STRING);
+	$type		 	= Kit::ValidateParam($type, _STRING);
+	$reason		 	= Kit::ValidateParam($reason, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	// Auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "[IN]", "xmds", "BlackList", "", $displayInfo['displayid']);
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "$xml", "xmds", "BlackList", "", $displayInfo['displayid']);
+
+	// Check to see if this media/display is already blacklisted (and not ignored)
+	$SQL = "SELECT BlackListID FROM blacklist WHERE MediaID = $mediaId AND isIgnored = 0 AND DisplayID = " . $displayInfo['displayid'];
+
+	if (!$results = $db->query($SQL))
+	{
+		trigger_error($db->error());
+		return new soap_fault("SOAP-ENV:Server", "", "Unable to query for BlackList records.", $db->error());
+	}
+
+	if ($db->num_rows($results) == 0)
+	{
+		// Insert the black list record
+		// Get all the displays and create a blacklist records
+		$SQL = "SELECT displayID FROM display";
+		if ($type == BLACKLIST_SINGLE)
+		{
+			// Only the current display
+			$SQL .= " WHERE displayID = " . $displayInfo['displayid'];
+		}
+
+		if (!$displays = $db->query($SQL))
+		{
+			trigger_error($db->error());
+			return new soap_fault("SOAP-ENV:Server", "", "Unable to query for BlackList Displays.", $db->error());
+		}
+
+		while ($row = $db->get_row($displays))
+		{
+			$displayId = $row[0];
+
+			$SQL = "INSERT INTO blacklist (MediaID, DisplayID, ReportingDisplayID, Reason)
+						VALUES ($mediaId, $displayId, " . $displayInfo['displayid'] . ", '$reason') ";
+
+			if (!$db->query($SQL))
+			{
+				trigger_error($db->error());
+				return new soap_fault("SOAP-ENV:Server", "", "Unable to insert BlackList records.", $db->error());
+			}
+		}
+	}
+	else
+	{
+		if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "Media Already BlackListed [$mediaId]", "xmds", "BlackList", "", $displayInfo['displayid']);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "[OUT]", "xmds", "BlackList", "", $displayInfo['displayid']);
+
+	return true;
+}
+
+/**
+ * Submit client logging
+ * @return
+ * @param $version Object
+ * @param $serverKey Object
+ * @param $hardwareKey Object
+ * @param $logXml Object
+ */
+function SubmitLog($version, $serverKey, $hardwareKey, $logXml)
+{
+	global $db;
+
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+	$logXml 		= Kit::ValidateParam($logXml, _HTMLSTRING);
+
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	// Auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "IN", "xmds", "SubmitLog", "", $displayInfo['displayid']);
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", 'XML [' . $logXml . ']', "xmds", "SubmitLog", "", $displayInfo['displayid']);
+
+	// Load the XML into a DOMDocument
+	$document = new DOMDocument("1.0");
+
+	if (!$document->loadXML($logXml))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "XML Cannot be loaded into DOM Document.", $hardwareKey);
+	}
+
+	foreach ($document->documentElement->childNodes as $node)
+	{
+		// Make sure we dont consider any text nodes
+		if ($node->nodeType == XML_TEXT_NODE) continue;
+			
+		// Zero out the common vars
+		$date 		= "";
+		$message 	= "";
+		$scheduleID = "";
+		$layoutID 	= "";
+		$mediaID 	= "";
+		$cat		= '';
+		$method		= '';
+
+		// This will be a bunch of trace nodes
+		$message = $node->textContent;
+		
+		if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", 'Trace Message: [' . $message . ']', "xmds", "SubmitLog", "", $displayInfo['displayid']);
+		
+		// Each element should have a category and a date
+		$date	= $node->getAttribute('date');
+		$cat	= $node->getAttribute('category');
+
+		if ($date == '' || $cat == '')
+		{
+			trigger_error('Log submitted without a date or category attribute');
+			continue;
+		}
+
+		// Get the date and the message (all log types have these)
+		foreach ($node->childNodes as $nodeElements)
+		{
+			if ($nodeElements->nodeName == "scheduleID")
+			{
+				$scheduleID = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "layoutID")
+			{
+				$layoutID = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "mediaID")
+			{
+				$mediaID = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "type")
+			{
+				$type = $nodeElements->textContent;
+			}
+			else if ($nodeElements->nodeName == "method")
+			{
+				$method	= $nodeElements->textContent;
+			}
+		}
+
+		// We should have enough information to log this now.
+		if ($cat == 'error' || $cat == 'Error')
+		{
+			Debug::LogEntry($db, $cat, $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);
+		}
+		else
+		{
+			Debug::LogEntry($db, 'audit', $message, 'Client', $method, $date, $displayInfo['displayid'], $scheduleID, $layoutID, $mediaID);
+		}
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "OUT", "xmds", "SubmitLog", "", $displayInfo['displayid']);
+
+	return true;
+}
+
+/**
+ * Submit display statistics to the server
+ * @return
+ * @param $version Object
+ * @param $serverKey Object
+ * @param $hardwareKey Object
+ * @param $statXml Object
+ */
+function SubmitStats($version, $serverKey, $hardwareKey, $statXml)
+{
+	global $db;
+
+	// Sanitize
+	$serverKey 		= Kit::ValidateParam($serverKey, _STRING);
+	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+	$version 		= Kit::ValidateParam($version, _STRING);
+	$statXml 		= Kit::ValidateParam($statXml, _HTMLSTRING);
+
+	// Make sure we are talking the same language
+	if (!CheckVersion($version))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk", $serverKey);
+	}
+
+	// Auth this request...
+	if (!$displayInfo = Auth($hardwareKey))
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "This display client is not licensed", $hardwareKey);
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "IN", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "StatXml: [" . $statXml . "]", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+
+	if ($statXml == "")
+	{
+		return new soap_fault("SOAP-ENV:Client", "", "Stat XML is empty.", $hardwareKey);
+	}
+
+	// Log
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "About to create Stat Object.", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+
+	$statObject = new Stat($db);
+
+	// Log
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "About to Create DOMDocument.", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+
+	// Load the XML into a DOMDocument
+	$document = new DOMDocument("1.0");
+	$document->loadXML($statXml);
+
+	foreach ($document->documentElement->childNodes as $node)
+	{	
+		// Make sure we dont consider any text nodes
+		if ($node->nodeType == XML_TEXT_NODE) continue;
+
+		//Zero out the common vars
+		$fromdt		= '';
+		$todt		= '';
+		$type		= '';
+
+		$scheduleID = 0;
+		$layoutID 	= 0;
+		$mediaID 	= '';
+		$tag		= '';
+
+		// Each element should have these attributes
+		$fromdt	= $node->getAttribute('fromdt');
+		$todt	= $node->getAttribute('todt');
+		$type	= $node->getAttribute('type');
+
+		if ($fromdt == '' || $todt == '' || $type == '')
+		{
+			trigger_error('Stat submitted without the fromdt, todt or type attributes.');
+			continue;
+		}
+
+		$scheduleID	= $node->getAttribute('scheduleid');
+		$layoutID	= $node->getAttribute('layoutid');
+		$mediaID	= $node->getAttribute('mediaid');
+		$tag		= $node->getAttribute('tag');
+
+		// Write the stat record with the information we have available to us.
+		if (!$statObject->Add($type, $fromdt, $todt, $scheduleID, $displayInfo['displayid'], $layoutID, $mediaID, $tag))
+		{
+			trigger_error(sprintf('Stat Add failed with error: %s', $statObject->GetErrorMessage()));
+			continue;
+		}
+	}
+
+	if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", "OUT", "xmds", "SubmitStats", "", $displayInfo['displayid']);
+
+	return true;
+}
+
+//$debug = 1;
+$service = new soap_server();
+
+$service->configureWSDL("xmds", "urn:xmds");
+
+$service->register("RegisterDisplay",
+		array('serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'displayName' => 'xsd:string', 'version' => 'xsd:string'),
+		array('ActivationMessage' => 'xsd:string'),
+		'urn:xmds',
+		'urn:xmds#RegisterDisplay',
+		'rpc',
+		'encoded',
+		'Registered the Display on the Xibo Network'
+		);
+
+$service->register("RequiredFiles",
+		array('serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'version' => 'xsd:string'),
+		array('RequiredFilesXml' => 'xsd:string'),
+		'urn:xmds',
+		'urn:xmds#RequiredFiles',
+		'rpc',
+		'encoded',
+		'The files required by the requesting display'
+		);
+
+$service->register("GetFile",
+		array('serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'filePath' => 'xsd:string', 'fileType' => 'xsd:string', 'chunkOffset' => 'xsd:int', 'chuckSize' => 'xsd:int', 'version' => 'xsd:string'),
+		array('file' => 'xsd:base64Binary'),
+		'urn:xmds',
+		'urn:xmds#GetFile',
+		'rpc',
+		'encoded',
+		'Gets the file requested'
+		);
+
+$service->register("Schedule",
+		array('serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'version' => 'xsd:string'),
+		array('ScheduleXml' => 'xsd:string'),
+		'urn:xmds',
+		'urn:xmds#Schedule',
+		'rpc',
+		'encoded',
+		'Gets the schedule'
+		);
+
+$service->register("RecieveXmlLog",
+		array('serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'xml' => 'xsd:string', 'version' => 'xsd:string'),
+		array('success' => 'xsd:boolean'),
+		'urn:xmds',
+		'urn:xmds#RecieveXmlLog',
+		'rpc',
+		'encoded',
+		'Recieves the Log Xml'
+	);
+
+$service->register("BlackList",
+		array('serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'mediaId' => 'xsd:int', 'type' => 'xsd:string', 'reason'=>'xsd:string', 'version' => 'xsd:string'),
+		array('success' => 'xsd:boolean'),
+		'urn:xmds',
+		'urn:xmds#BlackList',
+		'rpc',
+		'encoded',
+		'Set media to be blacklisted'
+	);
+
+$service->register("SubmitLog",
+		array('version' => 'xsd:string', 'serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'logXml' => 'xsd:string'),
+		array('success' => 'xsd:boolean'),
+		'urn:xmds',
+		'urn:xmds#SubmitLog',
+		'rpc',
+		'encoded',
+		'Submit Logging from the Client'
+	);
+
+$service->register("SubmitStats",
+		array('version' => 'xsd:string', 'serverKey' => 'xsd:string', 'hardwareKey' => 'xsd:string', 'statXml' => 'xsd:string'),
+		array('success' => 'xsd:boolean'),
+		'urn:xmds',
+		'urn:xmds#SubmitLog',
+		'rpc',
+		'encoded',
+		'Submit Display statistics from the Client'
+	);
+
+
+
+$HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';
+$service->service($HTTP_RAW_POST_DATA);
+
+//Debug::LogEntry($db, 'audit', $service->debug_str, "xmds", "NuSOAP");
+
+>>>>>>> MERGE-SOURCE
 ?>
 \ No newline at end of file