Merge lp:~dangarner/xibo/server-163-final into lp:xibo/1.7
- server-163-final
- Merge into tuttle
Proposed by
Dan Garner
Status: | Needs review |
---|---|
Proposed branch: | lp:~dangarner/xibo/server-163-final |
Merge into: | lp:xibo/1.7 |
Diff against target: |
1422 lines (+654/-169) (has conflicts) 36 files modified
default.pot (+8/-0) server/config/config.class.php (+12/-2) server/install.php (+12/-0) server/install/database/71.sql (+4/-0) server/install/master/data.sql (+4/-0) server/install/master/structure.sql (+10/-0) server/lib/app/kit.class.php (+1/-1) server/lib/app/pdoconnect.class.php (+11/-1) server/lib/data/dataset.data.class.php (+1/-2) server/lib/data/datasetdata.data.class.php (+1/-1) server/lib/data/displaygroup.data.class.php (+9/-5) server/lib/data/region.data.class.php (+19/-8) server/lib/data/userdata.data.class.php (+28/-0) server/lib/data/usergroup.data.class.php (+1/-1) server/lib/include.php (+4/-0) server/lib/modules/module.class.php (+8/-5) server/lib/pages/admin.class.php (+7/-7) server/lib/pages/content.class.php (+1/-1) server/lib/pages/display.class.php (+7/-5) server/lib/pages/displaygroup.class.php (+1/-1) server/lib/pages/schedule.class.php (+17/-12) server/lib/pages/statusdashboard.class.php (+1/-1) server/lib/pages/timeline.class.php (+6/-0) server/lib/pages/user.class.php (+5/-17) server/lib/service/xmdssoap.class.php (+6/-0) server/locale/dbtranslate.php (+43/-0) server/manual/content/admin/api_layouts.php (+39/-16) server/manual/content/admin/release_notes_1.6.2.php (+162/-76) server/manual/content/admin/release_notes_1.6.3.php (+83/-0) server/manual/template.php (+4/-0) server/modules/preview/HtmlTemplateForGetResource.html (+4/-0) server/modules/preview/html-preview.js (+12/-4) server/modules/preview/xibo-text-render.js (+31/-0) server/modules/preview/xibo-webpage-render.js (+73/-1) server/theme/default/html/status_dashboard.php (+7/-2) server/upgrade.php (+12/-0) Contents conflict in default.mo Text conflict in default.pot Text conflict in server/config/config.class.php Text conflict in server/install.php Text conflict in server/install/master/data.sql Text conflict in server/lib/data/region.data.class.php Text conflict in server/lib/include.php Text conflict in server/lib/service/xmdssoap.class.php Text conflict in server/manual/content/admin/release_notes_1.6.2.php Text conflict in server/manual/template.php Text conflict in server/modules/preview/HtmlTemplateForGetResource.html Text conflict in server/modules/preview/html-preview.js Text conflict in server/modules/preview/xibo-text-render.js Text conflict in server/modules/preview/xibo-webpage-render.js Text conflict in server/theme/default/html/status_dashboard.php Text conflict in server/upgrade.php |
To merge this branch: | bzr merge lp:~dangarner/xibo/server-163-final |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xibo Maintainters | Pending | ||
Review via email: mp+231716@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 359. By Dan Garner
-
[cms] Pushed files for release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === renamed file 'default.mo' => 'default.mo.OTHER' | |||
2 | 0 | Binary files default.mo 2014-07-15 16:00:50 +0000 and default.mo.OTHER 2014-08-21 12:09:46 +0000 differ | 0 | Binary files default.mo 2014-07-15 16:00:50 +0000 and default.mo.OTHER 2014-08-21 12:09:46 +0000 differ |
3 | === modified file 'default.pot' | |||
4 | --- default.pot 2014-07-15 16:00:50 +0000 | |||
5 | +++ default.pot 2014-08-21 12:09:46 +0000 | |||
6 | @@ -2,7 +2,11 @@ | |||
7 | 2 | msgstr "" | 2 | msgstr "" |
8 | 3 | "Project-Id-Version: Xibo Digital Signage\n" | 3 | "Project-Id-Version: Xibo Digital Signage\n" |
9 | 4 | "Report-Msgid-Bugs-To: \n" | 4 | "Report-Msgid-Bugs-To: \n" |
10 | 5 | <<<<<<< TREE | ||
11 | 5 | "POT-Creation-Date: 2014-07-15 17:00-0000\n" | 6 | "POT-Creation-Date: 2014-07-15 17:00-0000\n" |
12 | 7 | ======= | ||
13 | 8 | "POT-Creation-Date: 2014-07-15 16:44-0000\n" | ||
14 | 9 | >>>>>>> MERGE-SOURCE | ||
15 | 6 | "PO-Revision-Date: \n" | 10 | "PO-Revision-Date: \n" |
16 | 7 | "Last-Translator: Dan Garner <dan@xibo.org.uk>\n" | 11 | "Last-Translator: Dan Garner <dan@xibo.org.uk>\n" |
17 | 8 | "Language-Team: <info@xibo.org.uk>\n" | 12 | "Language-Team: <info@xibo.org.uk>\n" |
18 | @@ -10,7 +14,11 @@ | |||
19 | 10 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
20 | 11 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
21 | 12 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
22 | 17 | <<<<<<< TREE | ||
23 | 13 | "X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.7.0-alpha\n" | 18 | "X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.7.0-alpha\n" |
24 | 19 | ======= | ||
25 | 20 | "X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.6.2\n" | ||
26 | 21 | >>>>>>> MERGE-SOURCE | ||
27 | 14 | "X-Poedit-KeywordsList: __;Translate\n" | 22 | "X-Poedit-KeywordsList: __;Translate\n" |
28 | 15 | "X-Generator: Poedit 1.5.5\n" | 23 | "X-Generator: Poedit 1.5.5\n" |
29 | 16 | "X-Poedit-SearchPath-0: server\n" | 24 | "X-Poedit-SearchPath-0: server\n" |
30 | 17 | 25 | ||
31 | === modified file 'server/config/config.class.php' | |||
32 | --- server/config/config.class.php 2014-06-28 16:12:52 +0000 | |||
33 | +++ server/config/config.class.php 2014-08-21 12:09:46 +0000 | |||
34 | @@ -1,7 +1,7 @@ | |||
35 | 1 | <?php | 1 | <?php |
36 | 2 | /* | 2 | /* |
37 | 3 | * Xibo - Digital Signage - http://www.xibo.org.uk | 3 | * Xibo - Digital Signage - http://www.xibo.org.uk |
39 | 4 | * Copyright (C) 2006-2013 Daniel Garner and James Packer | 4 | * Copyright (C) 2006-2014 Daniel Garner and James Packer |
40 | 5 | * | 5 | * |
41 | 6 | * This file is part of Xibo. | 6 | * This file is part of Xibo. |
42 | 7 | * | 7 | * |
43 | @@ -22,6 +22,8 @@ | |||
44 | 22 | 22 | ||
45 | 23 | class Config | 23 | class Config |
46 | 24 | { | 24 | { |
47 | 25 | public static $VERSION_REQUIRED = '5.3.3'; | ||
48 | 26 | |||
49 | 25 | private $extensions; | 27 | private $extensions; |
50 | 26 | private $envTested; | 28 | private $envTested; |
51 | 27 | private $envFault; | 29 | private $envFault; |
52 | @@ -129,7 +131,7 @@ | |||
53 | 129 | // Check for PHP version | 131 | // Check for PHP version |
54 | 130 | $message = __('PHP Version'); | 132 | $message = __('PHP Version'); |
55 | 131 | 133 | ||
57 | 132 | if ($this->CheckPHP() == 1) | 134 | if ($this->CheckPHP()) |
58 | 133 | { | 135 | { |
59 | 134 | $output .= $imgGood.$message.'<br />'; | 136 | $output .= $imgGood.$message.'<br />'; |
60 | 135 | } | 137 | } |
61 | @@ -138,7 +140,11 @@ | |||
62 | 138 | $this->envFault = true; | 140 | $this->envFault = true; |
63 | 139 | 141 | ||
64 | 140 | $output .= $imgBad.$message.'<br />'; | 142 | $output .= $imgBad.$message.'<br />'; |
65 | 143 | <<<<<<< TREE | ||
66 | 141 | $output .= '<div class="check_explain"> <p>' . __("PHP version 5.3.3 or later required.") . '. Detected ' . phpversion() . '</p></div>'; | 144 | $output .= '<div class="check_explain"> <p>' . __("PHP version 5.3.3 or later required.") . '. Detected ' . phpversion() . '</p></div>'; |
67 | 145 | ======= | ||
68 | 146 | $output .= '<div class="check_explain"> <p>' . sprintf(__("PHP version %s or later required."), Config::$VERSION_REQUIRED) . '. Detected ' . phpversion() . '</p></div>'; | ||
69 | 147 | >>>>>>> MERGE-SOURCE | ||
70 | 142 | } | 148 | } |
71 | 143 | 149 | ||
72 | 144 | // Check for file system permissions | 150 | // Check for file system permissions |
73 | @@ -463,7 +469,11 @@ | |||
74 | 463 | */ | 469 | */ |
75 | 464 | function CheckPHP() | 470 | function CheckPHP() |
76 | 465 | { | 471 | { |
77 | 472 | <<<<<<< TREE | ||
78 | 466 | return ((version_compare('5.3.3', phpversion(), '>='))) ? 1 : 0; | 473 | return ((version_compare('5.3.3', phpversion(), '>='))) ? 1 : 0; |
79 | 474 | ======= | ||
80 | 475 | return (version_compare(phpversion(), Config::$VERSION_REQUIRED) != -1); | ||
81 | 476 | >>>>>>> MERGE-SOURCE | ||
82 | 467 | } | 477 | } |
83 | 468 | 478 | ||
84 | 469 | /** | 479 | /** |
85 | 470 | 480 | ||
86 | === modified file 'server/install.php' | |||
87 | --- server/install.php 2014-07-15 15:59:36 +0000 | |||
88 | +++ server/install.php 2014-08-21 12:09:46 +0000 | |||
89 | @@ -20,11 +20,14 @@ | |||
90 | 20 | */ | 20 | */ |
91 | 21 | DEFINE('XIBO', true); | 21 | DEFINE('XIBO', true); |
92 | 22 | 22 | ||
93 | 23 | <<<<<<< TREE | ||
94 | 23 | if (! checkPHP()) | 24 | if (! checkPHP()) |
95 | 24 | { | 25 | { |
96 | 25 | die('Xibo requires PHP 5.3.3 or later'); | 26 | die('Xibo requires PHP 5.3.3 or later'); |
97 | 26 | } | 27 | } |
98 | 27 | 28 | ||
99 | 29 | ======= | ||
100 | 30 | >>>>>>> MERGE-SOURCE | ||
101 | 28 | error_reporting(0); | 31 | error_reporting(0); |
102 | 29 | ini_set('display_errors', 0); | 32 | ini_set('display_errors', 0); |
103 | 30 | 33 | ||
104 | @@ -33,6 +36,12 @@ | |||
105 | 33 | include('config/config.class.php'); | 36 | include('config/config.class.php'); |
106 | 34 | include('config/db_config.php'); | 37 | include('config/db_config.php'); |
107 | 35 | 38 | ||
108 | 39 | $config = new Config(); | ||
109 | 40 | |||
110 | 41 | if (!$config->CheckPHP()) { | ||
111 | 42 | die(sprintf('Xibo required PHP version %s.', Config::$VERSION_REQUIRED)); | ||
112 | 43 | } | ||
113 | 44 | |||
114 | 36 | // Setup for the Translations using Gettext. | 45 | // Setup for the Translations using Gettext. |
115 | 37 | // 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) | 46 | // 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) |
116 | 38 | // Would be nice to include a method on the TranslationEngine that did this for us - but without the debugging | 47 | // Would be nice to include a method on the TranslationEngine that did this for us - but without the debugging |
117 | @@ -691,11 +700,14 @@ | |||
118 | 691 | return $key; | 700 | return $key; |
119 | 692 | } | 701 | } |
120 | 693 | 702 | ||
121 | 703 | <<<<<<< TREE | ||
122 | 694 | function checkPHP() | 704 | function checkPHP() |
123 | 695 | { | 705 | { |
124 | 696 | return (version_compare("5.3.3",phpversion(), "<=")); | 706 | return (version_compare("5.3.3",phpversion(), "<=")); |
125 | 697 | } | 707 | } |
126 | 698 | 708 | ||
127 | 709 | ======= | ||
128 | 710 | >>>>>>> MERGE-SOURCE | ||
129 | 699 | function CheckGettext() | 711 | function CheckGettext() |
130 | 700 | { | 712 | { |
131 | 701 | return extension_loaded("gettext"); | 713 | return extension_loaded("gettext"); |
132 | 702 | 714 | ||
133 | === added file 'server/install/database/71.sql' | |||
134 | --- server/install/database/71.sql 1970-01-01 00:00:00 +0000 | |||
135 | +++ server/install/database/71.sql 2014-08-21 12:09:46 +0000 | |||
136 | @@ -0,0 +1,4 @@ | |||
137 | 1 | |||
138 | 2 | UPDATE `version` SET `app_ver` = '1.6.3', `XmdsVersion` = 3; | ||
139 | 3 | UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE'; | ||
140 | 4 | UPDATE `version` SET `DBVersion` = '71'; | ||
141 | 0 | 5 | ||
142 | === modified file 'server/install/master/data.sql' | |||
143 | --- server/install/master/data.sql 2014-07-15 15:35:22 +0000 | |||
144 | +++ server/install/master/data.sql 2014-08-21 12:09:46 +0000 | |||
145 | @@ -1,5 +1,9 @@ | |||
146 | 1 | INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES | 1 | INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES |
147 | 2 | <<<<<<< TREE | ||
148 | 2 | ('1.6.2', 3, 1, 70); | 3 | ('1.6.2', 3, 1, 70); |
149 | 4 | ======= | ||
150 | 5 | ('1.6.3', 3, 1, 71); | ||
151 | 6 | >>>>>>> MERGE-SOURCE | ||
152 | 3 | 7 | ||
153 | 4 | INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES | 8 | INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES |
154 | 5 | (1, 'Users', 0, 0), | 9 | (1, 'Users', 0, 0), |
155 | 6 | 10 | ||
156 | === modified file 'server/install/master/structure.sql' | |||
157 | --- server/install/master/structure.sql 2014-03-09 14:41:56 +0000 | |||
158 | +++ server/install/master/structure.sql 2014-08-21 12:09:46 +0000 | |||
159 | @@ -34,6 +34,7 @@ | |||
160 | 34 | `DataSet` varchar(50) NOT NULL, | 34 | `DataSet` varchar(50) NOT NULL, |
161 | 35 | `Description` varchar(254) DEFAULT NULL, | 35 | `Description` varchar(254) DEFAULT NULL, |
162 | 36 | `UserID` int(11) NOT NULL, | 36 | `UserID` int(11) NOT NULL, |
163 | 37 | `LastDataEdit` int(11) NOT NULL DEFAULT '0', | ||
164 | 37 | PRIMARY KEY (`DataSetID`), | 38 | PRIMARY KEY (`DataSetID`), |
165 | 38 | KEY `UserID` (`UserID`) | 39 | KEY `UserID` (`UserID`) |
166 | 39 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; | 40 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; |
167 | @@ -602,6 +603,15 @@ | |||
168 | 602 | PRIMARY KEY (`id`) | 603 | PRIMARY KEY (`id`) |
169 | 603 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='File associations directly to Display Groups' AUTO_INCREMENT=1 ; | 604 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='File associations directly to Display Groups' AUTO_INCREMENT=1 ; |
170 | 604 | 605 | ||
171 | 606 | CREATE TABLE IF NOT EXISTS `lkdatasetlayout` ( | ||
172 | 607 | `LkDataSetLayoutID` int(11) NOT NULL AUTO_INCREMENT, | ||
173 | 608 | `DataSetID` int(11) NOT NULL, | ||
174 | 609 | `LayoutID` int(11) NOT NULL, | ||
175 | 610 | `RegionID` varchar(50) NOT NULL, | ||
176 | 611 | `MediaID` varchar(50) NOT NULL, | ||
177 | 612 | PRIMARY KEY (`LkDataSetLayoutID`) | ||
178 | 613 | ) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; | ||
179 | 614 | |||
180 | 605 | -- | 615 | -- |
181 | 606 | -- Constraints for dumped tables | 616 | -- Constraints for dumped tables |
182 | 607 | -- | 617 | -- |
183 | 608 | 618 | ||
184 | === modified file 'server/lib/app/kit.class.php' | |||
185 | --- server/lib/app/kit.class.php 2014-05-26 09:09:06 +0000 | |||
186 | +++ server/lib/app/kit.class.php 2014-08-21 12:09:46 +0000 | |||
187 | @@ -372,7 +372,7 @@ | |||
188 | 372 | */ | 372 | */ |
189 | 373 | public static function GetURL($page = "") | 373 | public static function GetURL($page = "") |
190 | 374 | { | 374 | { |
192 | 375 | $page = $this->ValidateParam($page, _WORD); | 375 | $page = Kit::ValidateParam($page, _WORD); |
193 | 376 | $fullUrl = 'http'; | 376 | $fullUrl = 'http'; |
194 | 377 | 377 | ||
195 | 378 | if(isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') | 378 | if(isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') |
196 | 379 | 379 | ||
197 | === modified file 'server/lib/app/pdoconnect.class.php' | |||
198 | --- server/lib/app/pdoconnect.class.php 2014-01-18 09:47:41 +0000 | |||
199 | +++ server/lib/app/pdoconnect.class.php 2014-08-21 12:09:46 +0000 | |||
200 | @@ -34,8 +34,18 @@ | |||
201 | 34 | global $dbpass; | 34 | global $dbpass; |
202 | 35 | global $dbname; | 35 | global $dbname; |
203 | 36 | 36 | ||
204 | 37 | $dbport = ''; | ||
205 | 38 | |||
206 | 39 | if (strstr($dbhost, ':')) { | ||
207 | 40 | $hostParts = explode(':', $dbhost); | ||
208 | 41 | $dsn = 'mysql:host=' . $hostParts[0] . ';port=' . $hostParts[1] . ';dbname=' . $dbname . ';'; | ||
209 | 42 | } | ||
210 | 43 | else { | ||
211 | 44 | $dsn = 'mysql:host=' . $dbhost . ';dbname=' . $dbname . ';'; | ||
212 | 45 | } | ||
213 | 46 | |||
214 | 37 | // Open the connection and set the error mode | 47 | // Open the connection and set the error mode |
216 | 38 | self::$conn = new PDO('mysql:host=' . $dbhost . ';dbname=' . $dbname . ';', $dbuser, $dbpass); | 48 | self::$conn = new PDO($dsn, $dbuser, $dbpass); |
217 | 39 | self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); | 49 | self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
218 | 40 | 50 | ||
219 | 41 | self::$conn->query("SET NAMES 'utf8'"); | 51 | self::$conn->query("SET NAMES 'utf8'"); |
220 | 42 | 52 | ||
221 | === modified file 'server/lib/data/dataset.data.class.php' | |||
222 | --- server/lib/data/dataset.data.class.php 2014-07-08 14:45:16 +0000 | |||
223 | +++ server/lib/data/dataset.data.class.php 2014-08-21 12:09:46 +0000 | |||
224 | @@ -441,8 +441,7 @@ | |||
225 | 441 | 441 | ||
226 | 442 | Debug::LogEntry('audit', $SQL); | 442 | Debug::LogEntry('audit', $SQL); |
227 | 443 | 443 | ||
230 | 444 | if (!$rows = $db->GetArray($SQL, $associative)) | 444 | $rows = $db->GetArray($SQL, $associative); |
229 | 445 | trigger_error($db->error()); | ||
231 | 446 | 445 | ||
232 | 447 | if (!is_array($rows)) | 446 | if (!is_array($rows)) |
233 | 448 | $rows = array(); | 447 | $rows = array(); |
234 | 449 | 448 | ||
235 | === modified file 'server/lib/data/datasetdata.data.class.php' | |||
236 | --- server/lib/data/datasetdata.data.class.php 2014-07-12 13:54:51 +0000 | |||
237 | +++ server/lib/data/datasetdata.data.class.php 2014-08-21 12:09:46 +0000 | |||
238 | @@ -377,4 +377,4 @@ | |||
239 | 377 | } | 377 | } |
240 | 378 | } | 378 | } |
241 | 379 | } | 379 | } |
242 | 380 | ?> | ||
243 | 381 | \ No newline at end of file | 380 | \ No newline at end of file |
244 | 381 | ?> | ||
245 | 382 | 382 | ||
246 | === modified file 'server/lib/data/displaygroup.data.class.php' | |||
247 | --- server/lib/data/displaygroup.data.class.php 2014-04-19 09:11:34 +0000 | |||
248 | +++ server/lib/data/displaygroup.data.class.php 2014-08-21 12:09:46 +0000 | |||
249 | @@ -151,7 +151,8 @@ | |||
250 | 151 | */ | 151 | */ |
251 | 152 | public function Delete($displayGroupID) | 152 | public function Delete($displayGroupID) |
252 | 153 | { | 153 | { |
254 | 154 | Debug::LogEntry('audit', 'IN', 'DisplayGroup', 'Delete'); | 154 | if ($displayGroupID == NULL || $displayGroupID == 0) |
255 | 155 | return $this->SetError(__('Missing displayGroupId')); | ||
256 | 155 | 156 | ||
257 | 156 | try { | 157 | try { |
258 | 157 | $dbh = PDOConnect::init(); | 158 | $dbh = PDOConnect::init(); |
259 | @@ -162,6 +163,13 @@ | |||
260 | 162 | if (!$schedule->DeleteScheduleForDisplayGroup($displayGroupID)) | 163 | if (!$schedule->DeleteScheduleForDisplayGroup($displayGroupID)) |
261 | 163 | throw new Exception('Unable to DeleteScheduleForDisplayGroup'); | 164 | throw new Exception('Unable to DeleteScheduleForDisplayGroup'); |
262 | 164 | 165 | ||
263 | 166 | // Remove all permissions | ||
264 | 167 | Kit::ClassLoader('displaygroupsecurity'); | ||
265 | 168 | $security = new DisplayGroupSecurity($this->db); | ||
266 | 169 | |||
267 | 170 | if (!$security->UnlinkAll($displayGroupID)) | ||
268 | 171 | throw new Exception('Unable to Unlink all Display Group Permissions'); | ||
269 | 172 | |||
270 | 165 | // Delete the Display Group | 173 | // Delete the Display Group |
271 | 166 | $sth = $dbh->prepare('DELETE FROM displaygroup WHERE DisplayGroupID = :displaygroupid'); | 174 | $sth = $dbh->prepare('DELETE FROM displaygroup WHERE DisplayGroupID = :displaygroupid'); |
272 | 167 | $sth->execute(array( | 175 | $sth->execute(array( |
273 | @@ -414,10 +422,6 @@ | |||
274 | 414 | 422 | ||
275 | 415 | try { | 423 | try { |
276 | 416 | $dbh = PDOConnect::init(); | 424 | $dbh = PDOConnect::init(); |
277 | 417 | |||
278 | 418 | // Check that some media assignments have been made | ||
279 | 419 | if (count($mediaList) == 0) | ||
280 | 420 | $this->ThrowError(25006, __('No media to assign')); | ||
281 | 421 | 425 | ||
282 | 422 | // Drop all current assignments | 426 | // Drop all current assignments |
283 | 423 | if (!$link->UnlinkAllFromDisplayGroup($displayGroupId)) | 427 | if (!$link->UnlinkAllFromDisplayGroup($displayGroupId)) |
284 | 424 | 428 | ||
285 | === modified file 'server/lib/data/region.data.class.php' | |||
286 | --- server/lib/data/region.data.class.php 2014-07-01 17:12:06 +0000 | |||
287 | +++ server/lib/data/region.data.class.php 2014-08-21 12:09:46 +0000 | |||
288 | @@ -22,10 +22,19 @@ | |||
289 | 22 | 22 | ||
290 | 23 | class Region extends Data | 23 | class Region extends Data |
291 | 24 | { | 24 | { |
296 | 25 | // Caching | 25 | <<<<<<< TREE |
297 | 26 | private $layoutXml; | 26 | // Caching |
298 | 27 | private $layoutDocument; | 27 | private $layoutXml; |
299 | 28 | 28 | private $layoutDocument; | |
300 | 29 | |||
301 | 30 | ======= | ||
302 | 31 | // Caching | ||
303 | 32 | private $layoutXml; | ||
304 | 33 | private $layoutDocument; | ||
305 | 34 | |||
306 | 35 | public $delayFinalise = false; | ||
307 | 36 | |||
308 | 37 | >>>>>>> MERGE-SOURCE | ||
309 | 29 | public function __construct(database $db) | 38 | public function __construct(database $db) |
310 | 30 | { | 39 | { |
311 | 31 | $this->db =& $db; | 40 | $this->db =& $db; |
312 | @@ -632,10 +641,12 @@ | |||
313 | 632 | if (!$this->SetLayoutXml($layoutid, $xml->saveXML())) | 641 | if (!$this->SetLayoutXml($layoutid, $xml->saveXML())) |
314 | 633 | return false; | 642 | return false; |
315 | 634 | 643 | ||
320 | 635 | // Update layout status | 644 | if (!$this->delayFinalise) { |
321 | 636 | Kit::ClassLoader('Layout'); | 645 | // Update layout status |
322 | 637 | $layout = new Layout($this->db); | 646 | Kit::ClassLoader('Layout'); |
323 | 638 | $layout->SetValid($layoutid, true); | 647 | $layout = new Layout($this->db); |
324 | 648 | $layout->SetValid($layoutid, true); | ||
325 | 649 | } | ||
326 | 639 | 650 | ||
327 | 640 | //Its swapped | 651 | //Its swapped |
328 | 641 | return true; | 652 | return true; |
329 | 642 | 653 | ||
330 | === modified file 'server/lib/data/userdata.data.class.php' | |||
331 | --- server/lib/data/userdata.data.class.php 2014-01-18 09:47:41 +0000 | |||
332 | +++ server/lib/data/userdata.data.class.php 2014-08-21 12:09:46 +0000 | |||
333 | @@ -34,6 +34,34 @@ | |||
334 | 34 | 34 | ||
335 | 35 | class Userdata extends Data | 35 | class Userdata extends Data |
336 | 36 | { | 36 | { |
337 | 37 | public $userId; | ||
338 | 38 | |||
339 | 39 | public function Delete() { | ||
340 | 40 | if (!isset($this->userId) || $this->userId == 0) | ||
341 | 41 | return $this->SetError(__('Missing userId')); | ||
342 | 42 | |||
343 | 43 | try { | ||
344 | 44 | $dbh = PDOConnect::init(); | ||
345 | 45 | |||
346 | 46 | $sth = $dbh->prepare('DELETE FROM `user` WHERE userid = :userid'); | ||
347 | 47 | $sth->execute(array('userid' => $this->userId)); | ||
348 | 48 | |||
349 | 49 | $sth = $dbh->prepare('DELETE FROM `session` WHERE userid = :userid'); | ||
350 | 50 | $sth->execute(array('userid' => $this->userId)); | ||
351 | 51 | |||
352 | 52 | return true; | ||
353 | 53 | } | ||
354 | 54 | catch (Exception $e) { | ||
355 | 55 | |||
356 | 56 | Debug::LogEntry('error', $e->getMessage(), get_class(), __FUNCTION__); | ||
357 | 57 | |||
358 | 58 | if (!$this->IsError()) | ||
359 | 59 | $this->SetError(1, __('Unknown Error')); | ||
360 | 60 | |||
361 | 61 | return false; | ||
362 | 62 | } | ||
363 | 63 | } | ||
364 | 64 | |||
365 | 37 | /** | 65 | /** |
366 | 38 | * Change a users password | 66 | * Change a users password |
367 | 39 | * @param <type> $userId | 67 | * @param <type> $userId |
368 | 40 | 68 | ||
369 | === modified file 'server/lib/data/usergroup.data.class.php' | |||
370 | --- server/lib/data/usergroup.data.class.php 2014-01-18 09:47:41 +0000 | |||
371 | +++ server/lib/data/usergroup.data.class.php 2014-08-21 12:09:46 +0000 | |||
372 | @@ -255,7 +255,7 @@ | |||
373 | 255 | 255 | ||
374 | 256 | $sth = $dbh->prepare('DELETE FROM lkusergroup WHERE UserID = :userid'); | 256 | $sth = $dbh->prepare('DELETE FROM lkusergroup WHERE UserID = :userid'); |
375 | 257 | $sth->execute(array( | 257 | $sth->execute(array( |
377 | 258 | 'userid' => $userID | 258 | 'userid' => $userId |
378 | 259 | )); | 259 | )); |
379 | 260 | 260 | ||
380 | 261 | Debug::LogEntry('audit', 'OUT', 'UserGroup', 'UnlinkAllGroups'); | 261 | Debug::LogEntry('audit', 'OUT', 'UserGroup', 'UnlinkAllGroups'); |
381 | 262 | 262 | ||
382 | === modified file 'server/lib/include.php' | |||
383 | --- server/lib/include.php 2014-07-15 15:36:06 +0000 | |||
384 | +++ server/lib/include.php 2014-08-21 12:09:46 +0000 | |||
385 | @@ -20,7 +20,11 @@ | |||
386 | 20 | */ | 20 | */ |
387 | 21 | defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser."); | 21 | defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser."); |
388 | 22 | 22 | ||
389 | 23 | <<<<<<< TREE | ||
390 | 23 | define('WEBSITE_VERSION', 70); | 24 | define('WEBSITE_VERSION', 70); |
391 | 25 | ======= | ||
392 | 26 | define('WEBSITE_VERSION', 71); | ||
393 | 27 | >>>>>>> MERGE-SOURCE | ||
394 | 24 | 28 | ||
395 | 25 | // No errors reported until we read the settings from the DB | 29 | // No errors reported until we read the settings from the DB |
396 | 26 | error_reporting(0); | 30 | error_reporting(0); |
397 | 27 | 31 | ||
398 | === modified file 'server/lib/modules/module.class.php' | |||
399 | --- server/lib/modules/module.class.php 2014-07-01 17:12:06 +0000 | |||
400 | +++ server/lib/modules/module.class.php 2014-08-21 12:09:46 +0000 | |||
401 | @@ -52,6 +52,7 @@ | |||
402 | 52 | protected $showRegionOptions; | 52 | protected $showRegionOptions; |
403 | 53 | protected $originalUserId; | 53 | protected $originalUserId; |
404 | 54 | protected $storedAs; | 54 | protected $storedAs; |
405 | 55 | protected $originalFilename; | ||
406 | 55 | 56 | ||
407 | 56 | // Track the error state | 57 | // Track the error state |
408 | 57 | private $error; | 58 | private $error; |
409 | @@ -237,7 +238,7 @@ | |||
410 | 237 | $dbh = PDOConnect::init(); | 238 | $dbh = PDOConnect::init(); |
411 | 238 | 239 | ||
412 | 239 | // Load what we know about this media into the object | 240 | // Load what we know about this media into the object |
414 | 240 | $sth = $dbh->prepare('SELECT duration, name, UserId, storedAs FROM media WHERE mediaID = :media_id'); | 241 | $sth = $dbh->prepare('SELECT duration, name, UserId, storedAs, originalFilename FROM media WHERE mediaID = :media_id'); |
415 | 241 | $sth->execute(array( | 242 | $sth->execute(array( |
416 | 242 | 'media_id' => $mediaid | 243 | 'media_id' => $mediaid |
417 | 243 | )); | 244 | )); |
418 | @@ -252,6 +253,7 @@ | |||
419 | 252 | $this->name = $rows[0]['name']; | 253 | $this->name = $rows[0]['name']; |
420 | 253 | $this->originalUserId = $rows[0]['UserId']; | 254 | $this->originalUserId = $rows[0]['UserId']; |
421 | 254 | $this->storedAs = $rows[0]['storedAs']; | 255 | $this->storedAs = $rows[0]['storedAs']; |
422 | 256 | $this->originalFilename = $rows[0]['originalFilename']; | ||
423 | 255 | } | 257 | } |
424 | 256 | catch (Exception $e) { | 258 | catch (Exception $e) { |
425 | 257 | 259 | ||
426 | @@ -1203,9 +1205,6 @@ | |||
427 | 1203 | 1205 | ||
428 | 1204 | Debug::LogEntry('audit', sprintf('Replacing mediaid %s with mediaid %s in all layouts', $oldMediaId, $newMediaId), 'module', 'ReplaceMediaInAllLayouts'); | 1206 | Debug::LogEntry('audit', sprintf('Replacing mediaid %s with mediaid %s in all layouts', $oldMediaId, $newMediaId), 'module', 'ReplaceMediaInAllLayouts'); |
429 | 1205 | 1207 | ||
430 | 1206 | // Create a region object for later use | ||
431 | 1207 | $region = new region($db); | ||
432 | 1208 | |||
433 | 1209 | try { | 1208 | try { |
434 | 1210 | $dbh = PDOConnect::init(); | 1209 | $dbh = PDOConnect::init(); |
435 | 1211 | 1210 | ||
436 | @@ -1231,6 +1230,9 @@ | |||
437 | 1231 | 1230 | ||
438 | 1232 | Debug::LogEntry('audit', sprintf('%d linked media items for layoutid %d', count($results), $layoutId), 'module', 'ReplaceMediaInAllLayouts'); | 1231 | Debug::LogEntry('audit', sprintf('%d linked media items for layoutid %d', count($results), $layoutId), 'module', 'ReplaceMediaInAllLayouts'); |
439 | 1233 | 1232 | ||
440 | 1233 | // Create a region object for later use (new one each time) | ||
441 | 1234 | $region = new region($db); | ||
442 | 1235 | |||
443 | 1234 | // Loop through each media link for this layout | 1236 | // Loop through each media link for this layout |
444 | 1235 | foreach ($results as $row) | 1237 | foreach ($results as $row) |
445 | 1236 | { | 1238 | { |
446 | @@ -1958,13 +1960,14 @@ | |||
447 | 1958 | } | 1960 | } |
448 | 1959 | 1961 | ||
449 | 1960 | $download = Kit::GetParam('download', _REQUEST, _BOOLEAN, false); | 1962 | $download = Kit::GetParam('download', _REQUEST, _BOOLEAN, false); |
450 | 1963 | $downloadFromLibrary = Kit::GetParam('downloadFromLibrary', _REQUEST, _BOOLEAN, false); | ||
451 | 1961 | 1964 | ||
452 | 1962 | $size = filesize($fileName); | 1965 | $size = filesize($fileName); |
453 | 1963 | 1966 | ||
454 | 1964 | if ($download) { | 1967 | if ($download) { |
455 | 1965 | header('Content-Type: application/octet-stream'); | 1968 | header('Content-Type: application/octet-stream'); |
456 | 1966 | header("Content-Transfer-Encoding: Binary"); | 1969 | header("Content-Transfer-Encoding: Binary"); |
458 | 1967 | header("Content-disposition: attachment; filename=\"" . basename($fileName) . "\""); | 1970 | header("Content-disposition: attachment; filename=\"" . (($downloadFromLibrary) ? $this->originalFilename : basename($fileName)) . "\""); |
459 | 1968 | } | 1971 | } |
460 | 1969 | else { | 1972 | else { |
461 | 1970 | $fi = new finfo( FILEINFO_MIME_TYPE ); | 1973 | $fi = new finfo( FILEINFO_MIME_TYPE ); |
462 | 1971 | 1974 | ||
463 | === modified file 'server/lib/pages/admin.class.php' | |||
464 | --- server/lib/pages/admin.class.php 2014-06-30 15:15:17 +0000 | |||
465 | +++ server/lib/pages/admin.class.php 2014-08-21 12:09:46 +0000 | |||
466 | @@ -262,13 +262,13 @@ | |||
467 | 262 | // Monthly bandwidth - optionally tested against limits | 262 | // Monthly bandwidth - optionally tested against limits |
468 | 263 | $xmdsLimit = Config::GetSetting('MONTHLY_XMDS_TRANSFER_LIMIT_KB'); | 263 | $xmdsLimit = Config::GetSetting('MONTHLY_XMDS_TRANSFER_LIMIT_KB'); |
469 | 264 | $startOfMonth = strtotime(date('m').'/01/'.date('Y').' 00:00:00'); | 264 | $startOfMonth = strtotime(date('m').'/01/'.date('Y').' 00:00:00'); |
477 | 265 | 265 | ||
478 | 266 | $sql = sprintf('SELECT IFNULL(SUM(Size), 0) AS BandwidthUsage FROM `bandwidth` WHERE Month = %d', $startOfMonth); | 266 | $sql = sprintf('SELECT IFNULL(SUM(Size), 0) AS BandwidthUsage FROM `bandwidth` WHERE Month > %d AND Month < %d', $startOfMonth, $startOfMonth + (86400 * 2)); |
479 | 267 | $bandwidthUsage = $this->db->GetSingleValue($sql, 'BandwidthUsage', _INT); | 267 | $bandwidthUsage = $this->db->GetSingleValue($sql, 'BandwidthUsage', _DOUBLE); |
480 | 268 | 268 | ||
481 | 269 | Debug::LogEntry('audit', $sql); | 269 | Debug::LogEntry('audit', $sql . '. Usage: ' . $bandwidthUsage); |
482 | 270 | 270 | ||
483 | 271 | $usagePcnt = ($xmdsLimit > 0) ? (($bandwidthUsage / ($xmdsLimit * 1024)) * 100) : ''; | 271 | $usagePcnt = ($xmdsLimit > 0) ? (((double)$bandwidthUsage / ($xmdsLimit * 1024)) * 100) : ''; |
484 | 272 | 272 | ||
485 | 273 | $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>'; | 273 | $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>'; |
486 | 274 | } | 274 | } |
487 | 275 | 275 | ||
488 | === modified file 'server/lib/pages/content.class.php' | |||
489 | --- server/lib/pages/content.class.php 2014-03-08 14:41:11 +0000 | |||
490 | +++ server/lib/pages/content.class.php 2014-08-21 12:09:46 +0000 | |||
491 | @@ -151,7 +151,7 @@ | |||
492 | 151 | // Download | 151 | // Download |
493 | 152 | $row['buttons'][] = array( | 152 | $row['buttons'][] = array( |
494 | 153 | 'id' => 'content_button_download', | 153 | 'id' => 'content_button_download', |
496 | 154 | 'url' => 'index.php?p=module&mod=' . $row['mediatype'] . '&q=Exec&method=GetResource&download=1&mediaid=' . $row['mediaid'], | 154 | 'url' => 'index.php?p=module&mod=' . $row['mediatype'] . '&q=Exec&method=GetResource&download=1&downloadFromLibrary=1&mediaid=' . $row['mediaid'], |
497 | 155 | 'text' => __('Download') | 155 | 'text' => __('Download') |
498 | 156 | ); | 156 | ); |
499 | 157 | 157 | ||
500 | 158 | 158 | ||
501 | === modified file 'server/lib/pages/display.class.php' | |||
502 | --- server/lib/pages/display.class.php 2014-07-12 12:09:34 +0000 | |||
503 | +++ server/lib/pages/display.class.php 2014-08-21 12:09:46 +0000 | |||
504 | @@ -338,11 +338,13 @@ | |||
505 | 338 | $row['mediainventorystatus'] = ($row['mediainventorystatus'] == 1) ? 'success' : (($row['mediainventorystatus'] == 2) ? 'error' : 'warning'); | 338 | $row['mediainventorystatus'] = ($row['mediainventorystatus'] == 1) ? 'success' : (($row['mediainventorystatus'] == 2) ? 'error' : 'warning'); |
506 | 339 | 339 | ||
507 | 340 | // Schedule Now | 340 | // Schedule Now |
513 | 341 | $row['buttons'][] = array( | 341 | if ($row['edit'] == 1 || Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'Yes') { |
514 | 342 | 'id' => 'display_button_schedulenow', | 342 | $row['buttons'][] = array( |
515 | 343 | 'url' => 'index.php?p=schedule&q=ScheduleNowForm&displayGroupId=' . $row['displaygroupid'], | 343 | 'id' => 'display_button_schedulenow', |
516 | 344 | 'text' => __('Schedule Now') | 344 | 'url' => 'index.php?p=schedule&q=ScheduleNowForm&displayGroupId=' . $row['displaygroupid'], |
517 | 345 | ); | 345 | 'text' => __('Schedule Now') |
518 | 346 | ); | ||
519 | 347 | } | ||
520 | 346 | 348 | ||
521 | 347 | // Media Inventory | 349 | // Media Inventory |
522 | 348 | $row['buttons'][] = array( | 350 | $row['buttons'][] = array( |
523 | 349 | 351 | ||
524 | === modified file 'server/lib/pages/displaygroup.class.php' | |||
525 | --- server/lib/pages/displaygroup.class.php 2014-06-30 15:15:17 +0000 | |||
526 | +++ server/lib/pages/displaygroup.class.php 2014-08-21 12:09:46 +0000 | |||
527 | @@ -775,7 +775,7 @@ | |||
528 | 775 | $response = new ResponseManager(); | 775 | $response = new ResponseManager(); |
529 | 776 | 776 | ||
530 | 777 | $displayGroupId = Kit::GetParam('displaygroupid', _GET, _INT); | 777 | $displayGroupId = Kit::GetParam('displaygroupid', _GET, _INT); |
532 | 778 | $mediaList = Kit::GetParam('MediaID', _POST, _ARRAY_INT, array(), false); | 778 | $mediaList = Kit::GetParam('MediaID', _POST, _ARRAY_INT, NULL, false); |
533 | 779 | 779 | ||
534 | 780 | if ($displayGroupId == 0) | 780 | if ($displayGroupId == 0) |
535 | 781 | trigger_error(__('Display Group not selected'), E_USER_ERROR); | 781 | trigger_error(__('Display Group not selected'), E_USER_ERROR); |
536 | 782 | 782 | ||
537 | === modified file 'server/lib/pages/schedule.class.php' | |||
538 | --- server/lib/pages/schedule.class.php 2014-07-09 17:27:29 +0000 | |||
539 | +++ server/lib/pages/schedule.class.php 2014-08-21 12:09:46 +0000 | |||
540 | @@ -1100,8 +1100,9 @@ | |||
541 | 1100 | // Determine if we are authed against this group. | 1100 | // Determine if we are authed against this group. |
542 | 1101 | $auth = $this->user->DisplayGroupAuth($displayGroupID, true); | 1101 | $auth = $this->user->DisplayGroupAuth($displayGroupID, true); |
543 | 1102 | 1102 | ||
546 | 1103 | if (!$auth->view) | 1103 | // We should only be able to schedule if we have edit permission or if the SCHEDULE_WITH_VIEW permission is ON |
547 | 1104 | continue; | 1104 | if (!$auth->edit && Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'No') |
548 | 1105 | continue; | ||
549 | 1105 | 1106 | ||
550 | 1106 | // Do we need to nest yet? We only nest display specific groups | 1107 | // Do we need to nest yet? We only nest display specific groups |
551 | 1107 | if ($isDisplaySpecific == 1 && !$nested) | 1108 | if ($isDisplaySpecific == 1 && !$nested) |
552 | @@ -1760,19 +1761,23 @@ | |||
553 | 1760 | * @return | 1761 | * @return |
554 | 1761 | * @param $eventDGIDs Object | 1762 | * @param $eventDGIDs Object |
555 | 1762 | */ | 1763 | */ |
560 | 1763 | private function IsEventEditable($eventDGIDs) | 1764 | private function IsEventEditable($eventDGIDs) { |
561 | 1764 | { | 1765 | |
562 | 1765 | $db =& $this->db; | 1766 | $scheduleWithView = (Config::GetSetting('SCHEDULE_WITH_VIEW_PERMISSION') == 'Yes'); |
559 | 1766 | $user =& $this->user; | ||
563 | 1767 | 1767 | ||
564 | 1768 | // Work out if this event is editable or not. To do this we need to compare the permissions | 1768 | // Work out if this event is editable or not. To do this we need to compare the permissions |
565 | 1769 | // of each display group this event is associated with | 1769 | // of each display group this event is associated with |
572 | 1770 | foreach ($eventDGIDs as $dgID) | 1770 | foreach ($eventDGIDs as $dgID) { |
573 | 1771 | { | 1771 | // Permissions for display group |
574 | 1772 | if (!$user->DisplayGroupAuth($dgID)) | 1772 | $auth = $this->user->DisplayGroupAuth($dgID, true); |
575 | 1773 | { | 1773 | |
576 | 1774 | return false; | 1774 | // Can schedule with view, but no view permissions |
577 | 1775 | } | 1775 | if ($scheduleWithView && !$auth->view) |
578 | 1776 | return false; | ||
579 | 1777 | |||
580 | 1778 | // Can't schedule with view, but no edit permissions | ||
581 | 1779 | if (!$scheduleWithView && !$auth->edit) | ||
582 | 1780 | return false; | ||
583 | 1776 | } | 1781 | } |
584 | 1777 | 1782 | ||
585 | 1778 | return true; | 1783 | return true; |
586 | 1779 | 1784 | ||
587 | === modified file 'server/lib/pages/statusdashboard.class.php' | |||
588 | --- server/lib/pages/statusdashboard.class.php 2014-06-29 14:37:07 +0000 | |||
589 | +++ server/lib/pages/statusdashboard.class.php 2014-08-21 12:09:46 +0000 | |||
590 | @@ -45,7 +45,7 @@ | |||
591 | 45 | 45 | ||
592 | 46 | foreach ($results as $row) { | 46 | foreach ($results as $row) { |
593 | 47 | 47 | ||
595 | 48 | $points['data'][] = array($row['month'], ((double)$row['size']) / 1024 / 1024 / 1024); | 48 | $points['data'][] = array(__($row['month']), ((double)$row['size']) / 1024 / 1024 / 1024); |
596 | 49 | } | 49 | } |
597 | 50 | 50 | ||
598 | 51 | $points['label'] = __('GB'); | 51 | $points['label'] = __('GB'); |
599 | 52 | 52 | ||
600 | === modified file 'server/lib/pages/timeline.class.php' | |||
601 | --- server/lib/pages/timeline.class.php 2014-06-30 15:15:17 +0000 | |||
602 | +++ server/lib/pages/timeline.class.php 2014-08-21 12:09:46 +0000 | |||
603 | @@ -293,6 +293,7 @@ | |||
604 | 293 | 293 | ||
605 | 294 | Kit::ClassLoader('region'); | 294 | Kit::ClassLoader('region'); |
606 | 295 | $regionObject = new region($db); | 295 | $regionObject = new region($db); |
607 | 296 | $regionObject->delayFinalise = true; | ||
608 | 296 | $ownerId = $regionObject->GetOwnerId($layoutid, $regionid); | 297 | $ownerId = $regionObject->GetOwnerId($layoutid, $regionid); |
609 | 297 | 298 | ||
610 | 298 | $regionAuth = $this->user->RegionAssignmentAuth($ownerId, $layoutid, $regionid, true); | 299 | $regionAuth = $this->user->RegionAssignmentAuth($ownerId, $layoutid, $regionid, true); |
611 | @@ -302,6 +303,11 @@ | |||
612 | 302 | if (!$regionObject->EditRegion($layoutid, $regionid, $width, $height, $top, $left)) | 303 | if (!$regionObject->EditRegion($layoutid, $regionid, $width, $height, $top, $left)) |
613 | 303 | trigger_error($regionObject->GetErrorMessage(), E_USER_ERROR); | 304 | trigger_error($regionObject->GetErrorMessage(), E_USER_ERROR); |
614 | 304 | } | 305 | } |
615 | 306 | |||
616 | 307 | // Set the layout status | ||
617 | 308 | Kit::ClassLoader('Layout'); | ||
618 | 309 | $layout = new Layout($this->db); | ||
619 | 310 | $layout->SetValid($layoutid, true); | ||
620 | 305 | 311 | ||
621 | 306 | $response->SetFormSubmitResponse(''); | 312 | $response->SetFormSubmitResponse(''); |
622 | 307 | $response->hideMessage = true; | 313 | $response->hideMessage = true; |
623 | 308 | 314 | ||
624 | === modified file 'server/lib/pages/user.class.php' | |||
625 | --- server/lib/pages/user.class.php 2014-06-30 15:15:17 +0000 | |||
626 | +++ server/lib/pages/user.class.php 2014-08-21 12:09:46 +0000 | |||
627 | @@ -430,23 +430,11 @@ | |||
628 | 430 | trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR); | 430 | trigger_error($userGroupObject->GetErrorMessage(), E_USER_ERROR); |
629 | 431 | 431 | ||
630 | 432 | // Delete the user | 432 | // Delete the user |
648 | 433 | $sqldel = "DELETE FROM user"; | 433 | Kit::ClassLoader('userdata'); |
649 | 434 | $sqldel .= " WHERE UserID = %d"; | 434 | $user = new UserData($this->db); |
650 | 435 | 435 | $user->userId = $userid; | |
651 | 436 | if (!$db->query(sprintf($sqldel, $userid))) | 436 | if (!$user->Delete()) |
652 | 437 | { | 437 | trigger_error($user->GetErrorMessage(), E_USER_ERROR); |
636 | 438 | trigger_error($db->error()); | ||
637 | 439 | trigger_error(__("This user has been active, you may only retire them."), E_USER_ERROR); | ||
638 | 440 | } | ||
639 | 441 | |||
640 | 442 | // We should delete this users sessions record. | ||
641 | 443 | $SQL = "DELETE FROM session WHERE userID = %d "; | ||
642 | 444 | |||
643 | 445 | if (!$db->query(sprintf($SQL, $userid))) | ||
644 | 446 | { | ||
645 | 447 | trigger_error($db->error()); | ||
646 | 448 | trigger_error(__("If logged in, this user will be deleted once they log out."), E_USER_ERROR); | ||
647 | 449 | } | ||
653 | 450 | 438 | ||
654 | 451 | $response->SetFormSubmitResponse(__('User Deleted.')); | 439 | $response->SetFormSubmitResponse(__('User Deleted.')); |
655 | 452 | $response->Respond(); | 440 | $response->Respond(); |
656 | 453 | 441 | ||
657 | === modified file 'server/lib/service/xmdssoap.class.php' | |||
658 | --- server/lib/service/xmdssoap.class.php 2014-07-08 12:46:48 +0000 | |||
659 | +++ server/lib/service/xmdssoap.class.php 2014-08-21 12:09:46 +0000 | |||
660 | @@ -1128,8 +1128,14 @@ | |||
661 | 1128 | 1128 | ||
662 | 1129 | // See if the client was offline and if appropriate send an alert | 1129 | // See if the client was offline and if appropriate send an alert |
663 | 1130 | // to say that it has come back online | 1130 | // to say that it has come back online |
664 | 1131 | <<<<<<< TREE | ||
665 | 1131 | if ($row[5] == 0 && $row[6] == 1 && Config::GetSetting('MAINTENANCE_ENABLED') == 'On' && | 1132 | if ($row[5] == 0 && $row[6] == 1 && Config::GetSetting('MAINTENANCE_ENABLED') == 'On' && |
666 | 1132 | (Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On' || Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'Protected')) | 1133 | (Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On' || Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'Protected')) |
667 | 1134 | ======= | ||
668 | 1135 | if ($row[5] == 0 && $row[6] == 1 | ||
669 | 1136 | && (Config::GetSetting('MAINTENANCE_ENABLED') == 'On' || Config::GetSetting('MAINTENANCE_ENABLED') == 'Protected') | ||
670 | 1137 | && Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On') | ||
671 | 1138 | >>>>>>> MERGE-SOURCE | ||
672 | 1133 | { | 1139 | { |
673 | 1134 | $msgTo = Kit::ValidateParam(Config::GetSetting("mail_to"),_PASSWORD); | 1140 | $msgTo = Kit::ValidateParam(Config::GetSetting("mail_to"),_PASSWORD); |
674 | 1135 | $msgFrom = Kit::ValidateParam(Config::GetSetting("mail_from"),_PASSWORD); | 1141 | $msgFrom = Kit::ValidateParam(Config::GetSetting("mail_from"),_PASSWORD); |
675 | 1136 | 1142 | ||
676 | === modified file 'server/locale/dbtranslate.php' | |||
677 | --- server/locale/dbtranslate.php 2014-06-30 14:41:38 +0000 | |||
678 | +++ server/locale/dbtranslate.php 2014-08-21 12:09:46 +0000 | |||
679 | @@ -116,4 +116,47 @@ | |||
680 | 116 | echo __('Value'); | 116 | echo __('Value'); |
681 | 117 | echo __('Formula'); | 117 | echo __('Formula'); |
682 | 118 | 118 | ||
683 | 119 | |||
684 | 120 | echo __('Media will be created with these settings. If public everyone will be able to view and use this media.'); | ||
685 | 121 | echo __('New layouts will be created with these settings. If public everyone will be able to view and use this layout.'); | ||
686 | 122 | echo __('Sets the default user type selected when creating a user.\r\n<br />\r\nWe recommend that this is set to "User"'); | ||
687 | 123 | 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'); | ||
688 | 124 | echo __('This sets which user authentication module is currently being used.'); | ||
689 | 125 | echo __('Sets the admin message to be displayed on the client page at all times'); | ||
690 | 126 | echo __('Set the default timezone for the application'); | ||
691 | 127 | echo __('Errors will be mailed here'); | ||
692 | 128 | echo __('Mail will be sent from this address'); | ||
693 | 129 | echo __('This is the fully qualified URI of the site. e.g http://www.xibo.co.uk/'); | ||
694 | 130 | echo __('Default length for JPG files (in seconds)'); | ||
695 | 131 | echo __('Default length for PPT files'); | ||
696 | 132 | echo __('Default height for PPT files'); | ||
697 | 133 | echo __('Default length for PPT files (in seconds)'); | ||
698 | 134 | echo __('Default length for SWF files'); | ||
699 | 135 | echo __('Turn on the auditing information. Warning this will quickly fill up the log'); | ||
700 | 136 | echo __('Should the server send anonymous statistics back to the Xibo project?'); | ||
701 | 137 | echo __('Key used to distinguish each Xibo instance. This is generated randomly based on the time you first installed Xibo, and is completely untraceable.'); | ||
702 | 138 | echo __('The URL to connect to to PHONE_HOME (if enabled)'); | ||
703 | 139 | echo __('The last time we PHONED_HOME in seconds since the epoch'); | ||
704 | 140 | 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.'); | ||
705 | 141 | echo __('Allow the maintenance script to run if it is called?'); | ||
706 | 142 | echo __('Global switch for email alerts to be sent'); | ||
707 | 143 | echo __('String appended to the maintenance script to prevent malicious calls to the script.'); | ||
708 | 144 | echo __('Maximum age for log entries. Set to 0 to keep logs indefinitely.'); | ||
709 | 145 | echo __('Maximum age for statistics entries. Set to 0 to keep statistics indefinitely.'); | ||
710 | 146 | 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.'); | ||
711 | 147 | |||
712 | 148 | |||
713 | 149 | echo __('January'); | ||
714 | 150 | echo __('February'); | ||
715 | 151 | echo __('March'); | ||
716 | 152 | echo __('April'); | ||
717 | 153 | echo __('May'); | ||
718 | 154 | echo __('June'); | ||
719 | 155 | echo __('July'); | ||
720 | 156 | echo __('August'); | ||
721 | 157 | echo __('September'); | ||
722 | 158 | echo __('October'); | ||
723 | 159 | echo __('November'); | ||
724 | 160 | echo __('December'); | ||
725 | 161 | |||
726 | 119 | ?> | 162 | ?> |
727 | 120 | 163 | ||
728 | === modified file 'server/manual/content/admin/api_layouts.php' | |||
729 | --- server/manual/content/admin/api_layouts.php 2014-01-12 20:46:20 +0000 | |||
730 | +++ server/manual/content/admin/api_layouts.php 2014-08-21 12:09:46 +0000 | |||
731 | @@ -82,8 +82,8 @@ | |||
732 | 82 | </li><li> left | 82 | </li><li> left |
733 | 83 | </li><li> ownerid | 83 | </li><li> ownerid |
734 | 84 | </li><li> permission_edit | 84 | </li><li> permission_edit |
737 | 85 | </li><li> permission_del | 85 | </li><li> permissions_del |
738 | 86 | </li><li> permission_update_permissions | 86 | </li><li> permissions_update_permissions |
739 | 87 | </li></ul> | 87 | </li></ul> |
740 | 88 | <p>Error Codes | 88 | <p>Error Codes |
741 | 89 | </p> | 89 | </p> |
742 | @@ -157,7 +157,7 @@ | |||
743 | 157 | </p> | 157 | </p> |
744 | 158 | <ul><li> mediaid | 158 | <ul><li> mediaid |
745 | 159 | </li><li> lkid | 159 | </li><li> lkid |
747 | 160 | </li><li> type | 160 | </li><li> mediatype |
748 | 161 | </li><li> duration | 161 | </li><li> duration |
749 | 162 | </li><li> permission_edit | 162 | </li><li> permission_edit |
750 | 163 | </li><li> permission_del | 163 | </li><li> permission_del |
751 | @@ -168,19 +168,42 @@ | |||
752 | 168 | </p> | 168 | </p> |
753 | 169 | <ul><li> 1 - Access Denied | 169 | <ul><li> 1 - Access Denied |
754 | 170 | </li></ul> | 170 | </li></ul> |
768 | 171 | <h3> <span class="mw-headline" id="LayoutRegionMediaDetails"> LayoutRegionMediaDetails </span></h3> | 171 | |
769 | 172 | <p>Parameters | 172 | <h2 class="api-method-call-doc" id="LayoutRegionMediaDetails">LayoutRegionMediaDetails</h2> |
770 | 173 | </p> | 173 | <h3>Parameters</h3> |
771 | 174 | <ul><li> layoutId | 174 | <dl> |
772 | 175 | </li><li> regionId | 175 | <dt>layoutId</dt> |
773 | 176 | </li><li> mediaId | 176 | <dd>The ID for this Layout. Required.</dd> |
774 | 177 | </li></ul> | 177 | </dl> |
775 | 178 | <p>Response | 178 | <dl> |
776 | 179 | The XLF for the provided media id (XML format) | 179 | <dt>regionId</dt> |
777 | 180 | </p><p>Error Codes | 180 | <dd>The ID for this Region. Required</dd> |
778 | 181 | </p> | 181 | </dl> |
779 | 182 | <ul><li> 1 - Access Denied | 182 | <dl> |
780 | 183 | </li></ul> | 183 | <dt>mediaId</dt> |
781 | 184 | <dd>The ID for this media. Required</dd> | ||
782 | 185 | </dl> | ||
783 | 186 | <dl> | ||
784 | 187 | <dt>type</dt> | ||
785 | 188 | <dd>The media type. Required</dd> | ||
786 | 189 | </dl> | ||
787 | 190 | |||
788 | 191 | <h3>Response</h3> | ||
789 | 192 | The XLF for the provided media id (XML format). Base 64 encoded. | ||
790 | 193 | <pre> | ||
791 | 194 | { | ||
792 | 195 | "media": { | ||
793 | 196 | "id": "1", | ||
794 | 197 | "base64Xlf": "base64" | ||
795 | 198 | }, | ||
796 | 199 | "status": "ok" | ||
797 | 200 | } | ||
798 | 201 | </pre> | ||
799 | 202 | |||
800 | 203 | <h3>Errors</h3> | ||
801 | 204 | <p>General Errors Only. | ||
802 | 205 | </p> | ||
803 | 206 | |||
804 | 184 | <h3> <span class="mw-headline" id="LayoutRegionMediaAdd"> LayoutRegionMediaAdd </span></h3> | 207 | <h3> <span class="mw-headline" id="LayoutRegionMediaAdd"> LayoutRegionMediaAdd </span></h3> |
805 | 185 | <p>Parameters | 208 | <p>Parameters |
806 | 186 | </p> | 209 | </p> |
807 | 187 | 210 | ||
808 | === modified file 'server/manual/content/admin/release_notes_1.6.2.php' | |||
809 | --- server/manual/content/admin/release_notes_1.6.2.php 2014-07-12 13:54:51 +0000 | |||
810 | +++ server/manual/content/admin/release_notes_1.6.2.php 2014-08-21 12:09:46 +0000 | |||
811 | @@ -1,76 +1,162 @@ | |||
888 | 1 | <?php | 1 | <<<<<<< TREE |
889 | 2 | /* | 2 | <?php |
890 | 3 | * Xibo - Digital Signage - http://www.xibo.org.uk | 3 | /* |
891 | 4 | * Copyright (C) 2006-2014 Daniel Garner | 4 | * Xibo - Digital Signage - http://www.xibo.org.uk |
892 | 5 | * | 5 | * Copyright (C) 2006-2014 Daniel Garner |
893 | 6 | * This file is part of Xibo. | 6 | * |
894 | 7 | * | 7 | * This file is part of Xibo. |
895 | 8 | * Xibo is free software: you can redistribute it and/or modify | 8 | * |
896 | 9 | * it under the terms of the GNU Affero General Public License as published by | 9 | * Xibo is free software: you can redistribute it and/or modify |
897 | 10 | * the Free Software Foundation, either version 3 of the License, or | 10 | * it under the terms of the GNU Affero General Public License as published by |
898 | 11 | * any later version. | 11 | * the Free Software Foundation, either version 3 of the License, or |
899 | 12 | * | 12 | * any later version. |
900 | 13 | * Xibo is distributed in the hope that it will be useful, | 13 | * |
901 | 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * Xibo is distributed in the hope that it will be useful, |
902 | 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
903 | 16 | * GNU Affero General Public License for more details. | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
904 | 17 | * | 17 | * GNU Affero General Public License for more details. |
905 | 18 | * You should have received a copy of the GNU Affero General Public License | 18 | * |
906 | 19 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. | 19 | * You should have received a copy of the GNU Affero General Public License |
907 | 20 | */ | 20 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. |
908 | 21 | defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser."); | 21 | */ |
909 | 22 | 22 | defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser."); | |
910 | 23 | $LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.2'; | 23 | |
911 | 24 | ?> | 24 | $LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.2'; |
912 | 25 | <h1 id="Notes_Title">Xibo 1.6.2 - Codename "Pons-Winnecke"</span></h1> | 25 | ?> |
913 | 26 | <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> | 26 | <h1 id="Notes_Title">Xibo 1.6.2 - Codename "Pons-Winnecke"</span></h1> |
914 | 27 | <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> | 27 | <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> |
915 | 28 | 28 | <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> | |
916 | 29 | <div id="toctitle"><h2>Contents</h2></div> | 29 | |
917 | 30 | 30 | <div id="toctitle"><h2>Contents</h2></div> | |
918 | 31 | <ol> | 31 | |
919 | 32 | <li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li> | 32 | <ol> |
920 | 33 | <li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li> | 33 | <li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li> |
921 | 34 | <li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li> | 34 | <li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li> |
922 | 35 | <li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li> | 35 | <li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li> |
923 | 36 | <li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li> | 36 | <li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li> |
924 | 37 | <li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li> | 37 | <li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li> |
925 | 38 | </ol> | 38 | <li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li> |
926 | 39 | 39 | </ol> | |
927 | 40 | 40 | ||
928 | 41 | <h2 id="Requirements">Requirements</h2> | 41 | |
929 | 42 | <p>You must use the 1.6.2 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p> | 42 | <h2 id="Requirements">Requirements</h2> |
930 | 43 | 43 | <p>You must use the 1.6.2 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p> | |
931 | 44 | <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> | 44 | |
932 | 45 | 45 | <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> | |
933 | 46 | <h2 id="Upgrading">Upgrading</h2> | 46 | |
934 | 47 | <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> | 47 | <h2 id="Upgrading">Upgrading</h2> |
935 | 48 | 48 | <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> | |
936 | 49 | <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> | 49 | |
937 | 50 | 50 | <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> | |
938 | 51 | <ul> | 51 | |
939 | 52 | <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> | 52 | <ul> |
940 | 53 | <li>Backup settings.php from your installation</li> | 53 | <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> |
941 | 54 | <li>Manually take a backup of your database</li> | 54 | <li>Backup settings.php from your installation</li> |
942 | 55 | <li>Replace your existing installation with the new version from the tar.gz or zip file</li> | 55 | <li>Manually take a backup of your database</li> |
943 | 56 | <li>Replace your backup settings.php file in your Xibo installation directory</li> | 56 | <li>Replace your existing installation with the new version from the tar.gz or zip file</li> |
944 | 57 | <li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li> | 57 | <li>Replace your backup settings.php file in your Xibo installation directory</li> |
945 | 58 | <li>You will be prompted that an upgrade is required.</li> | 58 | <li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li> |
946 | 59 | <li>Enter your xibo_admin password, and follow the upgrade wizard.</li> | 59 | <li>You will be prompted that an upgrade is required.</li> |
947 | 60 | <li>The upgrade should run, and finally ask you to log in as you would normally.</li> | 60 | <li>Enter your xibo_admin password, and follow the upgrade wizard.</li> |
948 | 61 | </ul> | 61 | <li>The upgrade should run, and finally ask you to log in as you would normally.</li> |
949 | 62 | 62 | </ul> | |
950 | 63 | <h2 id="Help">Help</h2> | 63 | |
951 | 64 | <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> | 64 | <h2 id="Help">Help</h2> |
952 | 65 | 65 | <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> | |
953 | 66 | <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> | 66 | |
954 | 67 | 67 | <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> | |
955 | 68 | <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> | 68 | |
956 | 69 | 69 | <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> | |
957 | 70 | <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> | 70 | |
958 | 71 | 71 | <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> | |
959 | 72 | <h2 id="Bug_Fixes">Bug Fixes</h2> | 72 | |
960 | 73 | <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> | 73 | <h2 id="Bug_Fixes">Bug Fixes</h2> |
961 | 74 | 74 | <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> | |
962 | 75 | <h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2> | 75 | |
963 | 76 | <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> | 76 | <h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2> |
964 | 77 | <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> | ||
965 | 78 | ======= | ||
966 | 79 | <?php | ||
967 | 80 | /* | ||
968 | 81 | * Xibo - Digital Signage - http://www.xibo.org.uk | ||
969 | 82 | * Copyright (C) 2006-2014 Daniel Garner | ||
970 | 83 | * | ||
971 | 84 | * This file is part of Xibo. | ||
972 | 85 | * | ||
973 | 86 | * Xibo is free software: you can redistribute it and/or modify | ||
974 | 87 | * it under the terms of the GNU Affero General Public License as published by | ||
975 | 88 | * the Free Software Foundation, either version 3 of the License, or | ||
976 | 89 | * any later version. | ||
977 | 90 | * | ||
978 | 91 | * Xibo is distributed in the hope that it will be useful, | ||
979 | 92 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
980 | 93 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
981 | 94 | * GNU Affero General Public License for more details. | ||
982 | 95 | * | ||
983 | 96 | * You should have received a copy of the GNU Affero General Public License | ||
984 | 97 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. | ||
985 | 98 | */ | ||
986 | 99 | defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser."); | ||
987 | 100 | |||
988 | 101 | $LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.2'; | ||
989 | 102 | ?> | ||
990 | 103 | <h1 id="Notes_Title">Xibo 1.6.2 - Codename "Pons-Winnecke"</span></h1> | ||
991 | 104 | <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> | ||
992 | 105 | <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> | ||
993 | 106 | |||
994 | 107 | <div id="toctitle"><h2>Contents</h2></div> | ||
995 | 108 | |||
996 | 109 | <ol> | ||
997 | 110 | <li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li> | ||
998 | 111 | <li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li> | ||
999 | 112 | <li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li> | ||
1000 | 113 | <li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li> | ||
1001 | 114 | <li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li> | ||
1002 | 115 | <li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li> | ||
1003 | 116 | </ol> | ||
1004 | 117 | |||
1005 | 118 | |||
1006 | 119 | <h2 id="Requirements">Requirements</h2> | ||
1007 | 120 | <p>You must use the 1.6.2 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p> | ||
1008 | 121 | |||
1009 | 122 | <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> | ||
1010 | 123 | |||
1011 | 124 | <h3>Xibo for Windows</h3> | ||
1012 | 125 | <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> | ||
1013 | 126 | |||
1014 | 127 | <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> | ||
1015 | 128 | |||
1016 | 129 | <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> | ||
1017 | 130 | |||
1018 | 131 | <h2 id="Upgrading">Upgrading</h2> | ||
1019 | 132 | <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> | ||
1020 | 133 | |||
1021 | 134 | <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> | ||
1022 | 135 | |||
1023 | 136 | <ul> | ||
1024 | 137 | <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> | ||
1025 | 138 | <li>Backup settings.php from your installation</li> | ||
1026 | 139 | <li>Manually take a backup of your database</li> | ||
1027 | 140 | <li>Replace your existing installation with the new version from the tar.gz or zip file</li> | ||
1028 | 141 | <li>Replace your backup settings.php file in your Xibo installation directory</li> | ||
1029 | 142 | <li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li> | ||
1030 | 143 | <li>You will be prompted that an upgrade is required.</li> | ||
1031 | 144 | <li>Enter your xibo_admin password, and follow the upgrade wizard.</li> | ||
1032 | 145 | <li>The upgrade should run, and finally ask you to log in as you would normally.</li> | ||
1033 | 146 | </ul> | ||
1034 | 147 | |||
1035 | 148 | <h2 id="Help">Help</h2> | ||
1036 | 149 | <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> | ||
1037 | 150 | |||
1038 | 151 | <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> | ||
1039 | 152 | |||
1040 | 153 | <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> | ||
1041 | 154 | |||
1042 | 155 | <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> | ||
1043 | 156 | |||
1044 | 157 | <h2 id="Bug_Fixes">Bug Fixes</h2> | ||
1045 | 158 | <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> | ||
1046 | 159 | |||
1047 | 160 | <h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2> | ||
1048 | 161 | <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> | ||
1049 | 162 | >>>>>>> MERGE-SOURCE | ||
1050 | 77 | 163 | ||
1051 | === added file 'server/manual/content/admin/release_notes_1.6.3.php' | |||
1052 | --- server/manual/content/admin/release_notes_1.6.3.php 1970-01-01 00:00:00 +0000 | |||
1053 | +++ server/manual/content/admin/release_notes_1.6.3.php 2014-08-21 12:09:46 +0000 | |||
1054 | @@ -0,0 +1,83 @@ | |||
1055 | 1 | <?php | ||
1056 | 2 | /* | ||
1057 | 3 | * Xibo - Digital Signage - http://www.xibo.org.uk | ||
1058 | 4 | * Copyright (C) 2006-2014 Daniel Garner | ||
1059 | 5 | * | ||
1060 | 6 | * This file is part of Xibo. | ||
1061 | 7 | * | ||
1062 | 8 | * Xibo is free software: you can redistribute it and/or modify | ||
1063 | 9 | * it under the terms of the GNU Affero General Public License as published by | ||
1064 | 10 | * the Free Software Foundation, either version 3 of the License, or | ||
1065 | 11 | * any later version. | ||
1066 | 12 | * | ||
1067 | 13 | * Xibo is distributed in the hope that it will be useful, | ||
1068 | 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1069 | 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1070 | 16 | * GNU Affero General Public License for more details. | ||
1071 | 17 | * | ||
1072 | 18 | * You should have received a copy of the GNU Affero General Public License | ||
1073 | 19 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. | ||
1074 | 20 | */ | ||
1075 | 21 | defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser."); | ||
1076 | 22 | |||
1077 | 23 | $LP_RELEASE_PAGE = 'https://launchpad.net/xibo/1.6/1.6.3'; | ||
1078 | 24 | ?> | ||
1079 | 25 | <h1 id="Notes_Title">Xibo 1.6.3 - Codename "Pons-Winnecke"</span></h1> | ||
1080 | 26 | <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> | ||
1081 | 27 | <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> | ||
1082 | 28 | |||
1083 | 29 | <div id="toctitle"><h2>Contents</h2></div> | ||
1084 | 30 | |||
1085 | 31 | <ol> | ||
1086 | 32 | <li class="toclevel-1 tocsection-1"><a href="#Notes_Title">Introduction</a></li> | ||
1087 | 33 | <li class="toclevel-1 tocsection-2"><a href="#Requirements">Requirements</a></li> | ||
1088 | 34 | <li class="toclevel-1 tocsection-3"><a href="#Upgrading">Upgrading</a></li> | ||
1089 | 35 | <li class="toclevel-1 tocsection-4"><a href="#Help">Help</a></li> | ||
1090 | 36 | <li class="toclevel-1 tocsection-7"><a href="#Bug_Fixes">Bug Fixes</a></li> | ||
1091 | 37 | <li class="toclevel-1 tocsection-8"><a href="#Known_Issues_and_Limitations">Known Issues and Limitations</a></li> | ||
1092 | 38 | </ol> | ||
1093 | 39 | |||
1094 | 40 | |||
1095 | 41 | <h2 id="Requirements">Requirements</h2> | ||
1096 | 42 | <p>You must use the 1.6.3 version of the Windows and Ubuntu Display Clients with this version of the Xibo CMS.</p> | ||
1097 | 43 | |||
1098 | 44 | <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> | ||
1099 | 45 | |||
1100 | 46 | <h3>Xibo for Windows</h3> | ||
1101 | 47 | <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> | ||
1102 | 48 | |||
1103 | 49 | <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> | ||
1104 | 50 | |||
1105 | 51 | <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> | ||
1106 | 52 | |||
1107 | 53 | <h2 id="Upgrading">Upgrading</h2> | ||
1108 | 54 | <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> | ||
1109 | 55 | |||
1110 | 56 | <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> | ||
1111 | 57 | |||
1112 | 58 | <ul> | ||
1113 | 59 | <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> | ||
1114 | 60 | <li>Backup settings.php from your installation</li> | ||
1115 | 61 | <li>Manually take a backup of your database</li> | ||
1116 | 62 | <li>Replace your existing installation with the new version from the tar.gz or zip file</li> | ||
1117 | 63 | <li>Replace your backup settings.php file in your Xibo installation directory</li> | ||
1118 | 64 | <li>Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a>as normal</li> | ||
1119 | 65 | <li>You will be prompted that an upgrade is required.</li> | ||
1120 | 66 | <li>Enter your xibo_admin password, and follow the upgrade wizard.</li> | ||
1121 | 67 | <li>The upgrade should run, and finally ask you to log in as you would normally.</li> | ||
1122 | 68 | </ul> | ||
1123 | 69 | |||
1124 | 70 | <h2 id="Help">Help</h2> | ||
1125 | 71 | <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> | ||
1126 | 72 | |||
1127 | 73 | <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> | ||
1128 | 74 | |||
1129 | 75 | <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> | ||
1130 | 76 | |||
1131 | 77 | <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> | ||
1132 | 78 | |||
1133 | 79 | <h2 id="Bug_Fixes">Bug Fixes</h2> | ||
1134 | 80 | <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> | ||
1135 | 81 | |||
1136 | 82 | <h2 id="Known_Issues_and_Limitations">Known Issues and Limitations</h2> | ||
1137 | 83 | <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> | ||
1138 | 0 | 84 | ||
1139 | === modified file 'server/manual/template.php' | |||
1140 | --- server/manual/template.php 2014-07-12 13:54:51 +0000 | |||
1141 | +++ server/manual/template.php 2014-08-21 12:09:46 +0000 | |||
1142 | @@ -7,7 +7,11 @@ | |||
1143 | 7 | define('PRODUCT_NAME', 'Xibo'); | 7 | define('PRODUCT_NAME', 'Xibo'); |
1144 | 8 | 8 | ||
1145 | 9 | # Product Version | 9 | # Product Version |
1146 | 10 | <<<<<<< TREE | ||
1147 | 10 | define('PRODUCT_VERSION', '1.6.2'); | 11 | define('PRODUCT_VERSION', '1.6.2'); |
1148 | 12 | ======= | ||
1149 | 13 | define('PRODUCT_VERSION', '1.6.3'); | ||
1150 | 14 | >>>>>>> MERGE-SOURCE | ||
1151 | 11 | 15 | ||
1152 | 12 | # Home page URL | 16 | # Home page URL |
1153 | 13 | define('PRODUCT_HOME', 'http://xibo.org.uk'); | 17 | define('PRODUCT_HOME', 'http://xibo.org.uk'); |
1154 | 14 | 18 | ||
1155 | === modified file 'server/modules/preview/HtmlTemplateForGetResource.html' | |||
1156 | --- server/modules/preview/HtmlTemplateForGetResource.html 2014-07-15 11:42:14 +0000 | |||
1157 | +++ server/modules/preview/HtmlTemplateForGetResource.html 2014-08-21 12:09:46 +0000 | |||
1158 | @@ -86,7 +86,11 @@ | |||
1159 | 86 | * You should have received a copy of the GNU Affero General Public License | 86 | * You should have received a copy of the GNU Affero General Public License |
1160 | 87 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. | 87 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. |
1161 | 88 | */ | 88 | */ |
1162 | 89 | <<<<<<< TREE | ||
1163 | 89 | 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(){}}})()} | 90 | 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(){}}})()} |
1164 | 91 | ======= | ||
1165 | 92 | 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(){}}})()} | ||
1166 | 93 | >>>>>>> MERGE-SOURCE | ||
1167 | 90 | </script> | 94 | </script> |
1168 | 91 | <!--script type="text/javascript" src="modules/preview/xibo-text-render.js"></script--> | 95 | <!--script type="text/javascript" src="modules/preview/xibo-text-render.js"></script--> |
1169 | 92 | 96 | ||
1170 | 93 | 97 | ||
1171 | === modified file 'server/modules/preview/html-preview.js' | |||
1172 | --- server/modules/preview/html-preview.js 2014-07-12 14:17:17 +0000 | |||
1173 | +++ server/modules/preview/html-preview.js 2014-08-21 12:09:46 +0000 | |||
1174 | @@ -333,10 +333,18 @@ | |||
1175 | 333 | 333 | ||
1176 | 334 | if (oldMedia) { | 334 | if (oldMedia) { |
1177 | 335 | $("#" + oldMedia.containerName).css("display", "none"); | 335 | $("#" + oldMedia.containerName).css("display", "none"); |
1182 | 336 | 336 | <<<<<<< TREE | |
1183 | 337 | if (oldMedia.mediaType == "video") { | 337 | |
1184 | 338 | $("#" + oldMedia.containerName + "-vid").get(0).pause(); | 338 | if (oldMedia.mediaType == "video") { |
1185 | 339 | } | 339 | $("#" + oldMedia.containerName + "-vid").get(0).pause(); |
1186 | 340 | } | ||
1187 | 341 | ======= | ||
1188 | 342 | |||
1189 | 343 | if (oldMedia.mediaType == "video") { | ||
1190 | 344 | $("#" + oldMedia.containerName + "-vid").get(0).pause(); | ||
1191 | 345 | $("#" + oldMedia.containerName + "-vid").get(0).currentTime = 0; | ||
1192 | 346 | } | ||
1193 | 347 | >>>>>>> MERGE-SOURCE | ||
1194 | 340 | } | 348 | } |
1195 | 341 | 349 | ||
1196 | 342 | $("#" + newMedia.containerName).css("display", "block"); | 350 | $("#" + newMedia.containerName).css("display", "block"); |
1197 | 343 | 351 | ||
1198 | === modified file 'server/modules/preview/xibo-text-render.js' | |||
1199 | --- server/modules/preview/xibo-text-render.js 2014-07-15 11:42:14 +0000 | |||
1200 | +++ server/modules/preview/xibo-text-render.js 2014-08-21 12:09:46 +0000 | |||
1201 | @@ -173,6 +173,7 @@ | |||
1202 | 173 | } | 173 | } |
1203 | 174 | 174 | ||
1204 | 175 | // Now make it size correctly | 175 | // Now make it size correctly |
1205 | 176 | <<<<<<< TREE | ||
1206 | 176 | // What IE are we? | 177 | // What IE are we? |
1207 | 177 | if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) { | 178 | if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) { |
1208 | 178 | $(this).css({ | 179 | $(this).css({ |
1209 | @@ -185,6 +186,20 @@ | |||
1210 | 185 | "transform-origin": "0 0" | 186 | "transform-origin": "0 0" |
1211 | 186 | }); | 187 | }); |
1212 | 187 | } | 188 | } |
1213 | 189 | ======= | ||
1214 | 190 | // What IE are we? | ||
1215 | 191 | if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) { | ||
1216 | 192 | $(this).css({ | ||
1217 | 193 | "filter": "progid:DXImageTransform.Microsoft.Matrix(M11=" + options.scaleFactor + ", M12=0, M21=0, M22=" + options.scaleFactor + ", SizingMethod='auto expand'" | ||
1218 | 194 | }); | ||
1219 | 195 | } | ||
1220 | 196 | else { | ||
1221 | 197 | $(this).css({ | ||
1222 | 198 | "transform": "scale(" + options.scaleFactor + ")", | ||
1223 | 199 | "transform-origin": "0 0" | ||
1224 | 200 | }); | ||
1225 | 201 | } | ||
1226 | 202 | >>>>>>> MERGE-SOURCE | ||
1227 | 188 | 203 | ||
1228 | 189 | // 4th objective - move the items around, start the timer | 204 | // 4th objective - move the items around, start the timer |
1229 | 190 | // settings involved: | 205 | // settings involved: |
1230 | @@ -296,6 +311,7 @@ | |||
1231 | 296 | height: options.originalHeight | 311 | height: options.originalHeight |
1232 | 297 | }); | 312 | }); |
1233 | 298 | 313 | ||
1234 | 314 | <<<<<<< TREE | ||
1235 | 299 | // What IE are we? | 315 | // What IE are we? |
1236 | 300 | if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) { | 316 | if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) { |
1237 | 301 | $("body").css({ | 317 | $("body").css({ |
1238 | @@ -309,6 +325,21 @@ | |||
1239 | 309 | }); | 325 | }); |
1240 | 310 | } | 326 | } |
1241 | 311 | 327 | ||
1242 | 328 | ======= | ||
1243 | 329 | // What IE are we? | ||
1244 | 330 | if ($("body").hasClass('ie7') || $("body").hasClass('ie8')) { | ||
1245 | 331 | $("body").css({ | ||
1246 | 332 | "filter": "progid:DXImageTransform.Microsoft.Matrix(M11=" + options.scaleFactor + ", M12=0, M21=0, M22=" + options.scaleFactor + ", SizingMethod='auto expand'" | ||
1247 | 333 | }); | ||
1248 | 334 | } | ||
1249 | 335 | else { | ||
1250 | 336 | $("body").css({ | ||
1251 | 337 | "transform": "scale(" + options.scaleFactor + ")", | ||
1252 | 338 | "transform-origin": "0 0" | ||
1253 | 339 | }); | ||
1254 | 340 | } | ||
1255 | 341 | |||
1256 | 342 | >>>>>>> MERGE-SOURCE | ||
1257 | 312 | var numberItems = $(this).attr("totalPages"); | 343 | var numberItems = $(this).attr("totalPages"); |
1258 | 313 | 344 | ||
1259 | 314 | if (options.rowsPerPage > 0) { | 345 | if (options.rowsPerPage > 0) { |
1260 | 315 | 346 | ||
1261 | === modified file 'server/modules/preview/xibo-webpage-render.js' | |||
1262 | --- server/modules/preview/xibo-webpage-render.js 2014-06-30 14:28:23 +0000 | |||
1263 | +++ server/modules/preview/xibo-webpage-render.js 2014-08-21 12:09:46 +0000 | |||
1264 | @@ -1,3 +1,4 @@ | |||
1265 | 1 | <<<<<<< TREE | ||
1266 | 1 | $(document).ready(function() { | 2 | $(document).ready(function() { |
1267 | 2 | 3 | ||
1268 | 3 | isMSIE = navigator.userAgent.match(/MSIE/), | 4 | isMSIE = navigator.userAgent.match(/MSIE/), |
1269 | @@ -63,4 +64,75 @@ | |||
1270 | 63 | }); | 64 | }); |
1271 | 64 | } | 65 | } |
1272 | 65 | } | 66 | } |
1273 | 66 | }); | ||
1274 | 67 | \ No newline at end of file | 67 | \ No newline at end of file |
1275 | 68 | });======= | ||
1276 | 69 | $(document).ready(function() { | ||
1277 | 70 | |||
1278 | 71 | isMSIE = navigator.userAgent.match(/MSIE/), | ||
1279 | 72 | MSIEVersion = navigator.userAgent.match(/MSIE (\d\.\d+)/) ? parseInt(RegExp.$1, 10) : null | ||
1280 | 73 | |||
1281 | 74 | if (options.previewWidth == 0 && options.previewHeight == 0) { | ||
1282 | 75 | options.width = $(window).width(); | ||
1283 | 76 | options.height = $(window).height(); | ||
1284 | 77 | } | ||
1285 | 78 | else { | ||
1286 | 79 | // We are a preview | ||
1287 | 80 | options.width = options.previewWidth; | ||
1288 | 81 | options.height = options.previewHeight; | ||
1289 | 82 | } | ||
1290 | 83 | |||
1291 | 84 | // Scale Factor | ||
1292 | 85 | options.scaleFactor = Math.min(options.width / options.originalWidth, options.height / options.originalHeight); | ||
1293 | 86 | |||
1294 | 87 | // We need to scale the scale according to the size difference between the layout designer and the actual request size. | ||
1295 | 88 | if (options.scale_override != 1) { | ||
1296 | 89 | options.offsetTop = options.offsetTop * options.scaleFactor; | ||
1297 | 90 | options.offsetLeft = options.offsetLeft * options.scaleFactor; | ||
1298 | 91 | options.scale = options.scale * options.scaleFactor; | ||
1299 | 92 | } | ||
1300 | 93 | |||
1301 | 94 | // Width should take into account the offset | ||
1302 | 95 | options.width = parseInt(options.width) + parseInt(options.offsetLeft); | ||
1303 | 96 | options.height = parseInt(options.height) + parseInt(options.offsetTop); | ||
1304 | 97 | |||
1305 | 98 | // Add the width and height on the wrap. | ||
1306 | 99 | $("#wrap").css({ | ||
1307 | 100 | "overflow": "hidden", | ||
1308 | 101 | "width": options.width, | ||
1309 | 102 | "height": options.height | ||
1310 | 103 | }); | ||
1311 | 104 | |||
1312 | 105 | // Margins on frame | ||
1313 | 106 | $("#iframe").css({ | ||
1314 | 107 | "margin-top": -1 * options.offsetTop, | ||
1315 | 108 | "margin-left": -1 * options.offsetLeft, | ||
1316 | 109 | "width": options.width, | ||
1317 | 110 | "height": options.height | ||
1318 | 111 | }); | ||
1319 | 112 | |||
1320 | 113 | // Transform on the frame | ||
1321 | 114 | if (options.scale != 1) { | ||
1322 | 115 | |||
1323 | 116 | if (isMSIE) { | ||
1324 | 117 | $("#iframe").css({ | ||
1325 | 118 | zoom: options.scale, | ||
1326 | 119 | height: parseInt((options.height / options.scale) * (1 / (MSIEVersion >= 9 ? 1 : options.scale)), 10), | ||
1327 | 120 | width: parseInt((options.width / options.scale) * (1 / (MSIEVersion >= 9 ? 1 : options.scale)), 10) | ||
1328 | 121 | }) | ||
1329 | 122 | } | ||
1330 | 123 | else { | ||
1331 | 124 | |||
1332 | 125 | $("#iframe").css({ | ||
1333 | 126 | 'transform-origin': "0 0", | ||
1334 | 127 | '-webkit-transform-origin': "0 0", | ||
1335 | 128 | '-moz-transform-origin': "0 0", | ||
1336 | 129 | '-o-transform-origin': "0 0", | ||
1337 | 130 | 'transform': 'scale(' + options.scale + ')', | ||
1338 | 131 | '-webkit-transform': 'scale(' + options.scale + ')', | ||
1339 | 132 | '-moz-transform': 'scale(' + options.scale + ')', | ||
1340 | 133 | '-o-transform': 'scale(' + options.scale + ')', | ||
1341 | 134 | "width": options.width / options.scale, | ||
1342 | 135 | "height": options.height / options.scale | ||
1343 | 136 | }); | ||
1344 | 137 | } | ||
1345 | 138 | } | ||
1346 | 139 | });>>>>>>> MERGE-SOURCE | ||
1347 | 68 | 140 | ||
1348 | === modified file 'server/theme/default/html/status_dashboard.php' | |||
1349 | --- server/theme/default/html/status_dashboard.php 2014-06-29 14:37:07 +0000 | |||
1350 | +++ server/theme/default/html/status_dashboard.php 2014-08-21 12:09:46 +0000 | |||
1351 | @@ -28,17 +28,22 @@ | |||
1352 | 28 | ?> | 28 | ?> |
1353 | 29 | <div class="row"> | 29 | <div class="row"> |
1354 | 30 | <div class="span6"> | 30 | <div class="span6"> |
1356 | 31 | <h3 class="text-center">Bandwidth Usage</h3> | 31 | <h3 class="text-center"><?php echo Theme::Translate('Bandwidth Usage'); ?></h3> |
1357 | 32 | <div id="flot_bandwidth_chart" style="height: 400px;" class="flot-chart"></div> | 32 | <div id="flot_bandwidth_chart" style="height: 400px;" class="flot-chart"></div> |
1358 | 33 | </div> | 33 | </div> |
1359 | 34 | <div class="span6"> | 34 | <div class="span6"> |
1360 | 35 | <<<<<<< TREE | ||
1361 | 35 | <h3 class="text-center">Library Usage</h3> | 36 | <h3 class="text-center">Library Usage</h3> |
1362 | 36 | <?php echo Theme::Get('library-widget'); ?> | 37 | <?php echo Theme::Get('library-widget'); ?> |
1363 | 38 | ======= | ||
1364 | 39 | <h3 class="text-center"><?php echo Theme::Translate('Library Usage'); ?></h3> | ||
1365 | 40 | <?php echo Theme::Get('library-widget'); ?> | ||
1366 | 41 | >>>>>>> MERGE-SOURCE | ||
1367 | 37 | </div> | 42 | </div> |
1368 | 38 | </div> | 43 | </div> |
1369 | 39 | <div class="row"> | 44 | <div class="row"> |
1370 | 40 | <div class="span6"> | 45 | <div class="span6"> |
1372 | 41 | <h3 class="text-center">Display Activity</h3> | 46 | <h3 class="text-center"><?php echo Theme::Translate('Display Activity'); ?></h3> |
1373 | 42 | <table class="table"> | 47 | <table class="table"> |
1374 | 43 | <thead> | 48 | <thead> |
1375 | 44 | <tr> | 49 | <tr> |
1376 | 45 | 50 | ||
1377 | === modified file 'server/upgrade.php' | |||
1378 | --- server/upgrade.php 2014-07-15 15:59:36 +0000 | |||
1379 | +++ server/upgrade.php 2014-08-21 12:09:46 +0000 | |||
1380 | @@ -20,10 +20,13 @@ | |||
1381 | 20 | */ | 20 | */ |
1382 | 21 | DEFINE('XIBO', true); | 21 | DEFINE('XIBO', true); |
1383 | 22 | 22 | ||
1384 | 23 | <<<<<<< TREE | ||
1385 | 23 | if (! checkPHP()) { | 24 | if (! checkPHP()) { |
1386 | 24 | die("Xibo requires PHP 5.3.3 or later"); | 25 | die("Xibo requires PHP 5.3.3 or later"); |
1387 | 25 | } | 26 | } |
1388 | 26 | 27 | ||
1389 | 28 | ======= | ||
1390 | 29 | >>>>>>> MERGE-SOURCE | ||
1391 | 27 | error_reporting(0); | 30 | error_reporting(0); |
1392 | 28 | ini_set('display_errors', 0); | 31 | ini_set('display_errors', 0); |
1393 | 29 | 32 | ||
1394 | @@ -34,6 +37,12 @@ | |||
1395 | 34 | include('config/db_config.php'); | 37 | include('config/db_config.php'); |
1396 | 35 | include('config/config.class.php'); | 38 | include('config/config.class.php'); |
1397 | 36 | 39 | ||
1398 | 40 | $config = new Config(); | ||
1399 | 41 | |||
1400 | 42 | if (!$config->CheckPHP()) { | ||
1401 | 43 | die(sprintf('Xibo required PHP version %s.', Config::$VERSION_REQUIRED)); | ||
1402 | 44 | } | ||
1403 | 45 | |||
1404 | 37 | // Setup the translations for gettext | 46 | // Setup the translations for gettext |
1405 | 38 | require_once("lib/app/translationengine.class.php"); | 47 | require_once("lib/app/translationengine.class.php"); |
1406 | 39 | 48 | ||
1407 | @@ -385,12 +394,15 @@ | |||
1408 | 385 | 394 | ||
1409 | 386 | include('install/footer.inc'); | 395 | include('install/footer.inc'); |
1410 | 387 | 396 | ||
1411 | 397 | <<<<<<< TREE | ||
1412 | 388 | # Functions | 398 | # Functions |
1413 | 389 | function checkPHP() { | 399 | function checkPHP() { |
1414 | 390 | # Check PHP version > 5 | 400 | # Check PHP version > 5 |
1415 | 391 | return (version_compare("5.3.3",phpversion(), "<=")); | 401 | return (version_compare("5.3.3",phpversion(), "<=")); |
1416 | 392 | } | 402 | } |
1417 | 393 | 403 | ||
1418 | 404 | ======= | ||
1419 | 405 | >>>>>>> MERGE-SOURCE | ||
1420 | 394 | function checkMySQL() { | 406 | function checkMySQL() { |
1421 | 395 | # Check PHP has MySQL module installed | 407 | # Check PHP has MySQL module installed |
1422 | 396 | return extension_loaded("mysql"); | 408 | return extension_loaded("mysql"); |