Merge pull request #354 from xibosignage/release18

Release 1.8.8

Dockerfile

@@ -95,7 +95,7 @@ RUN sed -i "s/error_reporting = .*$/error_reporting = E_ERROR | E_WARNING | E_PA
 # Setup persistent environment variables
 ENV CMS_DEV_MODE=false \
     XMR_HOST=xmr \
-    CMS_DB_VERSION=138 \
+    CMS_DB_VERSION=139 \
     CMS_SERVER_NAME=localhost \
     MYSQL_HOST=mysql \
     MYSQL_USER=cms \

build-composer.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# A simple helper script to run composer
+# useful if your dev host environment doesn't have PHP
+# on windows replace $PWD with your working repo root folder
+docker run --rm \
+    --volume $PWD:/app \
+    composer install --ignore-platform-reqs --optimize-autoloader

composer.json

@@ -56,7 +56,7 @@
     "guzzlehttp/guzzle": "~6.0",
     "league/oauth2-client": "~1.0",
     "james-heinrich/getid3": "^1.9",
-    "onelogin/php-saml": "^2.10",
+    "onelogin/php-saml": "3.0.0.x-dev",
     "fguillot/picofeed": "@stable",
     "xibosignage/xibo-xmr": "0.*",
     "tedivm/stash": "^0.14.1",

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       MYSQL_DATABASE: "cms"
 
   xmr:
-    image: xibosignage/xibo-xmr:latest
+    image: xibosignage/xibo-xmr:release-0.7
     ports:
      - "9505:9505"
     environment:

docker/entrypoint.sh

@@ -191,6 +191,8 @@ then
     mkdir -p /var/www/cms/library/temp
     chown apache.apache -R /var/www/cms
 
+    # If we have a CMS ALIAS environment variable, then configure that in our Apache conf.
+    # this must not be done in DEV mode, as it modifies the .htaccess file, which might then be committed by accident
     if [ ! "$CMS_ALIAS" == "none" ]
     then
         echo "Setting up CMS alias"

install/master/constraints.sql

@@ -124,3 +124,4 @@ CREATE INDEX lkdgdg_parentId_childId_depth_index ON lkdgdg (parentId, childId, d
 
 CREATE INDEX lkdgdg_childId_parentId_depth_index ON lkdgdg (childId, parentId, depth);
 
+CREATE INDEX media_editedMediaID_index ON media (editedMediaID);

install/master/data.sql

@@ -1,5 +1,5 @@
 INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
-('1.8.7', 5, 2, 138);
+('1.8.8', 5, 2, 139);
 
 INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`, `isSystemNotification`) VALUES
 (1, 'Users', 0, 0, 0),
@@ -181,8 +181,8 @@ INSERT INTO `setting` (`settingid`, `setting`, `value`, `fieldType`, `helptext`,
 (41, 'MAINTENANCE_ENABLED', 'Off', 'dropdown', 'Allow the maintenance script to run if it is called?', 'Protected|On|Off', 'maintenance', 1, 'Enable Maintenance?', '', 10, 'Off', 1, 'word'),
 (42, 'MAINTENANCE_EMAIL_ALERTS', 'On', 'dropdown', 'Global switch for email alerts to be sent', 'On|Off', 'maintenance', 1, 'Enable Email Alerts?', '', 20, 'On', 1, 'word'),
 (43, 'MAINTENANCE_KEY', 'changeme', 'text', 'String appended to the maintenance script to prevent malicious calls to the script.', NULL, 'maintenance', 1, 'Maintenance Key', '', 50, 'changeme', 1, 'string'),
-(44, 'MAINTENANCE_LOG_MAXAGE', '30', 'number', 'Maximum age for log entries. Set to 0 to keep logs indefinitely.', NULL, 'maintenance', 1, 'Max Log Age', '', 60, '30', 1, 'int'),
-(45, 'MAINTENANCE_STAT_MAXAGE', '30', 'number', 'Maximum age for statistics entries. Set to 0 to keep statistics indefinitely.', NULL, 'maintenance', 1, 'Max Statistics Age', '', 70, '30', 1, 'int'),
+(44, 'MAINTENANCE_LOG_MAXAGE', '30', 'number', 'Maximum age for log entries in days. Set to 0 to keep logs indefinitely.', NULL, 'maintenance', 1, 'Max Log Age', '', 60, '30', 1, 'int'),
+(45, 'MAINTENANCE_STAT_MAXAGE', '30', 'number', 'Maximum age for statistics entries in days. Set to 0 to keep statistics indefinitely.', NULL, 'maintenance', 1, 'Max Statistics Age', '', 70, '30', 1, 'int'),
 (46, 'MAINTENANCE_ALERT_TOUT', '12', 'number', 'How long in minutes after the last time a client connects should we send an alert? Can be overridden on a per client basis.', NULL, 'maintenance', 1, 'Max Display Timeout', '', 80, '12', 1, 'int'),
 (47, 'SHOW_DISPLAY_AS_VNCLINK', '', 'text', 'Turn the display name in display management into a VNC link using the IP address last collected. The %s is replaced with the IP address. Leave blank to disable.', NULL, 'displays', 1, 'Display a VNC Link?', '', 30, '', 1, 'string'),
 (48, 'SHOW_DISPLAY_AS_VNC_TGT', '_top', 'text', 'If the display name is shown as a link in display management, what target should the link have? Set _top to open the link in the same window or _blank to open in a new window.', NULL, 'displays', 1, 'Open VNC Link in new window?', '', 40, '_top', 1, 'string'),
@@ -244,8 +244,8 @@ INSERT INTO `usertype` (`usertypeid`, `usertype`) VALUES
 (2, 'Group Admin'),
 (3, 'User');
 
-INSERT INTO `user` (`UserID`, `usertypeid`, `UserName`, `UserPassword`, `loggedin`, `lastaccessed`, `email`, `homepageId`, `Retired`) VALUES
-(1, 1, 'xibo_admin', '21232f297a57a5a743894a0e4a801fc3', 1, NOW(), '', 29, 0);
+INSERT INTO `user` (`UserID`, `usertypeid`, `UserName`, `UserPassword`, `lastaccessed`, `email`, `homepageId`, `Retired`) VALUES
+(1, 1, 'xibo_admin', '21232f297a57a5a743894a0e4a801fc3', NOW(), '', 29, 0);
 
 INSERT INTO `lkusergroup` (`LkUserGroupID`, `GroupID`, `UserID`) VALUES
 (1, 3, 1);

install/master/structure.sql

@@ -929,7 +929,6 @@ CREATE TABLE IF NOT EXISTS `user` (
   `usertypeid` int(8) NOT NULL,
   `UserName` varchar(50) NOT NULL,
   `UserPassword` varchar(255) NOT NULL,
-  `loggedin` tinyint(1) NOT NULL DEFAULT '0',
   `lastaccessed` datetime DEFAULT NULL,
   `email` varchar(50) DEFAULT NULL COMMENT 'The users email address',
   `homePageId` int(11) NOT NULL DEFAULT '1' COMMENT 'The users homepage',
@@ -988,6 +987,8 @@ CREATE TABLE IF NOT EXISTS `widget` (
   `displayOrder` int(11) NOT NULL,
   `useDuration` int(4) NOT NULL DEFAULT '1',
   `calculatedDuration` int(4) NOT NULL,
+  `createdDt` int(11) NOT NULL,
+  `modifiedDt` int(11) NOT NULL,
   PRIMARY KEY (`widgetId`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 

install/steps/139.json

@@ -0,0 +1,26 @@
+{
+  "dbVersion": 139,
+  "appVersion": "1.8.8",
+  "steps": [
+    {
+      "step": "Add widget created/modified dates",
+      "action": "ALTER TABLE widget ADD createdDt INT NULL;ALTER TABLE widget ADD modifiedDt INT NULL;"
+    },
+    {
+      "step": "Add index to the media table",
+      "action": "CREATE INDEX media_editedMediaID_index ON media (editedMediaID);"
+    },
+    {
+      "step": "Update help text on MAINTENANCE_LOG_MAXAGE",
+      "action": "UPDATE `setting` SET helpText = 'Maximum age for log entries in days. Set to 0 to keep logs indefinitely.' WHERE setting = 'MAINTENANCE_LOG_MAXAGE' LIMIT 1"
+    },
+    {
+      "step": "Update help text on MAINTENANCE_STAT_MAXAGE",
+      "action": "UPDATE `setting` SET helpText = 'Maximum age for statistics entries in days. Set to 0 to keep statistics indefinitely.' WHERE setting = 'MAINTENANCE_STAT_MAXAGE' LIMIT 1"
+    },
+    {
+      "step": "Remove loggedin column from user table",
+      "action": "ALTER TABLE user DROP COLUMN loggedin;"
+    }
+  ]
+}