Merge pull request #13 from xibosignage/develop

Fixes with 1.7.0 upgrade.
xibosignage · Jan 28, 2015 · ada0bff · ada0bff
2 parents dde43dd + 8c633fb
commit ada0bff
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/install/database/80.sql b/install/database/80.sql
@@ -8,13 +8,13 @@ ALTER TABLE  `resolution` CHANGE  `resolution`  `resolution` VARCHAR( 254 ) CHAR
 
 UPDATE `resolution` SET enabled = 0;
 
-INSERT INTO `resolution` (`resolutionID`, `resolution`, `width`, `height`, `intended_width`, `intended_height`, `version`, `enabled`) VALUES
-(9, '1080p HD Landscape', 800, 450, 1920, 1080, 2, 1),
-(10, '720p HD Landscape', 800, 450, 1280, 720, 2, 1),
-(11, '1080p HD Portrait', 450, 800, 1080, 1920, 2, 1),
-(12, '720p HD Portrait', 450, 800, 720, 1280, 2, 1),
-(13, '4k', 800, 450, 4096, 2304, 2, 1),
-(14, 'Common PC Monitor 4:3', 800, 600, 1024, 768, 2, 1);
+INSERT INTO `resolution` (`resolution`, `width`, `height`, `intended_width`, `intended_height`, `version`, `enabled`) VALUES
+('1080p HD Landscape', 800, 450, 1920, 1080, 2, 1),
+('720p HD Landscape', 800, 450, 1280, 720, 2, 1),
+('1080p HD Portrait', 450, 800, 1080, 1920, 2, 1),
+('720p HD Portrait', 450, 800, 720, 1280, 2, 1),
+('4k', 800, 450, 4096, 2304, 2, 1),
+('Common PC Monitor 4:3', 800, 600, 1024, 768, 2, 1);
 
 DELETE FROM `lktemplategroup` WHERE TemplateID IN (SELECT TemplateID FROM `template` WHERE isSystem = 1);
 DELETE FROM `template` WHERE isSystem = 1;

diff --git a/install/database/82.sql b/install/database/82.sql
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `lktaglayout` (
   `tagId` int(11) NOT NULL,
   `layoutId` int(11) NOT NULL,
   PRIMARY KEY (`lkTagLayoutId`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf32 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 CREATE TABLE IF NOT EXISTS `lktagmedia` (
   `lkTagMediaId` int(11) NOT NULL AUTO_INCREMENT,

diff --git a/lib/pages/layout.class.php b/lib/pages/layout.class.php
@@ -1003,7 +1003,7 @@ function RenderDesigner()
             // Version 2 layouts have the layout resolution in the XLF and therefore need to be scaled back by the designer.
 
             $tipScale = ($version == 1) ? min($resolution['intended_width'] / $resolution['width'], $resolution['intended_height'] / $resolution['height']) : 1;
-            $designerScale = ($version == 1) ? 1 : min($resolution['width'] / $resolution['intended_width'], $resolution['intended_height'] / $resolution['height']);
+            $designerScale = ($version == 1) ? 1 : min($resolution['width'] / $resolution['intended_width'], $resolution['height'] / $resolution['intended_height']);
 
             // To do - version 2 layout can support zooming?
             if ($version > 1) {

diff --git a/maintenance.php b/maintenance.php
@@ -28,6 +28,7 @@
 ini_set('gd.jpeg_ignore_warning', 1);
 
 // Required Library Files
+require_once("lib/app/app_functions.php");
 require_once("lib/app/translationengine.class.php");
 require_once("lib/app/pdoconnect.class.php");
 require_once("lib/app/debug.class.php");
@@ -38,6 +39,9 @@
 require_once("lib/app/helpmanager.class.php");
 require_once("lib/app/thememanager.class.php");
 require_once("lib/data/display.data.class.php");
+require_once("lib/modules/module.interface.php");
+require_once("lib/modules/module.class.php");
+require_once('modules/module_user_general.php');
 
 // Required Config Files
 require_once("config/config.class.php");
@@ -291,6 +295,11 @@
 
         // Keep tidy
         Media::removeExpiredFiles();
+
+        // Install module files
+        if (Kit::GetParam('quick', _REQUEST, _INT) != 1) {
+            Media::installAllModuleFiles();
+        }
     }
     else {
         print __("Maintenance key invalid.");

diff --git a/modules/twitter.module.php b/modules/twitter.module.php
@@ -74,7 +74,8 @@ public function InstallFiles()
         $media->addModuleFile('modules/preview/vendor/jquery-1.11.1.min.js');
         $media->addModuleFile('modules/preview/xibo-text-render.js');
         $media->addModuleFile('modules/preview/xibo-layout-scaler.js');
-        $media->addModuleFileFromFolder('modules/theme/twitter/');
+        $media->addModuleFile('modules/theme/twitter/emoji.css');
+        $media->addModuleFile('modules/theme/twitter/emoji.png');
     }
 
     /**