Merge lp:~dangarner/xibo/server-164 into lp:xibo/1.6

[Dan Garner]

=== added file 'server/install/database/72.sql'
--- server/install/database/72.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/72.sql	2014-10-03 14:12:49 +0000
@@ -0,0 +1,6 @@
+
+ALTER TABLE `schedule_detail` ADD INDEX ( `FromDT` , `ToDT` ) ;
+
+UPDATE `version` SET `app_ver` = '1.6.4', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '72';

=== modified file 'server/install/master/data.sql'
--- server/install/master/data.sql	2014-08-15 14:50:45 +0000
+++ server/install/master/data.sql	2014-10-03 14:12:49 +0000
@@ -1,5 +1,5 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
-('1.6.3', 3, 1, 71);
+('1.6.4', 3, 1, 72);
 
 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-07-18 22:43:48 +0000
+++ server/install/master/structure.sql	2014-10-03 14:12:49 +0000
@@ -484,7 +484,8 @@
   PRIMARY KEY (`schedule_detailID`),
   KEY `layoutID` (`CampaignID`),
   KEY `scheduleID` (`eventID`),
-  KEY `DisplayGroupID` (`DisplayGroupID`)
+  KEY `DisplayGroupID` (`DisplayGroupID`),
+  KEY `FromDT` (`FromDT`,`ToDT`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='Replicated schedule across displays and recurrence' AUTO_INCREMENT=6 ;
 
 CREATE TABLE IF NOT EXISTS `session` (

=== modified file 'server/lib/data/datasetdata.data.class.php'
--- server/lib/data/datasetdata.data.class.php	2014-08-06 11:57:27 +0000
+++ server/lib/data/datasetdata.data.class.php	2014-10-03 14:12:49 +0000
@@ -361,7 +361,7 @@
             @unlink($csvFile);
 
             // TODO: Update list content definitions
-
+            $this->updateWatermark = true;
             $this->UpdateWatermark($dataSetId);
 
             return true;

=== modified file 'server/lib/modules/module.class.php'
--- server/lib/modules/module.class.php	2014-08-08 08:58:09 +0000
+++ server/lib/modules/module.class.php	2014-10-03 14:12:49 +0000
@@ -1153,10 +1153,22 @@
         	$this->mediaid	= $new_mediaid;
         	
         	// Find out what we stored this item as
-        	$storedAs = $db->GetSingleValue(sprintf("SELECT StoredAs FROM `media` WHERE mediaid = %d", $new_mediaid), 'StoredAs', _STRING);
-        	$this->SetOption('uri', $storedAs);
-
-        	Debug::LogEntry('audit', 'New revision uploaded: ' . $storedAs, 'module', 'EditLibraryMedia');
+            try {
+                $dbh = PDOConnect::init();
+
+                $sth = $dbh->prepare('SELECT StoredAs FROM `media` WHERE mediaid = :mediaId');
+                $sth->execute(array('mediaId' => $new_mediaid));
+                
+                $storedAs = Kit::ValidateParam($sth->fetchColumn(0), _FILENAME);
+                $this->SetOption('uri', $storedAs);
+            }
+            catch (Exception $e) {
+                Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__);
+             
+                trigger_error(__('Unable to find uploaded file.'), E_USER_ERROR);
+            }
+
+            Debug::LogEntry('audit', 'New revision uploaded: ' . $storedAs, 'module', 'EditLibraryMedia');
         }
 
         // Edit the media record

=== modified file 'server/lib/pages/schedule.class.php'
--- server/lib/pages/schedule.class.php	2014-08-06 12:15:31 +0000
+++ server/lib/pages/schedule.class.php	2014-10-03 14:12:49 +0000
@@ -1089,6 +1089,7 @@
         $output         .= __('Groups');
         $output     .= '<ul class="DisplayList">';
         $nested     = false;
+        $scheduleWithView = (Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'Yes');
         
         while($row = $db->get_assoc_row($results))
         {
@@ -1100,8 +1101,12 @@
             // Determine if we are authed against this group.
             $auth = $this->user->DisplayGroupAuth($displayGroupID, true);
 
-            // 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')
+            // Can schedule with view, but no view permissions
+            if ($scheduleWithView && $auth->view != 1)
+                continue;
+
+            // Can't schedule with view, but no edit permissions
+            if (!$scheduleWithView && $auth->edit != 1)
                 continue;
             
             // Do we need to nest yet? We only nest display specific groups
@@ -1207,9 +1212,6 @@
         $found = false;
         foreach($layouts as $layout)
         {
-            if (!$layout['edit'] == 1)
-                continue;
-
             // We have permission to edit this layout
             $output .= '<tr>';
             $output .= '    <td>' . $layout['campaign'] . '</td>';
@@ -1327,9 +1329,16 @@
         $output .= '    </thead>';
         $output .= '    <tbody>';
 
+        $scheduleWithView = (Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'Yes');
+
         foreach($displays as $display)
         {
-            if ($display['edit'] != 1 && Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'No')
+            // Can schedule with view, but no view permissions
+            if ($scheduleWithView && $display['view'] != 1)
+                continue;
+
+            // Can't schedule with view, but no edit permissions
+            if (!$scheduleWithView && $display['edit'] != 1)
                 continue;
 
             // We have permission to edit this layout

=== modified file 'server/lib/service/xmdssoap.class.php'
--- server/lib/service/xmdssoap.class.php	2014-07-22 15:08:23 +0000
+++ server/lib/service/xmdssoap.class.php	2014-10-03 14:12:49 +0000
@@ -1,7 +1,7 @@
 <?php
 /*
  * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2009-2013 Daniel Garner
+ * Copyright (C) 2009-2014 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -49,8 +49,7 @@
     public function RegisterDisplay($serverKey, $hardwareKey, $displayName, $version)
     {
 	$db =& $this->db;
-	define('SERVER_KEY', Config::GetSetting('SERVER_KEY'));
-
+	
 	// Sanitize
 	$serverKey 	= Kit::ValidateParam($serverKey, _STRING);
 	$hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
@@ -66,8 +65,8 @@
 	Debug::LogEntry("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)
-            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+	if ($serverKey != Config::GetSetting('SERVER_KEY'))
+        throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
 
 	// Check the Length of the hardwareKey
 	if (strlen($hardwareKey) > 40)
@@ -147,6 +146,9 @@
         if (!$this->CheckVersion($version))
             throw new SoapFault('Sender', 'Your client is not of the correct version for communication with this server.');
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -158,7 +160,7 @@
             throw new SoapFault('Sender', 'This display is not licensed.');
 
         if ($this->isAuditing == 1)
-            Debug::LogEntry("audit", '[IN] with hardware key: ' . $hardwareKey, "xmds", "RequiredFiles");
+            Debug::LogEntry("audit", '[IN] with hardware key: ' . $hardwareKey, 'xmds', 'RequiredFiles', '', $this->displayId);
 
         $requiredFilesXml = new DOMDocument("1.0");
         $fileElements 	= $requiredFilesXml->createElement("files");
@@ -166,8 +168,16 @@
 
         $requiredFilesXml->appendChild($fileElements);
 
-        $currentdate 	= time();
-        $rfLookahead 	= $currentdate + $rfLookahead;
+        // Hour to hour time bands for the query
+        // Start at the current hour
+        $fromFilter = time();
+        // Move forwards an hour and the rf lookahead
+        $rfLookahead = $fromFilter + 3600 + $rfLookahead;
+        // Dial both items back to the top of the hour
+        $fromFilter = $fromFilter - ($fromFilter % 3600);
+        $toFilter = $rfLookahead - ($rfLookahead % 3600);
+
+        Debug::LogEntry('audit', sprintf('FromDT = %s. ToDt = %s', date('Y-m-d h:i:s', $fromFilter), date('Y-m-d h:i:s', $toFilter)), 'xmds', 'RequiredFiles', '', $this->displayId);
 
         // Get a list of all layout ids in the schedule right now.
         $SQL  = " SELECT DISTINCT layout.layoutID ";
@@ -176,13 +186,12 @@
         $SQL .= "   INNER JOIN `lkcampaignlayout` ON lkcampaignlayout.CampaignID = campaign.CampaignID ";
         $SQL .= "   INNER JOIN `layout` ON lkcampaignlayout.LayoutID = layout.LayoutID ";
         $SQL .= "   INNER JOIN lkdisplaydg ON lkdisplaydg.DisplayGroupID = schedule_detail.DisplayGroupID ";
-        $SQL .= "   INNER JOIN display ON lkdisplaydg.DisplayID = display.displayID ";
-        $SQL .= sprintf(" WHERE display.license = '%s'  ", $hardwareKey);
-        $SQL .= sprintf(" AND schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d ", $rfLookahead, $currentdate - 3600);
+        $SQL .= sprintf(" WHERE lkdisplaydg.DisplayID = %d  ", $this->displayId);
+        $SQL .= sprintf(" AND schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d ", $toFilter, $fromFilter);
         $SQL .= "   AND layout.retired = 0  ";
 
         if ($this->isAuditing == 1)
-            Debug::LogEntry("audit", $SQL, "xmds", "RequiredFiles");
+            Debug::LogEntry("audit", $SQL, 'xmds', 'RequiredFiles', '', $this->displayId);
 
         if (!$results = $db->query($SQL))
         {
@@ -221,13 +230,12 @@
                     ON lkmediadisplaygroup.mediaid = media.MediaID
                     INNER JOIN lkdisplaydg 
                     ON lkdisplaydg.DisplayGroupID = lkmediadisplaygroup.DisplayGroupID
-                    INNER JOIN display 
-                    ON lkdisplaydg.DisplayID = display.displayID
                 ";
-        $SQL .= sprintf(" WHERE display.license = '%s'  ", $hardwareKey);
+        $SQL .= sprintf(" WHERE lkdisplaydg.DisplayID = %d  ", $this->displayId);
         $SQL .= " ORDER BY RecordType DESC";
 
-        if ($this->isAuditing == 1) Debug::LogEntry("audit", $SQL, "xmds", "RequiredFiles");
+        if ($this->isAuditing == 1) 
+            Debug::LogEntry("audit", $SQL, 'xmds', 'RequiredFiles', '', $this->displayId);
 
         if (!$results = $db->query($SQL))
         {
@@ -254,7 +262,7 @@
                 $fileSize 	= strlen($xml);
                 
                 if ($this->isAuditing == 1) 
-                    Debug::LogEntry("audit", 'MD5 for layoutid ' . $id . ' is: [' . $md5 . ']', "xmds", "RequiredFiles");
+                    Debug::LogEntry("audit", 'MD5 for layoutid ' . $id . ' is: [' . $md5 . ']', 'xmds', 'RequiredFiles', '', $this->displayId);
             }
             else if ($recordType == 'media')
             {
@@ -367,11 +375,8 @@
         $this->PhoneHome();
 
         if ($this->isAuditing == 1)
-        {
-            Debug::LogEntry("audit", $requiredFilesXml->saveXML(), "xmds", "RequiredFiles");
-            Debug::LogEntry("audit", "[OUT]", "xmds", "RequiredFiles");
-        }
-
+            Debug::LogEntry("audit", $requiredFilesXml->saveXML(), 'xmds', 'RequiredFiles', '', $this->displayId);
+        
         // Return the results of requiredFiles()
         $requiredFilesXml->formatOutput = true;
         $output = $requiredFilesXml->saveXML();
@@ -409,6 +414,9 @@
             throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
         }
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -484,12 +492,15 @@
         $serverKey 	= Kit::ValidateParam($serverKey, _STRING);
         $hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
         $version 	= Kit::ValidateParam($version, _STRING);
-        $sLookahead     = Kit::ValidateParam(Config::GetSetting('REQUIRED_FILES_LOOKAHEAD'), _INT);
+        $rfLookahead = Kit::ValidateParam(Config::GetSetting('REQUIRED_FILES_LOOKAHEAD'), _INT);
 
         // Make sure we are talking the same language
         if (!$this->CheckVersion($version))
             throw new SoapFault('Sender', "Your client is not of the correct version for communication with this server.");
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -499,23 +510,28 @@
             throw new SoapFault('Sender', "This display client is not licensed");
 
         if ($this->isAuditing == 1)
-            Debug::LogEntry("audit", "[IN] $hardwareKey", "xmds", "Schedule");
+            Debug::LogEntry("audit", "[IN] $hardwareKey", 'xmds', 'Schedule', '', $this->displayId);
 
         $scheduleXml = new DOMDocument("1.0");
         $layoutElements = $scheduleXml->createElement("schedule");
 
         $scheduleXml->appendChild($layoutElements);
 
-        $currentdate 	= time();
+        // Hour to hour time bands for the query
+        // Start at the current hour
+        $fromFilter = time();
+        // Move forwards an hour and the rf lookahead
+        $rfLookahead = $fromFilter + 3600 + $rfLookahead;
+        // Dial both items back to the top of the hour
+        $fromFilter = $fromFilter - ($fromFilter % 3600);
 
         if (Config::GetSetting('SCHEDULE_LOOKAHEAD') == 'On')
-        {
-            $sLookahead = $currentdate + $sLookahead;
-        }
-        else
-        {
-            $sLookahead = $currentdate;
-        }
+            $toFilter = $rfLookahead - ($rfLookahead % 3600);
+        else 
+            $toFilter = ($fromFilter + 3600) - (($fromFilter + 3600) % 3600);
+
+        if ($this->isAuditing == 1)
+            Debug::LogEntry('audit', sprintf('FromDT = %s. ToDt = %s', date('Y-m-d h:i:s', $fromFilter), date('Y-m-d h:i:s', $toFilter)), 'xmds', 'Schedule', '', $this->displayId);
 
         // Add file nodes to the $fileElements
         // Firstly get all the scheduled layouts
@@ -526,14 +542,13 @@
         $SQL .= " INNER JOIN `lkcampaignlayout` ON lkcampaignlayout.CampaignID = campaign.CampaignID ";
         $SQL .= " INNER JOIN `layout` ON lkcampaignlayout.LayoutID = layout.LayoutID ";
         $SQL .= " INNER JOIN lkdisplaydg ON lkdisplaydg.DisplayGroupID = schedule_detail.DisplayGroupID ";
-        $SQL .= " INNER JOIN display ON lkdisplaydg.DisplayID = display.displayID ";
-        $SQL .= sprintf(" WHERE display.license = '%s'  ", $hardwareKey);
-        $SQL .= sprintf(" AND (schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d )", $sLookahead, $currentdate - 3600);
+        $SQL .= sprintf(" WHERE lkdisplaydg.DisplayID = %d  ", $this->displayId);
+        $SQL .= sprintf(" AND (schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d )", $toFilter, $fromFilter);
         $SQL .= "   AND layout.retired = 0  ";
         $SQL .= " ORDER BY schedule_detail.DisplayOrder, lkcampaignlayout.DisplayOrder, schedule_detail.eventID ";
 
         if ($this->isAuditing == 1)
-            Debug::LogEntry("audit", $SQL, "xmds", "Schedule");
+            Debug::LogEntry("audit", $SQL, 'xmds', 'Schedule', '', $this->displayId);
 
         // Run the query
         if (!$results = $db->query($SQL))
@@ -589,7 +604,7 @@
         $scheduleXml->formatOutput = true;
         
         if ($this->isAuditing == 1)
-            Debug::LogEntry("audit", $scheduleXml->saveXML(), "xmds", "Schedule");
+            Debug::LogEntry("audit", $scheduleXml->saveXML(), 'xmds', 'Schedule', '', $this->displayId);
 
         $output = $scheduleXml->saveXML();
 
@@ -624,6 +639,9 @@
                 throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.", $serverKey);
         }
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -708,6 +726,9 @@
             throw new SoapFault('Sender', "Your client is not of the correct version for communication with this server.");
         }
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -833,6 +854,9 @@
             throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
         }
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -926,6 +950,9 @@
         if (!$this->CheckVersion($version))
             throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -1002,6 +1029,9 @@
         if (!$this->CheckVersion($version))
             throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server.");
 
+        if ($serverKey != Config::GetSetting('SERVER_KEY'))
+            throw new SoapFault('Sender', 'The Server key you entered does not match with the server key at this address');
+
         // Make sure we are sticking to our bandwidth limit
         if (!$this->CheckBandwidth())
             throw new SoapFault('Receiver', "Bandwidth Limit exceeded");
@@ -1188,7 +1218,7 @@
             return true;
 
         // Test bandwidth for the current month
-        $startOfMonth = strtotime(date('m').'/01/'.date('Y').' 00:00:00');
+        $startOfMonth = strtotime(date('m').'/02/'.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);

=== modified file 'server/maintenance.php'
--- server/maintenance.php	2014-01-18 09:47:41 +0000
+++ server/maintenance.php	2014-10-03 14:12:49 +0000
@@ -243,7 +243,7 @@
 
         // Log Tidy
         print "<h1>" . __("Tidy Logs") . "</h1>";
-        if(Config::GetSetting("MAINTENANCE_LOG_MAXAGE")!=0)
+        if(Config::GetSetting("MAINTENANCE_LOG_MAXAGE")!=0 && Kit::GetParam('quick', _REQUEST, _INT) != 1)
         {
             $maxage = date("Y-m-d H:i:s",time() - (86400 * Kit::ValidateParam(Config::GetSetting("MAINTENANCE_LOG_MAXAGE"),_INT)));
             
@@ -265,7 +265,7 @@
 
         // Stats Tidy
         print "<h1>" . __("Tidy Stats") . "</h1>";
-        if(Config::GetSetting("MAINTENANCE_STAT_MAXAGE")!=0)
+        if(Config::GetSetting("MAINTENANCE_STAT_MAXAGE")!=0 && Kit::GetParam('quick', _REQUEST, _INT) != 1)
         {
             $maxage = date("Y-m-d H:i:s",time() - (86400 * Kit::ValidateParam(Config::GetSetting("MAINTENANCE_STAT_MAXAGE"),_INT)));
             

=== modified file 'server/modules/module_user_general.php'
--- server/modules/module_user_general.php	2014-07-09 17:27:29 +0000
+++ server/modules/module_user_general.php	2014-10-03 14:12:49 +0000
@@ -505,7 +505,7 @@
                 
             $results = $sth->fetchAll();
 
-            return (count($results > 0));
+            return (count($results) > 0);
         }
         catch (Exception $e) {
             

=== modified file 'server/modules/preview/HtmlTemplateForGetResource.html'
--- server/modules/preview/HtmlTemplateForGetResource.html	2014-07-17 13:38:38 +0000
+++ server/modules/preview/HtmlTemplateForGetResource.html	2014-10-03 14:12:49 +0000
@@ -3,7 +3,7 @@
     <head>
         <title>Xibo Open Source Digital Signage</title>
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="viewport" content="width=[[ViewPortWidth]], user-scalable=no, initial-scale=1.0, target-densitydpi=device-dpi" />
+        <meta name="viewport" content="width=[[ViewPortWidth]]" />
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<!-- Copyright 2006-2014 Daniel Garner. Part of the Xibo Open Source Digital Signage Solution. Released under the AGPLv3 or later. -->
         <style type="text/css">

=== modified file 'server/modules/preview/HtmlTemplateSimple.html'
--- server/modules/preview/HtmlTemplateSimple.html	2014-07-15 11:42:14 +0000
+++ server/modules/preview/HtmlTemplateSimple.html	2014-10-03 14:12:49 +0000
@@ -7,7 +7,7 @@
     <head>
         <title>Xibo Open Source Digital Signage</title>
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="viewport" content="width=[[ViewPortWidth]], user-scalable=no, initial-scale=1.0, target-densitydpi=device-dpi" />
+        <meta name="viewport" content="width=[[ViewPortWidth]]" />
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <!-- Copyright 2006-2014 Daniel Garner. Part of the Xibo Open Source Digital Signage Solution. Released under the AGPLv3 or later. -->
         <style type="text/css">

=== modified file 'server/theme/default/html/status_dashboard.php'
--- server/theme/default/html/status_dashboard.php	2014-07-21 11:02:21 +0000
+++ server/theme/default/html/status_dashboard.php	2014-10-03 14:12:49 +0000
@@ -19,50 +19,51 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Theme variables:
- * 	id = The GridID for rendering AJAX layout table return
- * 	filter_id = The Filter Form ID
- * 	form_meta = Extra form meta that needs to be sent to the CMS to return the list of layouts
- * 	pager = A paging control for this Xibo Grid
+ *  id = The GridID for rendering AJAX layout table return
+ *  filter_id = The Filter Form ID
+ *  form_meta = Extra form meta that needs to be sent to the CMS to return the list of layouts
+ *  pager = A paging control for this Xibo Grid
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 ?>
 <div class="row">
-	<div class="span6">
-		<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">
-		<h3 class="text-center"><?php echo Theme::Translate('Library Usage'); ?></h3>
-		<?php echo Theme::Get('library-widget'); ?>
-	</div>
+    <div class="span6">
+        <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">
+        <h3 class="text-center"><?php echo Theme::Translate('Library Usage'); ?></h3>
+        <?php echo Theme::Get('library-widget'); ?>
+    </div>
 </div>
 <div class="row">
-	<div class="span6">
-		<h3 class="text-center"><?php echo Theme::Translate('Display Activity'); ?></h3>
-		<table class="table">
-			<thead>
-				<tr>
-					<th><?php echo Theme::Translate('Display'); ?></th>	
-					<th><?php echo Theme::Translate('Logged In'); ?></th>	
-					<th><?php echo Theme::Translate('Licence'); ?></th>
-				</tr>
-			</thead>
-			<tbody>
-				<?php foreach(Theme::Get('display-widget-rows') as $row) { ?>
-				<tr class="<?php echo $row['mediainventorystatus']; ?>">
-					<td><?php echo $row['display']; ?></td>
-					<td><span class="<?php echo $row['loggedin']; ?>"></span></td>
-					<td><span class="<?php echo $row['licensed']; ?>"></span></td>
-				</tr>
-				<?php } ?>
-			</tbody>
-		</table>
-	</div>
-	<div class="span6">
-		<?php echo Theme::Get('embedded-widget'); ?>
-	</div>
+    <div class="span6">
+        <h3 class="text-center"><?php echo Theme::Translate('Display Activity'); ?></h3>
+        <table class="table">
+            <thead>
+                <tr>
+                    <th><?php echo Theme::Translate('Display'); ?></th> 
+                    <th><?php echo Theme::Translate('Logged In'); ?></th>   
+                    <th><?php echo Theme::Translate('Licence'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach(Theme::Get('display-widget-rows') as $row) { ?>
+                <tr class="<?php echo $row['mediainventorystatus']; ?>">
+                    <td><?php echo $row['display']; ?></td>
+                    <td><span class="<?php echo $row['loggedin']; ?>"></span></td>
+                    <td><span class="<?php echo $row['licensed']; ?>"></span></td>
+                </tr>
+                <?php } ?>
+            </tbody>
+        </table>
+    </div>
+    <div class="span6">
+        <?php echo Theme::Get('embedded-widget'); ?>
+    </div>
 </div>
 <script type="text/javascript">
-	<?php echo Theme::Get('bandwidth-widget'); ?>
-	<?php echo Theme::Get('library-widget-js'); ?>
+    <?php echo Theme::Get('bandwidth-widget'); ?>
+    
+    <?php echo Theme::Get('library-widget-js'); ?>
 </script>
\ No newline at end of file