Xibo

Merge lp:~dangarner/xibo/server162-testfix into lp:xibo/1.7

  1. server162-testfix
  2. Merge into tuttle
Proposed by Dan Garner
Status: Merged
Merged at revision: 338
Proposed branch: lp:~dangarner/xibo/server162-testfix
Merge into: lp:xibo/1.7
Diff against target: 229 lines (+67/-7) (has conflicts)
6 files modified
default.pot (+8/-0)
server/config/config.class.php (+12/-2)
server/install.php (+12/-0)
server/lib/app/pdoconnect.class.php (+11/-1)
server/modules/preview/html-preview.js (+12/-4)
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/modules/preview/html-preview.js
Text conflict in server/upgrade.php
To merge this branch: bzr merge lp:~dangarner/xibo/server162-testfix
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+227176@code.launchpad.net
To post a comment you must log in.

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'
2Binary files default.mo 2014-07-15 16:00:50 +0000 and default.mo.OTHER 2014-07-17 11:17:41 +0000 differ
3=== modified file 'default.pot'
4--- default.pot 2014-07-15 16:00:50 +0000
5+++ default.pot 2014-07-17 11:17:41 +0000
6@@ -2,7 +2,11 @@
7 msgstr ""
8 "Project-Id-Version: Xibo Digital Signage\n"
9 "Report-Msgid-Bugs-To: \n"
10+<<<<<<< TREE
11 "POT-Creation-Date: 2014-07-15 17:00-0000\n"
12+=======
13+"POT-Creation-Date: 2014-07-15 16:44-0000\n"
14+>>>>>>> MERGE-SOURCE
15 "PO-Revision-Date: \n"
16 "Last-Translator: Dan Garner <dan@xibo.org.uk>\n"
17 "Language-Team: <info@xibo.org.uk>\n"
18@@ -10,7 +14,11 @@
19 "MIME-Version: 1.0\n"
20 "Content-Type: text/plain; charset=UTF-8\n"
21 "Content-Transfer-Encoding: 8bit\n"
22+<<<<<<< TREE
23 "X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.7.0-alpha\n"
24+=======
25+"X-Poedit-Basepath: C:\\Users\\dan\\www\\release\\1.6.2\n"
26+>>>>>>> MERGE-SOURCE
27 "X-Poedit-KeywordsList: __;Translate\n"
28 "X-Generator: Poedit 1.5.5\n"
29 "X-Poedit-SearchPath-0: server\n"
30
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-07-17 11:17:41 +0000
34@@ -1,7 +1,7 @@
35 <?php
36 /*
37 * Xibo - Digital Signage - http://www.xibo.org.uk
38- * Copyright (C) 2006-2013 Daniel Garner and James Packer
39+ * Copyright (C) 2006-2014 Daniel Garner and James Packer
40 *
41 * This file is part of Xibo.
42 *
43@@ -22,6 +22,8 @@
44
45 class Config
46 {
47+ public static $VERSION_REQUIRED = '5.3.3';
48+
49 private $extensions;
50 private $envTested;
51 private $envFault;
52@@ -129,7 +131,7 @@
53 // Check for PHP version
54 $message = __('PHP Version');
55
56- if ($this->CheckPHP() == 1)
57+ if ($this->CheckPHP())
58 {
59 $output .= $imgGood.$message.'<br />';
60 }
61@@ -138,7 +140,11 @@
62 $this->envFault = true;
63
64 $output .= $imgBad.$message.'<br />';
65+<<<<<<< TREE
66 $output .= '<div class="check_explain"> <p>' . __("PHP version 5.3.3 or later required.") . '. Detected ' . phpversion() . '</p></div>';
67+=======
68+ $output .= '<div class="check_explain"> <p>' . sprintf(__("PHP version %s or later required."), Config::$VERSION_REQUIRED) . '. Detected ' . phpversion() . '</p></div>';
69+>>>>>>> MERGE-SOURCE
70 }
71
72 // Check for file system permissions
73@@ -463,7 +469,11 @@
74 */
75 function CheckPHP()
76 {
77+<<<<<<< TREE
78 return ((version_compare('5.3.3', phpversion(), '>='))) ? 1 : 0;
79+=======
80+ return (version_compare(phpversion(), Config::$VERSION_REQUIRED) != -1);
81+>>>>>>> MERGE-SOURCE
82 }
83
84 /**
85
86=== modified file 'server/install.php'
87--- server/install.php 2014-07-15 15:59:36 +0000
88+++ server/install.php 2014-07-17 11:17:41 +0000
89@@ -20,11 +20,14 @@
90 */
91 DEFINE('XIBO', true);
92
93+<<<<<<< TREE
94 if (! checkPHP())
95 {
96 die('Xibo requires PHP 5.3.3 or later');
97 }
98
99+=======
100+>>>>>>> MERGE-SOURCE
101 error_reporting(0);
102 ini_set('display_errors', 0);
103
104@@ -33,6 +36,12 @@
105 include('config/config.class.php');
106 include('config/db_config.php');
107
108+$config = new Config();
109+
110+if (!$config->CheckPHP()) {
111+ die(sprintf('Xibo required PHP version %s.', Config::$VERSION_REQUIRED));
112+}
113+
114 // Setup for the Translations using Gettext.
115 // 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 // 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 return $key;
119 }
120
121+<<<<<<< TREE
122 function checkPHP()
123 {
124 return (version_compare("5.3.3",phpversion(), "<="));
125 }
126
127+=======
128+>>>>>>> MERGE-SOURCE
129 function CheckGettext()
130 {
131 return extension_loaded("gettext");
132
133=== modified file 'server/lib/app/pdoconnect.class.php'
134--- server/lib/app/pdoconnect.class.php 2014-01-18 09:47:41 +0000
135+++ server/lib/app/pdoconnect.class.php 2014-07-17 11:17:41 +0000
136@@ -34,8 +34,18 @@
137 global $dbpass;
138 global $dbname;
139
140+ $dbport = '';
141+
142+ if (strstr($dbhost, ':')) {
143+ $hostParts = explode(':', $dbhost);
144+ $dsn = 'mysql:host=' . $hostParts[0] . ';port=' . $hostParts[1] . ';dbname=' . $dbname . ';';
145+ }
146+ else {
147+ $dsn = 'mysql:host=' . $dbhost . ';dbname=' . $dbname . ';';
148+ }
149+
150 // Open the connection and set the error mode
151- self::$conn = new PDO('mysql:host=' . $dbhost . ';dbname=' . $dbname . ';', $dbuser, $dbpass);
152+ self::$conn = new PDO($dsn, $dbuser, $dbpass);
153 self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
154
155 self::$conn->query("SET NAMES 'utf8'");
156
157=== modified file 'server/modules/preview/html-preview.js'
158--- server/modules/preview/html-preview.js 2014-07-12 14:17:17 +0000
159+++ server/modules/preview/html-preview.js 2014-07-17 11:17:41 +0000
160@@ -333,10 +333,18 @@
161
162 if (oldMedia) {
163 $("#" + oldMedia.containerName).css("display", "none");
164-
165- if (oldMedia.mediaType == "video") {
166- $("#" + oldMedia.containerName + "-vid").get(0).pause();
167- }
168+<<<<<<< TREE
169+
170+ if (oldMedia.mediaType == "video") {
171+ $("#" + oldMedia.containerName + "-vid").get(0).pause();
172+ }
173+=======
174+
175+ if (oldMedia.mediaType == "video") {
176+ $("#" + oldMedia.containerName + "-vid").get(0).pause();
177+ $("#" + oldMedia.containerName + "-vid").get(0).currentTime = 0;
178+ }
179+>>>>>>> MERGE-SOURCE
180 }
181
182 $("#" + newMedia.containerName).css("display", "block");
183
184=== modified file 'server/upgrade.php'
185--- server/upgrade.php 2014-07-15 15:59:36 +0000
186+++ server/upgrade.php 2014-07-17 11:17:41 +0000
187@@ -20,10 +20,13 @@
188 */
189 DEFINE('XIBO', true);
190
191+<<<<<<< TREE
192 if (! checkPHP()) {
193 die("Xibo requires PHP 5.3.3 or later");
194 }
195
196+=======
197+>>>>>>> MERGE-SOURCE
198 error_reporting(0);
199 ini_set('display_errors', 0);
200
201@@ -34,6 +37,12 @@
202 include('config/db_config.php');
203 include('config/config.class.php');
204
205+$config = new Config();
206+
207+if (!$config->CheckPHP()) {
208+ die(sprintf('Xibo required PHP version %s.', Config::$VERSION_REQUIRED));
209+}
210+
211 // Setup the translations for gettext
212 require_once("lib/app/translationengine.class.php");
213
214@@ -385,12 +394,15 @@
215
216 include('install/footer.inc');
217
218+<<<<<<< TREE
219 # Functions
220 function checkPHP() {
221 # Check PHP version > 5
222 return (version_compare("5.3.3",phpversion(), "<="));
223 }
224
225+=======
226+>>>>>>> MERGE-SOURCE
227 function checkMySQL() {
228 # Check PHP has MySQL module installed
229 return extension_loaded("mysql");

Subscribers

People subscribed via source and target branches