Merge lp:~dangarner/xibo/server-163-final into lp:xibo/1.7

[Dan Garner]

Unmerged revisions

359. By Dan Garner on 2014-08-15

[cms] Pushed files for release.

=== renamed file 'default.mo' => 'default.mo.OTHER'
Binary files default.mo	2014-07-15 16:00:50 +0000 and default.mo.OTHER	2014-08-21 12:09:46 +0000 differ
=== modified file 'default.pot'
--- default.pot	2014-07-15 16:00:50 +0000
+++ default.pot	2014-08-21 12:09:46 +0000
@@ -2,7 +2,11 @@
 msgstr ""
 "Project-Id-Version: Xibo Digital Signage\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2014-07-15 17:00-0000\n"
+=======
+"POT-Creation-Date: 2014-07-15 16:44-0000\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: \n"
 "Last-Translator: Dan Garner <[e-mail]>\n"
 "Language-Team:  <[e-mail]>\n"
@@ -10,7 +14,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.7.0-alpha\n"
+=======
+"X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.6.2\n"
+>>>>>>> MERGE-SOURCE
 "X-Poedit-KeywordsList: __;Translate\n"
 "X-Generator: Poedit 1.5.5\n"
 "X-Poedit-SearchPath-0: server\n"

=== modified file 'server/config/config.class.php'
--- server/config/config.class.php	2014-06-28 16:12:52 +0000
+++ server/config/config.class.php	2014-08-21 12:09:46 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2013 Daniel Garner and James Packer
+ * Copyright (C) 2006-2014 Daniel Garner and James Packer
  *
  * This file is part of Xibo.
  *
@@ -22,6 +22,8 @@
  
 class Config 
 {
+	public static $VERSION_REQUIRED = '5.3.3';
+
 	private $extensions;
 	private $envTested;
 	private $envFault;
@@ -129,7 +131,7 @@
 		// Check for PHP version
 		$message = __('PHP Version');
 
-		if ($this->CheckPHP() == 1) 
+		if ($this->CheckPHP()) 
 		{
 			$output .= $imgGood.$message.'<br />';
 		}
@@ -138,7 +140,11 @@
 			$this->envFault = true;
 			
 			$output .= $imgBad.$message.'<br />';
+<<<<<<< TREE
 			$output .= '<div class="check_explain"> <p>' . __("PHP version 5.3.3 or later required.") . '. Detected ' . phpversion() . '</p></div>';
+=======
+			$output .= '<div class="check_explain"> <p>' . sprintf(__("PHP version %s or later required."), Config::$VERSION_REQUIRED) . '. Detected ' . phpversion() . '</p></div>';
+>>>>>>> MERGE-SOURCE
 		}
 		
 		// Check for file system permissions
@@ -463,7 +469,11 @@
 	 */
 	function CheckPHP() 
 	{
+<<<<<<< TREE
 		return ((version_compare('5.3.3', phpversion(), '>='))) ? 1 : 0;
+=======
+		return (version_compare(phpversion(), Config::$VERSION_REQUIRED) != -1);
+>>>>>>> MERGE-SOURCE
 	}
 	
 	/**

=== modified file 'server/install.php'
--- server/install.php	2014-07-15 15:59:36 +0000
+++ server/install.php	2014-08-21 12:09:46 +0000
@@ -20,11 +20,14 @@
  */ 
 DEFINE('XIBO', true);
 
+<<<<<<< TREE
 if (! checkPHP()) 
 {
 	die('Xibo requires PHP 5.3.3 or later');
 }
 
+=======
+>>>>>>> MERGE-SOURCE
 error_reporting(0);
 ini_set('display_errors', 0);
 
@@ -33,6 +36,12 @@
 include('config/config.class.php');
 include('config/db_config.php');
 
+$config = new Config();
+
+if (!$config->CheckPHP()) {
+  die(sprintf('Xibo required PHP version %s.', Config::$VERSION_REQUIRED));
+}
+
 // Setup for the Translations using Gettext.
 // There is normally a class that will do this for us - but it requires a DB object (which we do not have at install time)
 // Would be nice to include a method on the TranslationEngine that did this for us - but without the debugging
@@ -691,11 +700,14 @@
   return $key;
 }
 
+<<<<<<< TREE
 function checkPHP() 
 {
 	return (version_compare("5.3.3",phpversion(), "<="));
 }
 
+=======
+>>>>>>> MERGE-SOURCE
 function CheckGettext() 
 {
 	return extension_loaded("gettext");

=== added file 'server/install/database/71.sql'
--- server/install/database/71.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/71.sql	2014-08-21 12:09:46 +0000
@@ -0,0 +1,4 @@
+
+UPDATE `version` SET `app_ver` = '1.6.3', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '71';

=== modified file 'server/install/master/data.sql'
--- server/install/master/data.sql	2014-07-15 15:35:22 +0000
+++ server/install/master/data.sql	2014-08-21 12:09:46 +0000
@@ -1,5 +1,9 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
+<<<<<<< TREE
 ('1.6.2', 3, 1, 70);
+=======
+('1.6.3', 3, 1, 71);
+>>>>>>> MERGE-SOURCE
 
 INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
 (1, 'Users', 0, 0),

=== modified file 'server/install/master/structure.sql'
--- server/install/master/structure.sql	2014-03-09 14:41:56 +0000
+++ server/install/master/structure.sql	2014-08-21 12:09:46 +0000
@@ -34,6 +34,7 @@
   `DataSet` varchar(50) NOT NULL,
   `Description` varchar(254) DEFAULT NULL,
   `UserID` int(11) NOT NULL,
+  `LastDataEdit` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`DataSetID`),
   KEY `UserID` (`UserID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -602,6 +603,15 @@
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='File associations directly to Display Groups' AUTO_INCREMENT=1 ;
 
+CREATE TABLE IF NOT EXISTS `lkdatasetlayout` (
+  `LkDataSetLayoutID` int(11) NOT NULL AUTO_INCREMENT,
+  `DataSetID` int(11) NOT NULL,
+  `LayoutID` int(11) NOT NULL,
+  `RegionID` varchar(50) NOT NULL,
+  `MediaID` varchar(50) NOT NULL,
+  PRIMARY KEY (`LkDataSetLayoutID`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
 --
 -- Constraints for dumped tables
 --

=== modified file 'server/lib/app/kit.class.php'
--- server/lib/app/kit.class.php	2014-05-26 09:09:06 +0000
+++ server/lib/app/kit.class.php	2014-08-21 12:09:46 +0000
@@ -372,7 +372,7 @@
 	 */
 	public static function GetURL($page = "")
 	{
-		$page = $this->ValidateParam($page, _WORD);
+		$page = Kit::ValidateParam($page, _WORD);
 		$fullUrl = 'http';
 		
 		if(isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on')

=== modified file 'server/lib/app/pdoconnect.class.php'
--- server/lib/app/pdoconnect.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/app/pdoconnect.class.php	2014-08-21 12:09:46 +0000
@@ -34,8 +34,18 @@
 			global $dbpass;
 			global $dbname;
 
+			$dbport = '';
+
+			if (strstr($dbhost, ':')) {
+				$hostParts = explode(':', $dbhost);
+				$dsn = 'mysql:host=' . $hostParts[0] . ';port=' . $hostParts[1] . ';dbname=' . $dbname . ';';
+			}
+			else {
+				$dsn = 'mysql:host=' . $dbhost . ';dbname=' . $dbname . ';';
+			}
+
 			// Open the connection and set the error mode
-			self::$conn = new PDO('mysql:host=' . $dbhost . ';dbname=' . $dbname . ';', $dbuser, $dbpass);
+			self::$conn = new PDO($dsn, $dbuser, $dbpass);
 			self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 			self::$conn->query("SET NAMES 'utf8'");

=== modified file 'server/lib/data/dataset.data.class.php'
--- server/lib/data/dataset.data.class.php	2014-07-08 14:45:16 +0000
+++ server/lib/data/dataset.data.class.php	2014-08-21 12:09:46 +0000
@@ -441,8 +441,7 @@
 
         Debug::LogEntry('audit', $SQL);
 
-        if (!$rows = $db->GetArray($SQL, $associative))
-            trigger_error($db->error());
+        $rows = $db->GetArray($SQL, $associative);
 
         if (!is_array($rows))
             $rows = array();

=== modified file 'server/lib/data/datasetdata.data.class.php'
--- server/lib/data/datasetdata.data.class.php	2014-07-12 13:54:51 +0000
+++ server/lib/data/datasetdata.data.class.php	2014-08-21 12:09:46 +0000
@@ -377,4 +377,4 @@
         }
     }
 }
-?>
\ No newline at end of file
+?>

=== modified file 'server/lib/data/displaygroup.data.class.php'
--- server/lib/data/displaygroup.data.class.php	2014-04-19 09:11:34 +0000
+++ server/lib/data/displaygroup.data.class.php	2014-08-21 12:09:46 +0000
@@ -151,7 +151,8 @@
      */
     public function Delete($displayGroupID)
     {
-        Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'Delete');
+        if ($displayGroupID == NULL || $displayGroupID == 0)
+            return $this->SetError(__('Missing displayGroupId'));
 
         try {
             $dbh = PDOConnect::init();
@@ -162,6 +163,13 @@
             if (!$schedule->DeleteScheduleForDisplayGroup($displayGroupID))
                 throw new Exception('Unable to DeleteScheduleForDisplayGroup');
 
+            // Remove all permissions
+            Kit::ClassLoader('displaygroupsecurity');
+            $security = new DisplayGroupSecurity($this->db);
+
+            if (!$security->UnlinkAll($displayGroupID))
+                throw new Exception('Unable to Unlink all Display Group Permissions');                
+
             // Delete the Display Group
             $sth = $dbh->prepare('DELETE FROM displaygroup WHERE DisplayGroupID = :displaygroupid');
             $sth->execute(array(
@@ -414,10 +422,6 @@
 
         try {
             $dbh = PDOConnect::init();
-
-            // Check that some media assignments have been made
-            if (count($mediaList) == 0)
-                $this->ThrowError(25006, __('No media to assign'));
         
             // Drop all current assignments
             if (!$link->UnlinkAllFromDisplayGroup($displayGroupId))

=== modified file 'server/lib/data/region.data.class.php'
--- server/lib/data/region.data.class.php	2014-07-01 17:12:06 +0000
+++ server/lib/data/region.data.class.php	2014-08-21 12:09:46 +0000
@@ -22,10 +22,19 @@
 
 class Region extends Data
 {
-	// Caching
-	private $layoutXml;
-	private $layoutDocument;
-
+<<<<<<< TREE
+	// Caching
+	private $layoutXml;
+	private $layoutDocument;
+
+=======
+	// Caching
+	private $layoutXml;
+	private $layoutDocument;
+
+	public $delayFinalise = false;
+
+>>>>>>> MERGE-SOURCE
 	public function __construct(database $db) 
 	{
 		$this->db 	=& $db;
@@ -632,10 +641,12 @@
 			if (!$this->SetLayoutXml($layoutid, $xml->saveXML())) 
 				return false;
 	
-			// Update layout status
-	        Kit::ClassLoader('Layout');
-	        $layout = new Layout($this->db);
-	        $layout->SetValid($layoutid, true);
+			if (!$this->delayFinalise) {
+    			// Update layout status
+    	        Kit::ClassLoader('Layout');
+    	        $layout = new Layout($this->db);
+    	        $layout->SetValid($layoutid, true);
+            }
 			
 			//Its swapped
 			return true;  

=== modified file 'server/lib/data/userdata.data.class.php'
--- server/lib/data/userdata.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/userdata.data.class.php	2014-08-21 12:09:46 +0000
@@ -34,6 +34,34 @@
 
 class Userdata extends Data
 {
+    public $userId;
+
+    public function Delete() {
+        if (!isset($this->userId) || $this->userId == 0)
+            return $this->SetError(__('Missing userId'));
+
+        try {
+            $dbh = PDOConnect::init();
+        
+            $sth = $dbh->prepare('DELETE FROM `user` WHERE userid = :userid');
+            $sth->execute(array('userid' => $this->userId));
+
+            $sth = $dbh->prepare('DELETE FROM `session` WHERE userid = :userid');
+            $sth->execute(array('userid' => $this->userId));
+
+            return true;
+        }
+        catch (Exception $e) {
+            
+            Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+        
+            if (!$this->IsError())
+                $this->SetError(1, __('Unknown Error'));
+        
+            return false;
+        }
+    }
+
     /**
      * Change a users password
      * @param <type> $userId

=== modified file 'server/lib/data/usergroup.data.class.php'
--- server/lib/data/usergroup.data.class.php	2014-01-18 09:47:41 +0000
+++ server/lib/data/usergroup.data.class.php	2014-08-21 12:09:46 +0000
@@ -255,7 +255,7 @@
         
             $sth = $dbh->prepare('DELETE FROM lkusergroup WHERE UserID = :userid');
             $sth->execute(array(
-                    'userid' => $userID
+                    'userid' => $userId
                 ));
 
             Debug::LogEntry('audit', 'OUT', 'UserGroup', 'UnlinkAllGroups');

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2014-07-15 15:36:06 +0000
+++ server/lib/include.php	2014-08-21 12:09:46 +0000
@@ -20,7 +20,11 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
+<<<<<<< TREE
 define('WEBSITE_VERSION', 70);
+=======
+define('WEBSITE_VERSION', 71);
+>>>>>>> MERGE-SOURCE
 
 // No errors reported until we read the settings from the DB
 error_reporting(0);

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2014-07-01 17:12:06 +0000
+++ server/lib/modules/module.class.php	2014-08-21 12:09:46 +0000
@@ -52,6 +52,7 @@
     protected $showRegionOptions;
     protected $originalUserId;
     protected $storedAs;
+    protected $originalFilename;
 
     // Track the error state
 	private $error;
@@ -237,7 +238,7 @@
                     $dbh = PDOConnect::init();
                 
                     // Load what we know about this media into the object
-                    $sth = $dbh->prepare('SELECT duration, name, UserId, storedAs FROM media WHERE mediaID = :media_id');
+                    $sth = $dbh->prepare('SELECT duration, name, UserId, storedAs, originalFilename FROM media WHERE mediaID = :media_id');
                     $sth->execute(array(
                             'media_id' => $mediaid
                         ));
@@ -252,6 +253,7 @@
                     $this->name = $rows[0]['name'];
                     $this->originalUserId = $rows[0]['UserId'];
                     $this->storedAs = $rows[0]['storedAs'];
+                    $this->originalFilename = $rows[0]['originalFilename'];
                 }
                 catch (Exception $e) {
                     
@@ -1203,9 +1205,6 @@
         
         Debug::LogEntry('audit', sprintf('Replacing mediaid %s with mediaid %s in all layouts', $oldMediaId, $newMediaId), 'module', 'ReplaceMediaInAllLayouts');
 
-        // Create a region object for later use
-        $region = new region($db);
-
         try {
             $dbh = PDOConnect::init();
         
@@ -1231,6 +1230,9 @@
 
                 Debug::LogEntry('audit', sprintf('%d linked media items for layoutid %d', count($results), $layoutId), 'module', 'ReplaceMediaInAllLayouts');
                 
+                // Create a region object for later use (new one each time)
+                $region = new region($db);
+
                 // Loop through each media link for this layout
                 foreach ($results as $row)
                 {
@@ -1958,13 +1960,14 @@
         }
         
         $download = Kit::GetParam('download', _REQUEST, _BOOLEAN, false);
+        $downloadFromLibrary = Kit::GetParam('downloadFromLibrary', _REQUEST, _BOOLEAN, false);
 
         $size = filesize($fileName);
         
         if ($download) {
             header('Content-Type: application/octet-stream');
             header("Content-Transfer-Encoding: Binary"); 
-            header("Content-disposition: attachment; filename=\"" . basename($fileName) . "\"");
+            header("Content-disposition: attachment; filename=\"" . (($downloadFromLibrary) ? $this->originalFilename : basename($fileName)) . "\"");
         }
         else {
             $fi = new finfo( FILEINFO_MIME_TYPE );

=== modified file 'server/lib/pages/admin.class.php'
--- server/lib/pages/admin.class.php	2014-06-30 15:15:17 +0000
+++ server/lib/pages/admin.class.php	2014-08-21 12:09:46 +0000
@@ -262,13 +262,13 @@
                     // Monthly bandwidth - optionally tested against limits
                     $xmdsLimit = Config::GetSetting('MONTHLY_XMDS_TRANSFER_LIMIT_KB');
                     $startOfMonth = strtotime(date('m').'/01/'.date('Y').' 00:00:00');
-
-                    $sql = sprintf('SELECT IFNULL(SUM(Size), 0) AS BandwidthUsage FROM `bandwidth` WHERE Month = %d', $startOfMonth);
-                    $bandwidthUsage = $this->db->GetSingleValue($sql, 'BandwidthUsage', _INT);
-
-                    Debug::LogEntry('audit', $sql);
-                    
-                    $usagePcnt = ($xmdsLimit > 0) ? (($bandwidthUsage / ($xmdsLimit * 1024)) * 100) : '';
+                    
+                    $sql = sprintf('SELECT IFNULL(SUM(Size), 0) AS BandwidthUsage FROM `bandwidth` WHERE Month > %d AND Month < %d', $startOfMonth, $startOfMonth + (86400 * 2));
+                    $bandwidthUsage = $this->db->GetSingleValue($sql, 'BandwidthUsage', _DOUBLE);
+
+                    Debug::LogEntry('audit', $sql . '. Usage: ' . $bandwidthUsage);
+                    
+                    $usagePcnt = ($xmdsLimit > 0) ? (((double)$bandwidthUsage / ($xmdsLimit * 1024)) * 100) : '';
                     
                     $output .= '<p>' . sprintf(__('You have used %s of bandwidth this month.'), $this->FormatByteSize($bandwidthUsage)) . (($xmdsLimit > 0) ? sprintf(__(' This is %d %% of your %s limit.'), $usagePcnt, $this->FormatByteSize($xmdsLimit * 1024)) : '') . '</p>';
                 }

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2014-03-08 14:41:11 +0000
+++ server/lib/pages/content.class.php	2014-08-21 12:09:46 +0000
@@ -151,7 +151,7 @@
             // Download
             $row['buttons'][] = array(
                     'id' => 'content_button_download',
-                    'url' => 'index.php?p=module&mod=' . $row['mediatype'] . '&q=Exec&method=GetResource&download=1&mediaid=' . $row['mediaid'],
+                    'url' => 'index.php?p=module&mod=' . $row['mediatype'] . '&q=Exec&method=GetResource&download=1&downloadFromLibrary=1&mediaid=' . $row['mediaid'],
                     'text' => __('Download')
                 );
 

=== modified file 'server/lib/pages/display.class.php'
--- server/lib/pages/display.class.php	2014-07-12 12:09:34 +0000
+++ server/lib/pages/display.class.php	2014-08-21 12:09:46 +0000
@@ -338,11 +338,13 @@
             $row['mediainventorystatus'] = ($row['mediainventorystatus'] == 1) ? 'success' : (($row['mediainventorystatus'] == 2) ? 'error' : 'warning');
 
             // Schedule Now
-            $row['buttons'][] = array(
-                    'id' => 'display_button_schedulenow',
-                    'url' => 'index.php?p=schedule&q=ScheduleNowForm&displayGroupId=' . $row['displaygroupid'],
-                    'text' => __('Schedule Now')
-                );
+            if ($row['edit'] == 1 || Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'Yes') {
+                $row['buttons'][] = array(
+                        'id' => 'display_button_schedulenow',
+                        'url' => 'index.php?p=schedule&q=ScheduleNowForm&displayGroupId=' . $row['displaygroupid'],
+                        'text' => __('Schedule Now')
+                    );
+            }
 
             // Media Inventory
             $row['buttons'][] = array(

=== modified file 'server/lib/pages/displaygroup.class.php'
--- server/lib/pages/displaygroup.class.php	2014-06-30 15:15:17 +0000
+++ server/lib/pages/displaygroup.class.php	2014-08-21 12:09:46 +0000
@@ -775,7 +775,7 @@
         $response   = new ResponseManager();
 
         $displayGroupId = Kit::GetParam('displaygroupid', _GET, _INT);
-        $mediaList = Kit::GetParam('MediaID', _POST, _ARRAY_INT, array(), false);
+        $mediaList = Kit::GetParam('MediaID', _POST, _ARRAY_INT, NULL, false);
 
         if ($displayGroupId == 0)
             trigger_error(__('Display Group not selected'), E_USER_ERROR);

=== modified file 'server/lib/pages/schedule.class.php'
--- server/lib/pages/schedule.class.php	2014-07-09 17:27:29 +0000
+++ server/lib/pages/schedule.class.php	2014-08-21 12:09:46 +0000
@@ -1100,8 +1100,9 @@
             // Determine if we are authed against this group.
             $auth = $this->user->DisplayGroupAuth($displayGroupID, true);
 
-                        if (!$auth->view)
-                            continue;
+            // We should only be able to schedule if we have edit permission or if the SCHEDULE_WITH_VIEW permission is ON
+            if (!$auth->edit && Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'No')
+                continue;
             
             // Do we need to nest yet? We only nest display specific groups
             if ($isDisplaySpecific == 1 && !$nested)
@@ -1760,19 +1761,23 @@
      * @return 
      * @param $eventDGIDs Object
      */
-    private function IsEventEditable($eventDGIDs)
-    {
-        $db             =& $this->db;
-        $user           =& $this->user;
+    private function IsEventEditable($eventDGIDs) {
+        
+        $scheduleWithView = (Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'Yes');
         
         // Work out if this event is editable or not. To do this we need to compare the permissions
         // of each display group this event is associated with
-        foreach ($eventDGIDs as $dgID)
-        {
-            if (!$user->DisplayGroupAuth($dgID))
-            {
-                return false;
-            }
+        foreach ($eventDGIDs as $dgID) {
+            // Permissions for display group
+            $auth = $this->user->DisplayGroupAuth($dgID, true);
+
+            // Can schedule with view, but no view permissions
+            if ($scheduleWithView && !$auth->view)
+                return false;
+
+            // Can't schedule with view, but no edit permissions
+            if (!$scheduleWithView && !$auth->edit)
+                return false;
         }
         
         return true;

=== modified file 'server/lib/pages/statusdashboard.class.php'
--- server/lib/pages/statusdashboard.class.php	2014-06-29 14:37:07 +0000
+++ server/lib/pages/statusdashboard.class.php	2014-08-21 12:09:46 +0000
@@ -45,7 +45,7 @@
 
 		    foreach ($results as $row) {
 		        
-		        $points['data'][] = array($row['month'], ((double)$row['size']) / 1024 / 1024 / 1024);
+		        $points['data'][] = array(__($row['month']), ((double)$row['size']) / 1024 / 1024 / 1024);
 		    }
 
 		    $points['label'] = __('GB');

=== modified file 'server/lib/pages/timeline.class.php'
--- server/lib/pages/timeline.class.php	2014-06-30 15:15:17 +0000
+++ server/lib/pages/timeline.class.php	2014-08-21 12:09:46 +0000
@@ -293,6 +293,7 @@
             
             Kit::ClassLoader('region');
             $regionObject = new region($db);
+            $regionObject->delayFinalise = true;
             $ownerId = $regionObject->GetOwnerId($layoutid, $regionid);
 
             $regionAuth = $this->user->RegionAssignmentAuth($ownerId, $layoutid, $regionid, true);
@@ -302,6 +303,11 @@
     		if (!$regionObject->EditRegion($layoutid, $regionid, $width, $height, $top, $left))
     			trigger_error($regionObject->GetErrorMessage(), E_USER_ERROR);
         }
+
+        // Set the layout status
+        Kit::ClassLoader('Layout');
+        $layout = new Layout($this->db);
+        $layout->SetValid($layoutid, true);
 		
 		$response->SetFormSubmitResponse('');
 		$response->hideMessage = true;

=== modified file 'server/lib/pages/user.class.php'
--- server/lib/pages/user.class.php	2014-06-30 15:15:17 +0000
+++ server/lib/pages/user.class.php	2014-08-21 12:09:46 +0000
@@ -430,23 +430,11 @@
                 trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR);
 
             // Delete the user
-            $sqldel = "DELETE FROM user";
-            $sqldel .= " WHERE UserID = %d"; 
-
-            if (!$db->query(sprintf($sqldel, $userid)))
-            {
-                trigger_error($db->error());
-                trigger_error(__("This user has been active, you may only retire them."), E_USER_ERROR);
-            }
-
-            // We should delete this users sessions record.
-            $SQL = "DELETE FROM session WHERE userID = %d ";
-
-            if (!$db->query(sprintf($SQL, $userid)))
-            {
-                trigger_error($db->error());
-                trigger_error(__("If logged in, this user will be deleted once they log out."), E_USER_ERROR);
-            }
+            Kit::ClassLoader('userdata');
+            $user = new UserData($this->db);
+            $user->userId = $userid;
+            if (!$user->Delete())
+                trigger_error($user->GetErrorMessage(), E_USER_ERROR);
 
             $response->SetFormSubmitResponse(__('User Deleted.'));
             $response->Respond();

=== modified file 'server/lib/service/xmdssoap.class.php'
--- server/lib/service/xmdssoap.class.php	2014-07-08 12:46:48 +0000
+++ server/lib/service/xmdssoap.class.php	2014-08-21 12:09:46 +0000
@@ -1128,8 +1128,14 @@
 
         // See if the client was offline and if appropriate send an alert
         // to say that it has come back online
+<<<<<<< TREE
         if ($row[5] == 0 && $row[6] == 1 && Config::GetSetting('MAINTENANCE_ENABLED') == 'On' && 
             (Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On' || Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'Protected'))
+=======
+        if ($row[5] == 0 && $row[6] == 1 
+            && (Config::GetSetting('MAINTENANCE_ENABLED') == 'On' || Config::GetSetting('MAINTENANCE_ENABLED') == 'Protected') 
+            && Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On')
+>>>>>>> MERGE-SOURCE
         {
             $msgTo    = Kit::ValidateParam(Config::GetSetting("mail_to"),_PASSWORD);
             $msgFrom  = Kit::ValidateParam(Config::GetSetting("mail_from"),_PASSWORD);

=== modified file 'server/locale/dbtranslate.php'
--- server/locale/dbtranslate.php	2014-06-30 14:41:38 +0000
+++ server/locale/dbtranslate.php	2014-08-21 12:09:46 +0000
@@ -116,4 +116,47 @@
 echo __('Value');
 echo __('Formula');
 
+
+echo __('Media will be created with these settings. If public everyone will be able to view and use this media.');
+echo __('New layouts will be created with these settings. If public everyone will be able to view and use this layout.');
+echo __('Sets the default user type selected when creating a user.\r\n<br />\r\nWe recommend that this is set to "User"');
+echo __('Sets whether debug information is recorded when an error occurs.\r\n<br />\r\nThis should be set to "off" to ensure smaller log sizes');
+echo __('This sets which user authentication module is currently being used.');
+echo __('Sets the admin message to be displayed on the client page at all times');
+echo __('Set the default timezone for the application');
+echo __('Errors will be mailed here');
+echo __('Mail will be sent from this address');
+echo __('This is the fully qualified URI of the site. e.g http://www.xibo.co.uk/');
+echo __('Default length for JPG files (in seconds)');
+echo __('Default length for PPT files');
+echo __('Default height for PPT files');
+echo __('Default length for PPT files (in seconds)');
+echo __('Default length for SWF files');
+echo __('Turn on the auditing information. Warning this will quickly fill up the log');
+echo __('Should the server send anonymous statistics back to the Xibo project?');
+echo __('Key used to distinguish each Xibo instance. This is generated randomly based on the time you first installed Xibo, and is completely untraceable.');
+echo __('The URL to connect to to PHONE_HOME (if enabled)');
+echo __('The last time we PHONED_HOME in seconds since the epoch');
+echo __('This should only be set if you want to display the maximum allowed error messaging through the user interface. <br /> Useful for capturing critical php errors and environment issues.');
+echo __('Allow the maintenance script to run if it is called?');
+echo __('Global switch for email alerts to be sent');
+echo __('String appended to the maintenance script to prevent malicious calls to the script.');
+echo __('Maximum age for log entries. Set to 0 to keep logs indefinitely.');
+echo __('Maximum age for statistics entries. Set to 0 to keep statistics indefinitely.');
+echo __('How long in minutes after the last time a client connects should we send an alert? Can be overridden on a per client basis.');
+
+
+echo __('January');
+echo __('February');
+echo __('March');
+echo __('April');
+echo __('May');
+echo __('June');
+echo __('July');
+echo __('August');
+echo __('September');
+echo __('October');
+echo __('November');
+echo __('December');
+
 ?>

=== modified file 'server/manual/content/admin/api_layouts.php'
--- server/manual/content/admin/api_layouts.php	2014-01-12 20:46:20 +0000
+++ server/manual/content/admin/api_layouts.php	2014-08-21 12:09:46 +0000
@@ -82,8 +82,8 @@
 </li><li> left
 </li><li> ownerid
 </li><li> permission_edit
-</li><li> permission_del
-</li><li> permission_update_permissions
+</li><li> permissions_del
+</li><li> permissions_update_permissions
 </li></ul>
 <p>Error Codes
 </p>
@@ -157,7 +157,7 @@
 </p>
 <ul><li> mediaid
 </li><li> lkid
-</li><li> type
+</li><li> mediatype
 </li><li> duration
 </li><li> permission_edit
 </li><li> permission_del
@@ -168,19 +168,42 @@
 </p>
 <ul><li> 1 - Access Denied
 </li></ul>
-<h3> <span class="mw-headline" id="LayoutRegionMediaDetails"> LayoutRegionMediaDetails </span></h3>
-<p>Parameters
-</p>
-<ul><li> layoutId
-</li><li> regionId
-</li><li> mediaId
-</li></ul>
-<p>Response
-The XLF for the provided media id (XML format)
-</p><p>Error Codes
-</p>
-<ul><li> 1 - Access Denied
-</li></ul>
+
+<h2 class="api-method-call-doc" id="LayoutRegionMediaDetails">LayoutRegionMediaDetails</h2>
+<h3>Parameters</h3>
+<dl>
+    <dt>layoutId</dt>
+    <dd>The ID for this Layout. Required.</dd>
+</dl>
+<dl>
+    <dt>regionId</dt>
+    <dd>The ID for this Region. Required</dd>
+</dl>
+<dl>
+    <dt>mediaId</dt>
+    <dd>The ID for this media. Required</dd>
+</dl>
+<dl>
+    <dt>type</dt>
+    <dd>The media type. Required</dd>
+</dl>
+
+<h3>Response</h3>
+The XLF for the provided media id (XML format). Base 64 encoded.
+<pre>
+{
+    "media": {
+        "id": "1",
+        "base64Xlf": "base64"
+    },
+    "status": "ok"
+}
+</pre>
+
+<h3>Errors</h3>
+<p>General Errors Only.
+</p>
+
 <h3> <span class="mw-headline" id="LayoutRegionMediaAdd"> LayoutRegionMediaAdd </span></h3>
 <p>Parameters
 </p>

=== modified file 'server/manual/content/admin/release_notes_1.6.2.php'
--- server/manual/content/admin/release_notes_1.6.2.php	2014-07-12 13:54:51 +0000
+++ server/manual/content/admin/release_notes_1.6.2.php	2014-08-21 12:09:46 +0000
@@ -1,76 +1,162 @@
-<?php
-/*
- * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2014 Daniel Garner
- *
- * 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/>.
- */ 
-defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
-
-$LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.2';
-?>
-<h1 id="Notes_Title">Xibo 1.6.2 - Codename "Pons-Winnecke"</span></h1>
-<p><strong>This is a bug fixing release of the 1.6 Series of Xibo</strong>. We recommend everyone using 1.6 series upgrade to this release.</p>
-<p>You can download this release from <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
-
-<div id="toctitle"><h2>Contents</h2></div>
-
-<ol>
-	<li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li>
-	<li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li>
-	<li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li>
-	<li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li>
-	<li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li>
-	<li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li>
-</ol>
-
-
-<h2 id="Requirements">Requirements</h2>
-<p>You must use the 1.6.2 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p>
-
-<p>Xibo requires PHP 5.3.3 or higher. A full list of module requirements is presented at the point of installation - we'll even tell you which modules you're missing!</p>
-
-<h2 id="Upgrading">Upgrading</h2>
-<p>There are significant database schema changes between the 1.4 series of Xibo and prior released. The upgrade wizard will take a prior database and convert it to a schema suitable for the 1.4 series to date. Note that this is a one-way conversion. Please do not upgrade your production database to test Xibo 1.6 functionality, and then expect to run a prior series code base against that database.</p>
-
-<p>Instructions for cloning a Xibo database are available here <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Clone Database</a>.</p>
-
-<ul>
-	<li>Clone your existing Xibo database and grant permissions (see <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Release Notes:Clone Database</a> for details)</li>
-	<li>Backup settings.php from your installation</li>
-	<li>Manually take a backup of your database</li>
-	<li>Replace your existing installation with the new version from the tar.gz or zip file</li>
-	<li>Replace your backup settings.php file in your Xibo installation directory</li>
-	<li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li>
-	<li>You will be prompted that an upgrade is required.</li>
-	<li>Enter your xibo_admin password, and follow the upgrade wizard.</li>
-	<li>The upgrade should run, and finally ask you to log in as you would normally.</li>
-</ul>
-
-<h2 id="Help">Help</h2>
-<p>Please ask for help / advice in the Answers section of Launchpad: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a></p>
-
-<p>Please report any bugs in the Bugs section of Launchpad: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (if you're not sure that what you have found is a bug, please ask in the Answers section first!)</p>
-
-<p>Please report any enhancement requests in the Blueprints section of Launchpad: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a></p>
-
-<p>When asking for assistance with this release, please make it clear that you're using the release candidate and not a stable release of Xibo.</p>
-
-<h2 id="Bug_Fixes">Bug Fixes</h2>
-<p>For a full list of bug fixes please refer to the Release Project Page: <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
-
-<h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2>
-<p>There are plenty of new features in the pipeline, but to provide a stable platform for users wanting Xibo now, the 1.6 series of releases are now feature-frozen (no new features will be implemented). All new development work will go in to the 1.7 series - which will be made available as a BETA.</p>
+<<<<<<< TREE
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2014 Daniel Garner
+ *
+ * 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/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+$LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.2';
+?>
+<h1 id="Notes_Title">Xibo 1.6.2 - Codename "Pons-Winnecke"</span></h1>
+<p><strong>This is a bug fixing release of the 1.6 Series of Xibo</strong>. We recommend everyone using 1.6 series upgrade to this release.</p>
+<p>You can download this release from <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
+
+<div id="toctitle"><h2>Contents</h2></div>
+
+<ol>
+	<li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li>
+	<li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li>
+	<li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li>
+	<li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li>
+	<li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li>
+	<li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li>
+</ol>
+
+
+<h2 id="Requirements">Requirements</h2>
+<p>You must use the 1.6.2 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p>
+
+<p>Xibo requires PHP 5.3.3 or higher. A full list of module requirements is presented at the point of installation - we'll even tell you which modules you're missing!</p>
+
+<h2 id="Upgrading">Upgrading</h2>
+<p>There are significant database schema changes between the 1.4 series of Xibo and prior released. The upgrade wizard will take a prior database and convert it to a schema suitable for the 1.4 series to date. Note that this is a one-way conversion. Please do not upgrade your production database to test Xibo 1.6 functionality, and then expect to run a prior series code base against that database.</p>
+
+<p>Instructions for cloning a Xibo database are available here <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Clone Database</a>.</p>
+
+<ul>
+	<li>Clone your existing Xibo database and grant permissions (see <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Release Notes:Clone Database</a> for details)</li>
+	<li>Backup settings.php from your installation</li>
+	<li>Manually take a backup of your database</li>
+	<li>Replace your existing installation with the new version from the tar.gz or zip file</li>
+	<li>Replace your backup settings.php file in your Xibo installation directory</li>
+	<li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li>
+	<li>You will be prompted that an upgrade is required.</li>
+	<li>Enter your xibo_admin password, and follow the upgrade wizard.</li>
+	<li>The upgrade should run, and finally ask you to log in as you would normally.</li>
+</ul>
+
+<h2 id="Help">Help</h2>
+<p>Please ask for help / advice in the Answers section of Launchpad: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a></p>
+
+<p>Please report any bugs in the Bugs section of Launchpad: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (if you're not sure that what you have found is a bug, please ask in the Answers section first!)</p>
+
+<p>Please report any enhancement requests in the Blueprints section of Launchpad: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a></p>
+
+<p>When asking for assistance with this release, please make it clear that you're using the release candidate and not a stable release of Xibo.</p>
+
+<h2 id="Bug_Fixes">Bug Fixes</h2>
+<p>For a full list of bug fixes please refer to the Release Project Page: <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
+
+<h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2>
+<p>There are plenty of new features in the pipeline, but to provide a stable platform for users wanting Xibo now, the 1.6 series of releases are now feature-frozen (no new features will be implemented). All new development work will go in to the 1.7 series - which will be made available as a BETA.</p>
+=======
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2014 Daniel Garner
+ *
+ * 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/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+$LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.2';
+?>
+<h1 id="Notes_Title">Xibo 1.6.2 - Codename "Pons-Winnecke"</span></h1>
+<p><strong>This is a bug fixing release of the 1.6 Series of Xibo</strong>. We recommend everyone using 1.6 series upgrade to this release.</p>
+<p>You can download this release from <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
+
+<div id="toctitle"><h2>Contents</h2></div>
+
+<ol>
+	<li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li>
+	<li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li>
+	<li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li>
+	<li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li>
+	<li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li>
+	<li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li>
+</ol>
+
+
+<h2 id="Requirements">Requirements</h2>
+<p>You must use the 1.6.2 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p>
+
+<p>Xibo requires PHP 5.3.3 or higher. A full list of module requirements is presented at the point of installation - we'll even tell you which modules you're missing!</p>
+
+<h3>Xibo for Windows</h3>
+<p>Series 1.6 of Xibo has brought about advancements in text formatting, layout scaling and other general presentation improvements. As a result of this the recommended version of IE to have installed is IE9 on the client. IE9 is not supported on Windows XP.</p>
+
+<p>The Xibo team have made every effort to maintain support for XP as a platform and as a result Xibo will run on Windows XP, but may experience some visual defects and artefacts.</p>
+
+<p>We are looking to replace IE as a rendering engine in 1.7 Series. More information <a href="https://blueprints.launchpad.net/xibo/+spec/netclient-berkelium-sharp">here</a>.</p>
+
+<h2 id="Upgrading">Upgrading</h2>
+<p>There are significant database schema changes between the 1.4 series of Xibo and prior released. The upgrade wizard will take a prior database and convert it to a schema suitable for the 1.4 series to date. Note that this is a one-way conversion. Please do not upgrade your production database to test Xibo 1.6 functionality, and then expect to run a prior series code base against that database.</p>
+
+<p>Instructions for cloning a Xibo database are available here <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Clone Database</a>.</p>
+
+<ul>
+	<li>Clone your existing Xibo database and grant permissions (see <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Release Notes:Clone Database</a> for details)</li>
+	<li>Backup settings.php from your installation</li>
+	<li>Manually take a backup of your database</li>
+	<li>Replace your existing installation with the new version from the tar.gz or zip file</li>
+	<li>Replace your backup settings.php file in your Xibo installation directory</li>
+	<li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li>
+	<li>You will be prompted that an upgrade is required.</li>
+	<li>Enter your xibo_admin password, and follow the upgrade wizard.</li>
+	<li>The upgrade should run, and finally ask you to log in as you would normally.</li>
+</ul>
+
+<h2 id="Help">Help</h2>
+<p>Please ask for help / advice in the Answers section of Launchpad: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a></p>
+
+<p>Please report any bugs in the Bugs section of Launchpad: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (if you're not sure that what you have found is a bug, please ask in the Answers section first!)</p>
+
+<p>Please report any enhancement requests in the Blueprints section of Launchpad: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a></p>
+
+<p>When asking for assistance with this release, please make it clear that you're using the release candidate and not a stable release of Xibo.</p>
+
+<h2 id="Bug_Fixes">Bug Fixes</h2>
+<p>For a full list of bug fixes please refer to the Release Project Page: <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
+
+<h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2>
+<p>There are plenty of new features in the pipeline, but to provide a stable platform for users wanting Xibo now, the 1.6 series of releases are now feature-frozen (no new features will be implemented). All new development work will go in to the 1.7 series - which will be made available as a BETA.</p>
+>>>>>>> MERGE-SOURCE

=== added file 'server/manual/content/admin/release_notes_1.6.3.php'
--- server/manual/content/admin/release_notes_1.6.3.php	1970-01-01 00:00:00 +0000
+++ server/manual/content/admin/release_notes_1.6.3.php	2014-08-21 12:09:46 +0000
@@ -0,0 +1,83 @@
+<?php
+/*
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Copyright (C) 2006-2014 Daniel Garner
+ *
+ * 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/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+$LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.3';
+?>
+<h1 id="Notes_Title">Xibo 1.6.3 - Codename "Pons-Winnecke"</span></h1>
+<p><strong>This is a bug fixing release of the 1.6 Series of Xibo</strong>. We recommend everyone using 1.6 series upgrade to this release.</p>
+<p>You can download this release from <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
+
+<div id="toctitle"><h2>Contents</h2></div>
+
+<ol>
+	<li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li>
+	<li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li>
+	<li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li>
+	<li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li>
+	<li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li>
+	<li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li>
+</ol>
+
+
+<h2 id="Requirements">Requirements</h2>
+<p>You must use the 1.6.3 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p>
+
+<p>Xibo requires PHP 5.3.3 or higher. A full list of module requirements is presented at the point of installation - we'll even tell you which modules you're missing!</p>
+
+<h3>Xibo for Windows</h3>
+<p>Series 1.6 of Xibo has brought about advancements in text formatting, layout scaling and other general presentation improvements. As a result of this the recommended version of IE to have installed is IE9 on the client. IE9 is not supported on Windows XP.</p>
+
+<p>The Xibo team have made every effort to maintain support for XP as a platform and as a result Xibo will run on Windows XP, but may experience some visual defects and artefacts.</p>
+
+<p>We are looking to replace IE as a rendering engine in 1.7 Series. More information <a href="https://blueprints.launchpad.net/xibo/+spec/netclient-berkelium-sharp">here</a>.</p>
+
+<h2 id="Upgrading">Upgrading</h2>
+<p>There are significant database schema changes between the 1.4 series of Xibo and prior released. The upgrade wizard will take a prior database and convert it to a schema suitable for the 1.4 series to date. Note that this is a one-way conversion. Please do not upgrade your production database to test Xibo 1.6 functionality, and then expect to run a prior series code base against that database.</p>
+
+<p>Instructions for cloning a Xibo database are available here <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Clone Database</a>.</p>
+
+<ul>
+	<li>Clone your existing Xibo database and grant permissions (see <a href="index.php?toc=developer&p=admin/release_notes_clonedb" title="Clone Database">Release Notes:Clone Database</a> for details)</li>
+	<li>Backup settings.php from your installation</li>
+	<li>Manually take a backup of your database</li>
+	<li>Replace your existing installation with the new version from the tar.gz or zip file</li>
+	<li>Replace your backup settings.php file in your Xibo installation directory</li>
+	<li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li>
+	<li>You will be prompted that an upgrade is required.</li>
+	<li>Enter your xibo_admin password, and follow the upgrade wizard.</li>
+	<li>The upgrade should run, and finally ask you to log in as you would normally.</li>
+</ul>
+
+<h2 id="Help">Help</h2>
+<p>Please ask for help / advice in the Answers section of Launchpad: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a></p>
+
+<p>Please report any bugs in the Bugs section of Launchpad: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (if you're not sure that what you have found is a bug, please ask in the Answers section first!)</p>
+
+<p>Please report any enhancement requests in the Blueprints section of Launchpad: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a></p>
+
+<p>When asking for assistance with this release, please make it clear that you're using the release candidate and not a stable release of Xibo.</p>
+
+<h2 id="Bug_Fixes">Bug Fixes</h2>
+<p>For a full list of bug fixes please refer to the Release Project Page: <a rel="nofollow" class="external free" href="<?php echo $LP_RELEASE_PAGE; ?>"><?php echo $LP_RELEASE_PAGE; ?></a></p>
+
+<h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2>
+<p>There are plenty of new features in the pipeline, but to provide a stable platform for users wanting Xibo now, the 1.6 series of releases are now feature-frozen (no new features will be implemented). All new development work will go in to the 1.7 series - which will be made available as a BETA.</p>

=== modified file 'server/manual/template.php'
--- server/manual/template.php	2014-07-12 13:54:51 +0000
+++ server/manual/template.php	2014-08-21 12:09:46 +0000
@@ -7,7 +7,11 @@
     define('PRODUCT_NAME', 'Xibo');
 
     # Product Version
+<<<<<<< TREE
     define('PRODUCT_VERSION', '1.6.2');
+=======
+    define('PRODUCT_VERSION', '1.6.3');
+>>>>>>> MERGE-SOURCE
 
     # Home page URL
     define('PRODUCT_HOME', 'http://xibo.org.uk');

=== modified file 'server/modules/preview/HtmlTemplateForGetResource.html'
--- server/modules/preview/HtmlTemplateForGetResource.html	2014-07-15 11:42:14 +0000
+++ server/modules/preview/HtmlTemplateForGetResource.html	2014-08-21 12:09:46 +0000
@@ -86,7 +86,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
 */
+<<<<<<< TREE
 jQuery.fn.extend({xiboRender:function(e,t){var n={type:"ticker",direction:"single",duration:"50",durationIsPerItem:false,numItems:0,takeItemsFrom:"start",itemsPerPage:0,scrollSpeed:"2",scaleMode:"scale",previewWidth:0,previewHeight:0,scaleOverride:0};var e=$.extend({},n,e);if(e.previewWidth==0&&e.previewHeight==0){e.width=$(window).width();e.height=$(window).height()}else{e.width=e.previewWidth;e.height=e.previewHeight}e.scaleFactor=Math.min(e.width/e.originalWidth,e.height/e.originalHeight);if(e.scaleOverride!=0){e.originalWidth=e.previewWidth;e.originalHeight=e.previewHeight;e.scaleFactor=e.scaleOverride}this.each(function(){$(this).css({width:e.originalWidth,height:e.originalHeight});if(e.type=="ticker"){if(e.sourceid==undefined){console.error("Source ID undefined - assuming 1");e.sourceid=1}if(e.sourceid==1){if(e.takeItemsFrom=="end"){t.reverse()}if(e.numItems>t.length||e.numItems==0)e.numItems=t.length;t=t.slice(0,e.numItems);if(e.takeItemsFrom=="end"){t.reverse()}}else{e.numItems=t.length}}var n=e.numItems;var r=e.itemsPerPage>0?Math.ceil(e.numItems/e.itemsPerPage):e.numItems;var i=1;var s=this;for(var o=0;o<t.length;o++){if(e.direction=="single"&&e.itemsPerPage>0&&(i>=e.itemsPerPage||o==0)){s=$("<div/>").addClass("page").appendTo(this);i=0}$("<div/>").addClass("item").html(t[o]).appendTo(s);i++}if(e.scaleMode=="fit"){$("*",this).css("font-size","");$(this).fitText(1.75)}if($("body").hasClass("ie7")||$("body").hasClass("ie8")){$(this).css({zoom:e.scaleFactor})}else{$(this).css({transform:"scale("+e.scaleFactor+")","transform-origin":"0 0"})}var u=false;if(e.direction=="single"){var a=e.itemsPerPage>0?"> .page":"> .item";var f=e.itemsPerPage>0?r:n;var l=e.durationIsPerItem?e.duration:e.duration/f;$(this).cycle({fx:e.transition,timeout:l*1e3,slides:a})}else if(e.direction=="left"||e.direction=="right"){u=true;$(" .item",this).css({display:"inline","padding-left":"4px"});$(" .item p",this).css({display:"inline"})}else if(e.direction=="up"||e.direction=="down"){u=true}if(u){var c=$("<div/>").addClass("scroll").attr({scrollamount:e.scrollSpeed,scaleFactor:e.scaleFactor,behaviour:"scroll",direction:e.direction,height:e.originalHeight,width:e.originalWidth});$(this).wrapInner(c);$(this).find(".scroll").marquee()}if(e.direction=="up"||e.direction=="down"){$(this).children().children().css("white-space","normal")}})},dataSetRender:function(e){if(e===undefined||e===null){e={duration:5,transition:"fade",rowsPerPage:0,previewWidth:0,previewHeight:0,scaleOverride:0}}$(this).each(function(){if(e.previewWidth==0&&e.previewHeight==0){e.width=$(window).width();e.height=$(window).height()}else{e.width=e.previewWidth;e.height=e.previewHeight}e.scaleFactor=Math.min(e.width/e.originalWidth,e.height/e.originalHeight);if(e.scaleOverride!=0){e.originalWidth=e.previewWidth;e.originalHeight=e.previewHeight;e.scaleFactor=e.scaleOverride}$("body").css({width:e.originalWidth,height:e.originalHeight});if($("body").hasClass("ie7")||$("body").hasClass("ie8")){$("body").css({zoom:e.scaleFactor})}else{$("body").css({transform:"scale("+e.scaleFactor+")","transform-origin":"0 0"})}var t=$(this).attr("totalPages");if(e.rowsPerPage>0){$(this).cycle({fx:e.transition,timeout:e.duration*1e3/t,slides:"> table"})}})}});if(!window.console){(function(){var e=["log","debug","info","warn","error","assert","dir","dirxml","group","groupEnd","time","timeEnd","count","trace","profile","profileEnd"],t,n=e.length;window.console={};for(t=0;t<n;t++){window.console[e[t]]=function(){}}})()}
+=======
+jQuery.fn.extend({xiboRender:function(e,t){var n={type:"ticker",direction:"single",duration:"50",durationIsPerItem:false,numItems:0,takeItemsFrom:"start",itemsPerPage:0,scrollSpeed:"2",scaleMode:"scale",previewWidth:0,previewHeight:0,scaleOverride:0};var e=$.extend({},n,e);if(e.previewWidth==0&&e.previewHeight==0){e.width=$(window).width();e.height=$(window).height()}else{e.width=e.previewWidth;e.height=e.previewHeight}e.scaleFactor=Math.min(e.width/e.originalWidth,e.height/e.originalHeight);if(e.scaleOverride!=0){e.originalWidth=e.previewWidth;e.originalHeight=e.previewHeight;e.scaleFactor=e.scaleOverride}this.each(function(){$(this).css({width:e.originalWidth,height:e.originalHeight});if(e.type=="ticker"){if(e.sourceid==undefined){console.error("Source ID undefined - assuming 1");e.sourceid=1}if(e.sourceid==1){if(e.takeItemsFrom=="end"){t.reverse()}if(e.numItems>t.length||e.numItems==0)e.numItems=t.length;t=t.slice(0,e.numItems);if(e.takeItemsFrom=="end"){t.reverse()}}else{e.numItems=t.length}}var n=e.numItems;var r=e.itemsPerPage>0?Math.ceil(e.numItems/e.itemsPerPage):e.numItems;var i=1;var s=this;for(var o=0;o<t.length;o++){if(e.direction=="single"&&e.itemsPerPage>0&&(i>=e.itemsPerPage||o==0)){s=$("<div/>").addClass("page").appendTo(this);i=0}$("<div/>").addClass("item").html(t[o]).appendTo(s);i++}if(e.scaleMode=="fit"){$("*",this).css("font-size","");$(this).fitText(1.75)}if($("body").hasClass("ie7")||$("body").hasClass("ie8")){$(this).css({filter:"progid:DXImageTransform.Microsoft.Matrix(M11="+e.scaleFactor+", M12=0, M21=0, M22="+e.scaleFactor+", SizingMethod='auto expand'"})}else{$(this).css({transform:"scale("+e.scaleFactor+")","transform-origin":"0 0"})}var u=false;if(e.direction=="single"){var a=e.itemsPerPage>0?"> .page":"> .item";var f=e.itemsPerPage>0?r:n;var l=e.durationIsPerItem?e.duration:e.duration/f;$(this).cycle({fx:e.transition,timeout:l*1e3,slides:a})}else if(e.direction=="left"||e.direction=="right"){u=true;$(" .item",this).css({display:"inline","padding-left":"4px"});$(" .item p",this).css({display:"inline"})}else if(e.direction=="up"||e.direction=="down"){u=true}if(u){var c=$("<div/>").addClass("scroll").attr({scrollamount:e.scrollSpeed,scaleFactor:e.scaleFactor,behaviour:"scroll",direction:e.direction,height:e.originalHeight,width:e.originalWidth});$(this).wrapInner(c);$(this).find(".scroll").marquee()}if(e.direction=="up"||e.direction=="down"){$(this).children().children().css("white-space","normal")}})},dataSetRender:function(e){if(e===undefined||e===null){e={duration:5,transition:"fade",rowsPerPage:0,previewWidth:0,previewHeight:0,scaleOverride:0}}$(this).each(function(){if(e.previewWidth==0&&e.previewHeight==0){e.width=$(window).width();e.height=$(window).height()}else{e.width=e.previewWidth;e.height=e.previewHeight}e.scaleFactor=Math.min(e.width/e.originalWidth,e.height/e.originalHeight);if(e.scaleOverride!=0){e.originalWidth=e.previewWidth;e.originalHeight=e.previewHeight;e.scaleFactor=e.scaleOverride}$("body").css({width:e.originalWidth,height:e.originalHeight});if($("body").hasClass("ie7")||$("body").hasClass("ie8")){$("body").css({filter:"progid:DXImageTransform.Microsoft.Matrix(M11="+e.scaleFactor+", M12=0, M21=0, M22="+e.scaleFactor+", SizingMethod='auto expand'"})}else{$("body").css({transform:"scale("+e.scaleFactor+")","transform-origin":"0 0"})}var t=$(this).attr("totalPages");if(e.rowsPerPage>0){$(this).cycle({fx:e.transition,timeout:e.duration*1e3/t,slides:"> table"})}})}});if(!window.console){(function(){var e=["log","debug","info","warn","error","assert","dir","dirxml","group","groupEnd","time","timeEnd","count","trace","profile","profileEnd"],t,n=e.length;window.console={};for(t=0;t<n;t++){window.console[e[t]]=function(){}}})()}
+>>>>>>> MERGE-SOURCE
         </script>
         <!--script type="text/javascript" src="modules/preview/xibo-text-render.js"></script-->
 

=== modified file 'server/modules/preview/html-preview.js'
--- server/modules/preview/html-preview.js	2014-07-12 14:17:17 +0000
+++ server/modules/preview/html-preview.js	2014-08-21 12:09:46 +0000
@@ -333,10 +333,18 @@
         
         if (oldMedia) {
             $("#" + oldMedia.containerName).css("display", "none");
-
-            if (oldMedia.mediaType == "video") {
-                $("#" + oldMedia.containerName + "-vid").get(0).pause();
-            }
+<<<<<<< TREE
+
+            if (oldMedia.mediaType == "video") {
+                $("#" + oldMedia.containerName + "-vid").get(0).pause();
+            }
+=======
+
+            if (oldMedia.mediaType == "video") {
+                $("#" + oldMedia.containerName + "-vid").get(0).pause();
+                $("#" + oldMedia.containerName + "-vid").get(0).currentTime = 0;
+            }
+>>>>>>> MERGE-SOURCE
         }
         
         $("#" + newMedia.containerName).css("display", "block");

=== modified file 'server/modules/preview/xibo-text-render.js'
--- server/modules/preview/xibo-text-render.js	2014-07-15 11:42:14 +0000
+++ server/modules/preview/xibo-text-render.js	2014-08-21 12:09:46 +0000
@@ -173,6 +173,7 @@
             }
 
             // Now make it size correctly
+<<<<<<< TREE
             // What IE are we?
             if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) {
                 $(this).css({
@@ -185,6 +186,20 @@
                     "transform-origin": "0 0"
                 });
             }
+=======
+            // What IE are we?
+            if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) {
+                $(this).css({
+                    "filter": "progid:DXImageTransform.Microsoft.Matrix(M11=" + options.scaleFactor + ", M12=0, M21=0, M22=" + options.scaleFactor + ", SizingMethod='auto expand'"
+                });
+            }
+            else {
+                $(this).css({
+                    "transform": "scale(" + options.scaleFactor + ")",
+                    "transform-origin": "0 0"
+                });
+            }
+>>>>>>> MERGE-SOURCE
             
             // 4th objective - move the items around, start the timer
             // settings involved:
@@ -296,6 +311,7 @@
                 height: options.originalHeight
             });
 
+<<<<<<< TREE
             // What IE are we?
             if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) {
                 $("body").css({
@@ -309,6 +325,21 @@
                 });
             }
 
+=======
+            // What IE are we?
+            if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) {
+                $("body").css({
+                    "filter": "progid:DXImageTransform.Microsoft.Matrix(M11=" + options.scaleFactor + ", M12=0, M21=0, M22=" + options.scaleFactor + ", SizingMethod='auto expand'"
+                });
+            }
+            else {
+                $("body").css({
+                    "transform": "scale(" + options.scaleFactor + ")",
+                    "transform-origin": "0 0"
+                });
+            }
+
+>>>>>>> MERGE-SOURCE
             var numberItems = $(this).attr("totalPages");
 
             if (options.rowsPerPage > 0) {

=== modified file 'server/modules/preview/xibo-webpage-render.js'
--- server/modules/preview/xibo-webpage-render.js	2014-06-30 14:28:23 +0000
+++ server/modules/preview/xibo-webpage-render.js	2014-08-21 12:09:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 $(document).ready(function() { 
 
     isMSIE = navigator.userAgent.match(/MSIE/),
@@ -63,4 +64,75 @@
             });
         }
     }
-});
\ No newline at end of file
+});=======
+$(document).ready(function() { 
+
+    isMSIE = navigator.userAgent.match(/MSIE/),
+    MSIEVersion = navigator.userAgent.match(/MSIE (\d\.\d+)/) ? parseInt(RegExp.$1, 10) : null
+
+    if (options.previewWidth == 0 && options.previewHeight == 0) {
+        options.width = $(window).width();
+        options.height = $(window).height();
+    }
+    else {
+        // We are a preview
+        options.width = options.previewWidth;
+        options.height = options.previewHeight;
+    }
+
+    // Scale Factor
+    options.scaleFactor = Math.min(options.width / options.originalWidth, options.height / options.originalHeight);
+
+    // We need to scale the scale according to the size difference between the layout designer and the actual request size.
+    if (options.scale_override != 1) {
+        options.offsetTop = options.offsetTop * options.scaleFactor;
+        options.offsetLeft = options.offsetLeft * options.scaleFactor;
+        options.scale = options.scale * options.scaleFactor;
+    }
+
+    // Width should take into account the offset
+    options.width = parseInt(options.width) + parseInt(options.offsetLeft);
+    options.height = parseInt(options.height) + parseInt(options.offsetTop);
+
+    // Add the width and height on the wrap.
+    $("#wrap").css({
+        "overflow": "hidden",
+        "width": options.width,
+        "height": options.height
+    });
+
+    // Margins on frame
+    $("#iframe").css({
+        "margin-top": -1 * options.offsetTop, 
+        "margin-left": -1 * options.offsetLeft,
+        "width": options.width,
+        "height": options.height
+    });
+
+    // Transform on the frame
+    if (options.scale != 1) {
+
+        if (isMSIE) {
+            $("#iframe").css({
+                zoom: options.scale,
+                height: parseInt((options.height / options.scale) *  (1 / (MSIEVersion >= 9 ? 1 : options.scale)), 10),
+                width: parseInt((options.width / options.scale) * (1 / (MSIEVersion >= 9 ? 1 : options.scale)), 10)
+            })
+        }
+        else {
+
+            $("#iframe").css({
+                        'transform-origin': "0 0",
+                '-webkit-transform-origin': "0 0",
+                   '-moz-transform-origin': "0 0",
+                     '-o-transform-origin': "0 0",
+                        'transform': 'scale(' + options.scale + ')',
+                '-webkit-transform': 'scale(' + options.scale + ')',
+                   '-moz-transform': 'scale(' + options.scale + ')',
+                     '-o-transform': 'scale(' + options.scale + ')',
+                "width": options.width / options.scale,
+                "height": options.height / options.scale
+            });
+        }
+    }
+});>>>>>>> MERGE-SOURCE

=== modified file 'server/theme/default/html/status_dashboard.php'
--- server/theme/default/html/status_dashboard.php	2014-06-29 14:37:07 +0000
+++ server/theme/default/html/status_dashboard.php	2014-08-21 12:09:46 +0000
@@ -28,17 +28,22 @@
 ?>
 <div class="row">
 	<div class="span6">
-		<h3 class="text-center">Bandwidth Usage</h3>
+		<h3 class="text-center"><?php echo Theme::Translate('Bandwidth Usage'); ?></h3>
 		<div id="flot_bandwidth_chart" style="height: 400px;" class="flot-chart"></div>
 	</div>
 	<div class="span6">
+<<<<<<< TREE
 		<h3 class="text-center">Library Usage</h3>
 		<?php echo Theme::Get('library-widget'); ?>
+=======
+		<h3 class="text-center"><?php echo Theme::Translate('Library Usage'); ?></h3>
+		<?php echo Theme::Get('library-widget'); ?>
+>>>>>>> MERGE-SOURCE
 	</div>
 </div>
 <div class="row">
 	<div class="span6">
-		<h3 class="text-center">Display Activity</h3>
+		<h3 class="text-center"><?php echo Theme::Translate('Display Activity'); ?></h3>
 		<table class="table">
 			<thead>
 				<tr>

=== modified file 'server/upgrade.php'
--- server/upgrade.php	2014-07-15 15:59:36 +0000
+++ server/upgrade.php	2014-08-21 12:09:46 +0000
@@ -20,10 +20,13 @@
  */ 
 DEFINE('XIBO', true);
 
+<<<<<<< TREE
 if (! checkPHP()) {
   die("Xibo requires PHP 5.3.3 or later");
 }
 
+=======
+>>>>>>> MERGE-SOURCE
 error_reporting(0);
 ini_set('display_errors', 0);
 
@@ -34,6 +37,12 @@
 include('config/db_config.php');
 include('config/config.class.php');
 
+$config = new Config();
+
+if (!$config->CheckPHP()) {
+  die(sprintf('Xibo required PHP version %s.', Config::$VERSION_REQUIRED));
+}
+
 // Setup the translations for gettext
 require_once("lib/app/translationengine.class.php");
 
@@ -385,12 +394,15 @@
  
 include('install/footer.inc');
 
+<<<<<<< TREE
 # Functions
 function checkPHP() {
   # Check PHP version > 5
   return (version_compare("5.3.3",phpversion(), "<="));
 }
 
+=======
+>>>>>>> MERGE-SOURCE
 function checkMySQL() {
   # Check PHP has MySQL module installed
   return extension_loaded("mysql");