1
=== modified file 'server/README.TXT'
2
--- server/README.TXT	2014-01-02 21:06:28 +0000
3
+++ server/README.TXT	2014-01-19 13:57:27 +0000
4
@@ -1,5 +1,10 @@
5
1
<<<<<<< TREE
6
1
Xibo - Digitial Signage - http://www.xibo.org.uk
2
Xibo - Digitial Signage - http://www.xibo.org.uk
7
2
Copyright (C) 2006 - 2013 Daniel Garner, James Packer and Alex Harrington
3
Copyright (C) 2006 - 2013 Daniel Garner, James Packer and Alex Harrington
8
4
=======
9
5
Xibo - Digital Signage - http://www.xibo.org.uk
10
6
Copyright (C) 2006 - 2011 Daniel Garner, James Packer and Alex Harrington
11
7
>>>>>>> MERGE-SOURCE
12
3
8
13
4
This file is part of Xibo.
9
This file is part of Xibo.
14
5
10
15
6
11
16
=== modified file 'server/config/config.class.php'
17
--- server/config/config.class.php	2013-10-20 13:42:02 +0000
18
+++ server/config/config.class.php	2014-01-19 13:57:27 +0000
19
@@ -1,6 +1,6 @@
20
1
<?php
1
<?php
21
2
/*
2
/*
23
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
24
4
 * Copyright (C) 2006-2013 Daniel Garner and James Packer
4
 * Copyright (C) 2006-2013 Daniel Garner and James Packer
25
5
 *
5
 *
26
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
27
@@ -176,7 +176,7 @@
28
176
		}
176
		}
29
177
		
177
		
30
178
		// Check for MySQL
178
		// Check for MySQL
32
179
		$message = __('MySQL database (PHP MySql and PDO MySql)');
179
		$message = __('MySQL database (PHP MySql)');
33
180
180
34
181
		if ($this->CheckMySQL()) 
181
		if ($this->CheckMySQL()) 
35
182
		{
182
		{
36
@@ -193,6 +193,25 @@
37
193
      		</div>
193
      		</div>
38
194
END;
194
END;
39
195
		}
195
		}
40
196
41
197
		// Check for PDO
42
198
		$message = __('MySQL database (PDO MySql)');
43
199
44
200
		if ($this->CheckPDO()) 
45
201
		{
46
202
			$output .= $imgGood.$message.'<br />';
47
203
		}
48
204
		else
49
205
		{
50
206
			$this->envFault = true;
51
207
			
52
208
			$output .= $imgBad.$message.'<br />';
53
209
			$output .= <<<END
54
210
			<div class="check_explain">
55
211
      			<p>Xibo requires the PHP PDO Extension to function.</p>
56
212
      		</div>
57
213
END;
58
214
		}
59
196
		
215
		
60
197
		// Check for JSON
216
		// Check for JSON
61
198
		$message = __('JSON Extension');
217
		$message = __('JSON Extension');
62
@@ -459,10 +478,17 @@
63
459
	 */
478
	 */
64
460
	function CheckMySQL() 
479
	function CheckMySQL() 
65
461
	{
480
	{
67
462
		return extension_loaded("pdo_mysql") && extension_loaded("mysql");
481
		return extension_loaded("mysql");
68
463
	}
482
	}
69
464
	
483
	
70
465
	/**
484
	/**
71
485
	 * Check PHP has the PDO module installed (with MySQL driver)
72
486
	 */
73
487
	function CheckPDO() {
74
488
		return extension_loaded("pdo_mysql");
75
489
	}
76
490
77
491
	/**
78
466
	 * Check PHP has the GetText module installed
492
	 * Check PHP has the GetText module installed
79
467
	 * @return 
493
	 * @return 
80
468
	 */
494
	 */
81
469
495
82
=== modified file 'server/config/db_config.php'
83
--- server/config/db_config.php	2013-05-01 19:24:35 +0000
84
+++ server/config/db_config.php	2014-01-19 13:57:27 +0000
85
@@ -1,6 +1,6 @@
86
1
<?php
1
<?php
87
2
/*
2
/*
89
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
90
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
91
5
 *
5
 *
92
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
93
7
7
94
=== modified file 'server/index.php'
95
--- server/index.php	2013-05-01 19:24:35 +0000
96
+++ server/index.php	2014-01-19 13:57:27 +0000
97
@@ -1,6 +1,6 @@
98
1
<?php
1
<?php
99
2
/*
2
/*
101
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
102
4
 * Copyright (C) 2006-2012 Daniel Garner, James Packer and Alex Harrington
4
 * Copyright (C) 2006-2012 Daniel Garner, James Packer and Alex Harrington
103
5
 *
5
 *
104
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
105
7
7
106
=== removed file 'server/install.php'
107
--- server/install.php	2013-08-21 22:27:13 +0000
108
+++ server/install.php	1970-01-01 00:00:00 +0000
109
@@ -1,748 +0,0 @@
110
1
<?php
111
2
/*
112
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
113
4
 * Copyright (C) 2009-2013 Alex Harrington
114
5
 *
115
6
 * This file is part of Xibo.
116
7
 *
117
8
 * Xibo is free software: you can redistribute it and/or modify
118
9
 * it under the terms of the GNU Affero General Public License as published by
119
10
 * the Free Software Foundation, either version 3 of the License, or
120
11
 * any later version. 
121
12
 *
122
13
 * Xibo is distributed in the hope that it will be useful,
123
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
124
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
125
16
 * GNU Affero General Public License for more details.
126
17
 *
127
18
 * You should have received a copy of the GNU Affero General Public License
128
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
129
20
 */ 
130
21
DEFINE('XIBO', true);
131
22
132
23
if (! checkPHP()) 
133
24
{
134
25
	die('Xibo requires PHP 5.2.4 or later');
135
26
}
136
27
137
28
error_reporting(0);
138
29
ini_set('display_errors', 0);
139
30
140
31
include('lib/app/kit.class.php');
141
32
include('install/header.inc');
142
33
include('config/config.class.php');
143
34
include('config/db_config.php');
144
35
145
36
// Setup for the Translations using Gettext.
146
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)
147
38
// Would be nice to include a method on the TranslationEngine that did this for us - but without the debugging
148
39
// The actual translation function __() is included later in this file.
149
40
$langs 		= Kit::GetParam('HTTP_ACCEPT_LANGUAGE', $_SERVER, _STRING);
150
41
$lang		= 'en-gb'; 		// Default language
151
42
$encoding 	= '';			// We do not seem to need an encoding, but I read somewhere that we might - left as a reminder of this.
152
43
153
44
if ($langs != '') 
154
45
{
155
46
	$langs 	= explode(',', $langs);
156
47
	$lang 	= $langs[0];
157
48
}
158
49
159
50
// For windows
160
51
putenv('LANG='.$lang.'.'.$encoding);
161
52
putenv('LANGUAGE='.$lang.'.'.$encoding); 
162
53
putenv('LC_ALL='.$lang.'.'.$encoding); 
163
54
164
55
// Set local
165
56
setlocale(LC_ALL, $lang.'.'.$encoding);
166
57
167
58
// Translations have been setup.
168
59
169
60
$fault = false;
170
61
171
62
$xibo_step = Kit::GetParam('xibo_step',_POST,_INT,'0');
172
63
173
64
if (!isset($xibo_step) || $xibo_step == 0) {
174
65
  # First step of the process.
175
66
  # Show a welcome screen and next button
176
67
  ?>
177
68
  <?php echo __("Welcome to the Xibo Installer!"); ?><br /><br />
178
69
  <?php echo __("The installer will take you through setting up Xibo one step at a time."); ?><br /><br />
179
70
  <?php echo __("Lets get started!"); ?><br /><br />
180
71
  <form action="install.php" method="POST">
181
72
    <input type="hidden" name="xibo_step" value="1" />
182
73
    <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
183
74
  </form>
184
75
  <?php
185
76
}
186
77
elseif ($xibo_step == 1) {
187
78
  # Check environment
188
79
  $db = new Database();
189
80
  $cObj = new Config();
190
81
  ?>
191
82
  <p><?php echo __("First we need to check if your server meets Xibo's requirements."); ?></p>
192
83
  <div class="checks">
193
84
  <?php
194
85
    echo $cObj->CheckEnvironment();
195
86
    if ($cObj->EnvironmentFault()) {
196
87
    ?>
197
88
      <form action="install.php" method="POST">
198
89
        <input type="hidden" name="xibo_step" value="1" />
199
90
        <div class="loginbutton"><button type="submit"><?php echo __("Retest"); ?></button></div>
200
91
      </form>
201
92
    <?php
202
93
    }
203
94
    else if ($cObj->EnvironmentWarning()) {
204
95
    ?>
205
96
      <form action="install.php" method="POST">
206
97
        <input type="hidden" name="xibo_step" value="1" />
207
98
        <div class="loginbutton"><button type="submit"><?php echo __("Retest"); ?></button></div>
208
99
      </form>
209
100
      <form action="install.php" method="POST">
210
101
        <input type="hidden" name="xibo_step" value="2" />
211
102
        <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
212
103
      </form>
213
104
    <?php
214
105
    }
215
106
    else {
216
107
    ?>
217
108
      <form action="install.php" method="POST">
218
109
        <input type="hidden" name="xibo_step" value="2" />
219
110
        <div class="loginbutton"><button type="submit"><?php echo __("Next"); ?> ></button></div>
220
111
      </form>
221
112
    <?php
222
113
    }    
223
114
}
224
115
elseif ($xibo_step == 2) {
225
116
# Create database
226
117
## Does database exist already?
227
118
228
119
  ?>
229
120
  <div class="info">
230
121
    <p><?php echo __("Xibo needs to setup a new database."); ?></p>
231
122
    <p><?php echo __("If you have not yet created an empty database and database user for Xibo to use, and know the username/password of a MySQL administrator, click the \"Create New\" button, otherwise click \"Use Existing\"."); ?></p>
232
123
    <p><i><?php echo __("Note that any existing database must be empty"); ?></i></p>
233
124
  </div>
234
125
  <form action="install.php" method="POST">
235
126
    <input type="hidden" name="xibo_step" value="3" />
236
127
    <button type="submit"><?php echo __("Create New"); ?></button>
237
128
  </form>
238
129
  <form action="install.php" method="POST">
239
130
    <input type="hidden" name="xibo_step" value="4" />
240
131
    <button type="submit"><?php echo __("Use Existing"); ?></button>
241
132
  </form>
242
133
  <?php
243
134
}
244
135
elseif ($xibo_step == 3) {
245
136
## If not, gather admin password and use to create empty db and new user.
246
137
?>
247
138
<div class="info">
248
139
<p><?php echo __("Since no empty database has been created for Xibo to use, we need the username and password of a MySQL administrator to create a new database, and database user for Xibo."); ?></p>
249
140
<p><?php echo __("Additionally, please give us a new username and password to create in MySQL for Xibo to use. Xibo will create this automatically for you."); ?></p>
250
141
<form action="install.php" method="POST">
251
142
<input type="hidden" name="xibo_step" value="5" />
252
143
<input type="hidden" name="db_create" value="On" />
253
144
<div class="install_table">
254
145
  <p><label for="host"><?php echo __("Host:"); ?>&nbsp;</label><input class="username" type="text" id="host" name="host" size="12" value="localhost" /></p>
255
146
  <p><label for="admin_username"><?php echo __("Admin Username:"); ?>&nbsp;</label><input class="username" type="text" id="admin_username" name="admin_username" size="12" /></p>
256
147
  <p><label for="admin_password"><?php echo __("Admin Password:"); ?>&nbsp;</label><input class="username" type="password" id="admin_password" name="admin_password" size="12" /></p>
257
148
  <p><label for="db_name"><?php echo __("Xibo Database Name:"); ?>&nbsp;</label><input class="username" type="text" id="db_name" name="db_name" size="12" value="xibo" /></p>
258
149
  <p><label for="db_username"><?php echo __("Xibo Database Username:"); ?>&nbsp;</label><input class="username" type="text" id="db_username" name="db_username" size="12" value="xibo" /></p>
259
150
  <p><label for="db_password"><?php echo __("Xibo Database Password:"); ?>&nbsp;</label><input class="username" type="password" id="db_password" name="db_password" size="12" /></p>
260
151
</div>
261
152
</div>
262
153
<button type="submit"><?php echo __("Create"); ?></button>
263
154
</form>
264
155
<?php
265
156
}
266
157
elseif ($xibo_step == 4) {
267
158
## Get details of db that's been created already for us
268
159
?>
269
160
<div class="info">
270
161
<p><?php echo __("Please enter the details of the database and user you have created for Xibo."); ?></p>
271
162
<form action="install.php" method="POST">
272
163
<input type="hidden" name="xibo_step" value="5" />
273
164
<input type="hidden" name="db_create" value="Off" />
274
165
<div class="install_table">
275
166
  <p><label for="host"><?php echo __("Host:"); ?>&nbsp;</label><input class="username" type="text" id="host" name="host" size="12" value="localhost" /></p>
276
167
  <p><label for="db_name"><?php echo __("Xibo Database Name:"); ?>&nbsp;</label><input class="username" type="text" id="db_name" name="db_name" size="12" value="xibo" /></p>
277
168
  <p><label for="db_username"><?php echo __("Xibo Database Username:"); ?>&nbsp;</label><input class="username" type="text" id="db_username" name="db_username" size="12" value="xibo" /></p>
278
169
  <p><label for="db_password"><?php echo __("Xibo Database Password:"); ?>&nbsp;</label><input class="username" type="password" id="db_password" name="db_password" size="12" /></p>
279
170
</div>
280
171
</div>
281
172
<button type="submit"><?php echo __("Create"); ?></button>
282
173
</form>
283
174
<?php
284
175
}
285
176
elseif ($xibo_step == 5) {
286
177
287
178
  $db_create = Kit::GetParam('db_create',_POST,_STRING);
288
179
289
180
  if (!isset($db_create)) {
290
181
    reportError("2",__("Something went wrong"));
291
182
  }
292
183
  else {
293
184
    $db_host = Kit::GetParam('host',_POST,_STRING,'localhost');
294
185
    $db_user = Kit::GetParam('db_username',_POST,_PASSWORD);
295
186
    $db_pass = Kit::GetParam('db_password',_POST,_PASSWORD);
296
187
    $db_name = Kit::GetParam('db_name',_POST,_PASSWORD);
297
188
    ?>
298
189
    <div class="info">
299
190
    <?php
300
191
    if ($db_create == 'On') {  
301
192
      $db_admin_user = Kit::GetParam('admin_username',_POST,_PASSWORD);
302
193
      $db_admin_pass = Kit::GetParam('admin_password',_POST,_PASSWORD);
303
194
      
304
195
      if (! ($db_host && $db_name && $db_user && $db_admin_user)) {
305
196
        # Something was blank.
306
197
        # Throw an error.
307
198
        reportError("3", __("A field was blank. Please fill in all fields."));
308
199
      }
309
200
      
310
201
      $db = @mysql_connect($db_host,$db_admin_user,$db_admin_pass);
311
202
      
312
203
      if (! $db) {
313
204
        reportError("3", __("Could not connect to MySQL with the administrator details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
314
205
      }
315
206
      
316
207
      ?>
317
208
      <p><?php echo __("Creating new database."); ?></p>
318
209
      <?php
319
210
      flush();
320
211
      
321
212
      $SQL = sprintf("CREATE DATABASE `%s`",
322
213
                      mysql_real_escape_string($db_name));
323
214
      if (! @mysql_query($SQL, $db)) {
324
215
        # Create database and user
325
216
        reportError("3", __("Could not create a new database with the administrator details. Please check and try again.") . "<br /><br />" . "MySQL Error:" . "<br />" . mysql_error());
326
217
      }
327
218
      
328
219
      # Choose the MySQL DB to create a user
329
220
      @mysql_select_db("mysql", $db);
330
221
331
222
      # Make $db_host lowercase so it matches "localhost" if required.
332
223
      $db_host = strtolower($db_host);
333
224
      
334
225
      ?>
335
226
      <p><?php echo __("Creating new user"); ?></p>
336
227
      <?php
337
228
      flush();
338
229
      
339
230
      if ($db_host == 'localhost') {
340
231
        $SQL = sprintf("GRANT ALL PRIVILEGES ON `%s`.* to '%s'@'%s' IDENTIFIED BY '%s'",
341
232
                        mysql_real_escape_string($db_name),
342
233
                        mysql_real_escape_string($db_user),
343
234
                        mysql_real_escape_string($db_host),
344
235
                        mysql_real_escape_string($db_pass));
345
236
      }
346
237
      else {
347
238
        $SQL = sprintf("GRANT ALL PRIVILEGES ON `%s`.* to '%s'@'%%' IDENTIFIED BY '%s'",
348
239
                        mysql_real_escape_string($db_name),
349
240
                        mysql_real_escape_string($db_user),
350
241
                        mysql_real_escape_string($db_pass));
351
242
      }
352
243
      if (! @mysql_query($SQL, $db)) {
353
244
          reportError("3", __("Could not create a new user with the administrator details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
354
245
      }
355
246
      
356
247
357
248
      @mysql_query("FLUSH PRIVILEGES", $db);      
358
249
      @mysql_close($db);
359
250
      
360
251
    }
361
252
    else {
362
253
      if (! ($db_host && $db_name && $db_user && $db_pass)) {
363
254
        # Something was blank
364
255
        # Throw an error.
365
256
        reportError("4", __("A field was blank. Please fill in all fields.") . " " . $db_host . " " . $db_name . " " . $db_user . " " . $db_pass);
366
257
      }
367
258
    }
368
259
    ## Populate database
369
260
    
370
261
    $db = @mysql_connect($db_host,$db_user,$db_pass);
371
262
      
372
263
    if (! $db) {
373
264
      reportError("4", __("Could not connect to MySQL with the Xibo User account details. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
374
265
    }
375
266
      
376
267
    @mysql_select_db($db_name,$db);
377
268
    
378
269
    ?>
379
270
    <p>Populating the database</p>
380
271
    <?php
381
272
    flush();
382
273
    
383
274
    # Load from sql files to db - HOW?
384
275
    $sql_files = array('structure.sql', 'data.sql');
385
276
386
277
    $sqlStatementCount = 0;
387
278
388
279
    foreach ($sql_files as $filename) {
389
280
      ?>
390
281
      <p>Loading from <?php print $filename; ?>
391
282
      <?php
392
283
        flush();
393
284
        
394
285
        $delimiter = ';';
395
286
        $sql_file = @file_get_contents('install/master/' . $filename);
396
287
        $sql_file = remove_remarks($sql_file);
397
288
        $sql_file = split_sql_file($sql_file, $delimiter);
398
289
    
399
290
        foreach ($sql_file as $sql) {
400
291
          print ".";
401
292
          $sqlStatementCount++;
402
293
          flush();
403
294
          if (! @mysql_query($sql,$db)) {
404
295
            reportError("4", __("An error occured populating the database.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error() . "<br /><br />SQL executed:<br />" . $sql . "<br /><br />Statement number: " . $sqlStatementCount);
405
296
          }
406
297
        }
407
298
        print "</p>";
408
299
    }
409
300
    @mysql_close($db);
410
301
  }
411
302
  # Write out a new settings.php
412
303
  $fh = fopen("settings.php", 'wt');
413
304
  
414
305
  if (! $fh) {
415
306
    reportError("0", __("Unable to write to settings.php. We already checked this was possible earlier, so something changed."));
416
307
  }
417
308
  
418
309
  settings_strings();
419
310
  
420
311
  $settings_content = '$dbhost = \'' . $db_host . '\';' . "\n";
421
312
  $settings_content .= '$dbuser = \'' . $db_user . '\';' . "\n";
422
313
  $settings_content .= '$dbpass = \'' . $db_pass . '\';' . "\n";
423
314
  $settings_content .= '$dbname = \'' . $db_name . '\';' . "\n\n";
424
315
  $settings_content .= 'define(\'SECRET_KEY\',\'' . gen_secret() . '\');' . "\n";
425
316
  
426
317
  if (! fwrite($fh, $settings_header . $settings_content . $settings_footer)) {
427
318
    reportError("0", __("Unable to write to settings.php. We already checked this was possible earlier, so something changed."));
428
319
  }
429
320
    
430
321
  fclose($fh);
431
322
  
432
323
  ?>
433
324
  </div>
434
325
  <div class="install_table">
435
326
    <form action="install.php" method="POST">
436
327
      <input type="hidden" name="xibo_step" value="6" />
437
328
  </div>
438
329
    <button type="submit"><?php echo __("Next"); ?> ></button>
439
330
  </form>
440
331
  <?php
441
332
}
442
333
elseif ($xibo_step == 6) {
443
334
  # Form to get new admin password
444
335
  ?>
445
336
  <div class="info">
446
337
  <p><?php echo __("Xibo needs to set the \"xibo_admin\" user password. Please enter a password for this account below."); ?></p>
447
338
  </div>
448
339
  <div class="install_table">
449
340
    <form action="install.php" method="POST">
450
341
      <input type="hidden" name="xibo_step" value="7" />
451
342
      <p><label for="password1"><?php echo __("Password:"); ?>&nbsp;</label><input type="password" name="password1" size="12" /></p>
452
343
      <p><label for="password2"><?php echo __("Retype Password:"); ?>&nbsp;</label><input type="password" name="password2" size="12" /></p>
453
344
  </div>
454
345
    <button type="submit"><?php echo __("Next"); ?> ></button>
455
346
  </form>
456
347
  <?php
457
348
}
458
349
elseif ($xibo_step == 7) {
459
350
  # Setup xibo_admin password
460
351
  $password1 = Kit::GetParam('password1',_POST,_PASSWORD);
461
352
  $password2 = Kit::GetParam('password2',_POST,_PASSWORD);
462
353
  
463
354
  if (!(($password1 && $password2) && ($password1 == $password2))) {
464
355
    reportError("6", __("Please input a new password. Ensure both password fields are identical."));
465
356
  }
466
357
  
467
358
  include('settings.php');
468
359
  
469
360
  $password_hash = md5($password1);
470
361
  
471
362
  $db = @mysql_connect($dbhost,$dbuser,$dbpass);
472
363
      
473
364
    if (! $db) {
474
365
      reportError("6", __("Could not connect to MySQL with the Xibo User account details saved in settings.php. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
475
366
    }
476
367
      
477
368
    @mysql_select_db($dbname,$db);
478
369
479
370
    $SQL = sprintf("UPDATE `user` SET UserPassword = '%s' WHERE UserID = 1 LIMIT 1",
480
371
                    mysql_real_escape_string($password_hash));
481
372
    if (! @mysql_query($SQL, $db)) {
482
373
      reportError("6", __("An error occured changing the xibo_admin password.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
483
374
    }
484
375
 
485
376
    @mysql_close($db);
486
377
    
487
378
    ?>
488
379
    <div class="info">
489
380
      <?php echo __("Successfully changed the xibo_admin password. We're nearly there now. Just a couple more steps!"); ?>
490
381
    </div>
491
382
    <form action="install.php" method="POST">
492
383
      <input type="hidden" name="xibo_step" value="8" />
493
384
      <button type="submit"><?php echo __("Next"); ?> ></button>
494
385
    </form>
495
386
    <?php
496
387
}
497
388
elseif ($xibo_step == 8) {
498
389
  # Configure paths and keys
499
390
  ## nuSoap
500
391
  ## libraries
501
392
  ## server_key
502
393
  ?>
503
394
  <div class="info">
504
395
    <p><b><?php echo __("Library Location"); ?></b></p>
505
396
    <p><?php echo __("Xibo needs somewhere to store the things you upload to be shown. Ideally, this should be somewhere outside the root of your webserver - that is such that is not accessible by a web browser. Please input the full path to this folder. If the folder does not already exist, Xibo will attempt to create it for you."); ?></p>
506
397
    <form action="install.php" method="POST">
507
398
    <div class="install_table">
508
399
       <p><label for="library_location"><?php echo __("Library Location:"); ?>&nbsp;</label><input type="text" name="library_location" value="" /></p>
509
400
    </div>
510
401
    <p><b><?php echo __("Server Key"); ?></b></p>
511
402
    <p><?php echo __("Xibo needs you to choose a \"key\". This will be required each time you setup a new client. It should be complicated, and hard to remember. It is visible in the admin interface, so it need not be written down separately."); ?></p>
512
403
    <div class="install_table">
513
404
      <p><label for="server_key"><?php echo __("Server Key:"); ?> </label><input type="text" name="server_key" value="" /></p>
514
405
    </div>
515
406
    <p><b><?php echo __("Statistics"); ?></b></p>
516
407
    <p><?php echo __("We'd love to know you're running Xibo. If you're happy for us to collect anonymous statistics (version number, number of displays) then please leave the box ticked. Please untick the box if your server does not have direct access to the internet."); ?></p>
517
408
    <div class="install_table">
518
409
      <p><label for="stats"><?php echo __("Anonymous Statistics:"); ?>&nbsp;</label><input type="checkbox" name="stats" value="true" checked /></p>
519
410
    </div>
520
411
      <input type="hidden" name="xibo_step" value="9" />
521
412
    </div>
522
413
      <button type="submit"><?php echo __("Next"); ?> ></button>
523
414
    </form>
524
415
  <?php
525
416
}
526
417
elseif ($xibo_step == 9) {
527
418
528
419
  $server_key = Kit::GetParam('server_key',_POST,_STRING);
529
420
  $library_location = Kit::GetParam('library_location',_POST,_STRING);
530
421
  $stats = Kit::GetParam('stats',_POST,_BOOL);
531
422
  
532
423
  // Remove trailing whitespace from the path given.
533
424
  $library_location = trim($library_location);
534
425
535
426
  // Check both fields were completed
536
427
  if (! ($server_key && $library_location)) {
537
428
    reportError("8", __("A field was blank. Please make sure you complete all fields"));
538
429
  }
539
430
540
431
  if ($stats) {
541
432
    $stats="On"; // Fixme: translate ?
542
433
  }
543
434
  else {
544
435
    $stats="Off"; //Fixme : translate ?
545
436
  }
546
437
547
438
  // Does library_location exist already?
548
439
  if (! is_dir($library_location)) {
549
440
    if (is_file($library_location)) {
550
441
      reportError("8", __("A file exists with the name you gave for the Library Location. Please choose another location"));
551
442
    }
552
443
553
444
    // Directory does not exist. Attempt to make it
554
445
    // Using mkdir recursively, so it will attempt to make any
555
446
    // intermediate folders required.
556
447
    if (! mkdir($library_location,0755,true)) {
557
448
      reportError("8", __("Could not create the Library Location directory for you. Please ensure the webserver has permission to create a folder in this location, or create the folder manually and grant permission for the webserver to write to the folder."));
558
449
    }
559
450
    
560
451
  }
561
452
  
562
453
  // Is library_location writable?
563
454
  if (! is_writable($library_location)) {
564
455
    // Directory is not writable.
565
456
    reportError("8", __("The Library Location you gave is not writable by the webserver. Please fix the permissions and try again."));
566
457
  }
567
458
  
568
459
  // Is library_location empty?
569
460
  if (count(ls("*",$library_location,true)) > 0) {
570
461
    reportError("8", __("The Library Location you gave is not empty. Please give the location of an empty folder"));
571
462
  }
572
463
  
573
464
  // Check if the user has added a trailing slash.
574
465
  // If not, add one.
575
466
  if (!((substr($library_location, -1) == '/') || (substr($library_location, -1) == '\\'))) {
576
467
    $library_location = $library_location . '/';
577
468
  }
578
469
579
470
  include('settings.php');
580
471
  
581
472
  $db = @mysql_connect($dbhost,$dbuser,$dbpass);
582
473
      
583
474
    if (! $db) {
584
475
      reportError("8", __("Could not connect to MySQL with the Xibo User account details saved in settings.php. Please check and try again.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
585
476
    }
586
477
      
587
478
    @mysql_select_db($dbname,$db);
588
479
    
589
480
    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'LIBRARY_LOCATION' LIMIT 1",
590
481
                    mysql_real_escape_string($library_location));
591
482
    if (! @mysql_query($SQL, $db)) {
592
483
      reportError("8", __("An error occured changing the library location.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
593
484
    }
594
485
    
595
486
    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'SERVER_KEY' LIMIT 1",
596
487
                      mysql_real_escape_string($server_key));
597
488
    if (! @mysql_query($SQL, $db)) {
598
489
      reportError("8", __("An error occured changing the server key.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
599
490
    }
600
491
    
601
492
    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'defaultTimezone' LIMIT 1",
602
493
                      mysql_real_escape_string(date_default_timezone_get()));
603
494
    if (! @mysql_query($SQL, $db)) {
604
495
      reportError("8", __("An error occured setting the default timezone.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());    
605
496
    }
606
497
 
607
498
    $SQL = sprintf("UPDATE `setting` SET `value` = '%s' WHERE `setting`.`setting` = 'PHONE_HOME' LIMIT 1",
608
499
                      mysql_real_escape_string($stats));
609
500
    if (! @mysql_query($SQL, $db)) {
610
501
      reportError("8", __("An error occured setting anonymous statistics.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
611
502
    }
612
503
    $SQL = "UPDATE `setting` SET `value` = '" . md5(uniqid(rand(), true)) . "' WHERE `setting`.`setting` = 'PHONE_HOME_KEY' LIMIT 1";
613
504
    if (! @mysql_query($SQL, $db)) {
614
505
      reportError("8", __("An error occured setting anonymous statistics.") . "<br /><br />" . __("MySQL Error:") . "<br />" . mysql_error());
615
506
    }
616
507
    
617
508
    @mysql_close($db);
618
509
  
619
510
  ?>
620
511
  <div class="info">
621
512
    <p><?php echo __("Successfully set library location and server key."); ?></p>
622
513
  </div>
623
514
    <form action="install.php" method="POST">
624
515
      <input type="hidden" name="xibo_step" value="10" />
625
516
      <button type="submit"><?php echo __("Next"); ?> ></button>
626
517
    </form>
627
518
  <?php
628
519
}
629
520
elseif ($xibo_step == 10) {
630
521
# Delete install.php
631
522
# Redirect to login page.
632
523
  if (! unlink('install.php')) {
633
524
    reportError("10", __("Unable to delete install.php. Please ensure the webserver has permission to unlink this file and retry"), __("Retry")); // Fixme : translate "Retry" ?
634
525
  }
635
526
  if (! unlink('upgrade.php')) {
636
527
    reportError("10", __("Unable to delete upgrade.php. Please ensure the webserver has permission to unlink this file and retry"), __("Retry")); // Fixme : translate "Retry" ?
637
528
  }
638
529
  ?>
639
530
  <div class="info">
640
531
    <p><b><?php echo __("Xibo was successfully installed."); ?></b></p>
641
532
    <p><?php echo __("Please click"); ?>&nbsp;<a href="index.php"><?php echo __("here"); ?></a>&nbsp;<?php echo __("to logon to Xibo as \"xibo_admin\" with the password you chose earlier."); ?></p>
642
533
  </div>
643
534
  <?php
644
535
}
645
536
else {
646
537
  reportError("0", __("A required parameter was missing. Please go through the installer sequentially!"), __("Start Again")); // Fixme : translate "Start Again" ?
647
538
}
648
539
 
649
540
include('install/footer.inc');
650
541
651
542
# Functions
652
543
function checkFsPermissions() {
653
544
  # Check for appropriate filesystem permissions
654
545
  return ((is_writable("install.php") && (is_writable("settings.php")) && (is_writable("upgrade.php")) || is_writable(".")));
655
546
}
656
547
657
548
function checkMySQL() {
658
549
  # Check PHP has MySQL module installed
659
550
  return extension_loaded("mysql");
660
551
}
661
552
662
553
function checkJson() {
663
554
  # Check PHP has JSON module installed
664
555
  return extension_loaded("json");
665
556
}
666
557
667
558
function checkGd() {
668
559
  # Check PHP has JSON module installed
669
560
  return extension_loaded("gd");
670
561
}
671
562
672
563
function checkCal() {
673
564
  # Check PHP has JSON module installed
674
565
  return extension_loaded("calendar");
675
566
}
676
567
 
677
568
function reportError($step, $message, $button_text="&lt; Back") { // fixme : translate ?
678
569
?>
679
570
    <div class="info">
680
571
      <?php print $message; ?>
681
572
    </div>
682
573
    <form action="install.php" method="POST">
683
574
      <input type="hidden" name="xibo_step" value="<?php print $step; ?>"/>
684
575
      <button type="submit"><?php print $button_text; ?></button>
685
576
    </form>
686
577
  <?php
687
578
  include('install/footer.inc');
688
579
  die();
689
580
} 
690
581
691
582
// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
692
583
// By Crackster 
693
584
/**
694
585
 * remove_remarks will strip the sql comment lines out of an uploaded sql file
695
586
 */
696
587
function remove_remarks($sql){
697
588
  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^[-].*$/m', "\n", $sql));
698
589
  $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql));
699
590
  return $sql;
700
591
}
701
592
702
593
// Taken from http://forums.devshed.com/php-development-5/php-wont-load-sql-from-file-515902.html
703
594
// By Crackster              
704
595
/**
705
596
 * split_sql_file will split an uploaded sql file into single sql statements.
706
597
 * Note: expects trim() to have already been run on $sql.
707
598
 */
708
599
function split_sql_file($sql, $delimiter){
709
600
  $sql = str_replace("\r" , '', $sql);
710
601
  $data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
711
602
  $data = array_map('trim', $data);
712
603
  // The empty case
713
604
  $end_data = end($data);
714
605
  if (empty($end_data))
715
606
  {
716
607
    unset($data[key($data)]);
717
608
  }
718
609
  return $data;
719
610
}
720
611
 
721
612
/**
722
613
 * This funtion will take a pattern and a folder as the argument and go thru it(recursivly if needed)and return the list of 
723
614
 *               all files in that folder.
724
615
 * Link             : http://www.bin-co.com/php/scripts/filesystem/ls/
725
616
 * License	: BSD
726
617
 * Arguments     :  $pattern - The pattern to look out for [OPTIONAL]
727
618
 *                    $folder - The path of the directory of which's directory list you want [OPTIONAL]
728
619
 *                    $recursivly - The funtion will traverse the folder tree recursivly if this is true. Defaults to false. [OPTIONAL]
729
620
 *                    $options - An array of values 'return_files' or 'return_folders' or both
730
621
 * Returns       : A flat list with the path of all the files(no folders) that matches the condition given.
731
622
 */
732
623
function ls($pattern="*", $folder="", $recursivly=false, $options=array('return_files','return_folders')) {
733
624
    if($folder) {
734
625
        $current_folder = realpath('.');
735
626
        if(in_array('quiet', $options)) { // If quiet is on, we will suppress the 'no such folder' error
736
627
            if(!file_exists($folder)) return array();
737
628
        }
738
629
        
739
630
        if(!chdir($folder)) return array();
740
631
    }
741
632
    
742
633
    
743
634
    $get_files    = in_array('return_files', $options);
744
635
    $get_folders= in_array('return_folders', $options);
745
636
    $both = array();
746
637
    $folders = array();
747
638
    
748
639
    // Get the all files and folders in the given directory.
749
640
    if($get_files) $both = glob($pattern, GLOB_BRACE + GLOB_MARK);
750
641
    if($recursivly or $get_folders) $folders = glob("*", GLOB_ONLYDIR + GLOB_MARK);
751
642
    
752
643
    //If a pattern is specified, make sure even the folders match that pattern.
753
644
    $matching_folders = array();
754
645
    if($pattern !== '*') $matching_folders = glob($pattern, GLOB_ONLYDIR + GLOB_MARK);
755
646
    
756
647
    //Get just the files by removing the folders from the list of all files.
757
648
    $all = array_values(array_diff($both,$folders));
758
649
        
759
650
    if($recursivly or $get_folders) {
760
651
        foreach ($folders as $this_folder) {
761
652
            if($get_folders) {
762
653
                //If a pattern is specified, make sure even the folders match that pattern.
763
654
                if($pattern !== '*') {
764
655
                    if(in_array($this_folder, $matching_folders)) array_push($all, $this_folder);
765
656
                }
766
657
                else array_push($all, $this_folder);
767
658
            }
768
659
            
769
660
            if($recursivly) {
770
661
                // Continue calling this function for all the folders
771
662
                $deep_items = ls($pattern, $this_folder, $recursivly, $options); # :RECURSION:
772
663
                foreach ($deep_items as $item) {
773
664
                    array_push($all, $this_folder . $item);
774
665
                }
775
666
            }
776
667
        }
777
668
    }
778
669
    
779
670
    if($folder) chdir($current_folder);
780
671
    return $all;
781
672
}
782
673
783
674
function gen_secret() {
784
675
  # Generates a random 12 character alphanumeric string to use as a salt
785
676
  mt_srand((double)microtime()*1000000);
786
677
  $key = "";
787
678
  for ($i=0; $i < 12; $i++) {
788
679
    $c = mt_rand(0,2);
789
680
    if ($c == 0) {
790
681
      $key .= chr(mt_rand(65,90));
791
682
    }
792
683
    elseif ($c == 1) {
793
684
      $key .= chr(mt_rand(97,122));
794
685
    }
795
686
    else {
796
687
      $key .= chr(mt_rand(48,57));
797
688
    }
798
689
  } 
799
690
  
800
691
  return $key;
801
692
}
802
693
803
694
function checkPHP() 
804
695
{
805
696
	return (version_compare("5.2.4",phpversion(), "<="));
806
697
}
807
698
808
699
function CheckGettext() 
809
700
{
810
701
	return extension_loaded("gettext");
811
702
}
812
703
813
704
// Setup the translations for gettext
814
705
function __($string)
815
706
{
816
707
	if (CheckGettext())
817
708
	{
818
709
		return _($string);
819
710
	}
820
711
	else
821
712
	{
822
713
		return $string;
823
714
	}
824
715
}
825
716
826
717
function settings_strings() {
827
718
global $settings_header;
828
719
global $settings_footer;
829
720
830
721
  $settings_header = <<<END
831
722
<?php
832
723
833
724
/*
834
725
 * Xibo - Digital Signage - http://www.xibo.org.uk
835
726
 *
836
727
 * This file is part of Xibo - and is automatically generated by the installer
837
728
 *
838
729
 * You should not need to edit this file, unless your SQL connection details have changed.
839
730
 */
840
731
841
732
defined('XIBO') or die(__("Sorry, you are not allowed to directly access this page.") . "<br />" . __("Please press the back button in your browser."));
842
733
843
734
global \$dbhost;
844
735
global \$dbuser;
845
736
global \$dbpass;
846
737
global \$dbname;
847
738
848
739
849
740
END;
850
741
851
742
$settings_footer = <<<END
852
743
?>
853
744
END;
854
745
855
746
  return;
856
747
}
857
748
?>
858
749
0
859
=== modified file 'server/install/database/65.sql'
860
--- server/install/database/65.sql	2013-11-11 09:06:47 +0000
861
+++ server/install/database/65.sql	2014-01-19 13:57:27 +0000
862
@@ -1,4 +1,5 @@
863
1
1
864
2
<<<<<<< TREE
865
2
INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) 
3
INSERT INTO `setting` (`settingid`, `setting`, `value`, `type`, `helptext`, `options`, `cat`, `userChange`) 
866
3
VALUES (NULL, 'SCHEDULE_WITH_VIEW_PERMISSION', 'No', 'dropdown', 'Should users with View permissions on displays be allowed to schedule to them?', 'Yes|No', 'permissions', '1');
4
VALUES (NULL, 'SCHEDULE_WITH_VIEW_PERMISSION', 'No', 'dropdown', 'Should users with View permissions on displays be allowed to schedule to them?', 'Yes|No', 'permissions', '1');
867
4
5
868
@@ -7,5 +8,8 @@
869
7
UPDATE `menuitem` SET `Args`='manual/index.php' WHERE `Text`='Manual';
8
UPDATE `menuitem` SET `Args`='manual/index.php' WHERE `Text`='Manual';
870
8
9
871
9
UPDATE `version` SET `app_ver` = '1.5.2', `XmdsVersion` = 3;
10
UPDATE `version` SET `app_ver` = '1.5.2', `XmdsVersion` = 3;
872
11
=======
873
12
UPDATE `version` SET `app_ver` = '1.6.0-rc1', `XmdsVersion` = 3;
874
13
>>>>>>> MERGE-SOURCE
875
10
UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
14
UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
876
11
UPDATE `version` SET `DBVersion` = '65';
877
12
\ No newline at end of file
15
\ No newline at end of file
878
16
UPDATE `version` SET `DBVersion` = '66';
879
13
\ No newline at end of file
17
\ No newline at end of file
880
14
18
881
=== added file 'server/install/database/66.sql'
882
--- server/install/database/66.sql	1970-01-01 00:00:00 +0000
883
+++ server/install/database/66.sql	2014-01-19 13:57:27 +0000
884
@@ -0,0 +1,83 @@
885
1
DELETE FROM `help`;
886
2
887
3
INSERT INTO `help` (`HelpID`, `Topic`, `Category`, `Link`) VALUES
888
4
(1, 'Layout', 'General', 'manual/single.php?p=layout/overview'),
889
5
(2, 'Content', 'General', 'manual/single.php?p=content/overview'),
890
6
(4, 'Schedule', 'General', 'manual/single.php?p=schedule/overview'),
891
7
(5, 'Group', 'General', 'manual/single.php?p=users/groups'),
892
8
(6, 'Admin', 'General', 'manual/single.php?p=admin/settings'),
893
9
(7, 'Report', 'General', 'manual/single.php?p=admin/advanced'),
894
10
(8, 'Dashboard', 'General', 'manual/single.php?p=coreconcepts/dashboard'),
895
11
(9, 'User', 'General', 'manual/single.php?p=users/users'),
896
12
(10, 'Display', 'General', 'manual/single.php?p=admin/displays'),
897
13
(11, 'DisplayGroup', 'General', 'manual/single.php?p=admin/displaygroups'),
898
14
(12, 'Layout', 'Add', 'manual/single.php?p=layout/overview#Add_Layout'),
899
15
(13, 'Layout', 'Background', 'manual/single.php?p=layout/layoutdesigner#Background'),
900
16
(14, 'Content', 'Assign', 'manual/single.php?p=layout/assigncontent#Assigning_Content'),
901
17
(15, 'Layout', 'RegionOptions', 'manual/single.php?p=layout/assigncontent'),
902
18
(16, 'Content', 'AddtoLibrary', 'manual/single.php?p=content/adding'),
903
19
(17, 'Display', 'Edit', 'manual/single.php?p=admin/displays#Display_Edit'),
904
20
(18, 'Display', 'Delete', 'manual/single.php?p=admin/displays#Display_Delete'),
905
21
(19, 'Displays', 'Groups', 'manual/single.php?p=admin/displaygroups#Group_Members'),
906
22
(20, 'UserGroup', 'Add', 'manual/single.php?p=users/groups#Adding_Group'),
907
23
(21, 'User', 'Add', 'manual/single.php?p=users/users#Add_User'),
908
24
(22, 'User', 'Delete', 'manual/single.php?p=users/users#Delete_User'),
909
25
(23, 'Content', 'Config', 'manual/single.php?p=admin/settings#Content'),
910
26
(24, 'LayoutMedia', 'Permissions', 'manual/single.php?p=users/user_permissions'),
911
27
(25, 'Region', 'Permissions', 'manual/single.php?p=users/user_permissions'),
912
28
(26, 'Library', 'Assign', 'manual/single.php?p=layout/assigncontent#Add_From_Library'),
913
29
(27, 'Media', 'Delete', 'manual/single.php?p=content/deleting'),
914
30
(28, 'DisplayGroup', 'Add', 'manual/single.php?p=admin/displaygroups#Add_Group'),
915
31
(29, 'DisplayGroup', 'Edit', 'manual/single.php?p=admin/displaygroups#Edit_Group'),
916
32
(30, 'DisplayGroup', 'Delete', 'manual/single.php?p=admin/displaygroups#Delete_Group'),
917
33
(31, 'DisplayGroup', 'Members', 'manual/single.php?p=admin/displaygroups#Group_Members'),
918
34
(32, 'DisplayGroup', 'Permissions', 'manual/single.php?p=users/user_permissions'),
919
35
(34, 'Schedule', 'ScheduleNow', 'manual/single.php?p=schedule/schedule_now'),
920
36
(35, 'Layout', 'Delete', 'manual/single.php?p=layout/overview#Delete_Layout'),
921
37
(36, 'Layout', 'Copy', 'manual/single.php?p=layout/overview#Copy_Layout'),
922
38
(37, 'Schedule', 'Edit', 'manual/single.php?p=schedule/schedule_event'),
923
39
(38, 'Schedule', 'Add', 'manual/single.php?p=schedule/schedule_event'),
924
40
(39, 'Layout', 'Permissions', 'manual/single.php?p=users/user_permissions'),
925
41
(40, 'Display', 'MediaInventory', 'manual/single.php?p=admin/displays#Media_Inventory'),
926
42
(41, 'User', 'ChangePassword', 'manual/single.php?p=coreconcepts/navbar#Change_Password'),
927
43
(42, 'Schedule', 'Delete', 'manual/single.php?p=schedule/schedule_event'),
928
44
(43, 'Layout', 'Edit', 'manual/single.php?p=layout/overview#Edit_Layout'),
929
45
(44, 'Media', 'Permissions', 'manual/single.php?p=users/user_permissions'),
930
46
(45, 'Display', 'DefaultLayout', 'manual/single.php?p=admin/displays'),
931
47
(46, 'UserGroup', 'Edit', 'manual/single.php?p=users/groups#Edit_Group'),
932
48
(47, 'UserGroup', 'Members', 'manual/single.php?p=users/groups#Group_Member'),
933
49
(48, 'User', 'PageSecurity', 'manual/single.php?p=users/menu_page_security#Page_Security'),
934
50
(49, 'User', 'MenuSecurity', 'manual/single.php?p=users/menu_page_security#Menu_Security'),
935
51
(50, 'UserGroup', 'Delete', 'manual/single.php?p=users/groups#Delete_Group'),
936
52
(51, 'User', 'Edit', 'manual/single.php?p=users/users#Edit_User'),
937
53
(52, 'User', 'Applications', 'manual/single.php?p=users/users#Users_MyApplications'),
938
54
(53, 'User', 'SetHomepage', 'manual/single.php?p=coreconcepts/dashboard#Media_Dashboard'),
939
55
(54, 'DataSet', 'General', 'manual/single.php?p=content/content_dataset'),
940
56
(55, 'DataSet', 'Add', 'manual/single.php?p=content/content_dataset#Create_Dataset'),
941
57
(56, 'DataSet', 'Edit', 'manual/single.php?p=content/content_dataset#Edit_Dataset'),
942
58
(57, 'DataSet', 'Delete', 'manual/single.php?p=content/content_dataset#Delete_Dataset'),
943
59
(58, 'DataSet', 'AddColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
944
60
(59, 'DataSet', 'EditColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
945
61
(60, 'DataSet', 'DeleteColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
946
62
(61, 'DataSet', 'Data', 'manual/single.php?p=content/content_dataset#Dataset_Row'),
947
63
(62, 'DataSet', 'Permissions', 'manual/single.php?p=users/user_permissions'),
948
64
(63, 'Fault', 'General', 'manual/single.php?p=admin/advanced#Report_Fault'),
949
65
(65, 'Stats', 'General', 'manual/single.php?p=admin/displaystats'),
950
66
(66, 'Resolution', 'General', 'manual/single.php?p=templates/template_resolution'),
951
67
(67, 'Template', 'General', 'manual/single.php?p=templates/overview'),
952
68
(68, 'Services', 'Register', 'manual/single.php?p=admin/api_oauth#Registered_Applications'),
953
69
(69, 'OAuth', 'General', 'manual/single.php?p=admin/api_oauth'),
954
70
(70, 'Services', 'Log', 'manual/single.php?p=admin/api_oauth#oAuthLog'),
955
71
(71, 'Module', 'Edit', 'manual/single.php?p=admin/modules'),
956
72
(72, 'Module', 'General', 'manual/single.php?p=admin/modules'),
957
73
(73, 'Campaign', 'General', 'manual/single.php?p=layout/campaign_layout'),
958
74
(74, 'License', 'General', 'manual/single.php?p=license/licenses'),
959
75
(75, 'DataSet', 'ViewColumns', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
960
76
(76, 'Campaign', 'Permissions', 'manual/single.php?p=users/user_permissions'),
961
77
(77, 'Transition', 'Edit', 'manual/single.php?p=layout/transitions'),
962
78
(78, 'User', 'SetPassword', 'manual/single.php?p=users/users#Set_Password'),
963
79
(79, 'DataSet', 'ImportCSV', 'manual/single.php?p=content/content_dataset#Import_CSV');
964
80
965
81
UPDATE `version` SET `app_ver` = '1.6.0-rc1', `XmdsVersion` = 3;
966
82
UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
967
83
UPDATE `version` SET `DBVersion` = '66';
968
0
\ No newline at end of file
84
\ No newline at end of file
969
1
85
970
=== modified file 'server/install/header.inc'
971
--- server/install/header.inc	2013-05-01 19:25:37 +0000
972
+++ server/install/header.inc	2014-01-19 13:57:27 +0000
973
@@ -1,6 +1,6 @@
974
1
<?php
1
<?php
975
2
/*
2
/*
977
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
978
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
979
5
 *
5
 *
980
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
981
7
7
982
=== modified file 'server/install/header_upgrade.inc'
983
--- server/install/header_upgrade.inc	2013-05-01 19:25:37 +0000
984
+++ server/install/header_upgrade.inc	2014-01-19 13:57:27 +0000
985
@@ -1,6 +1,6 @@
986
1
<?php
1
<?php
987
2
/*
2
/*
989
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
990
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
991
5
 *
5
 *
992
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
993
7
7
994
=== modified file 'server/install/install.css'
995
--- server/install/install.css	2013-05-01 19:25:37 +0000
996
+++ server/install/install.css	2014-01-19 13:57:27 +0000
997
@@ -1,5 +1,5 @@
998
1
/*
1
/*
1000
2
 * Xibo - Digitial Signage - http://www.xibo.org.uk
2
 * Xibo - Digital Signage - http://www.xibo.org.uk
1001
3
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
3
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
1002
4
 *
4
 *
1003
5
 * This file is part of Xibo.
5
 * This file is part of Xibo.
1004
6
6
1005
=== modified file 'server/install/master/data.sql'
1006
--- server/install/master/data.sql	2013-11-11 09:06:47 +0000
1007
+++ server/install/master/data.sql	2014-01-19 13:57:27 +0000
1008
@@ -1,5 +1,5 @@
1009
1
INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
1
INSERT INTO `version` (`app_ver`, `XmdsVersion`, `XlfVersion`, `DBVersion`) VALUES
1011
2
('1.5.2', 3, 1, 65);
2
('1.6.0-rc1', 3, 1, 66);
1012
3
3
1013
4
INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
4
INSERT INTO `group` (`groupID`, `group`, `IsUserSpecific`, `IsEveryone`) VALUES
1014
5
(1, 'Users', 0, 0),
5
(1, 'Users', 0, 0),
1015
@@ -7,82 +7,82 @@
1016
7
(3, 'xibo_admin', 1, 0);
7
(3, 'xibo_admin', 1, 0);
1017
8
8
1018
9
INSERT INTO `help` (`HelpID`, `Topic`, `Category`, `Link`) VALUES
9
INSERT INTO `help` (`HelpID`, `Topic`, `Category`, `Link`) VALUES
1095
10
(1, 'Layout', 'General', 'manual/content/layout/overview.php'),
10
(1, 'Layout', 'General', 'manual/single.php?p=layout/overview'),
1096
11
(2, 'Content', 'General', 'manual/content/content/types.php'),
11
(2, 'Content', 'General', 'manual/single.php?p=content/overview'),
1097
12
(4, 'Schedule', 'General', 'manual/content/schedule/schedule_calendar.php'),
12
(4, 'Schedule', 'General', 'manual/single.php?p=schedule/overview'),
1098
13
(5, 'Group', 'General', 'manual/content/users/groups.php'),
13
(5, 'Group', 'General', 'manual/single.php?p=users/groups'),
1099
14
(6, 'Admin', 'General', 'manual/content/admin/settings.php'),
14
(6, 'Admin', 'General', 'manual/single.php?p=admin/settings'),
1100
15
(7, 'Report', 'General', 'manual/content/admin/advanced.php'),
15
(7, 'Report', 'General', 'manual/single.php?p=admin/advanced'),
1101
16
(8, 'Dashboard', 'General', 'manual/content/dashboard/dashboard.php'),
16
(8, 'Dashboard', 'General', 'manual/single.php?p=coreconcepts/dashboard'),
1102
17
(9, 'User', 'General', 'manual/content/users/users.php'),
17
(9, 'User', 'General', 'manual/single.php?p=users/users'),
1103
18
(10, 'Display', 'General', 'manual/content/admin/displays.php'),
18
(10, 'Display', 'General', 'manual/single.php?p=admin/displays'),
1104
19
(11, 'DisplayGroup', 'General', 'manual/content/admin/displays.php#Display_Group'),
19
(11, 'DisplayGroup', 'General', 'manual/single.php?p=admin/displaygroups'),
1105
20
(12, 'Layout', 'Add', 'manual/content/layout/addlayout.php'),
20
(12, 'Layout', 'Add', 'manual/single.php?p=layout/overview#Add_Layout'),
1106
21
(13, 'Layout', 'Background', 'manual/content/layout/layoutdesigner.php#Background'),
21
(13, 'Layout', 'Background', 'manual/single.php?p=layout/layoutdesigner#Background'),
1107
22
(14, 'Content', 'Assign', 'manual/content/content/types.php'),
22
(14, 'Content', 'Assign', 'manual/single.php?p=layout/assigncontent#Assigning_Content'),
1108
23
(15, 'Layout', 'RegionOptions', 'manual/content/layout/addregion.php'),
23
(15, 'Layout', 'RegionOptions', 'manual/single.php?p=layout/assigncontent'),
1109
24
(16, 'Content', 'AddtoLibrary', 'manual/content/content/adding.php'),
24
(16, 'Content', 'AddtoLibrary', 'manual/single.php?p=content/adding'),
1110
25
(17, 'Display', 'Edit', 'manual/content/admin/displays.php#Display_Edit'),
25
(17, 'Display', 'Edit', 'manual/single.php?p=admin/displays#Display_Edit'),
1111
26
(18, 'Display', 'Delete', 'manual/content/admin/displays.php#Display_Delete'),
26
(18, 'Display', 'Delete', 'manual/single.php?p=admin/displays#Display_Delete'),
1112
27
(19, 'Displays', 'Groups', 'manual/content/admin/displays.php#Display_Group'),
27
(19, 'Displays', 'Groups', 'manual/single.php?p=admin/displaygroups#Group_Members'),
1113
28
(20, 'UserGroup', 'Add', 'manual/content/users/groups.php#Adding_Group'),
28
(20, 'UserGroup', 'Add', 'manual/single.php?p=users/groups#Adding_Group'),
1114
29
(21, 'User', 'Add', 'manual/content/users/users.php#Adding_User'),
29
(21, 'User', 'Add', 'manual/single.php?p=users/users#Add_User'),
1115
30
(22, 'User', 'Delete', 'manual/content/users/users.php#Delete_User'),
30
(22, 'User', 'Delete', 'manual/single.php?p=users/users#Delete_User'),
1116
31
(23, 'Content', 'Config', 'manual/content/admin/settings.php#Content'),
31
(23, 'Content', 'Config', 'manual/single.php?p=admin/settings#Content'),
1117
32
(24, 'LayoutMedia', 'Permissions', 'manual/content/layout/addlayout.php#Layout_Permission'),
32
(24, 'LayoutMedia', 'Permissions', 'manual/single.php?p=users/user_permissions'),
1118
33
(25, 'Region', 'Permissions', 'manual/content/layout/addregion.php#Region_Permissions'),
33
(25, 'Region', 'Permissions', 'manual/single.php?p=users/user_permissions'),
1119
34
(26, 'Library', 'Assign', 'manual/content/layout/assigncontent.php#Add_From_Library'),
34
(26, 'Library', 'Assign', 'manual/single.php?p=layout/assigncontent#Add_From_Library'),
1120
35
(27, 'Media', 'Delete', 'manual/content/content/types.php'),
35
(27, 'Media', 'Delete', 'manual/single.php?p=content/deleting'),
1121
36
(28, 'DisplayGroup', 'Add', 'manual/content/admin/displays.php#Display_Group'),
36
(28, 'DisplayGroup', 'Add', 'manual/single.php?p=admin/displaygroups#Add_Group'),
1122
37
(29, 'DisplayGroup', 'Edit', 'manual/content/admin/displays.php#Display_Group'),
37
(29, 'DisplayGroup', 'Edit', 'manual/single.php?p=admin/displaygroups#Edit_Group'),
1123
38
(30, 'DisplayGroup', 'Delete', 'manual/content/admin/displays.php#Display_Group'),
38
(30, 'DisplayGroup', 'Delete', 'manual/single.php?p=admin/displaygroups#Delete_Group'),
1124
39
(31, 'DisplayGroup', 'Members', 'manual/content/admin/displays.php#Group_Members'),
39
(31, 'DisplayGroup', 'Members', 'manual/single.php?p=admin/displaygroups#Group_Members'),
1125
40
(32, 'DisplayGroup', 'Permissions', 'manual/content/users/user_permissions.php'),
40
(32, 'DisplayGroup', 'Permissions', 'manual/single.php?p=users/user_permissions'),
1126
41
(34, 'Schedule', 'ScheduleNow', 'manual/content/schedule/schedule_now.php'),
41
(34, 'Schedule', 'ScheduleNow', 'manual/single.php?p=schedule/schedule_now'),
1127
42
(35, 'Layout', 'Delete', 'manual/content/layout/addlayout.php#Delete_Layout'),
42
(35, 'Layout', 'Delete', 'manual/single.php?p=layout/overview#Delete_Layout'),
1128
43
(36, 'Layout', 'Copy', 'manual/content/layout/addlayout.php#Copy_Layout'),
43
(36, 'Layout', 'Copy', 'manual/single.php?p=layout/overview#Copy_Layout'),
1129
44
(37, 'Schedule', 'Edit', 'manual/content/schedule/schedule_calendar.php'),
44
(37, 'Schedule', 'Edit', 'manual/single.php?p=schedule/schedule_event'),
1130
45
(38, 'Schedule', 'Add', 'manual/content/schedule/schedule_calendar.php'),
45
(38, 'Schedule', 'Add', 'manual/single.php?p=schedule/schedule_event'),
1131
46
(39, 'Layout', 'Permissions', 'manual/content/layout/addregion.php#Region_Permissions'),
46
(39, 'Layout', 'Permissions', 'manual/single.php?p=users/user_permissions'),
1132
47
(40, 'Display', 'MediaInventory', 'manual/content/admin/displays.php#Media_Inventory'),
47
(40, 'Display', 'MediaInventory', 'manual/single.php?p=admin/displays#Media_Inventory'),
1133
48
(41, 'User', 'ChangePassword', 'manual/content/dashboard/navbar.php#Navigation_Top'),
48
(41, 'User', 'ChangePassword', 'manual/single.php?p=coreconcepts/navbar#Change_Password'),
1134
49
(42, 'Schedule', 'Delete', 'manual/content/schedule/schedule_event.htm'),
49
(42, 'Schedule', 'Delete', 'manual/single.php?p=schedule/schedule_event'),
1135
50
(43, 'Layout', 'Edit', 'manual/content/layout/addlayout.php#Edit_Layout'),
50
(43, 'Layout', 'Edit', 'manual/single.php?p=layout/overview#Edit_Layout'),
1136
51
(44, 'Media', 'Permissions', 'manual/content/users/user_permissions.php'),
51
(44, 'Media', 'Permissions', 'manual/single.php?p=users/user_permissions'),
1137
52
(45, 'Display', 'DefaultLayout', 'manual/content/admin/displays.php'),
52
(45, 'Display', 'DefaultLayout', 'manual/single.php?p=admin/displays'),
1138
53
(46, 'UserGroup', 'Edit', 'manual/content/users/groups.php#Edit_Group'),
53
(46, 'UserGroup', 'Edit', 'manual/single.php?p=users/groups#Edit_Group'),
1139
54
(47, 'UserGroup', 'Members', 'manual/content/users/groups.php#Group_Member'),
54
(47, 'UserGroup', 'Members', 'manual/single.php?p=users/groups#Group_Member'),
1140
55
(48, 'User', 'PageSecurity', 'manual/content/users/menu_page_security.php#Page_Security'),
55
(48, 'User', 'PageSecurity', 'manual/single.php?p=users/menu_page_security#Page_Security'),
1141
56
(49, 'User', 'MenuSecurity', 'manual/content/users/menu_page_security.php#Menu_Security'),
56
(49, 'User', 'MenuSecurity', 'manual/single.php?p=users/menu_page_security#Menu_Security'),
1142
57
(50, 'UserGroup', 'Delete', 'manual/content/users/groups.php#Delete_Group'),
57
(50, 'UserGroup', 'Delete', 'manual/single.php?p=users/groups#Delete_Group'),
1143
58
(51, 'User', 'Edit', 'manual/content/users/users.php#Edit_User'),
58
(51, 'User', 'Edit', 'manual/single.php?p=users/users#Edit_User'),
1144
59
(52, 'User', 'Applications', 'manual/content/users/menu_page_security.php'),
59
(52, 'User', 'Applications', 'manual/single.php?p=users/users#Users_MyApplications'),
1145
60
(53, 'User', 'SetHomepage', 'manual/content/dashboard/dashboard.php#Media_Dashboard'),
60
(53, 'User', 'SetHomepage', 'manual/single.php?p=coreconcepts/dashboard#Media_Dashboard'),
1146
61
(54, 'DataSet', 'General', 'manual/content/layout/content_datasets.php'),
61
(54, 'DataSet', 'General', 'manual/single.php?p=content/content_dataset'),
1147
62
(55, 'DataSet', 'Add', 'manual/content/layout/content_datasets.php#Create_Dataset'),
62
(55, 'DataSet', 'Add', 'manual/single.php?p=content/content_dataset#Create_Dataset'),
1148
63
(56, 'DataSet', 'Edit', 'manual/content/layout/content_datasets.php#Create_Dataset'),
63
(56, 'DataSet', 'Edit', 'manual/single.php?p=content/content_dataset#Edit_Dataset'),
1149
64
(57, 'DataSet', 'Delete', 'manual/content/layout/content_datasets.php#Create_Dataset'),
64
(57, 'DataSet', 'Delete', 'manual/single.php?p=content/content_dataset#Delete_Dataset'),
1150
65
(58, 'DataSet', 'AddColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
65
(58, 'DataSet', 'AddColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
1151
66
(59, 'DataSet', 'EditColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
66
(59, 'DataSet', 'EditColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
1152
67
(60, 'DataSet', 'DeleteColumn', 'manual/content/layout/content_datasets.php#Dataset_Column'),
67
(60, 'DataSet', 'DeleteColumn', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
1153
68
(61, 'DataSet', 'Data', 'manual/content/layout/content_datasets.php#Dataset_Row'),
68
(61, 'DataSet', 'Data', 'manual/single.php?p=content/content_dataset#Dataset_Row'),
1154
69
(62, 'DataSet', 'Permissions', 'manual/content/users/user_permissions.php'),
69
(62, 'DataSet', 'Permissions', 'manual/single.php?p=users/user_permissions'),
1155
70
(63, 'Fault', 'General', 'manual/content/admin/advanced.php'),
70
(63, 'Fault', 'General', 'manual/single.php?p=admin/advanced#Report_Fault'),
1156
71
(64, 'Report', 'General', 'manual/content/admin/advanced.php'),
71
(65, 'Stats', 'General', 'manual/single.php?p=admin/displaystats'),
1157
72
(65, 'Stats', 'General', 'manual/content/admin/displays.php#Display_Statistic'),
72
(66, 'Resolution', 'General', 'manual/single.php?p=templates/template_resolution'),
1158
73
(66, 'Resolution', 'General', 'manual/content/templates/template_resolution.php'),
73
(67, 'Template', 'General', 'manual/single.php?p=templates/overview'),
1159
74
(67, 'Template', 'General', 'manual/content/templates/overview.php'),
74
(68, 'Services', 'Register', 'manual/single.php?p=admin/api_oauth#Registered_Applications'),
1160
75
(68, 'Services', 'Register', 'manual/content/admin/api.php'),
75
(69, 'OAuth', 'General', 'manual/single.php?p=admin/api_oauth'),
1161
76
(69, 'OAuth', 'General', 'manual/content/admin/api.php'),
76
(70, 'Services', 'Log', 'manual/single.php?p=admin/api_oauth#oAuthLog'),
1162
77
(70, 'Services', 'Log', 'manual/content/admin/advanced.php'),
77
(71, 'Module', 'Edit', 'manual/single.php?p=admin/modules'),
1163
78
(71, 'Module', 'Edit', 'manual/content/admin/modules.php'),
78
(72, 'Module', 'General', 'manual/single.php?p=admin/modules'),
1164
79
(72, 'Module', 'General', 'manual/content/admin/modules.php'),
79
(73, 'Campaign', 'General', 'manual/single.php?p=layout/campaign_layout'),
1165
80
(73, 'Campaign', 'General', 'manual/content/layout/campaign_layout.php'),
80
(74, 'License', 'General', 'manual/single.php?p=license/licenses'),
1166
81
(74, 'License', 'General', 'manual/content/license/licenses.php'),
81
(75, 'DataSet', 'ViewColumns', 'manual/single.php?p=content/content_dataset#Dataset_Column'),
1167
82
(75, 'DataSet', 'ViewColumns', 'manual/content/layout/content_datasets.php#Dataset_Column'),
82
(76, 'Campaign', 'Permissions', 'manual/single.php?p=users/user_permissions'),
1168
83
(76, 'Campaign', 'Permissions', 'manual/content/layout/addlayout.php#Layout_Permission'),
83
(77, 'Transition', 'Edit', 'manual/single.php?p=layout/transitions'),
1169
84
(77, 'Transition', 'Edit', 'manual/content/transitions/transitions.php#Edit'),
84
(78, 'User', 'SetPassword', 'manual/single.php?p=users/users#Set_Password'),
1170
85
(78, 'User', 'SetPassword', 'manual/content/users/users.php#Set_Password');
85
(79, 'DataSet', 'ImportCSV', 'manual/single.php?p=content/content_dataset#Import_CSV');
1171
86
86
1172
87
INSERT INTO `menu` (`MenuID`, `Menu`) VALUES
87
INSERT INTO `menu` (`MenuID`, `Menu`) VALUES
1173
88
(8, 'Administration Menu'),
88
(8, 'Administration Menu'),
1174
@@ -95,15 +95,20 @@
1175
95
95
1176
96
INSERT INTO `module` (`ModuleID`, `Module`, `Name`, `Enabled`, `RegionSpecific`, `Description`, `ImageUri`, `SchemaVersion`, `ValidExtensions`, `PreviewEnabled`) VALUES
96
INSERT INTO `module` (`ModuleID`, `Module`, `Name`, `Enabled`, `RegionSpecific`, `Description`, `ImageUri`, `SchemaVersion`, `ValidExtensions`, `PreviewEnabled`) VALUES
1177
97
(1, 'Image', 'Image', 1, 0, 'Images. PNG, JPG, BMP, GIF', 'forms/image.gif', 1, 'jpg,jpeg,png,bmp,gif', 1),
97
(1, 'Image', 'Image', 1, 0, 'Images. PNG, JPG, BMP, GIF', 'forms/image.gif', 1, 'jpg,jpeg,png,bmp,gif', 1),
1179
98
(2, 'Video', 'Video', 1, 0, 'Videos. WMV.', 'forms/video.gif', 1, 'wmv,avi,mpg,mpeg', 1),
98
(2, 'Video', 'Video', 1, 0, 'Videos - support varies depending on the client hardware you are using.', 'forms/video.gif', 1, 'wmv,avi,mpg,mpeg,webm,mp4', 1),
1180
99
(3, 'Flash', 'Flash', 1, 0, 'Flash', 'forms/flash.gif', 1, 'swf', 1),
99
(3, 'Flash', 'Flash', 1, 0, 'Flash', 'forms/flash.gif', 1, 'swf', 1),
1181
100
(4, 'PowerPoint', 'PowerPoint', 1, 0, 'Powerpoint. PPT, PPS', 'forms/powerpoint.gif', 1, 'ppt,pps,pptx', 1),
100
(4, 'PowerPoint', 'PowerPoint', 1, 0, 'Powerpoint. PPT, PPS', 'forms/powerpoint.gif', 1, 'ppt,pps,pptx', 1),
1182
101
(5, 'Webpage', 'Webpage', 1, 1, 'Webpages.', 'forms/webpage.gif', 1, NULL, 1),
101
(5, 'Webpage', 'Webpage', 1, 1, 'Webpages.', 'forms/webpage.gif', 1, NULL, 1),
1183
102
(6, 'Ticker', 'Ticker', 1, 1, 'RSS Ticker.', 'forms/ticker.gif', 1, NULL, 1),
102
(6, 'Ticker', 'Ticker', 1, 1, 'RSS Ticker.', 'forms/ticker.gif', 1, NULL, 1),
1184
103
(7, 'Text', 'Text', 1, 1, 'Text. With Directional Controls.', 'forms/text.gif', 1, NULL, 1),
103
(7, 'Text', 'Text', 1, 1, 'Text. With Directional Controls.', 'forms/text.gif', 1, NULL, 1),
1185
104
(8, 'Embedded', 'Embedded', 1, 1, 'Embedded HTML', 'forms/webpage.gif', 1, NULL, 1),
104
(8, 'Embedded', 'Embedded', 1, 1, 'Embedded HTML', 'forms/webpage.gif', 1, NULL, 1),
1186
105
<<<<<<< TREE
1187
105
(9, 'MicroBlog', 'MicroBlog', 0, 1, NULL, 'forms/microblog.gif', 1, NULL, 1),
106
(9, 'MicroBlog', 'MicroBlog', 0, 1, NULL, 'forms/microblog.gif', 1, NULL, 1),
1188
106
(10, 'Counter', 'Counter', 1, 1, 'Customer Counter connected to a Remote Control', 'forms/counter.gif', 1, NULL, 1),
107
(10, 'Counter', 'Counter', 1, 1, 'Customer Counter connected to a Remote Control', 'forms/counter.gif', 1, NULL, 1),
1189
108
=======
1190
109
(9, 'MicroBlog', 'MicroBlog', 0, 1, NULL, 'forms/microblog.gif', 1, NULL, 1),
1191
110
(10, 'Counter', 'Counter', 0, 1, 'Customer Counter connected to a Remote Control', 'forms/counter.gif', 1, NULL, 1),
1192
111
>>>>>>> MERGE-SOURCE
1193
107
(11, 'datasetview', 'Data Set', 1, 1, 'A view on a DataSet', 'forms/datasetview.gif', 1, NULL, 1),
112
(11, 'datasetview', 'Data Set', 1, 1, 'A view on a DataSet', 'forms/datasetview.gif', 1, NULL, 1),
1194
108
(12, 'shellcommand', 'Shell Command', 1, 1, 'Execute a shell command on the client', 'forms/shellcommand.gif', 1, NULL, 1),
113
(12, 'shellcommand', 'Shell Command', 1, 1, 'Execute a shell command on the client', 'forms/shellcommand.gif', 1, NULL, 1),
1195
109
(13, 'localvideo', 'Local Video', 0, 1, 'Play a video locally stored on the client', 'forms/video.gif', 1, NULL, 1);
114
(13, 'localvideo', 'Local Video', 0, 1, 'Play a video locally stored on the client', 'forms/video.gif', 1, NULL, 1);
1196
110
115
1197
=== modified file 'server/lib/app/app_functions.php'
1198
--- server/lib/app/app_functions.php	2013-11-03 11:24:11 +0000
1199
+++ server/lib/app/app_functions.php	2014-01-19 13:57:27 +0000
1200
@@ -1,6 +1,6 @@
1201
1
<?php
1
<?php
1202
2
/*
2
/*
1204
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1205
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
1206
5
 *
5
 *
1207
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1208
7
7
1209
=== modified file 'server/lib/app/datemanager.class.php'
1210
--- server/lib/app/datemanager.class.php	2013-05-01 19:25:37 +0000
1211
+++ server/lib/app/datemanager.class.php	2014-01-19 13:57:27 +0000
1212
@@ -1,6 +1,6 @@
1213
1
<?php
1
<?php
1214
2
/*
2
/*
1216
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1217
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1218
5
 *
5
 *
1219
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1220
7
7
1221
=== modified file 'server/lib/app/debug.class.php'
1222
--- server/lib/app/debug.class.php	2013-08-21 22:27:13 +0000
1223
+++ server/lib/app/debug.class.php	2014-01-19 13:57:27 +0000
1224
@@ -1,6 +1,6 @@
1225
1
<?php
1
<?php
1226
2
/*
2
/*
1228
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1229
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
1230
5
 *
5
 *
1231
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1232
7
7
1233
=== modified file 'server/lib/app/formmanager.class.php'
1234
--- server/lib/app/formmanager.class.php	2013-05-01 19:24:35 +0000
1235
+++ server/lib/app/formmanager.class.php	2014-01-19 13:57:27 +0000
1236
@@ -1,6 +1,6 @@
1237
1
<?php
1
<?php
1238
2
/*
2
/*
1240
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1241
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
1242
5
 *
5
 *
1243
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1244
7
7
1245
=== modified file 'server/lib/app/helpmanager.class.php'
1246
--- server/lib/app/helpmanager.class.php	2013-05-01 19:24:35 +0000
1247
+++ server/lib/app/helpmanager.class.php	2014-01-19 13:57:27 +0000
1248
@@ -1,6 +1,6 @@
1249
1
<?php
1
<?php
1250
2
/*
2
/*
1252
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1253
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
1254
5
 *
5
 *
1255
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1256
7
7
1257
=== modified file 'server/lib/app/kit.class.php'
1258
--- server/lib/app/kit.class.php	2013-09-03 10:06:55 +0000
1259
+++ server/lib/app/kit.class.php	2014-01-19 13:57:27 +0000
1260
@@ -1,6 +1,6 @@
1261
1
<?php
1
<?php
1262
2
/*
2
/*
1264
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1265
4
 * Copyright (C) 2006-2013 Daniel Garner and James Packer
4
 * Copyright (C) 2006-2013 Daniel Garner and James Packer
1266
5
 *
5
 *
1267
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1268
@@ -61,7 +61,6 @@
1269
61
		} 
61
		} 
1270
62
		else 
62
		else 
1271
63
		{
63
		{
1272
64
			header( 'HTTP/1.1 301 Moved Permanently' );
1273
65
			header( 'Location: ' . $url );
64
			header( 'Location: ' . $url );
1274
66
		}
65
		}
1275
67
		
66
		
1276
@@ -615,5 +614,19 @@
1277
615
			return false;
614
			return false;
1278
616
		}
615
		}
1279
617
	}
616
	}
1280
617
1281
618
	/**
1282
619
	 * Format Bytes
1283
620
	 * http://stackoverflow.com/questions/2510434/format-bytes-to-kilobytes-megabytes-gigabytes
1284
621
	 * @param  [int]  $size   The file size in bytes
1285
622
	 * @param  integer $precision The precision to go to
1286
623
	 * @return [string] The Formatted string with suffix
1287
624
	 */
1288
625
	public static function formatBytes($size, $precision = 2) {
1289
626
		$base = log($size) / log(1024);
1290
627
		$suffixes = array('', 'k', 'M', 'G', 'T');   
1291
628
1292
629
		return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
1293
630
	}
1294
618
}
631
}
1295
619
?>
632
?>
1296
620
633
1297
=== modified file 'server/lib/app/menumanager.class.php'
1298
--- server/lib/app/menumanager.class.php	2013-05-01 19:24:35 +0000
1299
+++ server/lib/app/menumanager.class.php	2014-01-19 13:57:27 +0000
1300
@@ -1,6 +1,6 @@
1301
1
<?php
1
<?php
1302
2
/*
2
/*
1304
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1305
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
1306
5
 *
5
 *
1307
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1308
7
7
1309
=== modified file 'server/lib/app/modulemanager.class.php'
1310
--- server/lib/app/modulemanager.class.php	2013-05-01 19:24:35 +0000
1311
+++ server/lib/app/modulemanager.class.php	2014-01-19 13:57:27 +0000
1312
@@ -1,6 +1,6 @@
1313
1
<?php
1
<?php
1314
2
/*
2
/*
1316
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1317
4
 * Copyright (C) 2006-2012 Daniel Garner
4
 * Copyright (C) 2006-2012 Daniel Garner
1318
5
 *
5
 *
1319
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1320
7
7
1321
=== modified file 'server/lib/app/pagemanager.class.php'
1322
--- server/lib/app/pagemanager.class.php	2013-11-03 11:24:11 +0000
1323
+++ server/lib/app/pagemanager.class.php	2014-01-19 13:57:27 +0000
1324
@@ -1,6 +1,6 @@
1325
1
<?php
1
<?php
1326
2
/*
2
/*
1328
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1329
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1330
5
 *
5
 *
1331
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1332
7
7
1333
=== modified file 'server/lib/app/pdoconnect.class.php'
1334
--- server/lib/app/pdoconnect.class.php	2013-08-21 09:51:59 +0000
1335
+++ server/lib/app/pdoconnect.class.php	2014-01-19 13:57:27 +0000
1336
@@ -1,6 +1,6 @@
1337
1
<?php
1
<?php
1338
2
/*
2
/*
1340
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1341
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1342
5
 *
5
 *
1343
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1344
7
7
1345
=== modified file 'server/lib/app/permissionmanager.class.php'
1346
--- server/lib/app/permissionmanager.class.php	2013-05-01 19:24:35 +0000
1347
+++ server/lib/app/permissionmanager.class.php	2014-01-19 13:57:27 +0000
1348
@@ -1,6 +1,6 @@
1349
1
<?php
1
<?php
1350
2
/*
2
/*
1352
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1353
4
 * Copyright (C) 2011 Daniel Garner
4
 * Copyright (C) 2011 Daniel Garner
1354
5
 *
5
 *
1355
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1356
7
7
1357
=== modified file 'server/lib/app/responsemanager.class.php'
1358
--- server/lib/app/responsemanager.class.php	2013-11-03 11:24:11 +0000
1359
+++ server/lib/app/responsemanager.class.php	2014-01-19 13:57:27 +0000
1360
@@ -1,6 +1,6 @@
1361
1
<?php
1
<?php
1362
2
/*
2
/*
1364
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1365
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1366
5
 *
5
 *
1367
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1368
7
7
1369
=== modified file 'server/lib/app/rssreader.class.php'
1370
--- server/lib/app/rssreader.class.php	2013-05-01 19:24:35 +0000
1371
+++ server/lib/app/rssreader.class.php	2014-01-19 13:57:27 +0000
1372
@@ -1,6 +1,6 @@
1373
1
<?php
1
<?php
1374
2
/*
2
/*
1376
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1377
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
1378
5
 *
5
 *
1379
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1380
7
7
1381
=== modified file 'server/lib/app/session.class.php'
1382
--- server/lib/app/session.class.php	2013-09-03 10:06:55 +0000
1383
+++ server/lib/app/session.class.php	2014-01-19 13:57:27 +0000
1384
@@ -1,6 +1,6 @@
1385
1
<?php
1
<?php
1386
2
/*
2
/*
1388
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1389
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1390
5
 *
5
 *
1391
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1392
7
7
1393
=== modified file 'server/lib/app/thememanager.class.php'
1394
--- server/lib/app/thememanager.class.php	2013-08-21 09:36:12 +0000
1395
+++ server/lib/app/thememanager.class.php	2014-01-19 13:57:27 +0000
1396
@@ -1,6 +1,6 @@
1397
1
<?php
1
<?php
1398
2
/*
2
/*
1400
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1401
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1402
5
 *
5
 *
1403
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1404
7
7
1405
=== modified file 'server/lib/app/translationengine.class.php'
1406
--- server/lib/app/translationengine.class.php	2013-08-21 09:51:59 +0000
1407
+++ server/lib/app/translationengine.class.php	2014-01-19 13:57:27 +0000
1408
@@ -1,6 +1,6 @@
1409
1
<?php
1
<?php
1410
2
/*
2
/*
1412
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1413
4
 * Copyright (C) 2009 Daniel Garner
4
 * Copyright (C) 2009 Daniel Garner
1414
5
 *
5
 *
1415
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1416
7
7
1417
=== modified file 'server/lib/data/campaign.data.class.php'
1418
--- server/lib/data/campaign.data.class.php	2013-09-21 14:58:19 +0000
1419
+++ server/lib/data/campaign.data.class.php	2014-01-19 13:57:27 +0000
1420
@@ -1,6 +1,6 @@
1421
1
<?php
1
<?php
1422
2
/*
2
/*
1424
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1425
4
 * Copyright (C) 2012-2013 Daniel Garner
4
 * Copyright (C) 2012-2013 Daniel Garner
1426
5
 *
5
 *
1427
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1428
7
7
1429
=== modified file 'server/lib/data/campaignsecurity.data.class.php'
1430
--- server/lib/data/campaignsecurity.data.class.php	2013-09-14 17:51:02 +0000
1431
+++ server/lib/data/campaignsecurity.data.class.php	2014-01-19 13:57:27 +0000
1432
@@ -1,6 +1,6 @@
1433
1
<?php
1
<?php
1434
2
/*
2
/*
1436
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1437
4
 * Copyright (C) 2012-13 Daniel Garner
4
 * Copyright (C) 2012-13 Daniel Garner
1438
5
 *
5
 *
1439
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1440
7
7
1441
=== modified file 'server/lib/data/data.class.php'
1442
--- server/lib/data/data.class.php	2013-09-16 19:43:53 +0000
1443
+++ server/lib/data/data.class.php	2014-01-19 13:57:27 +0000
1444
@@ -1,6 +1,6 @@
1445
1
<?php
1
<?php
1446
2
/*
2
/*
1448
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1449
4
 * Copyright (C) 2009-2012 Daniel Garner
4
 * Copyright (C) 2009-2012 Daniel Garner
1450
5
 *
5
 *
1451
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1452
7
7
1453
=== modified file 'server/lib/data/dataset.data.class.php'
1454
--- server/lib/data/dataset.data.class.php	2013-09-21 14:58:19 +0000
1455
+++ server/lib/data/dataset.data.class.php	2014-01-19 13:57:27 +0000
1456
@@ -1,6 +1,6 @@
1457
1
<?php
1
<?php
1458
2
/*
2
/*
1460
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1461
4
 * Copyright (C) 2011-13 Daniel Garner
4
 * Copyright (C) 2011-13 Daniel Garner
1462
5
 *
5
 *
1463
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1464
7
7
1465
=== modified file 'server/lib/data/datasetcolumn.data.class.php'
1466
--- server/lib/data/datasetcolumn.data.class.php	2013-09-14 17:51:02 +0000
1467
+++ server/lib/data/datasetcolumn.data.class.php	2014-01-19 13:57:27 +0000
1468
@@ -1,6 +1,6 @@
1469
1
<?php
1
<?php
1470
2
/*
2
/*
1472
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1473
4
 * Copyright (C) 2011-13 Daniel Garner
4
 * Copyright (C) 2011-13 Daniel Garner
1474
5
 *
5
 *
1475
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1476
7
7
1477
=== modified file 'server/lib/data/datasetdata.data.class.php'
1478
--- server/lib/data/datasetdata.data.class.php	2013-09-21 14:58:19 +0000
1479
+++ server/lib/data/datasetdata.data.class.php	2014-01-19 13:57:27 +0000
1480
@@ -1,6 +1,6 @@
1481
1
<?php
1
<?php
1482
2
/*
2
/*
1484
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1485
4
 * Copyright (C) 2011-13 Daniel Garner
4
 * Copyright (C) 2011-13 Daniel Garner
1486
5
 *
5
 *
1487
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1488
7
7
1489
=== modified file 'server/lib/data/datasetgroupsecurity.data.class.php'
1490
--- server/lib/data/datasetgroupsecurity.data.class.php	2013-09-14 18:06:51 +0000
1491
+++ server/lib/data/datasetgroupsecurity.data.class.php	2014-01-19 13:57:27 +0000
1492
@@ -1,6 +1,6 @@
1493
1
<?php
1
<?php
1494
2
/*
2
/*
1496
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1497
4
 * Copyright (C) 2011-13 Daniel Garner
4
 * Copyright (C) 2011-13 Daniel Garner
1498
5
 *
5
 *
1499
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1500
7
7
1501
=== modified file 'server/lib/data/display.data.class.php'
1502
--- server/lib/data/display.data.class.php	2013-10-20 14:36:21 +0000
1503
+++ server/lib/data/display.data.class.php	2014-01-19 13:57:27 +0000
1504
@@ -1,6 +1,6 @@
1505
1
<?php
1
<?php
1506
2
/*
2
/*
1508
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1509
4
 * Copyright (C) 2009-2013 Daniel Garner
4
 * Copyright (C) 2009-2013 Daniel Garner
1510
5
 *
5
 *
1511
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1512
7
7
1513
=== modified file 'server/lib/data/displaygroup.data.class.php'
1514
--- server/lib/data/displaygroup.data.class.php	2013-09-21 14:58:19 +0000
1515
+++ server/lib/data/displaygroup.data.class.php	2014-01-19 13:57:27 +0000
1516
@@ -1,6 +1,6 @@
1517
1
<?php
1
<?php
1518
2
/*
2
/*
1520
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1521
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1522
5
 *
5
 *
1523
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1524
7
7
1525
=== modified file 'server/lib/data/displaygroupsecurity.data.class.php'
1526
--- server/lib/data/displaygroupsecurity.data.class.php	2013-09-21 15:18:29 +0000
1527
+++ server/lib/data/displaygroupsecurity.data.class.php	2014-01-19 13:57:27 +0000
1528
@@ -1,6 +1,6 @@
1529
1
<?php
1
<?php
1530
2
/*
2
/*
1532
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1533
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1534
5
 *
5
 *
1535
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1536
7
7
1537
=== modified file 'server/lib/data/file.data.class.php'
1538
--- server/lib/data/file.data.class.php	2013-09-22 10:37:35 +0000
1539
+++ server/lib/data/file.data.class.php	2014-01-19 13:57:27 +0000
1540
@@ -1,6 +1,6 @@
1541
1
<?php
1
<?php
1542
2
/*
2
/*
1544
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1545
4
 * Copyright (C) 2010-13 Daniel Garner
4
 * Copyright (C) 2010-13 Daniel Garner
1546
5
 *
5
 *
1547
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1548
7
7
1549
=== modified file 'server/lib/data/help.data.class.php'
1550
--- server/lib/data/help.data.class.php	2013-09-22 10:37:35 +0000
1551
+++ server/lib/data/help.data.class.php	2014-01-19 13:57:27 +0000
1552
@@ -1,6 +1,6 @@
1553
1
<?php
1
<?php
1554
2
/*
2
/*
1556
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1557
4
 * Copyright (C) 2012-13 Daniel Garner
4
 * Copyright (C) 2012-13 Daniel Garner
1558
5
 *
5
 *
1559
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1560
7
7
1561
=== modified file 'server/lib/data/layout.data.class.php'
1562
--- server/lib/data/layout.data.class.php	2013-11-03 22:44:50 +0000
1563
+++ server/lib/data/layout.data.class.php	2014-01-19 13:57:27 +0000
1564
@@ -1,6 +1,6 @@
1565
1
<?php
1
<?php
1566
2
/*
2
/*
1568
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1569
4
 * Copyright (C) 2011-2013 Daniel Garner
4
 * Copyright (C) 2011-2013 Daniel Garner
1570
5
 *
5
 *
1571
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1572
7
7
1573
=== modified file 'server/lib/data/layoutmediagroupsecurity.data.class.php'
1574
--- server/lib/data/layoutmediagroupsecurity.data.class.php	2013-09-22 15:49:19 +0000
1575
+++ server/lib/data/layoutmediagroupsecurity.data.class.php	2014-01-19 13:57:27 +0000
1576
@@ -1,6 +1,6 @@
1577
1
<?php
1
<?php
1578
2
/*
2
/*
1580
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1581
4
 * Copyright (C) 2011-13 Daniel Garner
4
 * Copyright (C) 2011-13 Daniel Garner
1582
5
 *
5
 *
1583
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1584
7
7
1585
=== modified file 'server/lib/data/layoutregiongroupsecurity.data.class.php'
1586
--- server/lib/data/layoutregiongroupsecurity.data.class.php	2013-09-22 13:31:06 +0000
1587
+++ server/lib/data/layoutregiongroupsecurity.data.class.php	2014-01-19 13:57:27 +0000
1588
@@ -1,6 +1,6 @@
1589
1
<?php
1
<?php
1590
2
/*
2
/*
1592
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1593
4
 * Copyright (C) 2013 Daniel Garner
4
 * Copyright (C) 2013 Daniel Garner
1594
5
 *
5
 *
1595
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1596
7
7
1597
=== modified file 'server/lib/data/maintenance.data.class.php'
1598
--- server/lib/data/maintenance.data.class.php	2013-08-21 09:36:12 +0000
1599
+++ server/lib/data/maintenance.data.class.php	2014-01-19 13:57:27 +0000
1600
@@ -1,6 +1,6 @@
1601
1
<?php
1
<?php
1602
2
/*
2
/*
1604
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1605
4
 * Copyright (C) 2012 Daniel Garner
4
 * Copyright (C) 2012 Daniel Garner
1606
5
 *
5
 *
1607
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1608
7
7
1609
=== modified file 'server/lib/data/media.data.class.php'
1610
--- server/lib/data/media.data.class.php	2013-09-22 15:49:19 +0000
1611
+++ server/lib/data/media.data.class.php	2014-01-19 13:57:27 +0000
1612
@@ -1,6 +1,6 @@
1613
1
<?php
1
<?php
1614
2
/*
2
/*
1616
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1617
4
 * Copyright (C) 2010-2013 Daniel Garner
4
 * Copyright (C) 2010-2013 Daniel Garner
1618
5
 *
5
 *
1619
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1620
7
7
1621
=== modified file 'server/lib/data/mediagroupsecurity.data.class.php'
1622
--- server/lib/data/mediagroupsecurity.data.class.php	2013-09-22 13:31:06 +0000
1623
+++ server/lib/data/mediagroupsecurity.data.class.php	2014-01-19 13:57:27 +0000
1624
@@ -1,6 +1,6 @@
1625
1
<?php
1
<?php
1626
2
/*
2
/*
1628
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1629
4
 * Copyright (C) 2011-13 Daniel Garner
4
 * Copyright (C) 2011-13 Daniel Garner
1630
5
 *
5
 *
1631
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1632
7
7
1633
=== modified file 'server/lib/data/region.data.class.php'
1634
--- server/lib/data/region.data.class.php	2013-11-02 13:30:06 +0000
1635
+++ server/lib/data/region.data.class.php	2014-01-19 13:57:27 +0000
1636
@@ -1,6 +1,6 @@
1637
1
<?php
1
<?php
1638
2
/*
2
/*
1640
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1641
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1642
5
 *
5
 *
1643
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1644
7
7
1645
=== modified file 'server/lib/data/resolution.data.class.php'
1646
--- server/lib/data/resolution.data.class.php	2013-09-22 14:01:16 +0000
1647
+++ server/lib/data/resolution.data.class.php	2014-01-19 13:57:27 +0000
1648
@@ -1,6 +1,6 @@
1649
1
<?php
1
<?php
1650
2
/*
2
/*
1652
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1653
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1654
5
 *
5
 *
1655
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1656
7
7
1657
=== modified file 'server/lib/data/schedule.data.class.php'
1658
--- server/lib/data/schedule.data.class.php	2013-11-11 10:32:42 +0000
1659
+++ server/lib/data/schedule.data.class.php	2014-01-19 13:57:27 +0000
1660
@@ -1,6 +1,6 @@
1661
1
<?php
1
<?php
1662
2
/*
2
/*
1664
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1665
4
 * Copyright (C) 2009-2013 Daniel Garner
4
 * Copyright (C) 2009-2013 Daniel Garner
1666
5
 *
5
 *
1667
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1668
7
7
1669
=== modified file 'server/lib/data/setting.data.class.php'
1670
--- server/lib/data/setting.data.class.php	2013-09-22 14:01:16 +0000
1671
+++ server/lib/data/setting.data.class.php	2014-01-19 13:57:27 +0000
1672
@@ -1,6 +1,6 @@
1673
1
<?php
1
<?php
1674
2
/*
2
/*
1676
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1677
4
 * Copyright (C) 2009 Daniel Garner
4
 * Copyright (C) 2009 Daniel Garner
1678
5
 *
5
 *
1679
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1680
7
7
1681
=== modified file 'server/lib/data/stat.data.class.php'
1682
--- server/lib/data/stat.data.class.php	2013-09-28 14:00:01 +0000
1683
+++ server/lib/data/stat.data.class.php	2014-01-19 13:57:27 +0000
1684
@@ -1,6 +1,6 @@
1685
1
<?php
1
<?php
1686
2
/*
2
/*
1688
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1689
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1690
5
 *
5
 *
1691
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1692
7
7
1693
=== modified file 'server/lib/data/template.data.class.php'
1694
--- server/lib/data/template.data.class.php	2013-09-22 14:01:16 +0000
1695
+++ server/lib/data/template.data.class.php	2014-01-19 13:57:27 +0000
1696
@@ -1,6 +1,6 @@
1697
1
<?php
1
<?php
1698
2
/*
2
/*
1700
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1701
4
 * Copyright (C) 2011-2013 Daniel Garner
4
 * Copyright (C) 2011-2013 Daniel Garner
1702
5
 *
5
 *
1703
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1704
7
7
1705
=== modified file 'server/lib/data/templategroupsecurity.data.class.php'
1706
--- server/lib/data/templategroupsecurity.data.class.php	2013-09-22 14:34:20 +0000
1707
+++ server/lib/data/templategroupsecurity.data.class.php	2014-01-19 13:57:27 +0000
1708
@@ -1,6 +1,6 @@
1709
1
<?php
1
<?php
1710
2
/*
2
/*
1712
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1713
4
 * Copyright (C) 2011-13 Daniel Garner
4
 * Copyright (C) 2011-13 Daniel Garner
1714
5
 *
5
 *
1715
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1716
7
7
1717
=== modified file 'server/lib/data/userdata.data.class.php'
1718
--- server/lib/data/userdata.data.class.php	2013-09-22 14:34:20 +0000
1719
+++ server/lib/data/userdata.data.class.php	2014-01-19 13:57:27 +0000
1720
@@ -1,6 +1,6 @@
1721
1
<?php
1
<?php
1722
2
/*
2
/*
1724
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1725
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1726
5
 *
5
 *
1727
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1728
7
7
1729
=== modified file 'server/lib/data/usergroup.data.class.php'
1730
--- server/lib/data/usergroup.data.class.php	2013-09-22 14:34:20 +0000
1731
+++ server/lib/data/usergroup.data.class.php	2014-01-19 13:57:27 +0000
1732
@@ -1,6 +1,6 @@
1733
1
<?php
1
<?php
1734
2
/*
2
/*
1736
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1737
4
 * Copyright (C) 2009-11 Daniel Garner
4
 * Copyright (C) 2009-11 Daniel Garner
1738
5
 *
5
 *
1739
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1740
7
7
1741
=== modified file 'server/lib/include.php'
1742
--- server/lib/include.php	2013-08-21 22:27:13 +0000
1743
+++ server/lib/include.php	2014-01-19 13:57:27 +0000
1744
@@ -1,6 +1,6 @@
1745
1
<?php
1
<?php
1746
2
/*
2
/*
1748
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1749
4
 * Copyright (C) 2006-2012 Daniel Garner and James Packer
4
 * Copyright (C) 2006-2012 Daniel Garner and James Packer
1750
5
 *
5
 *
1751
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1752
@@ -20,7 +20,7 @@
1753
20
 */
20
 */
1754
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.");
1755
22
22
1757
23
define('WEBSITE_VERSION', 65);
23
define('WEBSITE_VERSION', 66);
1758
24
24
1759
25
// No errors reported until we read the settings from the DB
25
// No errors reported until we read the settings from the DB
1760
26
error_reporting(0);
26
error_reporting(0);
1761
27
27
1762
=== modified file 'server/lib/modules/module.class.php'
1763
--- server/lib/modules/module.class.php	2013-11-11 08:36:36 +0000
1764
+++ server/lib/modules/module.class.php	2014-01-19 13:57:27 +0000
1765
@@ -1,6 +1,6 @@
1766
1
<?php
1
<?php
1767
2
/*
2
/*
1769
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1770
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1771
5
 *
5
 *
1772
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1773
7
7
1774
=== modified file 'server/lib/modules/module.interface.php'
1775
--- server/lib/modules/module.interface.php	2013-05-01 19:24:35 +0000
1776
+++ server/lib/modules/module.interface.php	2014-01-19 13:57:27 +0000
1777
@@ -1,6 +1,6 @@
1778
1
<?php
1
<?php
1779
2
/*
2
/*
1781
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1782
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
1783
5
 *
5
 *
1784
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1785
7
7
1786
=== modified file 'server/lib/oauth.inc.php'
1787
--- server/lib/oauth.inc.php	2013-08-21 09:36:12 +0000
1788
+++ server/lib/oauth.inc.php	2014-01-19 13:57:27 +0000
1789
@@ -1,6 +1,6 @@
1790
1
<?php
1
<?php
1791
2
/*
2
/*
1793
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1794
4
 * Copyright (C) 2010 Daniel Garner
4
 * Copyright (C) 2010 Daniel Garner
1795
5
 *
5
 *
1796
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1797
7
7
1798
=== modified file 'server/lib/pages/admin.class.php'
1799
--- server/lib/pages/admin.class.php	2013-10-20 14:26:32 +0000
1800
+++ server/lib/pages/admin.class.php	2014-01-19 13:57:27 +0000
1801
@@ -1,6 +1,6 @@
1802
1
<?php
1
<?php
1803
2
/*
2
/*
1805
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1806
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1807
5
 *
5
 *
1808
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1809
7
7
1810
=== modified file 'server/lib/pages/campaign.class.php'
1811
--- server/lib/pages/campaign.class.php	2013-08-21 09:36:12 +0000
1812
+++ server/lib/pages/campaign.class.php	2014-01-19 13:57:27 +0000
1813
@@ -1,6 +1,6 @@
1814
1
<?php
1
<?php
1815
2
/*
2
/*
1817
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1818
4
 * Copyright (C) 2012-2013 Daniel Garner
4
 * Copyright (C) 2012-2013 Daniel Garner
1819
5
 *
5
 *
1820
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1821
7
7
1822
=== modified file 'server/lib/pages/clock.class.php'
1823
--- server/lib/pages/clock.class.php	2013-05-01 19:25:37 +0000
1824
+++ server/lib/pages/clock.class.php	2014-01-19 13:57:27 +0000
1825
@@ -1,6 +1,6 @@
1826
1
<?php
1
<?php
1827
2
/*
2
/*
1829
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1830
4
 * Copyright (C) 2009 Daniel Garner
4
 * Copyright (C) 2009 Daniel Garner
1831
5
 *
5
 *
1832
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1833
7
7
1834
=== modified file 'server/lib/pages/content.class.php'
1835
--- server/lib/pages/content.class.php	2013-11-03 12:54:28 +0000
1836
+++ server/lib/pages/content.class.php	2014-01-19 13:57:27 +0000
1837
@@ -1,6 +1,6 @@
1838
1
<?php
1
<?php
1839
2
/*
2
/*
1841
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1842
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1843
5
 *
5
 *
1844
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1845
@@ -112,11 +112,8 @@
1846
112
			$row['permissions'] = $group = $this->GroupsForMedia($row['mediaid']);
112
			$row['permissions'] = $group = $this->GroupsForMedia($row['mediaid']);
1847
113
			$row['revised'] = ($row['parentid'] != 0) ? Theme::Image('act.gif') : '';
113
			$row['revised'] = ($row['parentid'] != 0) ? Theme::Image('act.gif') : '';
1848
114
114
1854
115
			// Display a friendly filesize
115
			// Display a friendly file size
1855
116
			$sz = 'BKMGTP';
116
			$row['size_text'] = Kit::FormatBytes($row['filesize']);
1851
117
            $factor = floor((strlen($row['filesize']) - 1) / 3);
1852
118
            $fileSize = sprintf('%.2f', $row['filesize'] / pow(1024, $factor)) . @$sz[$factor];
1853
119
			$row['size_text'] = $fileSize;
1856
120
117
1857
121
			$row['buttons'] = array();
118
			$row['buttons'] = array();
1858
122
119
1859
123
120
1860
=== modified file 'server/lib/pages/dashboard.class.php'
1861
--- server/lib/pages/dashboard.class.php	2013-05-01 19:24:35 +0000
1862
+++ server/lib/pages/dashboard.class.php	2014-01-19 13:57:27 +0000
1863
@@ -1,6 +1,6 @@
1864
1
<?php
1
<?php
1865
2
/*
2
/*
1867
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1868
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
1869
5
 *
5
 *
1870
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1871
7
7
1872
=== modified file 'server/lib/pages/dataset.class.php'
1873
--- server/lib/pages/dataset.class.php	2013-08-21 09:36:12 +0000
1874
+++ server/lib/pages/dataset.class.php	2014-01-19 13:57:27 +0000
1875
@@ -1,6 +1,6 @@
1876
1
<?php
1
<?php
1877
2
/*
2
/*
1879
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1880
4
 * Copyright (C) 2011-2013 Daniel Garner
4
 * Copyright (C) 2011-2013 Daniel Garner
1881
5
 *
5
 *
1882
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1883
7
7
1884
=== modified file 'server/lib/pages/display.class.php'
1885
--- server/lib/pages/display.class.php	2013-08-21 09:36:12 +0000
1886
+++ server/lib/pages/display.class.php	2014-01-19 13:57:27 +0000
1887
@@ -1,6 +1,6 @@
1888
1
<?php
1
<?php
1889
2
/*
2
/*
1891
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1892
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1893
5
 *
5
 *
1894
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1895
7
7
1896
=== modified file 'server/lib/pages/displaygroup.class.php'
1897
--- server/lib/pages/displaygroup.class.php	2013-08-20 20:17:11 +0000
1898
+++ server/lib/pages/displaygroup.class.php	2014-01-19 13:57:27 +0000
1899
@@ -1,6 +1,6 @@
1900
1
<?php
1
<?php
1901
2
/*
2
/*
1903
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1904
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1905
5
 *
5
 *
1906
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1907
7
7
1908
=== modified file 'server/lib/pages/error.class.php'
1909
--- server/lib/pages/error.class.php	2013-05-01 19:24:35 +0000
1910
+++ server/lib/pages/error.class.php	2014-01-19 13:57:27 +0000
1911
@@ -1,6 +1,6 @@
1912
1
<?php
1
<?php
1913
2
/*
2
/*
1915
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1916
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
4
 * Copyright (C) 2006,2007,2008 Daniel Garner
1917
5
 *
5
 *
1918
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1919
7
7
1920
=== modified file 'server/lib/pages/fault.class.php'
1921
--- server/lib/pages/fault.class.php	2013-08-21 22:27:13 +0000
1922
+++ server/lib/pages/fault.class.php	2014-01-19 13:57:27 +0000
1923
@@ -1,6 +1,6 @@
1924
1
<?php
1
<?php
1925
2
/*
2
/*
1927
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1928
4
 * Copyright (C) 2009-13 Daniel Garner
4
 * Copyright (C) 2009-13 Daniel Garner
1929
5
 *
5
 *
1930
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1931
7
7
1932
=== modified file 'server/lib/pages/group.class.php'
1933
--- server/lib/pages/group.class.php	2013-08-21 09:36:12 +0000
1934
+++ server/lib/pages/group.class.php	2014-01-19 13:57:27 +0000
1935
@@ -1,6 +1,6 @@
1936
1
<?php
1
<?php
1937
2
/*
2
/*
1939
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1940
4
 * Copyright (C) 2006,2007,2008,2009 Daniel Garner and James Packer
4
 * Copyright (C) 2006,2007,2008,2009 Daniel Garner and James Packer
1941
5
 *
5
 *
1942
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1943
@@ -695,7 +695,7 @@
1944
695
        $form = Theme::RenderReturn('usergroup_form_user_assign');
695
        $form = Theme::RenderReturn('usergroup_form_user_assign');
1945
696
696
1946
697
        $response->SetFormRequestResponse($form, __('Manage Membership'), '400', '375', 'ManageMembersCallBack');
697
        $response->SetFormRequestResponse($form, __('Manage Membership'), '400', '375', 'ManageMembersCallBack');
1948
698
        $response->AddButton(__('Help'), "XiboHelpRender(". HelpManager::Link('UserGroup', 'Members') .")");
698
        $response->AddButton(__('Help'), "XiboHelpRender('" . HelpManager::Link('UserGroup', 'Members') . "')");
1949
699
        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
699
        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
1950
700
        $response->AddButton(__('Save'), 'MembersSubmit()');
700
        $response->AddButton(__('Save'), 'MembersSubmit()');
1951
701
        $response->Respond();
701
        $response->Respond();
1952
702
702
1953
=== modified file 'server/lib/pages/help.class.php'
1954
--- server/lib/pages/help.class.php	2013-08-21 09:36:12 +0000
1955
+++ server/lib/pages/help.class.php	2014-01-19 13:57:27 +0000
1956
@@ -1,6 +1,6 @@
1957
1
<?php
1
<?php
1958
2
/*
2
/*
1960
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1961
4
 * Copyright (C) 2009-2013 Daniel Garner
4
 * Copyright (C) 2009-2013 Daniel Garner
1962
5
 *
5
 *
1963
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1964
@@ -159,6 +159,13 @@
1965
159
                        'url' => 'index.php?p=help&q=DeleteForm&HelpID=' . $row['helpid'],
159
                        'url' => 'index.php?p=help&q=DeleteForm&HelpID=' . $row['helpid'],
1966
160
                        'text' => __('Delete')
160
                        'text' => __('Delete')
1967
161
                    );
161
                    );
1968
162
1969
163
                // Test
1970
164
                $row['buttons'][] = array(
1971
165
                        'id' => 'help_button_test',
1972
166
                        'url' => HelpManager::Link($row['topic'], $row['category']),
1973
167
                        'text' => __('Test')
1974
168
                    );
1975
162
            }
169
            }
1976
163
170
1977
164
            $rows[] = $row;
171
            $rows[] = $row;
1978
165
172
1979
=== modified file 'server/lib/pages/index.class.php'
1980
--- server/lib/pages/index.class.php	2013-11-03 11:24:11 +0000
1981
+++ server/lib/pages/index.class.php	2014-01-19 13:57:27 +0000
1982
@@ -1,6 +1,6 @@
1983
1
<?php
1
<?php
1984
2
/*
2
/*
1986
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1987
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
1988
5
 *
5
 *
1989
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
1990
7
7
1991
=== modified file 'server/lib/pages/layout.class.php'
1992
--- server/lib/pages/layout.class.php	2013-08-21 09:36:12 +0000
1993
+++ server/lib/pages/layout.class.php	2014-01-19 13:57:27 +0000
1994
@@ -1,6 +1,6 @@
1995
1
<?php
1
<?php
1996
2
/*
2
/*
1998
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
1999
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2000
5
 *
5
 *
2001
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2002
@@ -547,7 +547,7 @@
2003
547
		}
547
		}
2004
548
		else
548
		else
2005
549
		{
549
		{
2007
550
            $thumbBgImage = "theme/default/img/forms/filenotfound.png";
550
            $thumbBgImage = "theme/default/img/forms/filenotfound.gif";
2008
551
		}
551
		}
2009
552
552
2010
553
		// Configure some template variables.
553
		// Configure some template variables.
2011
554
554
2012
=== modified file 'server/lib/pages/license.class.php'
2013
--- server/lib/pages/license.class.php	2013-05-01 19:24:35 +0000
2014
+++ server/lib/pages/license.class.php	2014-01-19 13:57:27 +0000
2015
@@ -1,6 +1,6 @@
2016
1
<?php
1
<?php
2017
2
/*
2
/*
2019
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2020
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2021
5
 *
5
 *
2022
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2023
7
7
2024
=== modified file 'server/lib/pages/log.class.php'
2025
--- server/lib/pages/log.class.php	2013-08-20 20:17:11 +0000
2026
+++ server/lib/pages/log.class.php	2014-01-19 13:57:27 +0000
2027
@@ -1,6 +1,6 @@
2028
1
<?php
1
<?php
2029
2
/*
2
/*
2031
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2032
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2033
5
 *
5
 *
2034
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2035
7
7
2036
=== modified file 'server/lib/pages/mediamanager.class.php'
2037
--- server/lib/pages/mediamanager.class.php	2013-05-01 19:24:35 +0000
2038
+++ server/lib/pages/mediamanager.class.php	2014-01-19 13:57:27 +0000
2039
@@ -1,6 +1,6 @@
2040
1
<?php
1
<?php
2041
2
/*
2
/*
2043
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2044
4
 * Copyright (C) 2011-2013 Daniel Garner
4
 * Copyright (C) 2011-2013 Daniel Garner
2045
5
 *
5
 *
2046
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2047
7
7
2048
=== modified file 'server/lib/pages/module.class.php'
2049
--- server/lib/pages/module.class.php	2013-08-21 09:36:12 +0000
2050
+++ server/lib/pages/module.class.php	2014-01-19 13:57:27 +0000
2051
@@ -1,6 +1,6 @@
2052
1
<?php
1
<?php
2053
2
/*
2
/*
2055
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2056
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2057
5
 *
5
 *
2058
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2059
7
7
2060
=== modified file 'server/lib/pages/oauth.class.php'
2061
--- server/lib/pages/oauth.class.php	2013-08-21 09:36:12 +0000
2062
+++ server/lib/pages/oauth.class.php	2014-01-19 13:57:27 +0000
2063
@@ -1,6 +1,6 @@
2064
1
<?php
1
<?php
2065
2
/*
2
/*
2067
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2068
4
 * Copyright (C) 2010-13 Daniel Garner
4
 * Copyright (C) 2010-13 Daniel Garner
2069
5
 *
5
 *
2070
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2071
@@ -283,7 +283,7 @@
2072
283
        $output = Theme::RenderReturn('application_form_user_applications');
283
        $output = Theme::RenderReturn('application_form_user_applications');
2073
284
284
2074
285
        $response->SetFormRequestResponse($output, __('Authorized applications for user'), '650', '450');
285
        $response->SetFormRequestResponse($output, __('Authorized applications for user'), '650', '450');
2076
286
        $response->AddButton(__('Help'), "XiboHelpRender('index.php?p=help&q=Display&Topic=Schedule&Category=General')");
286
        $response->AddButton(__('Help'), "XiboHelpRender('" . HelpManager::Link('User', 'Applications') . "')");
2077
287
        $response->AddButton(__('Close'), 'XiboDialogClose()');
287
        $response->AddButton(__('Close'), 'XiboDialogClose()');
2078
288
        $response->Respond();
288
        $response->Respond();
2079
289
    }
289
    }
2080
290
290
2081
=== modified file 'server/lib/pages/resolution.class.php'
2082
--- server/lib/pages/resolution.class.php	2013-08-20 20:17:11 +0000
2083
+++ server/lib/pages/resolution.class.php	2014-01-19 13:57:27 +0000
2084
@@ -1,6 +1,6 @@
2085
1
<?php
1
<?php
2086
2
/*
2
/*
2088
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2089
4
 * Copyright (C) 2009-2013 Daniel Garner
4
 * Copyright (C) 2009-2013 Daniel Garner
2090
5
 *
5
 *
2091
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2092
7
7
2093
=== modified file 'server/lib/pages/schedule.class.php'
2094
--- server/lib/pages/schedule.class.php	2013-11-03 13:30:21 +0000
2095
+++ server/lib/pages/schedule.class.php	2014-01-19 13:57:27 +0000
2096
@@ -1,6 +1,6 @@
2097
1
<?php
1
<?php
2098
2
/*
2
/*
2100
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2101
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2102
5
 *
5
 *
2103
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2104
@@ -753,8 +753,8 @@
2105
753
                }
753
                }
2106
754
            }
754
            }
2107
755
755
2110
756
            Debug::LogEntry('audit', 'Built Month Array');
756
            //Debug::LogEntry('audit', 'Built Month Array');
2111
757
            Debug::LogEntry('audit', var_export($events, true));
757
            //Debug::LogEntry('audit', var_export($events, true));
2112
758
758
2113
759
            return $events;
759
            return $events;
2114
760
    }
760
    }
2115
@@ -1404,7 +1404,7 @@
2116
1404
        <tr>
1404
        <tr>
2117
1405
            <td><label for="DisplayOrder" title="Select the Order for this Event">Display Order</label></td>
1405
            <td><label for="DisplayOrder" title="Select the Order for this Event">Display Order</label></td>
2118
1406
            <td><input type=text" name="DisplayOrder" value="0" />
1406
            <td><input type=text" name="DisplayOrder" value="0" />
2120
1407
            <td><label title="Sets whether or not this event has priority. If set the event will be show in preferance to other events." for="cb_is_priority">Priority</label></td>
1407
            <td><label title="Sets whether or not this event has priority. If set the event will be show in preference to other events." for="cb_is_priority">Priority</label></td>
2121
1408
            <td><input type="checkbox" id="cb_is_priority" name="is_priority" value="1" title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
1408
            <td><input type="checkbox" id="cb_is_priority" name="is_priority" value="1" title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
2122
1409
        </tr>
1409
        </tr>
2123
1410
END;
1410
END;
2124
@@ -1572,7 +1572,7 @@
2125
1572
        <tr>
1572
        <tr>
2126
1573
            <td><label for="DisplayOrder" title="Select the Order for this Event">Display Order</label></td>
1573
            <td><label for="DisplayOrder" title="Select the Order for this Event">Display Order</label></td>
2127
1574
            <td><input type=text" name="DisplayOrder" value="$displayOrder" />
1574
            <td><input type=text" name="DisplayOrder" value="$displayOrder" />
2129
1575
            <td><label title="Sets whether or not this event has priority. If set the event will be show in preferance to other events." for="cb_is_priority">Priority</label></td>
1575
            <td><label title="Sets whether or not this event has priority. If set the event will be show in preference to other events." for="cb_is_priority">Priority</label></td>
2130
1576
            <td><input type="checkbox" id="cb_is_priority" name="is_priority" $isPriority title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
1576
            <td><input type="checkbox" id="cb_is_priority" name="is_priority" $isPriority title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
2131
1577
        </tr>
1577
        </tr>
2132
1578
END;
1578
END;
2133
@@ -1921,7 +1921,7 @@
2134
1921
                        <td><input type=text" name="DisplayOrder" value="0" />
1921
                        <td><input type=text" name="DisplayOrder" value="0" />
2135
1922
                    </tr>
1922
                    </tr>
2136
1923
                    <tr>
1923
                    <tr>
2138
1924
                        <td><label title="Sets whether or not this event has priority. If set the event will be show in preferance to other events." for="cb_is_priority">Priority</label></td>
1924
                        <td><label title="Sets whether or not this event has priority. If set the event will be show in preference to other events." for="cb_is_priority">Priority</label></td>
2139
1925
                        <td><input type="checkbox" id="cb_is_priority" name="is_priority" value="1" title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
1925
                        <td><input type="checkbox" id="cb_is_priority" name="is_priority" value="1" title="Sets whether or not this event has priority. If set the event will be show in preference to other events."></td>
2140
1926
                    </tr>
1926
                    </tr>
2141
1927
                    <tr>
1927
                    <tr>
2142
1928
1928
2143
=== modified file 'server/lib/pages/sessions.class.php'
2144
--- server/lib/pages/sessions.class.php	2013-08-20 20:17:11 +0000
2145
+++ server/lib/pages/sessions.class.php	2014-01-19 13:57:27 +0000
2146
@@ -1,6 +1,6 @@
2147
1
<?php
1
<?php
2148
2
/*
2
/*
2150
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2151
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2152
5
 *
5
 *
2153
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2154
@@ -70,10 +70,7 @@
2155
70
		$fromdt = Kit::GetParam('filter_fromdt', _POST, _STRING);
70
		$fromdt = Kit::GetParam('filter_fromdt', _POST, _STRING);
2156
71
		
71
		
2157
72
		///get the dates and times
72
		///get the dates and times
2162
73
		if ($fromdt == '') {
73
		if ($fromdt != '') {
2159
74
			$starttime_timestamp = time();
2160
75
		}
2161
76
		else {
2163
77
			$start_date = explode("/",$fromdt); //		dd/mm/yyyy
74
			$start_date = explode("/",$fromdt); //		dd/mm/yyyy
2164
78
			$starttime_timestamp = strtotime($start_date[1] . "/" . $start_date[0] . "/" . $start_date[2] . ' ' . date("H", time()) . ":" . date("i", time()) . ':59');
75
			$starttime_timestamp = strtotime($start_date[1] . "/" . $start_date[0] . "/" . $start_date[2] . ' ' . date("H", time()) . ":" . date("i", time()) . ':59');
2165
79
		}
76
		}
2166
@@ -84,7 +81,10 @@
2167
84
		
81
		
2168
85
		$SQL  = "SELECT session.userID, user.UserName,  IsExpired, LastPage,  session.LastAccessed,  RemoteAddr,  UserAgent ";
82
		$SQL  = "SELECT session.userID, user.UserName,  IsExpired, LastPage,  session.LastAccessed,  RemoteAddr,  UserAgent ";
2169
86
		$SQL .= "FROM `session` LEFT OUTER JOIN user ON user.userID = session.userID ";
83
		$SQL .= "FROM `session` LEFT OUTER JOIN user ON user.userID = session.userID ";
2171
87
		$SQL .= sprintf(" WHERE session_expiration < '%s' ", $starttime_timestamp);
84
		$SQL .= "WHERE 1 = 1 ";
2172
85
2173
86
		if ($fromdt != '')
2174
87
			$SQL .= sprintf(" AND session_expiration < '%s' ", $starttime_timestamp);
2175
88
		
88
		
2176
89
		if ($type == "active")
89
		if ($type == "active")
2177
90
			$SQL .= " AND IsExpired = 0 ";
90
			$SQL .= " AND IsExpired = 0 ";
2178
@@ -110,7 +110,7 @@
2179
110
110
2180
111
            $row['userid'] = Kit::ValidateParam($row['userID'], _INT);
111
            $row['userid'] = Kit::ValidateParam($row['userID'], _INT);
2181
112
			$row['username'] = Kit::ValidateParam($row['UserName'], _STRING);
112
			$row['username'] = Kit::ValidateParam($row['UserName'], _STRING);
2183
113
			$row['isexpired'] = (Kit::ValidateParam($row['IsExpired'], _INT) == 1) ? 'icon-ok' : 'icon-remove';
113
			$row['isexpired'] = (Kit::ValidateParam($row['IsExpired'], _INT) == 0) ? 'icon-ok' : 'icon-remove';
2184
114
			$row['lastpage'] = Kit::ValidateParam($row['LastPage'], _STRING);
114
			$row['lastpage'] = Kit::ValidateParam($row['LastPage'], _STRING);
2185
115
			$row['lastaccessed'] = Kit::ValidateParam($row['LastAccessed'], _STRING);
115
			$row['lastaccessed'] = Kit::ValidateParam($row['LastAccessed'], _STRING);
2186
116
			$row['ip'] = Kit::ValidateParam($row['RemoteAddr'], _STRING);
116
			$row['ip'] = Kit::ValidateParam($row['RemoteAddr'], _STRING);
2187
117
117
2188
=== modified file 'server/lib/pages/stats.class.php'
2189
--- server/lib/pages/stats.class.php	2013-08-21 09:36:12 +0000
2190
+++ server/lib/pages/stats.class.php	2014-01-19 13:57:27 +0000
2191
@@ -1,6 +1,6 @@
2192
1
<?php
1
<?php
2193
2
/*
2
/*
2195
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2196
4
 * Copyright (C) 2009-2013 Daniel Garner
4
 * Copyright (C) 2009-2013 Daniel Garner
2197
5
 *
5
 *
2198
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2199
7
7
2200
=== modified file 'server/lib/pages/template.class.php'
2201
--- server/lib/pages/template.class.php	2013-09-22 14:01:16 +0000
2202
+++ server/lib/pages/template.class.php	2014-01-19 13:57:27 +0000
2203
@@ -1,6 +1,6 @@
2204
1
<?php
1
<?php
2205
2
/*
2
/*
2207
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2208
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2209
5
 *
5
 *
2210
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2211
7
7
2212
=== modified file 'server/lib/pages/timeline.class.php'
2213
--- server/lib/pages/timeline.class.php	2013-11-02 15:32:17 +0000
2214
+++ server/lib/pages/timeline.class.php	2014-01-19 13:57:27 +0000
2215
@@ -1,6 +1,6 @@
2216
1
<?php
1
<?php
2217
2
/*
2
/*
2219
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2220
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2221
5
 *
5
 *
2222
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2223
7
7
2224
=== modified file 'server/lib/pages/transition.class.php'
2225
--- server/lib/pages/transition.class.php	2013-08-21 09:36:12 +0000
2226
+++ server/lib/pages/transition.class.php	2014-01-19 13:57:27 +0000
2227
@@ -1,6 +1,6 @@
2228
1
<?php
1
<?php
2229
2
/*
2
/*
2231
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2232
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2233
5
 *
5
 *
2234
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2235
7
7
2236
=== modified file 'server/lib/pages/user.class.php'
2237
--- server/lib/pages/user.class.php	2013-08-21 09:36:12 +0000
2238
+++ server/lib/pages/user.class.php	2014-01-19 13:57:27 +0000
2239
@@ -1,6 +1,6 @@
2240
1
<?php
1
<?php
2241
2
/*
2
/*
2243
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2244
4
 * Copyright (C) 2006-2013 Daniel Garner
4
 * Copyright (C) 2006-2013 Daniel Garner
2245
5
 *
5
 *
2246
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2247
7
7
2248
=== modified file 'server/lib/service/rest.class.php'
2249
--- server/lib/service/rest.class.php	2013-10-20 14:59:58 +0000
2250
+++ server/lib/service/rest.class.php	2014-01-19 13:57:27 +0000
2251
@@ -1,6 +1,6 @@
2252
1
<?php
1
<?php
2253
2
/*
2
/*
2255
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2256
4
 * Copyright (C) 2010-2013 Daniel Garner
4
 * Copyright (C) 2010-2013 Daniel Garner
2257
5
 *
5
 *
2258
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2259
@@ -850,7 +850,7 @@
2260
850
        $layoutId = $this->GetParam('layoutId', _INT);
850
        $layoutId = $this->GetParam('layoutId', _INT);
2261
851
        $regionId = $this->GetParam('regionId', _STRING);
851
        $regionId = $this->GetParam('regionId', _STRING);
2262
852
        $type = $this->GetParam('type', _WORD);
852
        $type = $this->GetParam('type', _WORD);
2264
853
        $xlf = $this->GetParam('xlf', _STRING);
853
        $xlf = $this->GetParam('xlf', _HTMLSTRING);
2265
854
854
2266
855
        // Does the user have permissions to view this layout?
855
        // Does the user have permissions to view this layout?
2267
856
        if (!$this->user->LayoutAuth($layoutId))
856
        if (!$this->user->LayoutAuth($layoutId))
2268
@@ -892,7 +892,7 @@
2269
892
        $regionId = $this->GetParam('regionId', _STRING);
892
        $regionId = $this->GetParam('regionId', _STRING);
2270
893
        $mediaId = $this->GetParam('mediaId', _STRING);
893
        $mediaId = $this->GetParam('mediaId', _STRING);
2271
894
        $type = $this->GetParam('type', _WORD);
894
        $type = $this->GetParam('type', _WORD);
2273
895
        $xlf = $this->GetParam('xlf', _STRING);
895
        $xlf = $this->GetParam('xlf', _HTMLSTRING);
2274
896
896
2275
897
        // Does the user have permissions to view this layout?
897
        // Does the user have permissions to view this layout?
2276
898
        if (!$this->user->LayoutAuth($layoutId))
898
        if (!$this->user->LayoutAuth($layoutId))
2277
899
899
2278
=== modified file 'server/lib/service/restjson.class.php'
2279
--- server/lib/service/restjson.class.php	2013-09-21 15:09:35 +0000
2280
+++ server/lib/service/restjson.class.php	2014-01-19 13:57:27 +0000
2281
@@ -1,6 +1,6 @@
2282
1
<?php
1
<?php
2283
2
/*
2
/*
2285
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2286
4
 * Copyright (C) 2010 Daniel Garner
4
 * Copyright (C) 2010 Daniel Garner
2287
5
 *
5
 *
2288
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2289
7
7
2290
=== modified file 'server/lib/service/restxml.class.php'
2291
--- server/lib/service/restxml.class.php	2013-09-21 15:09:35 +0000
2292
+++ server/lib/service/restxml.class.php	2014-01-19 13:57:27 +0000
2293
@@ -1,6 +1,6 @@
2294
1
<?php
1
<?php
2295
2
/*
2
/*
2297
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2298
4
 * Copyright (C) 2010 Daniel Garner
4
 * Copyright (C) 2010 Daniel Garner
2299
5
 *
5
 *
2300
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2301
7
7
2302
=== modified file 'server/lib/service/serviceoauth.class.php'
2303
--- server/lib/service/serviceoauth.class.php	2013-05-01 19:24:35 +0000
2304
+++ server/lib/service/serviceoauth.class.php	2014-01-19 13:57:27 +0000
2305
@@ -1,6 +1,6 @@
2306
1
<?php
1
<?php
2307
2
/*
2
/*
2309
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2310
4
 * Copyright (C) 2010 Daniel Garner
4
 * Copyright (C) 2010 Daniel Garner
2311
5
 *
5
 *
2312
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2313
7
7
2314
=== modified file 'server/lib/service/serviceresponse.class.php'
2315
--- server/lib/service/serviceresponse.class.php	2013-09-24 17:57:08 +0000
2316
+++ server/lib/service/serviceresponse.class.php	2014-01-19 13:57:27 +0000
2317
@@ -1,6 +1,6 @@
2318
1
<?php
1
<?php
2319
2
/*
2
/*
2321
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2322
4
 * Copyright (C) 2009 Daniel Garner
4
 * Copyright (C) 2009 Daniel Garner
2323
5
 *
5
 *
2324
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2325
7
7
2326
=== modified file 'server/lib/service/xmdssoap.class.php'
2327
--- server/lib/service/xmdssoap.class.php	2013-09-29 18:54:12 +0000
2328
+++ server/lib/service/xmdssoap.class.php	2014-01-19 13:57:27 +0000
2329
@@ -1,6 +1,6 @@
2330
1
<?php
1
<?php
2331
2
/*
2
/*
2333
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2334
4
 * Copyright (C) 2009-2013 Daniel Garner
4
 * Copyright (C) 2009-2013 Daniel Garner
2335
5
 *
5
 *
2336
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2337
@@ -1069,7 +1069,7 @@
2338
1069
1069
2339
1070
        // See if the client was offline and if appropriate send an alert
1070
        // See if the client was offline and if appropriate send an alert
2340
1071
        // to say that it has come back online
1071
        // to say that it has come back online
2342
1072
        if (($row[5] == 0) and ($row[6] == 1))
1072
        if (($row[5] == 0) && ($row[6] == 1) && Config::GetSetting('MAINTENANCE_ENABLED') == 'On') && Config::GetSetting('MAINTENANCE_EMAIL_ALERTS') == 'On'))
2343
1073
        {
1073
        {
2344
1074
            $msgTo    = Kit::ValidateParam(Config::GetSetting("mail_to"),_PASSWORD);
1074
            $msgTo    = Kit::ValidateParam(Config::GetSetting("mail_to"),_PASSWORD);
2345
1075
            $msgFrom  = Kit::ValidateParam(Config::GetSetting("mail_from"),_PASSWORD);
1075
            $msgFrom  = Kit::ValidateParam(Config::GetSetting("mail_from"),_PASSWORD);
2346
1076
1076
2347
=== modified file 'server/lib/xmds.inc.php'
2348
--- server/lib/xmds.inc.php	2013-08-23 18:25:01 +0000
2349
+++ server/lib/xmds.inc.php	2014-01-19 13:57:27 +0000
2350
@@ -1,6 +1,6 @@
2351
1
<?php
1
<?php
2352
2
/*
2
/*
2354
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2355
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
4
 * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
2356
5
 *
5
 *
2357
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2358
7
7
2359
=== modified file 'server/locale/dbtranslate.php'
2360
--- server/locale/dbtranslate.php	2013-11-03 13:30:21 +0000
2361
+++ server/locale/dbtranslate.php	2014-01-19 13:57:27 +0000
2362
@@ -1,6 +1,6 @@
2363
1
<?php
1
<?php
2364
2
/*
2
/*
2366
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2367
4
 * Copyright (C) 2009-12 Daniel Garner
4
 * Copyright (C) 2009-12 Daniel Garner
2368
5
 *
5
 *
2369
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2370
@@ -53,6 +53,7 @@
2371
53
echo __('Modules');
53
echo __('Modules');
2372
54
echo __('Campaigns');
54
echo __('Campaigns');
2373
55
echo __('Transitions');
55
echo __('Transitions');
2374
56
echo __('Resolutions');
2375
56
57
2376
57
// Settings translations
58
// Settings translations
2377
58
echo __('jpg_length');
59
echo __('jpg_length');
2378
59
60
2379
=== modified file 'server/maintenance.php'
2380
--- server/maintenance.php	2013-08-21 09:51:59 +0000
2381
+++ server/maintenance.php	2014-01-19 13:57:27 +0000
2382
@@ -1,7 +1,7 @@
2383
1
<?php
1
<?php
2384
2
/*
2
/*
2387
3
 * Xibo - Digitial Signage - http://www.xibo.org.uk
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2388
4
 * Copyright (C) 2010 Alex Harrington
4
 * Copyright (C) 2010-13 Alex Harrington
2389
5
 *
5
 *
2390
6
 * This file is part of Xibo.
6
 * This file is part of Xibo.
2391
7
 *
7
 *
2392
@@ -29,6 +29,7 @@
2393
29
29
2394
30
// Required Library Files
30
// Required Library Files
2395
31
require_once("lib/app/translationengine.class.php");
31
require_once("lib/app/translationengine.class.php");
2396
32
require_once("lib/app/pdoconnect.class.php");
2397
32
require_once("lib/app/debug.class.php");
33
require_once("lib/app/debug.class.php");
2398
33
require_once("lib/app/kit.class.php");
34
require_once("lib/app/kit.class.php");
2399
34
require_once("lib/data/data.class.php");
35
require_once("lib/data/data.class.php");
2400
35
36
2401
=== modified file 'server/manual/content/admin/advanced.php'
2402
--- server/manual/content/admin/advanced.php	2013-05-01 19:24:35 +0000
2403
+++ server/manual/content/admin/advanced.php	2014-01-19 13:57:27 +0000
2404
@@ -1,57 +1,44 @@
2462
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
1
<?php
2463
2
<?php include('../../template.php'); ?>
2
/*
2464
3
<html>
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2465
4
	<head>
4
 * Copyright (C) 2006-2013 Daniel Garner
2466
5
		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5
 *
2467
6
		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
6
 * This file is part of Xibo.
2468
7
		<link rel=stylesheet type="text/css" href="../../css/doc.css">
7
 *
2469
8
		<meta http-equiv="Content-Type" content="text/html" />
8
 * Xibo is free software: you can redistribute it and/or modify
2470
9
		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
9
 * it under the terms of the GNU Affero General Public License as published by
2471
10
		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
10
 * the Free Software Foundation, either version 3 of the License, or
2472
11
11
 * any later version. 
2473
12
		<link href="img/favicon.ico" rel="shortcut icon"/>
12
 *
2474
13
		<!-- Javascript Libraries -->
13
 * Xibo is distributed in the hope that it will be useful,
2475
14
		<script type="text/javascript" src="lib/jquery.pack.js"></script>
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2476
15
		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2477
16
		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
16
 * GNU Affero General Public License for more details.
2478
17
	</head>
17
 *
2479
18
	<body>
18
 * You should have received a copy of the GNU Affero General Public License
2480
19
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
2481
20
		<h1>Advanced</h1>
20
 */ 
2482
21
		<p>The Advanced page is mainly used by system administrator to help troubleshooting system problem or reporting fault 
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
2483
22
		to the <?php echo PRODUCT_NAME; ?> xstreamedia team for assistance</p>
22
?>
2484
23
    	<p>Click Advanced from the Navigation Bar. System loads the Log page by default.</p>
23
2485
24
24
<h1>Troubleshooting <small>The Advanced Menu</small></h1>
2486
25
 	<blockquote>
25
<p>The CMS contains a number of useful tools for first line debugging and reporting faults to technical support.</p>
2487
26
  		<a name="Error_Log_Help" id="Error_Log_Help"></a><h3>System Log</h3>
26
2488
27
		 
27
<h2 id="Report_Fault">Report Fault</h2>
2489
28
    	<p><img alt="SA Advanced" src="sa_advanced.png"
28
<p>The Report Fault Wizard is designed to be enabled by the CMS administrator to recreate the problem and collect logging information that can be analysed or submitted to the Technical Support team for further analysis. The Wizard lists 6 steps which should be followed in order.</p>
2490
29
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
29
2491
30
	   width="803" height="161"></p>
30
<p><img class="img-thumbnail" alt="Report Fault Wizard" src="content/admin/report_fault_wizard.png"></p>
2492
31
31
2493
32
    	<p>The system log is used to help troubleshoot problems with <?php echo PRODUCT_NAME; ?>. When you encounter an error it will be logged
32
2494
33
    	and listed in the system here. These error messages can help the xstreamedia team solve your problem.</p>
33
<h2>System Log</h2>
2495
34
   	 	<p>Truncating the log helps you to troubleshoot a problem by clearing the current error messages</p>
34
<p>The CMS keeps a detailed log of all errors that have been recorded as well as detailed debugging information. This is intended for a more technical user to analyse and fix issues.</p>
2496
35
    	<p>The page and sub page items helps locate where the error has been generated from.</p>
35
2497
36
    	<ul>
36
<p>The System Log is available from the Advanced Menu.</p>
2498
37
    		<li><strong>Log Date</strong><p> states the date and time the error message was logged.</p></li>
37
2499
38
    		<li><strong>Page</strong><p> states the page that the error has been generated from.</p></li>
38
<p><img class="img-thumbnail" alt="System Log" src="content/admin/sa_advanced.png"></p>
2500
39
    		<li><strong>Function</strong><p>state function that the error message has been generated from.</p></li>
39
2501
40
    		<li><strong>Message</strong><p> gives details of what error has occurred in the system.</p></li>
40
<p class="alert alert-warning">The system log can get quite large over time and should be manually truncated after any debugging session. This is done from the System Log page using the "Truncate" menu item in the top right corner of the Log Table.</p>
2502
41
    	</ul>
41
2503
42
   		<a name="Session" id="Session"></a><h3>Sessions</h3>
42
<h2>Sessions</h2>
2504
43
   		<p>Sessions provide details of the current user activity on the network</p>
43
<p>Sessions provide details of the current user activity on the network</p>
2505
44
    	<p><img alt="SA Advanced Session" src="sa_advanced_sessions.png"
44
<p><img class="img-thumbnail" alt="Sessions" src="content/admin/sa_advanced_sessions.png"></p>
2449
45
	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
2450
46
	   	width="805" height="208"></p>
2451
47
2452
48
   		<a name="Report_Fault" id="Report_Fault"></a><h3>Report Fault</h3>
2453
49
   		<p>Simple instruaction on the collection of system error and report fault to <?php echo PRODUCT_NAME; ?> xsteamedia team.</p>
2454
50
2455
51
   		<a name="License" id="License"></a><h3>License Information</h3>
2456
52
   		<p>The license page provides details of all the relevant licenses for the system.</p>
2457
53
 </blockquote>
2458
54
2459
55
		<?php include('../../template/footer.php'); ?>
2460
56
	</body>
2461
57
</html>
2506
58
\ No newline at end of file
45
\ No newline at end of file
2507
59
46
2508
=== added file 'server/manual/content/admin/api_displaygroups.php'
2509
--- server/manual/content/admin/api_displaygroups.php	1970-01-01 00:00:00 +0000
2510
+++ server/manual/content/admin/api_displaygroups.php	2014-01-19 13:57:27 +0000
2511
@@ -0,0 +1,11 @@
2512
1
2513
2
<h3> <span class="mw-headline" id="DisplayGroups"> DisplayGroups </span></h3>
2514
3
<ul><li> DisplayGroupList
2515
4
</li><li> DisplayGroupAdd
2516
5
</li><li> DisplayGroupEdit
2517
6
</li><li> DisplayGroupDelete
2518
7
</li><li> DisplayGroupMembersList
2519
8
</li><li> DisplayGroupMembersEdit
2520
9
</li><li> DisplayGroupUserGroupList
2521
10
</li><li> DisplayGroupUserGroupEdit
2522
11
</li></ul>
2523
0
\ No newline at end of file
12
\ No newline at end of file
2524
1
13
2525
=== added file 'server/manual/content/admin/api_displays.php'
2526
--- server/manual/content/admin/api_displays.php	1970-01-01 00:00:00 +0000
2527
+++ server/manual/content/admin/api_displays.php	2014-01-19 13:57:27 +0000
2528
@@ -0,0 +1,8 @@
2529
1
<h3> <span class="mw-headline" id="Displays"> Displays </span></h3>
2530
2
<ul><li> DisplayList
2531
3
</li><li> DisplayEdit
2532
4
</li><li> DisplayRetire
2533
5
</li><li> DisplayDelete
2534
6
</li><li> DisplayUserGroupSecurity
2535
7
</li><li> DisplayUserGroupEdit
2536
8
</li></ul>
2537
0
\ No newline at end of file
9
\ No newline at end of file
2538
1
10
2539
=== added file 'server/manual/content/admin/api_layouts.php'
2540
--- server/manual/content/admin/api_layouts.php	1970-01-01 00:00:00 +0000
2541
+++ server/manual/content/admin/api_layouts.php	2014-01-19 13:57:27 +0000
2542
@@ -0,0 +1,260 @@
2543
1
2544
2
<h3> <span class="mw-headline" id="Layout"> Layout </span></h3>
2545
3
<ul><li> LayoutList
2546
4
</li><li> LayoutAdd
2547
5
</li><li> LayoutEdit
2548
6
</li><li> LayoutCopy
2549
7
</li><li> LayoutDelete
2550
8
</li><li> LayoutRetire
2551
9
</li><li> LayoutBackgroundList
2552
10
</li><li> LayoutBackgroundEdit
2553
11
</li><li> LayoutGetXlf
2554
12
</li><li> LayoutRegionList
2555
13
</li><li> LayoutRegionAdd
2556
14
</li><li> LayoutRegionEdit
2557
15
</li><li> LayoutRegionPosition
2558
16
</li><li> LayoutRegionTimelineList
2559
17
</li><li> LayoutRegionMediaAdd
2560
18
</li><li> LayoutRegionMediaReorder
2561
19
</li><li> LayoutRegionMediaDelete
2562
20
</li><li> LayoutRegionLibraryAdd
2563
21
</li><li> LayoutRegionMediaEdit
2564
22
</li><li> LayoutRegionMediaDetails
2565
23
</li></ul>
2566
24
2567
25
2568
26
<h2> <span class="mw-headline" id="Layout_2"> Layout </span></h2>
2569
27
<p>Transactions Related to Layouts
2570
28
</p>
2571
29
<h3> <span class="mw-headline" id="LayoutAdd"> LayoutAdd </span></h3>
2572
30
<p>Parameters
2573
31
</p>
2574
32
<ul><li> layout - The Name of the Layout
2575
33
</li><li> description - The Description of the Layout
2576
34
</li><li> permissionid - PermissionID for the layout
2577
35
</li><li> tags - Tags for the Layout
2578
36
</li><li> templateid - Template for the Layout
2579
37
</li></ul>
2580
38
<p>Response
2581
39
</p>
2582
40
<ul><li> layout - The ID of the layout
2583
41
</li></ul>
2584
42
<p>Errors
2585
43
</p>
2586
44
<ul><li> Code 1 - Access Denied
2587
45
</li><li> Code 25001 - Layout Name must be between 1 and 50 characters
2588
46
</li><li> Code 25002 - Description must be less than 254 characters
2589
47
</li><li> Code 25003 - All tags combined must be less that 254 characters
2590
48
</li><li> Code 25004 - User already has a layout with this name
2591
49
</li><li> Code 25005 - Database error adding layout
2592
50
</li><li> Code 25006 - Failed to Parse Tags
2593
51
</li><li> Code 25007 - Unable to update layout xml
2594
52
</li><li> Code 25008 - Unable to Delete layout on failure
2595
53
</li></ul>
2596
54
<h3> <span class="mw-headline" id="LayoutDelete"> LayoutDelete </span></h3>
2597
55
<p>Parameters
2598
56
</p>
2599
57
<ul><li> layoutId - The ID of the layout to delete
2600
58
</li></ul>
2601
59
<p>Response
2602
60
</p>
2603
61
<ul><li> success = true
2604
62
</li></ul>
2605
63
<p>Errors
2606
64
</p>
2607
65
<ul><li> Code 1 - Access Denied
2608
66
</li><li> Code 25008 - Unable to delete layout
2609
67
</li></ul>
2610
68
2611
69
2612
70
<h3> <span class="mw-headline" id="LayoutRegionList"> LayoutRegionList </span></h3>
2613
71
<p>Parameters
2614
72
</p>
2615
73
<ul><li> layoutId
2616
74
</li></ul>
2617
75
<p>Response
2618
76
</p><p>A list of region timelines. Each item will have the following values:
2619
77
</p>
2620
78
<ul><li> regionid
2621
79
</li><li> width
2622
80
</li><li> height
2623
81
</li><li> top
2624
82
</li><li> left
2625
83
</li><li> ownerid
2626
84
</li><li> permission_edit
2627
85
</li><li> permission_del
2628
86
</li><li> permission_update_permissions
2629
87
</li></ul>
2630
88
<p>Error Codes
2631
89
</p>
2632
90
<ul><li> 1 - Access Denied
2633
91
</li></ul>
2634
92
<h3> <span class="mw-headline" id="LayoutRegionAdd"> LayoutRegionAdd </span></h3>
2635
93
<p>Adds a new Region Timeline to a Layout
2636
94
</p><p>Parameters
2637
95
</p>
2638
96
<ul><li> layoutId
2639
97
</li><li> width
2640
98
</li><li> height
2641
99
</li><li> top
2642
100
</li><li> left
2643
101
</li><li> name
2644
102
</li></ul>
2645
103
<p>Response
2646
104
</p>
2647
105
<ul><li> success = true
2648
106
</li></ul>
2649
107
<p>Error Codes
2650
108
</p>
2651
109
<ul><li> 1 - Access Denied
2652
110
</li></ul>
2653
111
<h3> <span class="mw-headline" id="LayoutRegionEdit"> LayoutRegionEdit </span></h3>
2654
112
<p>Edits an existing Region Timeline on a Layout
2655
113
</p><p>Parameters
2656
114
</p>
2657
115
<ul><li> layoutId
2658
116
</li><li> regionId
2659
117
</li><li> width
2660
118
</li><li> height
2661
119
</li><li> top
2662
120
</li><li> left
2663
121
</li><li> name
2664
122
</li></ul>
2665
123
<p>Response
2666
124
</p>
2667
125
<ul><li> success = true
2668
126
</li></ul>
2669
127
<p>Error Codes
2670
128
</p>
2671
129
<ul><li> 1 - Access Denied
2672
130
</li></ul>
2673
131
<h3> <span class="mw-headline" id="LayoutRegionDelete"> LayoutRegionDelete </span></h3>
2674
132
<p>Deletes an existing Region Timeline on a Layout
2675
133
</p><p>Parameters
2676
134
</p>
2677
135
<ul><li> layoutId
2678
136
</li><li> regionId
2679
137
</li></ul>
2680
138
<p>Response
2681
139
</p>
2682
140
<ul><li> success = true
2683
141
</li></ul>
2684
142
<p>Error Codes
2685
143
</p>
2686
144
<ul><li> 1 - Access Denied
2687
145
</li></ul>
2688
146
<h2> <span class="mw-headline" id="Layout_Timelines"> Layout Timelines </span></h2>
2689
147
<p>Transactions related to layout timelines
2690
148
</p>
2691
149
<h3> <span class="mw-headline" id="LayoutRegionTimelineList"> LayoutRegionTimelineList </span></h3>
2692
150
<p>Parameters
2693
151
</p>
2694
152
<ul><li> layoutId
2695
153
</li><li> regionId
2696
154
</li></ul>
2697
155
<p>Response
2698
156
</p><p>A list of media items on a region timeline. Each item will have the following values:
2699
157
</p>
2700
158
<ul><li> mediaid
2701
159
</li><li> lkid
2702
160
</li><li> type
2703
161
</li><li> duration
2704
162
</li><li> permission_edit
2705
163
</li><li> permission_del
2706
164
</li><li> permission_update_duration
2707
165
</li><li> permission_update_permissions
2708
166
</li></ul>
2709
167
<p>Error Codes
2710
168
</p>
2711
169
<ul><li> 1 - Access Denied
2712
170
</li></ul>
2713
171
<h3> <span class="mw-headline" id="LayoutRegionMediaDetails"> LayoutRegionMediaDetails </span></h3>
2714
172
<p>Parameters
2715
173
</p>
2716
174
<ul><li> layoutId
2717
175
</li><li> regionId
2718
176
</li><li> mediaId
2719
177
</li></ul>
2720
178
<p>Response
2721
179
The XLF for the provided media id (XML format)
2722
180
</p><p>Error Codes
2723
181
</p>
2724
182
<ul><li> 1 - Access Denied
2725
183
</li></ul>
2726
184
<h3> <span class="mw-headline" id="LayoutRegionMediaAdd"> LayoutRegionMediaAdd </span></h3>
2727
185
<p>Parameters
2728
186
</p>
2729
187
<ul><li> layoutId
2730
188
</li><li> regionId
2731
189
</li><li> type (the type of media item being added)
2732
190
</li><li> xlf (the xibo layout file xml representing the media to add)
2733
191
</li></ul>
2734
192
<p>The XLF will be checked for the attributes that are required for all media type. It is the callers responsibility to ensure media type specific attributes are set correctly.
2735
193
</p><p>Response
2736
194
</p>
2737
195
<pre> The Media ID added
2738
196
</pre>
2739
197
<p>Error Codes
2740
198
</p>
2741
199
<ul><li> 1 - Access Denied
2742
200
</li></ul>
2743
201
<h3> <span class="mw-headline" id="LayoutRegionLibraryAdd"> LayoutRegionLibraryAdd </span></h3>
2744
202
<p>Parameters
2745
203
</p>
2746
204
<ul><li> layoutId
2747
205
</li><li> regionId
2748
206
</li><li> mediaList (A list of media id's from the library that should be added to to supplied layout/region)
2749
207
</li></ul>
2750
208
<p>Response
2751
209
</p>
2752
210
<pre>success (true|error)
2753
211
</pre>
2754
212
<p>Error Codes
2755
213
</p>
2756
214
<ul><li> 1 - Access Denied
2757
215
</li></ul>
2758
216
<h3> <span class="mw-headline" id="LayoutRegionMediaEdit"> LayoutRegionMediaEdit </span></h3>
2759
217
<p>Parameters
2760
218
</p>
2761
219
<ul><li> layoutId
2762
220
</li><li> regionId
2763
221
</li><li> mediaId
2764
222
</li><li> xlf (the xibo layout file xml representing the media to add)
2765
223
</li></ul>
2766
224
<p>The XLF will be checked for the attributes that are required for all media type. It is the callers responsibility to ensure media type specific attributes are set correctly.
2767
225
</p><p>Response
2768
226
</p>
2769
227
<pre>success (true|error)
2770
228
</pre>
2771
229
<p>Error Codes
2772
230
</p>
2773
231
<ul><li> 1 - Access Denied
2774
232
</li></ul>
2775
233
<h3> <span class="mw-headline" id="LayoutRegionMediaReorder"> LayoutRegionMediaReorder </span></h3>
2776
234
<p>Parameters
2777
235
</p>
2778
236
<ul><li> layoutId
2779
237
</li><li> regionId
2780
238
</li><li> mediaList (array('mediaid' =&gt; <i>, 'lkid' =&gt; 0))</i>
2781
239
</li></ul>
2782
240
<p>Response
2783
241
</p>
2784
242
<ul><li> success (true|false)
2785
243
</li></ul>
2786
244
<p>Error Codes
2787
245
</p>
2788
246
<ul><li> 1 - Access Denied
2789
247
</li></ul>
2790
248
<h3> <span class="mw-headline" id="LayoutRegionMediaDelete"> LayoutRegionMediaDelete </span></h3>
2791
249
<p>Parameters
2792
250
</p>
2793
251
<ul><li> layoutId
2794
252
</li><li> regionId
2795
253
</li><li> mediaId
2796
254
</li></ul>
2797
255
<p>Response
2798
256
success (true|error)
2799
257
</p><p>Error Codes
2800
258
</p>
2801
259
<ul><li> 1 - Access Denied
2802
260
</li></ul>
2803
0
\ No newline at end of file
261
\ No newline at end of file
2804
1
262
2805
=== added file 'server/manual/content/admin/api_library.php'
2806
--- server/manual/content/admin/api_library.php	1970-01-01 00:00:00 +0000
2807
+++ server/manual/content/admin/api_library.php	2014-01-19 13:57:27 +0000
2808
@@ -0,0 +1,132 @@
2809
1
2810
2
<h3> <span class="mw-headline" id="Library"> Library </span></h3>
2811
3
<ul><li> LibraryMediaFileUpload
2812
4
</li><li> LibraryMediaFileRevise
2813
5
</li><li> LibraryMediaAdd
2814
6
</li><li> LibraryMediaEdit
2815
7
</li><li> LibraryMediaRetire
2816
8
</li><li> LibraryMediaDownload
2817
9
</li><li> LibraryMediaList
2818
10
</li></ul>
2819
11
2820
12
<p>Transactions related to the Library
2821
13
</p>
2822
14
<h3> <span class="mw-headline" id="LibraryMediaFileUpload"> LibraryMediaFileUpload </span></h3>
2823
15
<p>Parameters
2824
16
</p>
2825
17
<ul><li> FileID - Null for 1st call
2826
18
</li><li> Chunk Offset
2827
19
</li><li> Check Sum (MD5)
2828
20
</li></ul>
2829
21
<p>Response
2830
22
</p>
2831
23
<ul><li> FileID
2832
24
</li><li> Offset (file length)
2833
25
</li></ul>
2834
26
<p>Errors
2835
27
</p>
2836
28
<ul><li> 1 - Access Denied
2837
29
</li><li> 2 - Payload Checksum doesn't match provided checksum
2838
30
</li><li> 3 - Unable to add File record to the Database
2839
31
</li><li> 4 - Library location does not exist
2840
32
</li><li> 5 - Unable to create file in the library location
2841
33
</li><li> 6 - Unable to write to file in the library location
2842
34
</li><li> 7 - File does not exist
2843
35
</li></ul>
2844
36
<h3> <span class="mw-headline" id="LibraryMediaAdd"> LibraryMediaAdd </span></h3>
2845
37
<p>Parameters
2846
38
</p>
2847
39
<ul><li> fileId
2848
40
</li><li> type (image|video|flash|ppt)
2849
41
</li><li> name
2850
42
</li><li> duration
2851
43
</li><li> fileName (including extension)
2852
44
</li></ul>
2853
45
<p>Response
2854
46
</p>
2855
47
<ul><li> MediaID
2856
48
</li></ul>
2857
49
<p>Errors
2858
50
</p>
2859
51
<ul><li> Code 1 - Access Denied
2860
52
</li><li> Code 10 - The Name cannot be longer than 100 characters
2861
53
</li><li> Code 11 - You must enter a duration
2862
54
</li><li> Code 12 - This user already owns media with this name
2863
55
</li><li> Code 13 - Error inserting media into the database
2864
56
</li><li> Code 14 - Cannot clean up after failure
2865
57
</li><li> Code 15 - Cannot store file
2866
58
</li><li> Code 16 - Cannot update stored file location
2867
59
</li><li> Code 18 - Invalid File Extension
2868
60
</li></ul>
2869
61
<h3> <span class="mw-headline" id="LibraryMediaEdit"> LibraryMediaEdit </span></h3>
2870
62
<p>Parameters
2871
63
</p>
2872
64
<ul><li> mediaId
2873
65
</li><li> name
2874
66
</li><li> duration
2875
67
</li></ul>
2876
68
<p>Response
2877
69
</p>
2878
70
<ul><li> success
2879
71
</li></ul>
2880
72
<p>Errors
2881
73
</p>
2882
74
<ul><li> 1 - Access Denied
2883
75
</li><li> 10 - The Name cannot be longer than 100 characters
2884
76
</li><li> 11 - You must enter a duration
2885
77
</li><li> 12 - This user already owns media with this name
2886
78
</li><li> 30 - Database failure updating media
2887
79
</li></ul>
2888
80
<h3> <span class="mw-headline" id="LibraryMediaFileRevise"> LibraryMediaFileRevise </span></h3>
2889
81
<p>Parameters
2890
82
</p>
2891
83
<ul><li> mediaId
2892
84
</li><li> fileId
2893
85
</li><li> fileName (including extension)
2894
86
</li></ul>
2895
87
<p>Response
2896
88
</p>
2897
89
<ul><li> mediaId
2898
90
</li></ul>
2899
91
<p>Errors
2900
92
</p>
2901
93
<ul><li> 1 - Access Denied
2902
94
</li><li> 13 - Error inserting media into the database
2903
95
</li><li> 14 - Cannot clean up after failure
2904
96
</li><li> 15 - Cannot store file
2905
97
</li><li> 16 - Cannot update stored file location
2906
98
</li><li> 18 - Invalid File Extension
2907
99
</li><li> 31 - Unable to get information about existing media record
2908
100
</li><li> 32 - Unable to update existing media record
2909
101
</li></ul>
2910
102
<h3> <span class="mw-headline" id="LibraryMediaRetire"> LibraryMediaRetire </span></h3>
2911
103
<p>Parameters
2912
104
</p>
2913
105
<ul><li> mediaId
2914
106
</li></ul>
2915
107
<p>Response
2916
108
</p>
2917
109
<ul><li> success
2918
110
</li></ul>
2919
111
<p>Error Codes
2920
112
</p>
2921
113
<ul><li> 1 - Access Denied
2922
114
</li><li> 19 - Error retiring media
2923
115
</li></ul>
2924
116
<h3> <span class="mw-headline" id="LibraryMediaDelete"> LibraryMediaDelete </span></h3>
2925
117
<p>Parameters
2926
118
</p>
2927
119
<ul><li> mediaId
2928
120
</li></ul>
2929
121
<p>Response
2930
122
</p>
2931
123
<ul><li> Success = True
2932
124
</li></ul>
2933
125
<p>Error Codes
2934
126
</p>
2935
127
<ul><li> 1 - Access Denied
2936
128
</li><li> 20 - Cannot check if media is assigned to layouts
2937
129
</li><li> 21 - Media is in use
2938
130
</li><li> 22 - Cannot locate stored files, unable to delete
2939
131
</li><li> 23 - Database error deleting media
2940
132
</li></ul>
2941
0
\ No newline at end of file
133
\ No newline at end of file
2942
1
134
2943
=== added file 'server/manual/content/admin/api_methods.php'
2944
--- server/manual/content/admin/api_methods.php	1970-01-01 00:00:00 +0000
2945
+++ server/manual/content/admin/api_methods.php	2014-01-19 13:57:27 +0000
2946
@@ -0,0 +1,144 @@
2947
1
<?php
2948
2
/*
2949
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
2950
4
 * Copyright (C) 2006-2013 Daniel Garner
2951
5
 *
2952
6
 * This file is part of Xibo.
2953
7
 *
2954
8
 * Xibo is free software: you can redistribute it and/or modify
2955
9
 * it under the terms of the GNU Affero General Public License as published by
2956
10
 * the Free Software Foundation, either version 3 of the License, or
2957
11
 * any later version. 
2958
12
 *
2959
13
 * Xibo is distributed in the hope that it will be useful,
2960
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2961
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2962
16
 * GNU Affero General Public License for more details.
2963
17
 *
2964
18
 * You should have received a copy of the GNU Affero General Public License
2965
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
2966
20
 */ 
2967
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
2968
22
?>
2969
23
<h2> <span class="mw-headline" id="Request_Formats"> Request Formats </span></h2>
2970
24
<p>Xibo supports the following request formats
2971
25
</p>
2972
26
<ul><li> REST
2973
27
</li></ul>
2974
28
<h3> <span class="mw-headline" id="REST"> REST </span></h3>
2975
29
<p>A simple POST or GET.
2976
30
</p><p>To request the Xibo Version method:
2977
31
</p>
2978
32
<pre>services.php?service=rest&amp;method=version
2979
33
</pre>
2980
34
<p>By default the response type is xml. To get a different response type send "&amp;response="
2981
35
</p><p><br />
2982
36
</p>
2983
37
<h2> <span class="mw-headline" id="Response_Types"> Response Types </span></h2>
2984
38
<p>Xibo supports the following response types
2985
39
</p>
2986
40
<ul><li> JSON (not implemented)
2987
41
</li><li> XML
2988
42
</li></ul>
2989
43
<h3> <span class="mw-headline" id="JSON"> JSON </span></h3>
2990
44
<p>To return a JSON object specify the response to be JSON (response="json")
2991
45
</p><p>A method call returns:
2992
46
</p>
2993
47
<pre>xiboApi({
2994
48
  "stat":"ok",
2995
49
  "response": {...}
2996
50
})
2997
51
</pre>
2998
52
<p><br />
2999
53
A failure call returns:
3000
54
</p>
3001
55
<pre>xiboApi({
3002
56
  "stat":"error",
3003
57
  "error": {
3004
58
     "code": "[error-code]",
3005
59
     "message": "[error-message]"
3006
60
  }
3007
61
})
3008
62
</pre>
3009
63
<h3> <span class="mw-headline" id="XML"> XML </span></h3>
3010
64
<p>A successful call returns this:
3011
65
</p>
3012
66
<pre>&lt;?xml version="1.0" encoding="utf-8"&#160;?&gt;
3013
67
&lt;rsp status="ok"&gt;
3014
68
	[xml-payload-here]
3015
69
&lt;/rsp&gt;
3016
70
</pre>
3017
71
<p>A failure call returns this:
3018
72
</p>
3019
73
<pre>&lt;?xml version="1.0" encoding="utf-8"&#160;?&gt;
3020
74
&lt;rsp status="error"&gt;
3021
75
    &lt;error code="[error-code]" message="[error-message]"
3022
76
&lt;/rsp&gt;
3023
77
</pre>
3024
78
<h2> <span class="mw-headline" id="Error_Codes">General Error Codes </span></h2>
3025
79
<p>A list of the potential error codes from each method call can be found with the documentation of that call.
3026
80
</p>
3027
81
3028
82
<table border="1">
3029
83
<caption> Error code numbers and explanations
3030
84
</caption>
3031
85
<tr>
3032
86
<th>Error Code</th>
3033
87
<th>Explanation</th>
3034
88
<th>Use case
3035
89
</th></tr>
3036
90
<tr>
3037
91
<td> 1 </td>
3038
92
<td>Access Denied</td>
3039
93
<td>OAuth was successful, but Xibo denied access to that functionality for the user
3040
94
</td></tr>
3041
95
<tr>
3042
96
<td> 2 </td>
3043
97
<td>Checksum does not match with the generated checksum for the current payload</td>
3044
98
<td>Used when Uploading data or requesting file offset
3045
99
</td></tr>
3046
100
<tr>
3047
101
<td> 3 </td>
3048
102
<td>Unable to add File record to the Database</td>
3049
103
<td>
3050
104
</td></tr>
3051
105
<tr>
3052
106
<td> 4 </td>
3053
107
<td>Library location does not exist</td>
3054
108
<td>
3055
109
</td></tr>
3056
110
<tr>
3057
111
<td> 5 </td>
3058
112
<td>Unable to create file in the library location</td>
3059
113
<td>
3060
114
</td></tr>
3061
115
<tr>
3062
116
<td> 6 </td>
3063
117
<td>Unable to write to file in the library location</td>
3064
118
<td>
3065
119
</td></tr>
3066
120
<tr>
3067
121
<td> 7 </td>
3068
122
<td>File does not exist</td>
3069
123
<td>
3070
124
</td></tr>
3071
125
<tr>
3072
126
<td>10</td>
3073
127
<td>The Layout Name cannot be longer than 100 characters</td>
3074
128
<td>
3075
129
</td></tr>
3076
130
<tr>
3077
131
<td>11</td>
3078
132
<td>You must enter a duration</td>
3079
133
<td>
3080
134
</td></tr>
3081
135
<tr>
3082
136
<td>12</td>
3083
137
<td>The user already owns media with this name</td>
3084
138
<td>
3085
139
</td></tr>
3086
140
<tr>
3087
141
<td>13</td>
3088
142
<td>Error inserting media into the database</td>
3089
143
<td>
3090
144
</td></tr></table>
3091
0
\ No newline at end of file
145
\ No newline at end of file
3092
1
146
3093
=== added file 'server/manual/content/admin/api_misc.php'
3094
--- server/manual/content/admin/api_misc.php	1970-01-01 00:00:00 +0000
3095
+++ server/manual/content/admin/api_misc.php	2014-01-19 13:57:27 +0000
3096
@@ -0,0 +1,15 @@
3097
1
3098
2
<h3> <span class="mw-headline" id="Other"> Other </span></h3>
3099
3
<ul><li> Version
3100
4
</li><li> ServerStatus
3101
5
</li></ul>
3102
6
3103
7
3104
8
<h3> <span class="mw-headline" id="Version"> Version </span></h3>
3105
9
<p>Response
3106
10
</p>
3107
11
<pre>&lt;?xml version="1.0"?&gt;
3108
12
&lt;rsp status="ok"&gt;
3109
13
    &lt;version app_ver="1.1.1" XlfVersion="1" XmdsVersion="2" DBVersion="22"/&gt;
3110
14
&lt;/rsp&gt;
3111
15
</pre>
3112
0
\ No newline at end of file
16
\ No newline at end of file
3113
1
17
3114
=== added file 'server/manual/content/admin/api_modules.php'
3115
--- server/manual/content/admin/api_modules.php	1970-01-01 00:00:00 +0000
3116
+++ server/manual/content/admin/api_modules.php	2014-01-19 13:57:27 +0000
3117
@@ -0,0 +1,19 @@
3118
1
3119
2
<h3> <span class="mw-headline" id="Modules"> Modules</span></h3>
3120
3
<ul><li> ModuleList
3121
4
</li></ul>
3122
5
3123
6
3124
7
<h3> <span class="mw-headline" id="ModuleList"> ModuleList </span></h3>
3125
8
<p>Response
3126
9
A list of modules with the following attributes:
3127
10
</p>
3128
11
<ul><li> module - The Module Name
3129
12
</li><li> layoutOnly- Whether the module is a library based module or only available for layouts
3130
13
</li><li> description - A description of the module
3131
14
</li><li> extensions - Extensions allowed by this module
3132
15
</li></ul>
3133
16
<p>Error Codes
3134
17
</p>
3135
18
<ul><li> 40 - Unable to query for modules
3136
19
</li></ul>
3137
0
\ No newline at end of file
20
\ No newline at end of file
3138
1
21
3139
=== added file 'server/manual/content/admin/api_oauth.php'
3140
--- server/manual/content/admin/api_oauth.php	1970-01-01 00:00:00 +0000
3141
+++ server/manual/content/admin/api_oauth.php	2014-01-19 13:57:27 +0000
3142
@@ -0,0 +1,100 @@
3143
1
<?php
3144
2
/*
3145
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
3146
4
 * Copyright (C) 2006-2013 Daniel Garner
3147
5
 *
3148
6
 * This file is part of Xibo.
3149
7
 *
3150
8
 * Xibo is free software: you can redistribute it and/or modify
3151
9
 * it under the terms of the GNU Affero General Public License as published by
3152
10
 * the Free Software Foundation, either version 3 of the License, or
3153
11
 * any later version. 
3154
12
 *
3155
13
 * Xibo is distributed in the hope that it will be useful,
3156
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3157
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3158
16
 * GNU Affero General Public License for more details.
3159
17
 *
3160
18
 * You should have received a copy of the GNU Affero General Public License
3161
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
3162
20
 */ 
3163
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
3164
22
?>
3165
23
<h1>Applications <small>API Authentication with oAuth</small></h1>
3166
24
<p>Any application that connects to the CMS API will require pre-registration and user authentication before it is allowed to connect.</p>
3167
25
3168
26
<p>Applications must have an "Application" record in the CMS, which describes the application name, home page location and authentication information (application keys). Applications can be viewed from the Administration > Applications menu.</p>
3169
27
3170
28
<p><img class="img-thumbnail" alt="API" src="content/admin/sa_api.png"></p>
3171
29
3172
30
<p class="alert alert-danger">It is recommended to keep this information confidential and only accessible to super administrator users.</p>
3173
31
3174
32
3175
33
<h3 id="Registered_Applications">Registered Applications</h3>
3176
34
3177
35
<p>You must obtain a consumer_key and consumer_secret for your application. Keys for "Supported" applications will be shipped with <?php echo PRODUCT_NAME; ?> meaning no extra steps are required. If you have made your own application you will need to register it with your <?php echo PRODUCT_NAME; ?> CMS using the "Add Application" menu button.</p>
3178
36
3179
37
<p><img class="img-thumbnail" alt="API" src="content/admin/api_register_application.png"></p>
3180
38
3181
39
3182
40
<h3 id="Callback_URL">Callback URL</h3>
3183
41
<p>The Callback URL will be automatically called by <?php echo PRODUCT_NAME; ?> on a completely Authorize request. It will be called regardless 
3184
42
of whether the authorization was successful and will contain an OAuth message indicating the authorize success.</p>
3185
43
3186
44
<p>If you do not specify a Callback URL <?php echo PRODUCT_NAME; ?> will show a message requesting the user return to the application once authorized.</p>
3187
45
  
3188
46
<h2 id="oAuthLog">oAuth Log <small>Debugging authentication requests</small></h2>
3189
47
<p>The CMS provides a log of all oAuth requests for tokens in the oAuth Log. Currently this log is a list of the last 50 oAuth requests, showing the date and header provided by the client.</p>
3190
48
3191
49
<p><img class="img-thumbnail" alt="API" src="content/admin/api_oauth_log.png"></p>
3192
50
3193
51
<h1 id="Authorization">Application Code <small>within the 3rd party application</small></h1>
3194
52
<p>The 3rd party application must obtain an access token which is used when making requests. This is done using the standard oAuth pattern. The specific URL's for the CMS are shown below:</p>
3195
53
3196
54
<p>Service location: <code>http:://**YourCMS**/services.php</code></p>
3197
55
<p>OAuth methods:</p>
3198
56
3199
57
<ul>
3200
58
    <li>XRDS: <code>services.php?xrds</code></li>
3201
59
    <li>Request Token: <code>services.php?service=oauth&amp;method=request_token</code></li>
3202
60
    <li>Authorize Token: <code>index.php?p=oauth&amp;q=authorize</code></li>
3203
61
    <li>Access Token: <code>services.php?service=oauth&amp;method=access_token</code></li>
3204
62
</ul>
3205
63
3206
64
<h3 id="XRDS">XRDS</h3>
3207
65
<p>The service is also discoverable by XRDS. The schema is below: </p>
3208
66
3209
67
<pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
3210
68
  &lt;XRDS xmlns="xri://$xrds"&gt;
3211
69
  &lt;XRD xmlns:simple="<a href="http://xrds-simple.net/core/1.0" class="external free" title="http://xrds-simple.net/core/1.0" 
3212
70
  rel="nofollow">http://xrds-simple.net/core/1.0</a>"
3213
71
  xmlns="xri://$XRD*($v*2.0)"  xmlns:openid="<a href="http://openid.net/xmlns/1.0" class="external free" title="http://openid.net/xmlns/1.0" rel="nofollow">http://openid.net/xmlns/1.0</a>" version="2.0" xml:id="main"&gt; 
3214
72
  &lt;Type&gt;xri://$xrds*simple&lt;/Type&gt;
3215
73
&lt;Service&gt;
3216
74
    &lt;Type&gt;<a href="http://oauth.net/discovery/1.0" class="external free" title="http://oauth.net/discovery/1.0" rel="nofollow">http://oauth.net/discovery/1.0</a>&lt;/Type&gt;
3217
75
    &lt;URI&gt;#main&lt;/URI&gt;
3218
76
&lt;/Service&gt;
3219
77
&lt;Service&gt;
3220
78
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/request" class="external free" title="http://oauth.net/core/1.0/endpoint/request" rel="nofollow">http://oauth.net/core/1.0/endpoint/request</a>&lt;/Type&gt;
3221
79
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/auth-header" class="external free" title="http://oauth.net/core/1.0/parameters/auth-header" rel="nofollow">http://oauth.net/core/1.0/parameters/auth-header</a>&lt;/Type&gt;
3222
80
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
3223
81
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/HMAC-SHA1" class="external free" title="http://oauth.net/core/1.0/signature/HMAC-SHA1" rel="nofollow">http://oauth.net/core/1.0/signature/HMAC-SHA1</a>&lt;/Type&gt;
3224
82
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/PLAINTEXT" class="external free" title="http://oauth.net/core/1.0/signature/PLAINTEXT" rel="nofollow">http://oauth.net/core/1.0/signature/PLAINTEXT</a>&lt;/Type&gt;
3225
83
    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/services.php?service=oauth&amp;method=request_token&lt;/URI&gt;
3226
84
&lt;/Service&gt;
3227
85
&lt;Service&gt;
3228
86
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/authorize" class="external free" title="http://oauth.net/core/1.0/endpoint/authorize" rel="nofollow">http://oauth.net/core/1.0/endpoint/authorize</a>&lt;/Type&gt;
3229
87
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
3230
88
    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/index.php?p=oauth&amp;q=authorize&lt;/URI&gt;
3231
89
&lt;/Service&gt;
3232
90
&lt;Service&gt;
3233
91
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/access" class="external free" title="http://oauth.net/core/1.0/endpoint/access" rel="nofollow">http://oauth.net/core/1.0/endpoint/access</a>&lt;/Type&gt;
3234
92
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/auth-header" class="external free" title="http://oauth.net/core/1.0/parameters/auth-header" rel="nofollow">http://oauth.net/core/1.0/parameters/auth-header</a>&lt;/Type&gt;
3235
93
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
3236
94
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/HMAC-SHA1" class="external free" title="http://oauth.net/core/1.0/signature/HMAC-SHA1" rel="nofollow">http://oauth.net/core/1.0/signature/HMAC-SHA1</a>&lt;/Type&gt;
3237
95
    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/PLAINTEXT" class="external free" title="http://oauth.net/core/1.0/signature/PLAINTEXT" rel="nofollow">http://oauth.net/core/1.0/signature/PLAINTEXT</a>&lt;/Type&gt;
3238
96
    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/services.php?service=oauth&amp;method=access_token&lt;/URI&gt;
3239
97
&lt;/Service&gt;
3240
98
&lt;/XRD&gt;
3241
99
&lt;/XRDS&gt;
3242
100
</pre>
3243
0
\ No newline at end of file
101
\ No newline at end of file
3244
1
102
3245
=== added file 'server/manual/content/admin/api_oauth_log.png'
3246
2
Binary files server/manual/content/admin/api_oauth_log.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/api_oauth_log.png	2014-01-19 13:57:27 +0000 differ
103
Binary files server/manual/content/admin/api_oauth_log.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/api_oauth_log.png	2014-01-19 13:57:27 +0000 differ
3247
=== renamed file 'server/manual/content/admin/api.php' => 'server/manual/content/admin/api_overview.php'
3248
--- server/manual/content/admin/api.php	2013-05-01 19:24:35 +0000
3249
+++ server/manual/content/admin/api_overview.php	2014-01-19 13:57:27 +0000
3250
@@ -1,396 +1,25 @@
3647
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
1
<?php
3648
2
<?php include('../../template.php'); ?>
2
/*
3649
3
<html>
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
3650
4
	<head>
4
 * Copyright (C) 2006-2013 Daniel Garner
3651
5
		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5
 *
3652
6
		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
6
 * This file is part of Xibo.
3653
7
		<link rel=stylesheet type="text/css" href="../../css/doc.css">
7
 *
3654
8
		<meta http-equiv="Content-Type" content="text/html" />
8
 * Xibo is free software: you can redistribute it and/or modify
3655
9
		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
9
 * it under the terms of the GNU Affero General Public License as published by
3656
10
		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
10
 * the Free Software Foundation, either version 3 of the License, or
3657
11
11
 * any later version. 
3658
12
		<link href="img/favicon.ico" rel="shortcut icon"/>
12
 *
3659
13
		<!-- Javascript Libraries -->
13
 * Xibo is distributed in the hope that it will be useful,
3660
14
		<script type="text/javascript" src="lib/jquery.pack.js"></script>
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3661
15
		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3662
16
		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
16
 * GNU Affero General Public License for more details.
3663
17
	</head>
17
 *
3664
18
	<body>
18
 * You should have received a copy of the GNU Affero General Public License
3665
19
	<h1><?php echo PRODUCT_NAME; ?> API</h1>
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
3666
20
20
 */ 
3667
21
    <p><img alt="SA <?php echo PRODUCT_NAME; ?> API" src="sa_api.png"
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
3668
22
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
22
?>
3669
23
	   width="805" height="149"></p>
23
<h1><?php echo PRODUCT_NAME; ?> API</h1>
3670
24
24
3671
25
    <a name="Authorization" id="Authorization"></a><h2>Authorization</h2>
25
<p>The CMS comes with an API for external applications to integrate with <?php echo PRODUCT_NAME; ?>.</p>
3276
26
    <p>OAuth will be used to provide authorization for access to the <?php echo PRODUCT_NAME; ?> API.</p>
3277
27
 
3278
28
<blockquote>    
3279
29
    <a name="OAuth_Information" id="OAuth_Information"></a><h3>OAuth Information</h3>
3280
30
    <p>Service location: services.php</p>
3281
31
    <p>OAuth methods:</p>
3282
32
3283
33
    <ul>
3284
34
	    <li> XRDS: services.php?xrds</li>
3285
35
	    <li> Request Token: services.php?service=oauth&amp;method=request_token</li>
3286
36
	    <li> Authorize Token: index.php?p=oauth&amp;q=authorize</li>
3287
37
	    <li> Access Token: services.php?service=oauth&amp;method=access_token</li>
3288
38
    </ul>
3289
39
3290
40
    <a name="XRDS" id="XRDS"></a><h3>XRDS</h3>
3291
41
    <pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
3292
42
      &lt;XRDS xmlns="xri://$xrds"&gt;
3293
43
      &lt;XRD xmlns:simple="<a href="http://xrds-simple.net/core/1.0" class="external free" title="http://xrds-simple.net/core/1.0" 
3294
44
      rel="nofollow">http://xrds-simple.net/core/1.0</a>"
3295
45
      xmlns="xri://$XRD*($v*2.0)"  xmlns:openid="<a href="http://openid.net/xmlns/1.0" class="external free" title="http://openid.net/xmlns/1.0" rel="nofollow">http://openid.net/xmlns/1.0</a>" version="2.0" xml:id="main"&gt; 
3296
46
      &lt;Type&gt;xri://$xrds*simple&lt;/Type&gt;
3297
47
    &lt;Service&gt;
3298
48
	    &lt;Type&gt;<a href="http://oauth.net/discovery/1.0" class="external free" title="http://oauth.net/discovery/1.0" rel="nofollow">http://oauth.net/discovery/1.0</a>&lt;/Type&gt;
3299
49
	    &lt;URI&gt;#main&lt;/URI&gt;
3300
50
    &lt;/Service&gt;
3301
51
    &lt;Service&gt;
3302
52
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/request" class="external free" title="http://oauth.net/core/1.0/endpoint/request" rel="nofollow">http://oauth.net/core/1.0/endpoint/request</a>&lt;/Type&gt;
3303
53
 	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/auth-header" class="external free" title="http://oauth.net/core/1.0/parameters/auth-header" rel="nofollow">http://oauth.net/core/1.0/parameters/auth-header</a>&lt;/Type&gt;
3304
54
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
3305
55
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/HMAC-SHA1" class="external free" title="http://oauth.net/core/1.0/signature/HMAC-SHA1" rel="nofollow">http://oauth.net/core/1.0/signature/HMAC-SHA1</a>&lt;/Type&gt;
3306
56
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/PLAINTEXT" class="external free" title="http://oauth.net/core/1.0/signature/PLAINTEXT" rel="nofollow">http://oauth.net/core/1.0/signature/PLAINTEXT</a>&lt;/Type&gt;
3307
57
	    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/services.php?service=oauth&amp;method=request_token&lt;/URI&gt;
3308
58
	&lt;/Service&gt;
3309
59
	&lt;Service&gt;
3310
60
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/authorize" class="external free" title="http://oauth.net/core/1.0/endpoint/authorize" rel="nofollow">http://oauth.net/core/1.0/endpoint/authorize</a>&lt;/Type&gt;
3311
61
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
3312
62
	    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/index.php?p=oauth&amp;q=authorize&lt;/URI&gt;
3313
63
	&lt;/Service&gt;
3314
64
	&lt;Service&gt;
3315
65
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/endpoint/access" class="external free" title="http://oauth.net/core/1.0/endpoint/access" rel="nofollow">http://oauth.net/core/1.0/endpoint/access</a>&lt;/Type&gt;
3316
66
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/auth-header" class="external free" title="http://oauth.net/core/1.0/parameters/auth-header" rel="nofollow">http://oauth.net/core/1.0/parameters/auth-header</a>&lt;/Type&gt;
3317
67
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/parameters/uri-query" class="external free" title="http://oauth.net/core/1.0/parameters/uri-query" rel="nofollow">http://oauth.net/core/1.0/parameters/uri-query</a>&lt;/Type&gt;
3318
68
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/HMAC-SHA1" class="external free" title="http://oauth.net/core/1.0/signature/HMAC-SHA1" rel="nofollow">http://oauth.net/core/1.0/signature/HMAC-SHA1</a>&lt;/Type&gt;
3319
69
	    &lt;Type&gt;<a href="http://oauth.net/core/1.0/signature/PLAINTEXT" class="external free" title="http://oauth.net/core/1.0/signature/PLAINTEXT" rel="nofollow">http://oauth.net/core/1.0/signature/PLAINTEXT</a>&lt;/Type&gt;
3320
70
	    &lt;URI&gt;http://<a href="/index.php?title=Template:XRDS_LOCATION&amp;action=edit&amp;redlink=1" class="new" title="Template:XRDS LOCATION (page does not exist)">Template:XRDS LOCATION</a>/services.php?service=oauth&amp;method=access_token&lt;/URI&gt;
3321
71
	&lt;/Service&gt;
3322
72
    &lt;/XRD&gt;
3323
73
  &lt;/XRDS&gt;
3324
74
  </pre>
3325
75
3326
76
  	<a name="Registered_Applications" id="Registered_Applications"></a><h3>Registered Applications</h3>
3327
77
  	<p>You must obtain a consumer_key and consumer_secret for your application. Keys for "Supported" applications 
3328
78
  	will be shipped with <?php echo PRODUCT_NAME; ?> meaning no extra steps are required. If you have made your own application you will need
3329
79
 	to register it with your <?php echo PRODUCT_NAME; ?> Server using the following address:</p>
3330
80
  	<p>Register Service: index.php?p=oauth</p>
3331
81
  	<p>You will be asked for:</p>
3332
82
  	<ul>
3333
83
  		<li>Your Name</li>
3334
84
 	 	<li> Your email address</li>
3335
85
  		<li> A URL for your Application</li>
3336
86
  		<li> A Callback URL</li>
3337
87
 	</ul>
3338
88
  	<p><?php echo PRODUCT_NAME; ?> will (at a later date) have a UI for displaying all registered applications.</p>
3339
89
3340
90
  	<a name="Callback_URL" id="Callback_URL"></a><h3>Callback URL</h3>
3341
91
   	<p>The Callback URL will be automatically called by <?php echo PRODUCT_NAME; ?> on a completely Authorize request. It will be called regardless 
3342
92
   	of whether the authorization was successful and will contain an OAuth message indicating the authorize success.</p>
3343
93
   	<p>If you do not specify a Callback URL <?php echo PRODUCT_NAME; ?> will show a message requesting the user return to the application once authorized.</p>
3344
94
</blockquote>    
3345
95
3346
96
    <a name="Request_Formats" id="Request_Formats"></a><h2>Request Formats</h2>
3347
97
    <p><?php echo PRODUCT_NAME; ?> supports the following request formats</p>
3348
98
3349
99
    <ul><li>REST</li></ul>
3350
100
3351
101
<blockquote>    
3352
102
    <a name="REST" id="REST"></a><h3>REST</h3>
3353
103
    <p>A simple POST or GET.</p>
3354
104
    <p>To request the <?php echo PRODUCT_NAME; ?> Version method:</p>
3355
105
    <pre>services.php?service=rest&amp;method=version</pre>
3356
106
    <p>By default the response type is xml. To get a different response type send "&amp;response="</p>
3357
107
</blockquote>    
3358
108
3359
109
    <a name="Response_Types" id="Response_Types"></a><h2>Response Types</h2>
3360
110
    <p><?php echo PRODUCT_NAME; ?> supports the following response types</p>
3361
111
3362
112
    <blockquote>    
3363
113
    <ul><li>JSON</li>
3364
114
    	<li> XML</li></ul>
3365
115
  
3366
116
    <a name="JSON" id="JSON"></a><h3>JSON</h3>
3367
117
    <p>To return a JSON object specify the response to be JSON (response="json")</p>
3368
118
    <p>A method call returns:</p>
3369
119
    <pre><?php echo PRODUCT_NAME; ?>Api({
3370
120
      "stat":"ok",
3371
121
      "response": {...}
3372
122
    })
3373
123
    </pre>
3374
124
  
3375
125
    <p>A failure call returns:</p>
3376
126
    <pre><?php echo PRODUCT_NAME; ?>Api({
3377
127
    "stat":"error",
3378
128
    "error": {
3379
129
       "code": "[error-code]",
3380
130
       "message": "[error-message]"
3381
131
     }
3382
132
    })
3383
133
    </pre>
3384
134
3385
135
      <a name="XML" id="XML"></a><h3>XML</h3>
3386
136
      <p>A successful call returns this:</p>
3387
137
      <pre>&lt;?xml version="1.0" encoding="utf-8"&nbsp;?&gt;
3388
138
        &lt;rsp status="ok"&gt;
3389
139
        	[xml-payload-here]
3390
140
        &lt;/rsp&gt;
3391
141
      </pre>
3392
142
      <p>A failure call returns this:</p>
3393
143
      <pre>&lt;?xml version="1.0" encoding="utf-8"&nbsp;?&gt;
3394
144
      &lt;rsp status="error"&gt;
3395
145
      &lt;error code="[error-code]" message="[error-message]"
3396
146
      &lt;/rsp&gt;
3397
147
      </pre>
3398
148
</blockquote>    
3399
149
3400
150
      <a name="Error_Codes" id="Error_Codes"></a><h2>Error Codes</h2>
3401
151
      <p>A complete list of error codes can be found here: <a href="http://wiki.<?php echo PRODUCT_NAME; ?>.org.uk/wiki/Error_codes" 
3402
152
      class="external free" title="http://wiki.<?php echo PRODUCT_NAME; ?>.org.uk/wiki/Error_codes" rel="nofollow">http://wiki.<?php echo PRODUCT_NAME; ?>.org.uk/wiki/Error_codes</a></p>
3403
153
      <p>A list of the potential error codes from each method call can be found with the documentation of that call.</p>
3404
154
3405
155
      <a name="Methods" id="Methods"></a><h2>Methods</h2>
3406
156
      <p>Transactions supported by <?php echo PRODUCT_NAME; ?></p>
3407
157
3408
158
  <blockquote>    
3409
159
      <a name="Displays" id="Displays"></a><h3>Displays</h3>
3410
160
      <ul><li>DisplayList</li>
3411
161
	      <li>DisplayEdit</li>
3412
162
	      <li>DisplayRetire</li>
3413
163
	      <li>DisplayDelete</li>
3414
164
	      <li>DisplayUserGroupSecurity</li>
3415
165
	      <li>DisplayUserGroupEdit</li>
3416
166
      </ul>
3417
167
3418
168
      <a name="DisplayGroups" id="DisplayGroups"></a><h3>DisplayGroups</h3>
3419
169
      <ul><li> DisplayGroupList</li>
3420
170
	      <li> DisplayGroupAdd</li>
3421
171
	      <li> DisplayGroupEdit</li>
3422
172
	      <li> DisplayGroupDelete</li>
3423
173
	      <li> DisplayGroupMembersList</li>
3424
174
	      <li> DisplayGroupMembersEdit</li>
3425
175
	      <li> DisplayGroupUserGroupList</li>
3426
176
	      <li> DisplayGroupUserGroupEdit</li></ul>
3427
177
3428
178
      <a name="Layout" id="Layout"></a><h3>Layout</h3>
3429
179
      <ul><li> LayoutList</li>
3430
180
	      <li> LayoutAdd</li>
3431
181
	      <li> LayoutEdit</li>
3432
182
	      <li> LayoutCopy</li>
3433
183
	      <li> LayoutDelete</li>
3434
184
	      <li> LayoutRetire</li>
3435
185
	      <li> LayoutBackgroundList</li>
3436
186
	      <li> LayoutBackgroundEdit</li>
3437
187
	      <li> LayoutGetXlf</li>
3438
188
	      <li> LayoutRegionList</li>
3439
189
	      <li> LayoutRegionAdd</li><li> LayoutRegionEdit</li>
3440
190
	      <li> LayoutRegionPosition</li><li> LayoutRegionTimelineList</li>
3441
191
	      <li> LayoutRegionMediaAdd</li>
3442
192
	      <li> LayoutRegionMediaReorder</li>
3443
193
	      <li> LayoutRegionMediaDelete</li>
3444
194
	      <li> LayoutRegionLibraryAdd</li>
3445
195
	      <li> LayoutRegionMediaEdit</li>
3446
196
	      <li> LayoutRegionMediaDetails</li></ul>
3447
197
      
3448
198
      <a name="Library" id="Library"></a><h3>Library</h3>
3449
199
      <ul><li> LibraryMediaFileUpload</li>
3450
200
	      <li> LibraryMediaFileRevise</li>
3451
201
	      <li> LibraryMediaAdd</li>
3452
202
	      <li> LibraryMediaEdit</li>
3453
203
	      <li> LibraryMediaRetire</li>
3454
204
	      <li> LibraryMediaDownload</li>
3455
205
	      <li> LibraryMediaList</li></ul>
3456
206
3457
207
      <a name="Schedule" id="Schedule"></a><h3>Schedule</h3>
3458
208
      <ul><li> ScheduleList</li>
3459
209
	      <li> ScheduleAdd</li>
3460
210
	      <li> ScheduleEdit</li>
3461
211
	      <li> ScheduleDelete</li></ul>
3462
212
      
3463
213
      <a name="Template" id="Template"></a><h3>Template</h3>
3464
214
      <ul><li> TemplateList</li>
3465
215
      		<li> TemplateDelete</li></ul>
3466
216
3467
217
      <a name="Resolution" id="Resolution"></a><h3>Resolution</h3>
3468
218
      <ul><li> ResolutionList</li></ul>
3469
219
3470
220
      <a name="Modules" id="Modules"></a><h3>Modules</h3>
3471
221
      <ul><li> ModuleList</li></ul>
3472
222
3473
223
      <a name="Other" id="Other"></a><h3>Other</h3>
3474
224
      <ul><li> Version</li>
3475
225
      	<li> ServerStatus</li></ul>
3476
226
	</blockquote>    
3477
227
3478
228
    <a name="Method_Calls" id="Method_Calls"></a><h2>Method Calls</h2>
3479
229
3480
230
    <blockquote>    
3481
231
    <a name="LayoutAdd" id="LayoutAdd"></a><h3>LayoutAdd</h3>
3482
232
    <p>Parameters</p>
3483
233
	<ul><li> layout - The Name of the Layout</li>
3484
234
		<li> description - The Description of the Layout</li>
3485
235
		<li> permissionid - PermissionID for the layout</li>
3486
236
		<li> tags - Tags for the Layout</li>
3487
237
		<li> templateid - Template for the Layout</li>
3488
238
	</ul>
3489
239
3490
240
	<p>Response</p>
3491
241
	<ul><li> layout - The ID of the layout</li></ul>
3492
242
	
3493
243
	<p>Errors</p>
3494
244
	<ul><li> Code 1 - Access Denied</li>
3495
245
		<li> Code 25001 - Layout Name must be between 1 and 50 characters</li>
3496
246
		<li> Code 25002 - Description must be less than 254 characters</li>
3497
247
		<li> Code 25003 - All tags combined must be less that 254 characters</li>
3498
248
		<li> Code 25004 - User already has a layout with this name</li>
3499
249
		<li> Code 25005 - Database error adding layout</li>
3500
250
		<li> Code 25006 - Failed to Parse Tags</li>
3501
251
		<li> Code 25007 - Unable to update layout xml</li>
3502
252
		<li> Code 25008 - Unable to Delete layout on failure</li>
3503
253
	</ul>
3504
254
3505
255
	<a name="LayoutEdit" id="LayoutEdit"></a><h3> <span class="mw-headline"> LayoutEdit </span></h3>
3506
256
	<p>Not implemented</p>
3507
257
3508
258
	<a name="LayoutUpdateXlf" id="LayoutUpdateXlf"></a><h3> <span class="mw-headline"> LayoutUpdateXlf </span></h3>
3509
259
	<p>Not Implemented</p>
3510
260
3511
261
	<a name="LayoutBackground" id="LayoutBackground"></a><h3> <span class="mw-headline"> LayoutBackground </span></h3>
3512
262
	<p>Not Implemented</p>
3513
263
3514
264
	<a name="LayoutDelete" id="LayoutDelete"></a><h3> <span class="mw-headline"> LayoutDelete </span></h3>
3515
265
	<p>Parameters</p>
3516
266
	<ul><li> layoutId - The ID of the layout to delete</li></ul>
3517
267
	<p>Response</p>
3518
268
	<ul><li> success = true</li></ul>
3519
269
	<p>Errors</p>
3520
270
	<ul><li> Code 1 - Access Denied</li><li> Code 25008 - Unable to delete layout</li></ul>
3521
271
3522
272
	<a name="TemplateDelete" id="TemplateDelete"></a><h3> <span class="mw-headline"> TemplateDelete </span></h3>
3523
273
	<p>Parameters</p>
3524
274
	<ul><li> templateId - The ID of the template to delete</li></ul>
3525
275
	<p>Response</p>
3526
276
	<ul><li> success = true</li></ul>
3527
277
	<p>Errors</p>
3528
278
	<ul><li> Code 1 - Access Denied</li><li> Code 25105 - Unable to delete template</li></ul>
3529
279
3530
280
	<a name="LibraryMediaFileUpload" id="LibraryMediaFileUpload"></a><h3> <span class="mw-headline"> LibraryMediaFileUpload </span></h3>
3531
281
	<p>Parameters</p>
3532
282
	<ul>
3533
283
		<li> FileID - Null for 1st call</li><li> Chunk Offset</li>
3534
284
		<li> Check Sum (MD5)</li></ul>
3535
285
		<p>Response</p>
3536
286
	<ul><li> FileID</li>
3537
287
		<li> Offset (file length)</li></ul>
3538
288
		<p>Errors</p>
3539
289
	<ul><li> 1 - Access Denied</li>
3540
290
		<li> 2 - Payload Checksum doesn't match provided checksum</li>
3541
291
		<li> 3 - Unable to add File record to the Database</li>
3542
292
		<li> 4 - Library location does not exist</li>
3543
293
		<li> 5 - Unable to create file in the library location</li>
3544
294
		<li> 6 - Unable to write to file in the library location</li>
3545
295
		<li> 7 - File does not exist</li></ul>
3546
296
3547
297
	<a name="LibraryMediaAdd" id="LibraryMediaAdd"></a><h3> <span class="mw-headline"> LibraryMediaAdd </span></h3>
3548
298
	<p>Parameters	</p>
3549
299
	<ul><li> fileId</li>
3550
300
		<li>type (image|video|flash|ppt)</li>
3551
301
		<li> name</li>
3552
302
		<li>duration</li>
3553
303
		<li> permissionId (1|2|3)</li>
3554
304
		<li> fileName (including extension)</li></ul>
3555
305
		<p>Response</p>
3556
306
		<ul><li> MediaID</li></ul>
3557
307
	<p>Errors</p>
3558
308
	<ul><li> Code 1 - Access Denied</li>
3559
309
		<li> Code 10 - The Name cannot be longer than 100 characters</li>
3560
310
		<li> Code 11 - You must enter a duration</li>
3561
311
		<li> Code 12 - This user already owns media with this name</li>
3562
312
		<li> Code 13 - Error inserting media into the database</li>
3563
313
		<li> Code 14 - Cannot clean up after failure</li>
3564
314
		<li> Code 15 - Cannot store file</li>
3565
315
		<li> Code 16 - Cannot update stored file location</li>
3566
316
		<li> Code 18 - Invalid File Extension</li></ul>
3567
317
3568
318
	<a name="LibraryMediaEdit" id="LibraryMediaEdit"></a><h3> <span class="mw-headline"> LibraryMediaEdit </span></h3>
3569
319
	<p>Parameters</p>
3570
320
	<ul><li> mediaId</li>
3571
321
		<li> name</li>
3572
322
		<li>duration</li>
3573
323
		<li> permissionId (1|2|3)</li>
3574
324
		</ul>
3575
325
		<p>Response</p>
3576
326
	<ul><li> success</li></ul>
3577
327
	<p>Errors</p>
3578
328
	<ul><li> 1 - Access Denied</li>
3579
329
		<li> 10 - The Name cannot be longer than 100 characters</li>
3580
330
		<li> 11 - You must enter a duration</li>
3581
331
		<li> 12 - This user already owns media with this name</li>
3582
332
		<li> 30 - Database failure updating media</li>
3583
333
		</ul>
3584
334
3585
335
	<a name="LibraryMediaFileRevise" id="LibraryMediaFileRevise"></a><h3> <span class="mw-headline"> LibraryMediaFileRevise </span></h3>
3586
336
	<p>Parameters</p>
3587
337
	<ul><li> mediaId</li>
3588
338
		<li> fileId</li>
3589
339
		<li> fileName (including extension)</li></ul>
3590
340
	<p>Response</p>
3591
341
	<ul><li> mediaId</li></ul>
3592
342
	<p>Errors</p>
3593
343
	<ul><li> 1 - Access Denied</li>
3594
344
		<li> 13 - Error inserting media into the database</li>
3595
345
		<li> 14 - Cannot clean up after failure</li>
3596
346
		<li> 15 - Cannot store file</li>
3597
347
		<li> 16 - Cannot update stored file location</li>
3598
348
		<li> 18 - Invalid File Extension</li>
3599
349
		<li> 31 - Unable to get information about existing media record</li>
3600
350
		<li> 32 - Unable to update existing media record</li>
3601
351
		</ul>
3602
352
3603
353
	<a name="LibraryMediaRetire" id="LibraryMediaRetire"></a><h3> <span class="mw-headline"> LibraryMediaRetire </span></h3>
3604
354
	<p>Parameters</p>
3605
355
	<ul><li> mediaId</li></ul>
3606
356
	<p>Response</p>
3607
357
	<ul><li> success</li></ul>
3608
358
	<p>Error Codes</p>
3609
359
	<ul><li> 1 - Access Denied</li>
3610
360
		<li> 19 - Error retiring media</li></ul>
3611
361
3612
362
	<a name="LibraryMediaDelete" id="LibraryMediaDelete"></a><h3> <span class="mw-headline"> LibraryMediaDelete </span></h3>
3613
363
	<p>Parameters</p>
3614
364
	<ul><li> mediaId</li></ul>
3615
365
	<p>Response</p>
3616
366
	<ul><li> Success = True</li></ul>
3617
367
	<p>Error Codes</p>
3618
368
	<ul><li> 1 - Access Denied</li>
3619
369
		<li> 20 - Cannot check if media is assigned to layouts</li>
3620
370
		<li> 21 - Media is in use</li>
3621
371
		<li> 22 - Cannot locate stored files, unable to delete</li>
3622
372
		<li> 23 - Database error deleting media</li>
3623
373
	</ul>
3624
374
3625
375
	<a name="ModuleList" id="ModuleList"></a><h3> <span class="mw-headline"> ModuleList </span></h3>
3626
376
	<p>Response A list of modules with the following attributes:</p>
3627
377
	<ul><li> module - The Module Name</li>
3628
378
		<li> layoutOnly- Whether the module is a library based module or only available for layouts</li>
3629
379
		<li> description - A description of the module</li>
3630
380
		<li> extensions - Extensions allowed by this module</li>
3631
381
	</ul>
3632
382
	<p>Error Codes</p>
3633
383
	<ul><li> 40 - Unable to query for modules</li></ul>
3634
384
3635
385
	<a name="Version" id="Version"></a><h3> <span class="mw-headline"> Version </span></h3>
3636
386
	<p>Response</p>
3637
387
	<pre>&lt;?xml version="1.0"?&gt;
3638
388
		&lt;rsp status="ok"&gt;
3639
389
	    &lt;version app_ver="1.1.1" XlfVersion="1" XmdsVersion="2" DBVersion="22"/&gt;
3640
390
		&lt;/rsp&gt;
3641
391
	</pre>
3642
392
	</blockquote>    
3643
393
3644
394
	<?php include('../../template/footer.php'); ?>
3645
395
	</body>
3646
396
</html>
3672
397
26
3673
=== added file 'server/manual/content/admin/api_register_application.png'
3674
398
Binary files server/manual/content/admin/api_register_application.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/api_register_application.png	2014-01-19 13:57:27 +0000 differ
27
Binary files server/manual/content/admin/api_register_application.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/api_register_application.png	2014-01-19 13:57:27 +0000 differ
3675
=== added file 'server/manual/content/admin/api_resolution.php'
3676
--- server/manual/content/admin/api_resolution.php	1970-01-01 00:00:00 +0000
3677
+++ server/manual/content/admin/api_resolution.php	2014-01-19 13:57:27 +0000
3678
@@ -0,0 +1,4 @@
3679
1
3680
2
<h3> <span class="mw-headline" id="Resolution"> Resolution </span></h3>
3681
3
<ul><li> ResolutionList
3682
4
</li></ul>
3683
0
\ No newline at end of file
5
\ No newline at end of file
3684
1
6
3685
=== added file 'server/manual/content/admin/api_schedule.php'
3686
--- server/manual/content/admin/api_schedule.php	1970-01-01 00:00:00 +0000
3687
+++ server/manual/content/admin/api_schedule.php	2014-01-19 13:57:27 +0000
3688
@@ -0,0 +1,7 @@
3689
1
3690
2
<h3> <span class="mw-headline" id="Schedule"> Schedule </span></h3>
3691
3
<ul><li> ScheduleList
3692
4
</li><li> ScheduleAdd
3693
5
</li><li> ScheduleEdit
3694
6
</li><li> ScheduleDelete
3695
7
</li></ul>
3696
0
\ No newline at end of file
8
\ No newline at end of file
3697
1
9
3698
=== added file 'server/manual/content/admin/api_template.php'
3699
--- server/manual/content/admin/api_template.php	1970-01-01 00:00:00 +0000
3700
+++ server/manual/content/admin/api_template.php	2014-01-19 13:57:27 +0000
3701
@@ -0,0 +1,21 @@
3702
1
3703
2
<h3> <span class="mw-headline" id="Template"> Template </span></h3>
3704
3
<ul><li> TemplateList
3705
4
</li><li> TemplateDelete
3706
5
</li></ul>
3707
6
3708
7
3709
8
<h3> <span class="mw-headline" id="TemplateDelete"> TemplateDelete </span></h3>
3710
9
<p>Parameters
3711
10
</p>
3712
11
<ul><li> templateId - The ID of the template to delete
3713
12
</li></ul>
3714
13
<p>Response
3715
14
</p>
3716
15
<ul><li> success = true
3717
16
</li></ul>
3718
17
<p>Errors
3719
18
</p>
3720
19
<ul><li> Code 1 - Access Denied
3721
20
</li><li> Code 25105 - Unable to delete template
3722
21
</li></ul>
3723
0
\ No newline at end of file
22
\ No newline at end of file
3724
1
23
3725
=== added file 'server/manual/content/admin/blueprints.php'
3726
--- server/manual/content/admin/blueprints.php	1970-01-01 00:00:00 +0000
3727
+++ server/manual/content/admin/blueprints.php	2014-01-19 13:57:27 +0000
3728
@@ -0,0 +1,24 @@
3729
1
<?php
3730
2
/*
3731
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
3732
4
 * Copyright (C) 2006-2013 Daniel Garner
3733
5
 *
3734
6
 * This file is part of Xibo.
3735
7
 *
3736
8
 * Xibo is free software: you can redistribute it and/or modify
3737
9
 * it under the terms of the GNU Affero General Public License as published by
3738
10
 * the Free Software Foundation, either version 3 of the License, or
3739
11
 * any later version. 
3740
12
 *
3741
13
 * Xibo is distributed in the hope that it will be useful,
3742
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3743
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3744
16
 * GNU Affero General Public License for more details.
3745
17
 *
3746
18
 * You should have received a copy of the GNU Affero General Public License
3747
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
3748
20
 */ 
3749
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
3750
22
?>
3751
23
<h1>Blueprints</h1>
3752
24
<p>For the time being blueprints will be managed on the <a href="https://blueprints.launchpad.net/xibo">Launchpad Project Page</a>.</p>
3753
0
\ No newline at end of file
25
\ No newline at end of file
3754
1
26
3755
=== added file 'server/manual/content/admin/contributing.php'
3756
--- server/manual/content/admin/contributing.php	1970-01-01 00:00:00 +0000
3757
+++ server/manual/content/admin/contributing.php	2014-01-19 13:57:27 +0000
3758
@@ -0,0 +1,167 @@
3759
1
<table id="toc" class="toc"><tr><td><div id="toctitle"><h1>Contributing <small>How can you help?</small></h1></div>
3760
2
<ul>
3761
3
<li class="toclevel-1 tocsection-1"><a href="#Introduction"><span class="tocnumber">1</span> <span class="toctext">Introduction</span></a></li>
3762
4
<li class="toclevel-1 tocsection-2"><a href="#Ways_to_Contribute"><span class="tocnumber">2</span> <span class="toctext">Ways to Contribute</span></a></li>
3763
5
<li class="toclevel-1 tocsection-3"><a href="#Licensing"><span class="tocnumber">3</span> <span class="toctext">Licensing</span></a></li>
3764
6
<li class="toclevel-1 tocsection-4"><a href="#Answering_Questions"><span class="tocnumber">4</span> <span class="toctext">Answering Questions</span></a></li>
3765
7
<li class="toclevel-1 tocsection-5"><a href="#Reporting_Bugs"><span class="tocnumber">5</span> <span class="toctext">Reporting Bugs</span></a></li>
3766
8
<li class="toclevel-1 tocsection-6"><a href="#Suggest_Improvements"><span class="tocnumber">6</span> <span class="toctext">Suggest Improvements</span></a></li>
3767
9
<li class="toclevel-1 tocsection-7"><a href="#Translate_Xibo"><span class="tocnumber">7</span> <span class="toctext">Translate Xibo</span></a></li>
3768
10
<li class="toclevel-1 tocsection-8"><a href="#Triage_Bugs"><span class="tocnumber">8</span> <span class="toctext">Triage Bugs</span></a></li>
3769
11
<li class="toclevel-1 tocsection-9"><a href="#Test_Unstable_Releases"><span class="tocnumber">9</span> <span class="toctext">Test Unstable Releases</span></a></li>
3770
12
<li class="toclevel-1 tocsection-10"><a href="#Documentation"><span class="tocnumber">10</span> <span class="toctext">Documentation</span></a></li>
3771
13
<li class="toclevel-1 tocsection-11"><a href="#Fix_Bugs_.2F_Implement_Blueprints"><span class="tocnumber">11</span> <span class="toctext">Fix Bugs / Implement Blueprints</span></a>
3772
14
<ul>
3773
15
<li class="toclevel-2 tocsection-12"><a href="#Development_Overview"><span class="tocnumber">11.1</span> <span class="toctext">Development Overview</span></a></li>
3774
16
<li class="toclevel-2 tocsection-13"><a href="#Important_Links"><span class="tocnumber">11.2</span> <span class="toctext">Important Links</span></a></li>
3775
17
<li class="toclevel-2 tocsection-14"><a href="#Development_Process_.28how_to_contribute.29"><span class="tocnumber">11.3</span> <span class="toctext">Development Process (how to contribute)</span></a>
3776
18
<ul>
3777
19
<li class="toclevel-3 tocsection-15"><a href="#Blueprints_.28new_features.29"><span class="tocnumber">11.3.1</span> <span class="toctext">Blueprints (new features)</span></a></li>
3778
20
<li class="toclevel-3 tocsection-16"><a href="#Bugs"><span class="tocnumber">11.3.2</span> <span class="toctext">Bugs</span></a></li>
3779
21
</ul>
3780
22
</li>
3781
23
</ul>
3782
24
</li>
3783
25
<li class="toclevel-1 tocsection-17"><a href="#Translatability"><span class="tocnumber">12</span> <span class="toctext">Translatability</span></a></li>
3784
26
<li class="toclevel-1 tocsection-18"><a href="#Coding_Style_Guide"><span class="tocnumber">13</span> <span class="toctext">Coding Style Guide</span></a>
3785
27
<ul>
3786
28
<li class="toclevel-2 tocsection-19"><a href="#Server"><span class="tocnumber">13.1</span> <span class="toctext">Server</span></a></li>
3787
29
<li class="toclevel-2 tocsection-20"><a href="#Notes"><span class="tocnumber">13.2</span> <span class="toctext">Notes</span></a></li>
3788
30
</ul>
3789
31
</li>
3790
32
</ul>
3791
33
</td></tr></table>
3792
34
<h2> <span class="mw-headline" id="Introduction">Introduction</span></h2>
3793
35
<p>Xibo is primarily developed by Daniel Garner and Alex Harrington. Xibo 1.0.0 also has heavy involvement from James Packer. Being a small development team we are very intimate with the Xibo code and design.
3794
36
</p><p>We are always delighted to accept contributions from others and we would always encourage this.
3795
37
</p>
3796
38
<h2> <span class="mw-headline" id="Ways_to_Contribute">Ways to Contribute</span></h2>
3797
39
<p>There are lots of ways to contribute to the Xibo project, and there are jobs that everyone can do, even if you're not a programmer! Here are the main ways, listed in ascending order of difficulty.
3798
40
</p>
3799
41
<ul><li>Answer questions in Launchpad Answers: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a>
3800
42
</li><li>Report bugs you find in Launchpad Bugs: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (The new bug report wizard in 1.0.0 greatly simplifies this)
3801
43
</li><li>Suggest improvements and new features in Launchpad Blueprints: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
3802
44
</li><li>Translate Xibo in to new Languages: <a rel="nofollow" class="external free" href="https://translations.launchpad.net/xibo">https://translations.launchpad.net/xibo</a>
3803
45
</li><li>Help triage bugs in Launchpad Bugs: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
3804
46
</li><li>Test unstable development releases and report bugs
3805
47
</li><li>Improve the documentation in the wiki or manual: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk/manual">http://www.xibo.org.uk/manual</a>
3806
48
</li><li>Fix bugs in Launchpad Bugs: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
3807
49
</li><li>Implement Xibo Blueprints (new features) <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
3808
50
</li></ul>
3809
51
<p>Each of these areas is covered in more detail below:
3810
52
</p>
3811
53
<h2> <span class="mw-headline" id="Licensing">Licensing</span></h2>
3812
54
<p>Xibo is released under the AGPL v3. Xibo documentation is released under the Creative Commons Attribution Sharealike License. Xibo Translations are licensed by Launchpad under the BSD license (revised, without advertising clause).
3813
55
</p><p>All contributions to Xibo should be under the appropriate license listed above. If you object to contributing code under the appropriate license, please email info@xibo.org.uk BEFORE starting work, as there is a strong possibility that your contribution would be rejected.
3814
56
</p><p><br />
3815
57
</p>
3816
58
<h2> <span class="mw-headline" id="Answering_Questions">Answering Questions</span></h2>
3817
59
<p>Xibo isn't particularly well documented at present. There is a manual-in-progress, but it isn't complete. A great deal of time is taken up answering queries from people asking how to install Xibo, or how to use Xibo, or asking if various behaviours are bugs or not etc.
3818
60
</p><p>If you've used Xibo for a little while, and become familiar with its operation, you are more than qualified to suggest answers to these questions. All we ask is that you are polite and factual at all times.
3819
61
</p><p>We're particularly interested in people who speak more than one language who would be happy to answer questions posed in non-english languages (as Alex and Dan have very limited skills in that area!) or who can translate for us!
3820
62
</p>
3821
63
<h2> <span class="mw-headline" id="Reporting_Bugs">Reporting Bugs</span></h2>
3822
64
<p>Think you've found a bug? First check in Launchpad Bugs if someone else has already reported the same issue. If they have, you can subscribe to the bug so you get notification when its status changes, or when a new version of Xibo is released which solves the problem.
3823
65
</p><p>If you've found a new bug, please let us know about it!
3824
66
</p><p>Xibo 1.0.0 sees the release of the bug reporting wizard for Xibo Server. Initially please follow the steps in the bug wizard (found in the management menu). Also include screenshots if appropriate to show us what's wrong. The bug wizard collects alot of the commonly requested information that we need, but we might come back to you and ask for more information or further examples so we can figure out what went wrong.
3825
67
</p>
3826
68
<h2> <span class="mw-headline" id="Suggest_Improvements">Suggest Improvements</span></h2>
3827
69
<p>Everyone has ideas about how Xibo could improve, not just the developers. If you've got an idea, first have a look in Xibo Blueprints to see if it has already been suggested. If it has, subscribe to it to be notified as its status changes. Also feel free to ADD to the blueprint whiteboard specific thoughts about how things might work.
3828
70
</p><p>If your idea is new, feel free to create a new Blueprint. You should describe the idea you have in as much detail as you feel able. If you've done some development work on Xibo before, you might write a new section in the Wiki to further detail how you think the idea might be implemented.
3829
71
</p><p>With new ideas, especially if they are radically different to the general direction of Xibo development, it's best to start out with an overview of the functionallity, which you or a developer can flesh out at a later date.
3830
72
</p><p>An aside: Blueprints are just that - plans for the future. Not everything suggested will end up as a feature, especially if your idea is applicable to a very small number of users, or if the idea is a fundamental departure from the general direction of Xibo development.
3831
73
</p>
3832
74
<h2> <span class="mw-headline" id="Translate_Xibo">Translate Xibo</span></h2>
3833
75
<p>Already Xibo is being used in several countries. Xibo 1.1 and later will have support for GNU Gettext Translations. Translations will be handled by Launchpad Translations. If Xibo isn't currently available in your language, or a language you speak, then it's a really great way to help. Launchpad Translations is its own system, and help on how to use the system are best directed to the Launchpad Translations team. They have a getting started guide here: <a rel="nofollow" class="external free" href="https://help.launchpad.net/Translations/StartingToTranslate">https://help.launchpad.net/Translations/StartingToTranslate</a>
3834
76
</p>
3835
77
<h2> <span class="mw-headline" id="Triage_Bugs">Triage Bugs</span></h2>
3836
78
<p>Triage is a medical term, and it basically means catagorise problems by their severity. In Launchpad, triage is the process of checking a bug report to make sure it has all the appropriate information a developer will need to fix the problem, or in fact confirming that the problem exists and is reproducable.
3837
79
</p><p>When a bug arrives in Launchpad, it's status is set to "New" and it's importance is set to "Unknown". A bug triager will look at the bug report, and see if all the required information is there - eg is a suitable txt file attached with the output of the server Bug Wizard? Are screenshots provided if necessary. Can the bug triager reproduce the problem.
3838
80
</p><p>If information is missing, please add a comment to the bug asking for that information to be added. Set the bug status to "Incomplete" if you have suitable access rights.
3839
81
</p><p>If all the information is there, have a go at reproducing the problem on your system (virtual machines are really good for this). If you can reproduce the problem, mark the bug as "Confirmed" and add a comment to the bug describing how you reproduced it in detail. Attach any media as required, or provide links. If you can't reproduce the problem, then add a comment to that effect, but leave the status as "New".
3840
82
If you confirmed the bug, is there a workaround? If there is, describe it in a comment. Set the priority to "Low" and status to "Triaged" if you have suitable access rights.
3841
83
If there is no work around, set the priority as described below and the status to "Triaged". If you're not sure, leave this step all together:
3842
84
</p>
3843
85
<ul><li>Low - Confirmed bugs with workaround available
3844
86
</li><li>Medium - Confirmed bugs with no workaround that does not significantly impact upon operation of the whole system
3845
87
</li><li>High - Confirmed bugs with no workaround that impacts significantly on one or more areas of the whole system, but that leaves other areas of the system working.
3846
88
</li><li>Critical - Confirmed bugs with no workaround that make the whole system inoperable.
3847
89
</li></ul>
3848
90
<h2> <span class="mw-headline" id="Test_Unstable_Releases">Test Unstable Releases</span></h2>
3849
91
<p>The whole Xibo 1.1 series is "unstable". That means that releases in the series are not recommended for production environments. You can help by installing these releases and testing their operation as if it were a live system. Report any problems in Launchpad Bugs or Launchpad Answers.
3850
92
</p>
3851
93
<h2> <span class="mw-headline" id="Documentation">Documentation</span></h2>
3852
94
<p>There are large sections of the Xibo Manual still to be written, and the existing sections will need constant updates to track Xibo development. If you're interested in working on Xibo documentation, then please email info@xibo.org.uk and we'll get something worked out.
3853
95
</p><p><br />
3854
96
</p>
3855
97
<h2> <span class="mw-headline" id="Fix_Bugs_.2F_Implement_Blueprints">Fix Bugs / Implement Blueprints</span></h2>
3856
98
<h3> <span class="mw-headline" id="Development_Overview">Development Overview</span></h3>
3857
99
<p>These notes will give guidelines to developers which will ensure that any work you do has the maximum chance of getting merged into a Xibo release.
3858
100
</p><p>The Xibo Project exclusively uses Launchpad as a development platform. Through launchpad we manage blueprints (specifications for new features), bugs, Q&amp;A (support), translations and the code release cycle. The only thing we do not manage in Launchpad is the detailed specification documents and developer documentation - which is of course managed here on this Wiki.
3859
101
</p>
3860
102
<h3> <span class="mw-headline" id="Important_Links">Important Links</span></h3>
3861
103
<ul><li>Xibo Homepage: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk">http://www.xibo.org.uk</a>
3862
104
</li><li>Launchpad Project Page: <a rel="nofollow" class="external free" href="https://launchpad.net/xibo">https://launchpad.net/xibo</a>
3863
105
</li><li>Developer Wiki: <a rel="nofollow" class="external free" href="http://wiki.xibo.org.uk">http://wiki.xibo.org.uk</a>
3864
106
</li></ul>
3865
107
<h3> <span class="mw-headline" id="Development_Process_.28how_to_contribute.29">Development Process (how to contribute)</span></h3>
3866
108
<p>I will split the development process into two sections; bugs and blueprints. They are essentially managed in the same way with a few minor differences.
3867
109
</p>
3868
110
<h4> <span class="mw-headline" id="Blueprints_.28new_features.29">Blueprints (new features)</span></h4>
3869
111
<p>So you want to implement an exciting new feature or idea into Xibo? - or maybe you want to change the way Xibo works slightly? In both of these circumstances your first task is to create a blueprint for the feature and assign it to yourself. You are then responsible for writing a specification document (it may be a brief paragraph, an article on this wiki or a IM conversation with us) at which point we will either Approve your idea, ask for more details or suggest an alternative.
3870
112
</p><p>Once your idea is approved you can ask for a "mentor" to help you get started - or you can pull the latest "future" series of the Xibo code and begin development. All development should be done using BZR (supported by Launchpad) and pushed to the Xibo project space in Launchpad. There are some good Launchpad tutorials available on their help site.
3871
113
</p><p><b>Note:</b> Blueprints will almost always be for the "Future series".
3872
114
We would suggest you call your branch "lp:~username/xibo/blueprint-title"
3873
115
</p>
3874
116
<h4> <span class="mw-headline" id="Bugs">Bugs</span></h4>
3875
117
<p>Found a bug that you want to help fix? The first place to go is the "Bugs" section in Launchpad to create a bug report for the problem you have found. This bug report will then be triaged by the community to determine if it has already been fixed or if it is a new bug, etc.
3876
118
</p><p>If the bug gets confirmed and you would like to implement a fix for the bug attach a comment to the bug saying so - we will then give the bug a milestone and a series goal and assign it to you. You can then branch the Xibo code from the appropriate series goal (unlike a blueprint a bug may be targeted to the stable release or to the future release).
3877
119
</p><p>Once you have the code, implement the fix to that one bug only and push your code back to launchpad. We would suggest you call your branch "lp:~username/xibo/bug#"
3878
120
</p><p><i>Check list</i>
3879
121
</p>
3880
122
<pre>1. Register a bug report or blueprint in Launchpad
3881
123
2. For a blueprint create a specification document - for a bug help triage it
3882
124
3. Get your blueprint approved / bug confirmed and assigned to you
3883
125
4. Branch the code your blueprint/bug relates to
3884
126
5. Implement the one blueprint / bug and push the branch back to Launchpad
3885
127
6. Does the code meet the coding style guide?
3886
128
7. Does the code use the appropriate library objects (Config, Kit, ResponseManager, db etc)
3887
129
8. Does the code output translatable strings (use the library function)
3888
130
9. Create a merge request
3889
131
</pre>
3890
132
<p>10. Wait for your code to be reviewed and merged!!
3891
133
11. Points 1-3 may take some time to get checked off - but it is worth it!
3892
134
</p>
3893
135
<h2> <span class="mw-headline" id="Translatability">Translatability</span></h2>
3894
136
<p>We're in the process of adding translation support to Xibo. There will be a library method to call in place of PHP's _("string") call. All new code must use this function. Also please look at the existing library of strings and see if the message you need to output is already in the translation library. If there is a suitable string there already, please reuse it rather than creating a new, very similar one, that has to be translated separatly.
3895
137
</p>
3896
138
<h2> <span class="mw-headline" id="Coding_Style_Guide">Coding Style Guide</span></h2>
3897
139
<h4> <span class="mw-headline" id="Server">Server</span></h4>
3898
140
<p>Blocks are expressed as follows:
3899
141
</p>
3900
142
<pre>class Example
3901
143
{
3902
144
   function registerDisplay(var)
3903
145
   {
3904
146
       print "OK";
3905
147
   }
3906
148
}
3907
149
3908
150
$example = new Example();
3909
151
</pre>
3910
152
<p>Comments are good. Please add adequate comments to describe your code.
3911
153
If you include code written by someone else, please fully document where you got the code from, who wrote it and under what license you're using it. <b>Bear in mind that the license must be AGPLv3 or later compatible.</b>
3912
154
</p><p>Xibo is very object oriented. Please make sure you code in an object-oriented style where appropriate.
3913
155
</p>
3914
156
<h3> <span class="mw-headline" id="Notes">Notes</span></h3>
3915
157
<p>Due to the time pressures on Alex and myself we are unlikely to accept any code changes that fall into the below categories:
3916
158
</p>
3917
159
<ul><li> Do not have an approved blueprint or associated bug
3918
160
</li><li> Have more than one blueprint or associated bug (without prior agreement)
3919
161
</li><li> Are not released under an appropriate license (see above)
3920
162
</li></ul>
3921
163
<p>This may seem like an excessively complex way of contributing to Xibo - and if this is too much for you to do we understand. However this method gives the Xibo project the maximum chance of being stable, extensible and well managed!
3922
164
</p><p>We dont want to delay the release of important fixes and improvements any more than you want to wait for them to be released! This is why we have adopted launchpad as a solution. When used in the above manor it will allow bugs to be merged across series and features to be implemented in isolation. It will also reduce the chances of two contributions conflicting with each other.
3923
165
</p><p>It is also the method the Xibo Maintainers (Alex and I) develop and bug fix Xibo!!
3924
166
</p><p>We look forward to your contributions!
3925
167
</p>
3926
0
\ No newline at end of file
168
\ No newline at end of file
3927
1
169
3928
=== added file 'server/manual/content/admin/contributing_fr.php'
3929
--- server/manual/content/admin/contributing_fr.php	1970-01-01 00:00:00 +0000
3930
+++ server/manual/content/admin/contributing_fr.php	2014-01-19 13:57:27 +0000
3931
@@ -0,0 +1,166 @@
3932
1
<p>Merci de vous référer aux notes ci-dessous lors de vos réflexions ou contributions au projet Xibo
3933
2
</p>
3934
3
<table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
3935
4
<ul>
3936
5
<li class="toclevel-1 tocsection-1"><a href="#Introduction"><span class="tocnumber">1</span> <span class="toctext">Introduction</span></a></li>
3937
6
<li class="toclevel-1 tocsection-2"><a href="#Comment_contribuer"><span class="tocnumber">2</span> <span class="toctext">Comment contribuer</span></a></li>
3938
7
<li class="toclevel-1 tocsection-3"><a href="#Licence"><span class="tocnumber">3</span> <span class="toctext">Licence</span></a></li>
3939
8
<li class="toclevel-1 tocsection-4"><a href="#Questions_.2F_R.C3.A9ponses"><span class="tocnumber">4</span> <span class="toctext">Questions / Réponses</span></a></li>
3940
9
<li class="toclevel-1 tocsection-5"><a href="#Report_des_bugs"><span class="tocnumber">5</span> <span class="toctext">Report des bugs</span></a></li>
3941
10
<li class="toclevel-1 tocsection-6"><a href="#Sugg.C3.A9rer_des_am.C3.A9liorations"><span class="tocnumber">6</span> <span class="toctext">Suggérer des améliorations</span></a></li>
3942
11
<li class="toclevel-1 tocsection-7"><a href="#Traduire_Xibo"><span class="tocnumber">7</span> <span class="toctext">Traduire Xibo</span></a></li>
3943
12
<li class="toclevel-1 tocsection-8"><a href="#Triage_des_bugs"><span class="tocnumber">8</span> <span class="toctext">Triage des bugs</span></a></li>
3944
13
<li class="toclevel-1 tocsection-9"><a href="#Test_des_versions_instables"><span class="tocnumber">9</span> <span class="toctext">Test des versions instables</span></a></li>
3945
14
<li class="toclevel-1 tocsection-10"><a href="#Documentation"><span class="tocnumber">10</span> <span class="toctext">Documentation</span></a></li>
3946
15
<li class="toclevel-1 tocsection-11"><a href="#Correction_de_Bugs_.2F_Impl.C3.A9mentation_Blueprints"><span class="tocnumber">11</span> <span class="toctext">Correction de Bugs / Implémentation Blueprints</span></a>
3947
16
<ul>
3948
17
<li class="toclevel-2 tocsection-12"><a href="#Vue_d.27ensemble_du_d.C3.A9veloppement"><span class="tocnumber">11.1</span> <span class="toctext">Vue d'ensemble du développement</span></a></li>
3949
18
<li class="toclevel-2 tocsection-13"><a href="#Liens_importants"><span class="tocnumber">11.2</span> <span class="toctext">Liens importants</span></a></li>
3950
19
<li class="toclevel-2 tocsection-14"><a href="#Processus_de_d.C3.A9veloppement_.28comment_contribuer.29"><span class="tocnumber">11.3</span> <span class="toctext">Processus de développement (comment contribuer)</span></a>
3951
20
<ul>
3952
21
<li class="toclevel-3 tocsection-15"><a href="#Blueprints_.28nouvelles_fonctionnalit.C3.A9s.29"><span class="tocnumber">11.3.1</span> <span class="toctext">Blueprints (nouvelles fonctionnalités)</span></a></li>
3953
22
<li class="toclevel-3 tocsection-16"><a href="#Bugs"><span class="tocnumber">11.3.2</span> <span class="toctext">Bugs</span></a></li>
3954
23
</ul>
3955
24
</li>
3956
25
</ul>
3957
26
</li>
3958
27
<li class="toclevel-1 tocsection-17"><a href="#Traduction"><span class="tocnumber">12</span> <span class="toctext">Traduction</span></a></li>
3959
28
<li class="toclevel-1 tocsection-18"><a href="#Guide_pour_le_code_source"><span class="tocnumber">13</span> <span class="toctext">Guide pour le code source</span></a>
3960
29
<ul>
3961
30
<li class="toclevel-2 tocsection-19"><a href="#Serveur"><span class="tocnumber">13.1</span> <span class="toctext">Serveur</span></a></li>
3962
31
<li class="toclevel-2 tocsection-20"><a href="#Notes"><span class="tocnumber">13.2</span> <span class="toctext">Notes</span></a></li>
3963
32
</ul>
3964
33
</li>
3965
34
</ul>
3966
35
</td></tr></table>
3967
36
<h2> <span class="mw-headline" id="Introduction">Introduction</span></h2>
3968
37
<p>Xibo est principalement développé par Daniel Garner et Alex Harrington. James Packer s'est aussi beaucoup impliqué dans Xibo 1.0.0. Étant une petite équipe de développement, nous sommes très intime avec le code et le design de Xibo.
3969
38
</p><p>Nous sommes toujours ravis d'accepter des contributions d'autres personnes et nous encourageons cela.
3970
39
</p>
3971
40
<h2> <span class="mw-headline" id="Comment_contribuer">Comment contribuer</span></h2>
3972
41
<p>Il existe de nombreuses façons de contribuer au projet Xibo, et il ya des tâches que chacun peut faire, même si vous n'êtes pas développeurs&#160;! 
3973
42
Voici les principaux moyens, énumérés dans l'ordre croissant de difficulté&#160;:
3974
43
</p>
3975
44
<ul><li>Poser des questions sur Launchpad Answers&#160;: <a rel="nofollow" class="external free" href="https://answers.launchpad.net/xibo">https://answers.launchpad.net/xibo</a>
3976
45
</li><li>Reporter un bug que vous avez trouvé sur Launchpad Bugs&#160;: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a> (Le nouvel assistant de report de bugs dans 1.0.0 simplifie grandement cela)
3977
46
</li><li>Suggérer des améliorations ou nouvelles fonctionnalités sur Launchpad Blueprints&#160;: <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
3978
47
</li><li>Traduire Xibo dans d'autres Langues: https&#160;://translations.launchpad.net/xibo
3979
48
</li><li>Aider au trie des bugs sur Launchpad Bugs&#160;: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
3980
49
</li><li>Tester les versions de développement instables et reporter les bugs
3981
50
</li><li>Améliorer la documentation sur le wiki ou le manuel&#160;: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk/manual">http://www.xibo.org.uk/manual</a>
3982
51
</li><li>Corriger des bugs dans Launchpad Bugs&#160;: <a rel="nofollow" class="external free" href="https://bugs.launchpad.net/xibo">https://bugs.launchpad.net/xibo</a>
3983
52
</li><li>Mettre en oeuvre les idées de Xibo Blueprints (nouvelles fonctionnalités) <a rel="nofollow" class="external free" href="https://blueprints.launchpad.net/xibo">https://blueprints.launchpad.net/xibo</a>
3984
53
</li></ul>
3985
54
<p>Chacun de ces aspects est traité plus en détail ci-dessous&#160;:
3986
55
</p>
3987
56
<h2> <span class="mw-headline" id="Licence">Licence</span></h2>
3988
57
<p>Xibo est publié sous licence AGPL v3. La documentation de Xibo est sous Creative Commons Attribution ShareAlike License. 
3989
58
Les traductions de Xibo sont par le biais de Launchpad sous licence BSD (révisé, sans clause de publicité).
3990
59
</p><p>Toutes les contributions à Xibo doivent être dans le cadre de la licence mentionnées ci-dessus. Si vous vous opposez à contribuer du code sous la licence appropriée, merci d'envoter un courriel à info@xibo.org.uk avant de commencer à travailler, car il est fort possible que votre contribution soit rejetée.
3991
60
</p>
3992
61
<h2> <span class="mw-headline" id="Questions_.2F_R.C3.A9ponses">Questions / Réponses</span></h2>
3993
62
<p>Xibo n'est pas particulièrement bien documenté à l'heure actuelle. Il existe un manuel en cours de rédaction, mais il n'est pas complet. Nous passons beaucoup de temps  à répondre à des requêtes de gens demandant comment installer Xibo, comment utiliser Xibo ou encore de demander si les différents comportements sont des bugs ou pas.
3994
63
</p><p>Si vous avez utilisé Xibo un peu de temps, et que vous êtes familiarisé avec son fonctionnement, vous êtes plus que qualifié pour suggérer des réponses à ces questions. Tout ce que nous demandons, c'est d'être toujours poli.
3995
64
</p><p>Nous sommes particulièrement intéressés par des gens qui parlent plus d'une langue et qui se feront un plaisir de répondre à des questions posées dans les langues non-anglophones (comme Alex et Dan ont très peu de compétences dans ce domaine&#160;!) Ou qui peuvent les traduires pour nous&#160;!
3996
65
</p>
3997
66
<h2> <span class="mw-headline" id="Report_des_bugs">Report des bugs</span></h2>
3998
67
<p>Vous pensez que vous avez trouvé un bug&#160;? Vérifiez d'abord dans Launchpad Bugs si quelqu'un a déjà signalé le même problème. Si c'est le cas, vous pouvez vous abonner à l'erreur afin que vous obteniez une notification lorsque son statut change, ou quand une nouvelle version de Xibo est disponible et qui résout le problème.
3999
68
</p><p>Si vous avez trouvé un nouveau bug, merci de nous le faire savoir&#160;!
4000
69
</p><p>Xibo 1.0.0 voit la publication des rapports de bugs à partir de l'assistant pour Xibo Server. Au début, merci de suivre les étapes de l'assistant de bug (qui se trouve dans le menu de gestion). Inclure également des captures d'écran le cas échéant, afin de nous montrer ce qui ne va pas. L'assistant de bug rassemble une grande partie des informations communes que nous avons besoin, mais nous pourrions revenir vers vous et vous demander plus d'information ou d'autres exemples afin que nous puissions comprendre ce qui s'est mal passé.
4001
70
</p>
4002
71
<h2> <span class="mw-headline" id="Sugg.C3.A9rer_des_am.C3.A9liorations">Suggérer des améliorations</span></h2>
4003
72
<p>Tout le monde a des idées sur la façon dont Xibo pourrait s'améliorer et non pas seulement les développeurs. Si vous avez une idée, d'abord jeter un oeil dans le Blueprint de Xibo pour voir si elle n'a pas déjà été suggérée. Si c'est le cas, vous pouvez y souscrire pour être notifié si son statut change. N'hésitez pas à ajouter au tableau blanc spécifique, des idées sur la façon dont les choses pourraient fonctionner.
4004
73
</p><p>Si votre idée est nouvelle, sentez vous libre de créer une nouvelle idée dans Blueprint. Vous devez décrire l'idée que vous avez, en détaillant autant que possible. Si vous avez effectué avant, certains travaux de développement sur Xibo, vous pouvez écrire un nouveau chapitre dans le Wiki pour plus de détails sur la manière dont vous pensez que l'idée pourrait être mise en œuvre.
4005
74
</p><p>Avec de nouvelles idées, surtout si elles sont radicalement différentes de la direction générale de Xibo développement, il est préférable de commencer par une vue d'ensemble des fonctionnalités, que vous ou un développeur peut préciser pour une date ultérieure.
4006
75
</p><p>Un aparté: les idées sur Blueprints ne sont que des plans pour l'avenir. Tout ce qui est suggéré ne finira pas comme une caractéristique, surtout si votre idée est applicable à un très petit nombre d'utilisateurs, ou si l'idée est un chemin fondamentallement différent de la direction générale du développement de Xibo.
4007
76
</p>
4008
77
<h2> <span class="mw-headline" id="Traduire_Xibo">Traduire Xibo</span></h2>
4009
78
<p>Xibo est déjà utilisé dans plusieurs pays. Xibo 1.1 et supérieur supporterons la traduction via GNU Gettext. Les traductions seront traités par Launchpad Translations. Si Xibo n'est actuellement pas disponible dans votre langue, ou dans une langue que vous parlez, alors c'est un excellent moyen de nous aider. Launchpad Translations à son propre système, et l'aide sur l'utilisation du système est par l'équipe de Launchpad Translations ets la plus adaptée. Ils ont un guide de démarrage ici: <a rel="nofollow" class="external free" href="https://help.launchpad.net/Translations/StartingToTranslate">https://help.launchpad.net/Translations/StartingToTranslate</a>
4010
79
</p>
4011
80
<h2> <span class="mw-headline" id="Triage_des_bugs">Triage des bugs</span></h2>
4012
81
<p>Le triage est un terme médical, qui signifie catégoriser des problèmes de par leur gravité. Pour Launchpad, le triage est un processus de vérification d'un rapport de bug pour s'assurer qu'il y a toutes les informations qu'auront besoin un développeur pour résoudre le problème, ou de confirmer que le problème existe et qu'il se reproduit.
4013
82
</p><p>Quand un bug arrive dans Launchpad, son statut est réglé sur "New" et son importance est fixée à "Unknown". Un trieur de bug se penchera sur le rapport de bug, et voir si toutes les informations requises sont présentes, comme par exemple un fichier txt joint à la sortie de l'Assistant de bug du serveur&#160;? Des captures d'écran fournis si nécessaire. Puis le trieur de bug va essayer de reproduire le problème.
4014
83
</p><p>Si l'information est manquante, merci d'ajouter un commentaire à l'erreur pour demander que les informations soit ajoutées. Chnager le statut du problème à «Incomplete» si vous avez les droits d'accès appropriés.
4015
84
</p><p>Si toute l'information est là, se lancer à reproduire le problème sur votre système (les machines virtuelles sont vraiment bons pour ça). Si vous pouvez reproduire ce problème, marquer le bug comme "Confirmed", et ajouter un commentaire sur le bug pour décrire comment le reproduire en détail. Joindre les médias nécessaire en cas de besoin ou des liens. 
4016
85
Si vous ne pouvez pas reproduire le problème, ajoutez un commentaire à cet effet, mais laissez le statut sur "New". Si vous avez confirmé le bug, y'a t'il une solution? Si c'est le cas, la décrire dans un commentaire. Définissez la priorité à "Low" et le statut de "Triaged" si vous avez les droits d'accès appropriés. S'il n'y a pas de problème, la priorité tel que décrit ci-dessous et le statut de "Triaged". Si vous ne savez pas, laissez cette étape, tous ensemble:
4017
86
</p>
4018
87
<ul><li> Low - Bugs confirmés avec une solution disponible
4019
88
</li><li> Middle - Bugs confirmés, sans solution disponible, sans impact significatif sur le fonctionnement de l'ensemble du système
4020
89
</li><li> High - Bugs confirmés, sans solution disponible, avec impact significatif uniquement sur un ou plusieurs parties de l'ensemble du système, mais qui laisse d'autres parties du système fonctionner.
4021
90
</li><li> Critical - Bugs confirmés, sans solution disponible et qui rend l'ensemble du système inutilisable.
4022
91
</li></ul>
4023
92
<h2> <span class="mw-headline" id="Test_des_versions_instables">Test des versions instables</span></h2>
4024
93
<p>L'ensemble de la série Xibo 1.1 est "instable". Cela signifie que les versions dans ses séries ne sont pas recommandés pour les environnements de production. Vous pouvez nous aider par l'installation de ces versions et en testant leurs fonctionnement, comme si elle était en environnement réel. Reporter les problèmes dans Launchpad Bugs ou dans Launchpad Answers.
4025
94
</p>
4026
95
<h2> <span class="mw-headline" id="Documentation">Documentation</span></h2>
4027
96
<p>Il y a de grandes sections de la Xibo Manuel qui ne sont pas encore écrites, et les sections doivent être constamment mises à jour en fonction du développement de Xibo. Si vous êtes intéressé pour travailler sur la documentation de Xibo, alors merci d'envoyer un courriel à l'adresse info@xibo.org.uk et nous vous donnerons quelque chose à faire.
4028
97
</p>
4029
98
<h2> <span class="mw-headline" id="Correction_de_Bugs_.2F_Impl.C3.A9mentation_Blueprints">Correction de Bugs / Implémentation Blueprints</span></h2>
4030
99
<h3> <span class="mw-headline" id="Vue_d.27ensemble_du_d.C3.A9veloppement">Vue d'ensemble du développement</span></h3>
4031
100
<p>Ces notes donnent des directives pour les développeurs qui feront en sorte que tout travail que vous faites ai le maximum de chances de se fusionner dans une version de Xibo.
4032
101
</p><p>Le projet utilise exclusivement Xibo Launchpad comme plate-forme de développement. Grâce Launchpad nous gérons propositions d'idées (spécifications pour de nouvelles fonctionnalités), les bugs, FAQ (support), les traductions et la gestion du cycle pour le code source. La seule chose que nous ne parvenons pas à Launchpad est la spécification détaillée des documents et de documentation pour les développeurs, ce qui est bien sûr géré ici sur ce Wiki.
4033
102
</p>
4034
103
<h3> <span class="mw-headline" id="Liens_importants">Liens importants</span></h3>
4035
104
<ul><li> Site du projet Xibo&#160;: <a rel="nofollow" class="external free" href="http://www.xibo.org.uk">http://www.xibo.org.uk</a>
4036
105
</li><li> Page du project sur Launchpad&#160;: <a rel="nofollow" class="external free" href="https://launchpad.net/xibo">https://launchpad.net/xibo</a>
4037
106
</li><li> Wiki pour les développeurs&#160;: <a rel="nofollow" class="external free" href="http://labs.xibo.org.uk/blueprints">http://labs.xibo.org.uk/blueprints</a> 
4038
107
</li></ul>
4039
108
<h3> <span class="mw-headline" id="Processus_de_d.C3.A9veloppement_.28comment_contribuer.29">Processus de développement (comment contribuer)</span></h3>
4040
109
<p>Je vais diviser le processus de développement en deux sections; Blueprints et bugs. Elles sont essentiellement gérées de la même manière, avec quelques différences mineures.
4041
110
</p>
4042
111
<h4> <span class="mw-headline" id="Blueprints_.28nouvelles_fonctionnalit.C3.A9s.29">Blueprints (nouvelles fonctionnalités)</span></h4>
4043
112
<p>Vous voulez mettre en place une nouvelle fonctionnalité ou une idée pour Xibo&#160;? Ou peut-être que vous voulez un peu modifier la façon dont fonctionne Xibo&#160;? Dans ces deux circonstances, votre première tâche est de créer un entrée dans Blueprint pour cette fonctionnalité et l'attribuer à vous-même. Vous êtes alors responsable de la rédaction d'un document de spécification (cela doit être un bref paragraphe, un article sur ce wiki ou d'une conversation de messagerie instantanée avec nous) dans un second temps, nous pouvons approuver votre idée, demander plus de détails ou suggérer une alternative.
4044
113
</p><p>Une fois que votre idée est approuvée, vous pouvez demander à un «mentor» de vous aider à démarrer ou vous pouvez récupérer le code de la  "future" version de la série Xibo et commencer le développement. Tous les efforts devraient être faits en utilisant BZR (Bazaar, soutenu par Launchpad) et renvoyer les modifications de votre branche sur Launchpad, dans l'espace réservé au projet Xibo. Il ya de bons tutoriels Launchpad disponibles sur leur site d'aide.
4045
114
</p><p><b>Note</b>&#160;: Les propositions sur Blueprint seront presque toujours pour les «futures versions". Nous vous suggérons de nommer vos branches "lp:~nom-utilisateur/xibo/titre-blueprint"
4046
115
</p>
4047
116
<h4> <span class="mw-headline" id="Bugs">Bugs</span></h4>
4048
117
<p>Vous avez trouvé un bug et vous voulez nous aider à corriger&#160;? Le premier endroit où aller est la partie "bugs" du projet Xibo dans le Launchpad pour créer un rapport de bug pour le problème que vous avez trouvé. Ce rapport de bug sera ensuite triés par la communautée afin de déterminer si il a déjà été fixé ou si c'est un nouveau bug.
4049
118
</p><p>Si le bug est confirmé et vous souhaitez appliquer un correctif pour le bug, joindre un commentaire à l'erreur pour le dire, nous donnerons un objectif pour une version et vous l'assignerons. Vous pouvez ensuite récupérer le code de la branche correspondante à la version Xibo spécifiée lros de l'attribution du bug (contrairement à une nouvelle fonctionnalité, un bug est assignée pour une version pour la version stable ou une future version).
4050
119
</p><p>Une fois que vous avez récupérer le code, mettre en œuvre la correction du bug et renvoyer le code sur le Launchpad. Nous vous suggérons de nommer votre branche "lp:~nom-utilisateur/xibo/bug#"
4051
120
</p><p><i>Check list</i>
4052
121
</p>
4053
122
<pre>1. Enregistrer un rapport de bug ou une nouvelle fonctionnalité Blueprint in Launchpad
4054
123
2. Pour une fonctionnalité Blueprint, créer une spécifiation détaillée, pour un bug aider au triage de celui-ci
4055
124
3. Obtenez l'approbation de votre fonctionnalité Blueprint / confirmation de votre bug et vous l'assignez
4056
125
4. Récupérer le code la branche correspondante à la fonctionnalité Blueprint / de votre bug
4057
126
5. Implémenter la fonctionnalité Blueprint / corriger le bug et publié le code dans une nouvelle branche sur Launchpad
4058
127
6. Est-ce que le code correspond au style du code Xibo indiqué dans le guide 
4059
128
7. Est-ce que le code utilise corectement les libraries d'objets Xibo (Config, Kit, ResponseManager, DB, etc)
4060
129
8. Es-ce que le code affiche bien les variables (utilisation des librairies de fonctions)
4061
130
9. Faire une demande de fusion du code
4062
131
10. Attendre que votre code soit relu et fusionné&#160;! 
4063
132
11. Les points à 1-3 peuvent mettre du temps à être complété, mais cela en vaut la peine&#160;!
4064
133
</pre>
4065
134
<h2> <span class="mw-headline" id="Traduction">Traduction</span></h2>
4066
135
<p>Nous sommes actuellement dans le processus d'ajout de traduction à Xibo. Il y aura une librairie de méthode pour permettre la traduction à la place des appels Gettext en PHP _( "string"). Tous les nouveaux code doivent utiliser cette fonction. Aussi, merci de jeter un oeil à la bibliothèque existante de variables et de voir si le message que vous avez besoin pour l'affichage est déjà dans la librairie de traduction. Si il y a une chaîne de caractères qui existe déjà, merci de la réutiliser plutôt que de créer une nouvelle, très similaire, qui doit être traduit séparément.
4067
136
</p>
4068
137
<h2> <span class="mw-headline" id="Guide_pour_le_code_source">Guide pour le code source</span></h2>
4069
138
<h4> <span class="mw-headline" id="Serveur">Serveur</span></h4>
4070
139
<p>Les blocs sont exprimés comme suit:
4071
140
</p>
4072
141
<pre>class Example
4073
142
{
4074
143
   function registerDisplay(var)
4075
144
   {
4076
145
       print "OK";
4077
146
   }
4078
147
}
4079
148
4080
149
$example = new Example();
4081
150
</pre>
4082
151
<p>Les commentaires sont utiles. Merci d'ajouter des commentaires adéquats pour décrire votre code.
4083
152
Si vous incluez le code écrit par quelqu'un d'autre, merci de documenter complétement dans ce cas là où vous l'avez obtenu le code, qui a écrit et sous quelle licence vous l'utiliser. <i> 'Gardez à l'esprit que la licence doit être compatible AGPLv3 ou suivante.'</i>
4084
153
</p><p>Xibo est très orienté objet. Merci de vous assurer que votre code suive aussi le style orienté objet, s'il ya lieu.
4085
154
</p>
4086
155
<h3> <span class="mw-headline" id="Notes">Notes</span></h3>
4087
156
<p>En raison de contraintes de temps d'Alex et moi-même nous ne pouvons accepter tout changement de code qui entrent dans les catégories ci-dessous:
4088
157
</p>
4089
158
<ul><li> Ne pas avoir une fonctionnalité Blueprint ou bug attribué
4090
159
</li><li> Avoir plus d'une fonctionnalité Blueprint ou bug en même temps (sans accord préalable)
4091
160
</li><li> Ne pas avoir une licence appropriée (voir ci-dessus)
4092
161
</li></ul>
4093
162
<p>Cette cela peut sembler excessivement complexe de contribuer à Xibo et si cela est trop pour vous, nous vous comprenons. Toutefois, cette méthode donne au projet Xibo le maximum de chances d'être stable, extensible et bien géré&#160;!
4094
163
</p><p>Nous ne voulons pas retarder la publication d'importantes corrections et améliorations, pas plus que vous voulez attendre leur libération&#160;! C'est pourquoi nous avons adopté la solution Launchpad. Lorsqu'il est utilisé à bon escient, il permet de corriger les bugs et fusionné ensuite avec une version, et les caractéristiques d'être mis en oeuvre de façon isolée. Il permettra également de réduire les chances que deux contributions entre en conflit les unes avec les autres.
4095
164
</p><p>Il s'agit également de la méthode que les Mainteneurs Xibo (Alex et moi) élabore pour le développement et la correction des bugs dans Xibo!
4096
165
</p><p>Nous attendons vos contributions!
4097
166
</p>
4098
0
\ No newline at end of file
167
\ No newline at end of file
4099
1
168
4100
=== added file 'server/manual/content/admin/database_model.php'
4101
--- server/manual/content/admin/database_model.php	1970-01-01 00:00:00 +0000
4102
+++ server/manual/content/admin/database_model.php	2014-01-19 13:57:27 +0000
4103
@@ -0,0 +1,26 @@
4104
1
<?php
4105
2
/*
4106
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4107
4
 * Copyright (C) 2006-2013 Daniel Garner
4108
5
 *
4109
6
 * This file is part of Xibo.
4110
7
 *
4111
8
 * Xibo is free software: you can redistribute it and/or modify
4112
9
 * it under the terms of the GNU Affero General Public License as published by
4113
10
 * the Free Software Foundation, either version 3 of the License, or
4114
11
 * any later version. 
4115
12
 *
4116
13
 * Xibo is distributed in the hope that it will be useful,
4117
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4118
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4119
16
 * GNU Affero General Public License for more details.
4120
17
 *
4121
18
 * You should have received a copy of the GNU Affero General Public License
4122
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4123
20
 */ 
4124
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4125
22
?>
4126
23
<h1>Database Model</h1>
4127
24
4128
25
<h2>EER</h2>
4129
26
<p><a href="content/admin/eer_1.4.png"><img class="img-thumbnail" alt="EER" src="content/admin/eer_1.4.png"></a></p>
4130
0
\ No newline at end of file
27
\ No newline at end of file
4131
1
28
4132
=== added file 'server/manual/content/admin/display_action_menu.png'
4133
2
Binary files server/manual/content/admin/display_action_menu.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/display_action_menu.png	2014-01-19 13:57:27 +0000 differ
29
Binary files server/manual/content/admin/display_action_menu.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/display_action_menu.png	2014-01-19 13:57:27 +0000 differ
4134
=== added file 'server/manual/content/admin/display_wakeonlan.php'
4135
--- server/manual/content/admin/display_wakeonlan.php	1970-01-01 00:00:00 +0000
4136
+++ server/manual/content/admin/display_wakeonlan.php	2014-01-19 13:57:27 +0000
4137
@@ -0,0 +1,78 @@
4138
1
<?php
4139
2
/*
4140
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4141
4
 * Copyright (C) 2006-2013 Daniel Garner
4142
5
 *
4143
6
 * This file is part of Xibo.
4144
7
 *
4145
8
 * Xibo is free software: you can redistribute it and/or modify
4146
9
 * it under the terms of the GNU Affero General Public License as published by
4147
10
 * the Free Software Foundation, either version 3 of the License, or
4148
11
 * any later version. 
4149
12
 *
4150
13
 * Xibo is distributed in the hope that it will be useful,
4151
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4152
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4153
16
 * GNU Affero General Public License for more details.
4154
17
 *
4155
18
 * You should have received a copy of the GNU Affero General Public License
4156
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4157
20
 */ 
4158
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4159
22
?>
4160
23
<h1>Wake On LAN (WOL)</h1>
4161
24
4162
25
<p>This section will look at the Wake On Lan (WOL) feature of <?php echo PRODUCT_NAME; ?>.</p>
4163
26
4164
27
<p>There has been a lot of interest over the years <?php echo PRODUCT_NAME; ?> has been running for a solution to be "green", "save power" and 
4165
28
generally not have the <?php echo PRODUCT_NAME; ?> display screen solution on unnecessarily.</p>
4166
29
4167
30
<p>The WOL function is intended to be used for display clients that are addressable by the server, by this we mean that there 
4168
31
has to be a clear addressable network route between the server and the client that needs to wake up. It is also required that
4169
32
WOL is turned on in any necessary settings on the client PC.</p>
4170
33
4171
34
<p>The WOL configuration happens on a display by display basis from the Edit Display form. Each display has new settings for:</p>
4172
35
<dl>
4173
36
	<dt>Enable Wake On LAN</dt>
4174
37
	<dd>Turn WOL on/off for the display</dd>
4175
38
</dl>
4176
39
<dl>
4177
40
	<dt>Wake On LAN Time</dt>
4178
41
	<dd>Specify a time for this display to wake, using the 24 hr clock</dd>
4179
42
</dl>
4180
43
<dl>
4181
44
	<dt>BroadCast Address</dt>
4182
45
	<dd>The BroadCast address of the client, if unknown use the IP address and fill in the CIDR field</dd>
4183
46
</dl>
4184
47
<dl>
4185
48
	<dt>Wake On LAN Secure On</dt>
4186
49
	<dd>The SecureOn password for the client, if supported</dd>
4187
50
</dl>
4188
51
<dl>
4189
52
	<dt>Wake On LAN CIDR</dt>
4190
53
	<dd>The CIDR subnet mask, if the BroadCast Address is unknown</dd>
4191
54
</dl>
4192
55
4193
56
<p>Once the display has these settings it can be woken up in 2 ways:</p>
4194
57
4195
58
4196
59
<h3>Wake On LAN Now</h3>
4197
60
4198
61
<p><img class="img-thumbnail" alt="Send WOL Form" src="content/admin/sa_display_wol.png"></p>
4199
62
4200
63
<p>Each display has the "Wake On LAN" button which can be used to send a wake on LAN command on demand. Clicking the button displays 
4201
64
a form for confirmation, once this is pressed the command is send immediately to the client.</p>
4202
65
4203
66
<h3>Wake On LAN Time - Maintenance Script</h3>
4204
67
<p>In addition to the WOL now function, the <?php echo PRODUCT_NAME; ?> maintenance module has been altered to send a WOL packet to any display which has 
4205
68
a "Wake On LAN Time" specified. It will only send the command once, as the time window is passed.</p>
4206
69
4207
70
<p>The maintenance script has to be running for this to work correctly. Maintenance instructions can be found on the 
4208
71
<a title="Maintenance Instructions" href="index.php?toc=getting_started&p=admin/settings#Maintenance">Settings -> Maintenance</a>.</p>
4209
72
4210
73
<h3>Putting the client to sleep</h3>
4211
74
<p>There are a few different options for putting the client to sleep - such as a scheduled task. However, the next article in this series 
4212
75
will look at an option built into <?php echo PRODUCT_NAME; ?>. The "Shell Command" module.</p>
4213
76
4214
77
<p class="alert alert-info">WOL is not routable. The <?php echo PRODUCT_NAME; ?> server is unable to see clients over the internet that are behind NAT,  
4215
78
or on a different subnet.</p>
4216
0
\ No newline at end of file
79
\ No newline at end of file
4217
1
80
4218
=== added file 'server/manual/content/admin/displaygroups.php'
4219
--- server/manual/content/admin/displaygroups.php	1970-01-01 00:00:00 +0000
4220
+++ server/manual/content/admin/displaygroups.php	2014-01-19 13:57:27 +0000
4221
@@ -0,0 +1,53 @@
4222
1
<?php
4223
2
/*
4224
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4225
4
 * Copyright (C) 2006-2013 Daniel Garner
4226
5
 *
4227
6
 * This file is part of Xibo.
4228
7
 *
4229
8
 * Xibo is free software: you can redistribute it and/or modify
4230
9
 * it under the terms of the GNU Affero General Public License as published by
4231
10
 * the Free Software Foundation, either version 3 of the License, or
4232
11
 * any later version. 
4233
12
 *
4234
13
 * Xibo is distributed in the hope that it will be useful,
4235
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4236
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4237
16
 * GNU Affero General Public License for more details.
4238
17
 *
4239
18
 * You should have received a copy of the GNU Affero General Public License
4240
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4241
20
 */ 
4242
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4243
22
?>
4244
23
<h1 id="Display_Group">Display Groups</h1>
4245
24
4246
25
<p>Display Groups help to easily schedule layouts and campaigns to multiple displays at once.</p>
4247
26
4248
27
<p><img class="img-thumbnail" alt="Display Group Administration" src="content/admin/sa_display_groups.png"></p>
4249
28
4250
29
4251
30
<h3 id="Add_Group">Adding a Group</h3>
4252
31
<p>Click the navigation menu "Displays > Display Groups" to go to Display Groups page. To add a group click on 
4253
32
the "Add Group" button found at the top of the Displays list.</p>
4254
33
4255
34
<h3 id="Edit_Group">Edit a Group</h3>
4256
35
<p>To edit a group click on the edit button on the row belonging to the group you wish to edit.</p>
4257
36
4258
37
<p><strong>Name</strong> is a unique identifier for a group.</p>	   
4259
38
4260
39
<h3 id="Delete_Group">Delete a Group</h3>
4261
40
<p>To delete a group click on the delete button on the row belonging to the group you wish to delete.</p>
4262
41
4263
42
<h3 id="Group_Component_Security">Group / Component Security</h3>
4264
43
<p>When editing a group the components that are assigned / unassigned to that group are show. These
4265
44
determine the permissions of the users belonging to that group.</p>
4266
45
4267
46
<p>You should always have at least one group.</p>
4268
47
4269
48
<h3 id="Group_Members">Group Members</h3>
4270
49
4271
50
<p>Click on "Group Members" load the "Manage Membership" form for editing. All the Displays on the system will be shown. 
4272
51
You can assign or remove group members.</p>
4273
52
4274
53
<p><img class="img-thumbnail" alt="Display Group Members" src="content/admin/sa_display_group_members.png"></p>
4275
0
\ No newline at end of file
54
\ No newline at end of file
4276
1
55
4277
=== modified file 'server/manual/content/admin/displays.php'
4278
--- server/manual/content/admin/displays.php	2013-05-01 19:24:35 +0000
4279
+++ server/manual/content/admin/displays.php	2014-01-19 13:57:27 +0000
4280
@@ -1,189 +1,163 @@
4470
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
1
<?php
4471
2
<?php include('../../template.php'); ?>
2
/*
4472
3
<html>
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4473
4
	<head>
4
 * Copyright (C) 2006-2013 Daniel Garner
4474
5
		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5
 *
4475
6
		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
6
 * This file is part of Xibo.
4476
7
		<link rel=stylesheet type="text/css" href="../../css/doc.css">
7
 *
4477
8
		<meta http-equiv="Content-Type" content="text/html" />
8
 * Xibo is free software: you can redistribute it and/or modify
4478
9
		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
9
 * it under the terms of the GNU Affero General Public License as published by
4479
10
		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
10
 * the Free Software Foundation, either version 3 of the License, or
4480
11
11
 * any later version. 
4481
12
		<link href="img/favicon.ico" rel="shortcut icon"/>
12
 *
4482
13
		<!-- Javascript Libraries -->
13
 * Xibo is distributed in the hope that it will be useful,
4483
14
		<script type="text/javascript" src="lib/jquery.pack.js"></script>
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4484
15
		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4485
16
		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
16
 * GNU Affero General Public License for more details.
4486
17
	</head>
17
 *
4487
18
	<body>
18
 * You should have received a copy of the GNU Affero General Public License
4488
19
	<a name="Displays" id="Displays"></a><h1>Displays</h1>
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4489
20
    
20
 */ 
4490
21
    <p>Displays are how you output your layouts with <?php echo PRODUCT_NAME; ?>.</p>
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4491
22
    <p>Each client application registered with the server creates a new display record in <?php echo PRODUCT_NAME; ?> server. You can then choose a 
22
?>
4492
23
    default layout for that display, schedule further layouts on the display and control who has access to the display, 
23
<h1 id="Displays">Displays</h1>
4493
24
    as well as monitor its status from the Display Management page.</p>
24
4494
25
     
25
<p>Displays are records to identify each physical device that should show content from the <?php echo PRODUCT_NAME; ?> CMS. Each display client application registered with the server creates a unique display record when registered.</p>
4495
26
    <p>The Display Manamagement page is accessed from the Nagivation Bar by clicking on "Displays > Displays"</p>
26
4496
27
27
<p>Display records can be assigned a default layout, have a schedule of layouts and are used for status monitoring and access control. The main area for displays is the Display Administration page accessed from the Nagivation Bar by clicking on "Displays > Displays"</p>
4497
28
    <p><img alt="SA Displays" src="sa_displays.png"
28
4498
29
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
29
<p><img class="img-thumbnail" alt="Display Administration" src="content/admin/sa_displays.png"></p>
4499
30
	   width="820" height="262"></p>
30
4500
31
    <blockquote>	   
31
<p>The display administration table gives an easy to understand overview of each display registered in the CMS.</p>
4501
32
		<a name="Display_Edit" id="Display_Edit"></a><h3>Display Edit</h3>
32
4502
33
		<p>After a new display client is registered with <?php echo PRODUCT_NAME; ?> server, you need to perform Edit granting license to the client 
33
<dl class="dl-horizontal">
4503
34
    	to work.</p>
34
	<dt>Row Colour</dt>
4504
35
    	<p> Click on the 'Edit" button of the Display loads its editing window. You can then proceed to change the settings for
35
	<dd>The status of the display. Red = missing content, Yellow = downloading missing content, Green = Up to Date.</dd>
4505
36
    	the chosen Display. </p>                                                                                         
36
</dl>
4506
37
37
<dl class="dl-horizontal">
4507
38
	   <p><img alt="Display Edit" src="sa_display_edit.png"
38
	<dt>ID</dt>
4508
39
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
39
	<dd>The internal ID for the display.</dd>
4509
40
	   width="493" height="231"></p> 
40
</dl>
4510
41
41
<dl class="dl-horizontal">
4511
42
		<a name="Display_Delete" id="Display_Delete"></a><h3>Display Delete</h3>
42
	<dt>Licence</dt>
4512
43
		<p>After a display client is registered and licensed with <?php echo PRODUCT_NAME; ?> server, you can "unlicense" a client which will prevent it from connecting
43
	<dd>A tick or cross showing whether the display has been granted a licence with the CMS. This prevents unauthourised displays being added to the CMS.</dd>
4513
44
			to the server.</p>
44
</dl>
4514
45
    	<p> Click on the 'Delete" button of the Display you want to unlicense; and the below form is loaded. </p>                                                                                         
45
<dl class="dl-horizontal">
4515
46
46
	<dt>Display</dt>
4516
47
	   <p><img alt="Display Delete" src="sa_display_delete.png"
47
	<dd>A friendly name for the display. This can be set during the registration process in the display client software.</dd>
4517
48
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
48
</dl>
4518
49
	   width="357" height="217"></p>
49
<dl class="dl-horizontal">
4519
50
	   
50
	<dt>Default Layout</dt>
4520
51
	   <p>Note: Delete a display cannot be undone. The client needs to re-regisiter and liscense before it is allowed to connect to the server again.</p>
51
	<dd>The default layout that will play when there are no other layouts/campaigns scheduled or when all scheduled layouts are invalid.</dd>
4521
52
	   
52
</dl>
4522
53
    	<a name="Media_Inventory" id="Media_Inventory"></a><h3>Media Inventory</h3>
53
<dl class="dl-horizontal">
4523
54
    	<p>When you schedule new content, or change existing content, it is helpful to know that the displays have updated with the new 
54
	<dt>Interleave Default</dt>
4524
55
    	information. In a <?php echo PRODUCT_NAME; ?> server and client system, the client applications will connect in to the server periodically 
55
	<dd>A tick or cross showing whether the default layout will play when there are other layouts scheduled.</dd>
4525
56
    	and update itself on the media items that they have stored locally. Media Inventory allows you to look at a glance to check if 
56
</dl>
4526
57
    	your updates were pulled by the clients yet.</p>
57
<dl class="dl-horizontal">
4527
58
    	<p>On the display management page, you'll see a column "Status". The status light can be one of either green, amber or red.</p>
58
	<dt>Email Alert</dt>
4528
59
    	<p>When you make a change that affects the output of the server to a given client (for example if you modify a layout scheduled 
59
	<dd>A tick or cross showing whether an email alert will be sent by the Maintenance module.</dd>
4529
60
    	on that client, schedule a new layout or change the default layout), the status light will immediately goes red. That signifies 
60
</dl>
4530
61
    	that as far as the server is aware there are updates pending for that client and it has not received them yet.</p>
61
<dl class="dl-horizontal">
4531
62
    	<p>The client will then connect up to the server on a schedule and will read the new information that is available. If there 
62
	<dt>Logged In</dt>
4532
63
    	are new files to download (for example if you modified a layout or scheduled something completely new), the status light will 
63
	<dd>A tick or cross showing whether the display has logged in recently. The time out for the display is set on each display OR in the global settings field MAINTENANCE_ALERT_TOUT.</dd>
4533
64
    	turn amber while the files are being downloaded.</p>
64
</dl>
4534
65
    	<p>Once the client is satisfied that all files have been downloaded, it will send an inventory of all the files it has active 
65
<dl class="dl-horizontal">
4535
66
    	in it is cache back to the server, and the server will change the status light to green.</p>
66
	<dt>Last Accessed</dt>
4536
67
    	<p>If you are curious to see what files the client is actively monitoring, you can click the "Media Inventory" button and a popup 
67
	<dd>The date/time of last access.</dd>
4537
68
    	will appear showing the status of each file, along with the last time the client checked it was still stored correctly on disk. 
68
</dl>
4538
69
    	You will also see any files that the client is in the process of downloading. (Note here that what you will not see is files 
69
<dl class="dl-horizontal">
4539
70
    	that the client needs to download, but that it is unaware of at the present time. For example. If you schedule a new layout 
70
	<dt>IP Address</dt>
4540
71
    	and immediately go to the Media Inventory before the client has connected up to the server, you'll see the status light is red, 
71
	<dd>The IP address the display had the last time it reported its status through the "Media Inventory" status call.</dd>
4541
72
   	 	but the content of the media inventory will not show the new files that are required. Once the client connects, those new files 
72
</dl>
4542
73
    	will be included in the inventory automatically.)</p>	   
73
<dl class="dl-horizontal">
4543
74
74
	<dt>Mac Address</dt>
4544
75
     	<p><img alt="Display Media Inventory" src="sa_display_media_inventory.png"
75
	<dd>The Mac Address of the display (if the client software is capable of sending it).</dd>
4545
76
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
76
</dl>
4546
77
	   width="418" height="268"></p>
77
4547
78
78
<h2 id="Display_ActionMenu">Action Menu <small>options for each display</small></h2>
4548
79
   		<a name="Display_Group_Member" id="Display_Group_Member"></a><h3>Group Members</h3>
79
<p>Displays can have a number of actions performed against them.</p>
4549
80
    	<p>To find the Group that the Display is belonged to, click on the "Group Members" on the corresponding row.</p>
80
4550
81
		 
81
<p><img class="img-thumbnail" alt="Display Action Menu" src="content/admin/display_action_menu.png"></p>
4551
82
    	<p><img alt="SA Display Group Edit" src="sa_display_groups_edit.png"
82
4552
83
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
83
<dl class="dl-horizontal">
4553
84
	   width="408" height="218"></p>
84
	<dt>Schedule Now</dt>
4554
85
    </blockquote>
85
	<dd>A quick shortcut to scheduling a layout from the current time for a particular duration.</dd>
4555
86
86
</dl>
4556
87
	<h2>Wake On LAN (WOL)</h2>
87
<dl class="dl-horizontal">
4557
88
    <blockquote>
88
	<dt>Media Inventory</dt>
4558
89
    	<h3>Introducing Wake On Lan for Display Clients</h3>
89
	<dd>View the required media inventory and the current status of each item as reported by the display during the last check in.</dd>
4559
90
 		<p>This section will look at the Wake On Lan (WOL) feature of <?php echo PRODUCT_NAME; ?>.</p>
90
</dl>
4560
91
91
<dl class="dl-horizontal">
4561
92
   	 	<p>There has been a lot of interest over the years <?php echo PRODUCT_NAME; ?> has been running for a solution to be "green", "save power" and 
92
	<dt>Default Layout</dt>
4562
93
    	generally not have the <?php echo PRODUCT_NAME; ?> display screen solution on unnecessarily.</p>
93
	<dd>A quick shortcut to updating the default layout.</dd>
4563
94
94
</dl>
4564
95
    	<p>The WOL function is intended to be used for display clients that are addressable by the server, by this we mean that there 
95
<dl class="dl-horizontal">
4565
96
    	has to be a clear addressable network route between the server and the client that needs to wake up. It is also required that
96
	<dt>Edit</dt>
4566
97
    	WOL is turned on in any necessary settings on the client PC.</p>
97
	<dd>The display edit form for adjusting all options available on the display.</dd>
4567
98
98
</dl>
4568
99
    	<p>The WOL configuration happens on a display by display basis from the Edit Display form. Each display has new settings for:</p>
99
<dl class="dl-horizontal">
4569
100
    	<ul>
100
	<dt>Wake on LAN</dt>
4570
101
      		<li><strong>Enable Wake On LAN</strong> - (Turn WOL on/off for the display)</li>
101
	<dd>Send a Wake on LAN packet to the display - requires the Wake On LAN settings to be configured.</dd>
4571
102
      		<li><strong>Wake On LAN Time</strong> - (Specify a time for this display to wake, using the 24 hr clock)</li>
102
</dl>
4572
103
      		<li><strong>BroadCast Address</strong> - (The BroadCast address of the client, if unknown use the IP address and fill in the CIDR field)</li>
103
<dl class="dl-horizontal">
4573
104
      		<li><strong>Wake On LAN Secure On</strong> - (The SecureOn password for the client, if supported)</li>
104
	<dt>Delete</dt>
4574
105
      		<li><strong>Wake On LAN CIDR</strong> - (The CIDR subnet mask, if the BroadCast Address is unknown)</li>
105
	<dd>The display delete form.</dd>
4575
106
    	</ul>
106
</dl>
4576
107
107
<dl class="dl-horizontal">
4577
108
    	<p>Once the display has these settings it can be woken up in 2 ways:</p>
108
	<dt>Display Groups</dt>
4578
109
    	<h3>Wake On LAN Now</h3>
109
	<dd>Administration of the display groups this display belongs to.</dd>
4579
110
    
110
</dl>
4580
111
   		<p><img alt="SA Display WOL" src="sa_display_wol.png"
111
<dl class="dl-horizontal">
4581
112
	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
112
	<dt>Permissions</dt>
4582
113
	   	width="308" height="158"></p>
113
	<dd>Adjust the user/user group permissions on this display.</dd>
4583
114
     
114
</dl>
4584
115
    	<p>Each display has the "Wake On LAN" button which can be used to send a wake on LAN command on demand. Clicking the button displays 
115
4585
116
    	a form for confirmation, once this is pressed the command is send immediately to the client.</p>
116
<h2 id="Display_Edit">Display Edit</h2>
4586
117
117
4587
118
    	<h3>Wake On LAN Time - Maintenance Script</h3>
118
<p>Before the display will be allowed to download its schedule or required media it must be licenced with the CMS. After a display client is registered a new display record will appear in the Display Administration - it will then need to be edited to grant is access (getting a licence).</p>
4588
119
    	<p>In addition to the WOL now function, the <?php echo PRODUCT_NAME; ?> maintenance module has been altered to send a WOL packet to any display which has 
119
4589
120
    	a "Wake On LAN Time" specified. It will only send the command once, as the time window is passed.</p>
120
<p>Click on the "Edit" button of the Display loads its editing window. You can then proceed to change the settings for the chosen Display.</p>                                                                                         
4590
121
121
4591
122
    	<p>The maintenance script has to be running for this to work correctly. Maintenance instructions can be found on the 
122
<p><img class="img-thumbnail" alt="Display Edit" src="content/admin/sa_display_edit.png"></p> 
4592
123
    	<a title="Maintenance Instructions" href="settings.php">Settings -> Maintenance</a>.</p>
123
4593
124
124
4594
125
    	<h3>Putting the client to sleep</h3>
125
<h2 id="Display_Delete">Display Delete</h2>
4595
126
   	 	<p>There are a few different options for putting the client to sleep - such as a scheduled task. However, the next article in this series 
126
4596
127
    	will look at an option built into <?php echo PRODUCT_NAME; ?>. The "Shell Command" module.</p>
127
<p>Deleting a display will remove it from the CMS entirely and can only be performed if the display is not active.</p>
4597
128
128
4598
129
    	<p>Note: WOL is not routable. The <?php echo PRODUCT_NAME; ?> server is unable to see clients over the internet that are behind NAT,  
129
<p class="alert alert-info">A display can be unlicenced without deleting it using the Display Edit form.</p>
4599
130
    	or on a different subnet.</p>
130
4600
131
    </blockquote>
131
<p><img class="img-thumbnail" alt="Display Delete" src="content/admin/sa_display_delete.png"></p>
4601
132
132
4602
133
	<a name="Display_Group" id="Display_Group"></a><h1>Display Groups</h1>
133
<p class="alert alert-warning">Deleting a display cannot be reversed. A display can be reconnected to the CMS by repeating the "register" procedure which will create a new display record.</p>
4603
134
    <p>A group should be added when there is a new set of components required for a particular group of users.
134
4604
135
    It could be that you want certain users to only have access to certain components or that certain users 
135
4605
136
    should not be able to share their content, playlists and schedules with each other.</p>
136
<h2 id="Media_Inventory">Media Inventory</h2>
4606
137
    
137
4607
138
    <p><strong>Components</strong> refer to parts of <?php echo PRODUCT_NAME; ?>, e.g. Content, or Playlists.</p>
138
<p>When you schedule new content, or change existing content, it is helpful to know that the displays have updated with the new 
4608
139
        
139
information. In a <?php echo PRODUCT_NAME; ?> server and client system, the client applications will connect in to the server periodically 
4609
140
    <blockquote>
140
and update itself on the media items that they have stored locally. Media Inventory allows you to look at a glance to check if 
4610
141
    	<a name="Adding_a_Group" id="Adding_a_Group"></a><h3>Adding a Group</h3>
141
your updates were pulled by the clients yet.</p>
4611
142
    	<p>Click the navigation menu "Displays > Display Groups" to go to Display Groups page. To add a group click on 
142
4612
143
    	the "Add Group" button found at the top of the Displays list.</p>
143
<p>On the display management page, you'll see a column "Status". The status light can be one of either green, amber or red.</p>
4613
144
  
144
4614
145
    	<a name="Edit_Group" id="Edit_Group"></a><h3>Edit a Group</h3>
145
<p>When you make a change that affects the output of the server to a given client (for example if you modify a layout scheduled 
4615
146
    	<p>To edit a group click on the edit button on the row belonging to the group you wish to edit.</p>
146
on that client, schedule a new layout or change the default layout), the status light will immediately goes red. That signifies 
4616
147
		 
147
that as far as the server is aware there are updates pending for that client and it has not received them yet.</p>
4617
148
    	<p><img alt="SA Display Group" src="sa_display_groups.png"
148
4618
149
	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
149
<p>The client will then connect up to the server on a schedule and will read the new information that is available. If there 
4619
150
	   	width="621" height="226"></p>
150
are new files to download (for example if you modified a layout or scheduled something completely new), the status light will 
4620
151
 
151
turn amber while the files are being downloaded.</p>
4621
152
    	<p><strong>Name</strong> is a unique identifier for a group.</p>	   
152
4622
153
    	   
153
<p>Once the client is satisfied that all files have been downloaded, it will send an inventory of all the files it has active 
4623
154
    	<a name="Delete_Group" id="Delete_Group"></a><h3>Delete a Group</h3>
154
in it is cache back to the server, and the server will change the status light to green.</p>
4624
155
    	<p>To delete a group click on the delete button on the row belonging to the group you wish to delete.</p>
155
4625
156
    
156
<p>If you are curious to see what files the client is actively monitoring, you can click the "Media Inventory" button and a popup 
4626
157
    	<a name="Group_Component_Security" id="Group_Component_Security"></a><h3>Group / Component Security</h3>
157
will appear showing the status of each file, along with the last time the client checked it was still stored correctly on disk. 
4627
158
    	<p>When editing a group the components that are assigned / unassigned to that group are show. These
158
You will also see any files that the client is in the process of downloading.</p>
4628
159
    	determine the permissions of the users belonging to that group.</p>
159
4629
160
    	<p>You should always have at least one group.</p>
160
4630
161
161
<p><img class="img-thumbnail" alt="Display Media Inventory" src="content/admin/sa_display_media_inventory.png"></p>
4631
162
    	<a name="Group_Members" id="Group_Members"></a><h3>Group Members</h3>
162
4632
163
163
<p class="alert alert-info">Note here that what you will not see is files that the client needs to download, but that it is unaware of at the present time. For example. If you schedule a new layout and immediately go to the Media Inventory before the client has connected up to the server, you'll see the status light is red, but the content of the media inventory will not show the new files that are required. Once the client connects, those new files will be included in the inventory automatically.</p>
4444
164
    	<p>Click on "Group Members" load the "Manage Membership" form for editing. All the Displays on the system will be shown. 
4445
165
    	You can assign or remove group members.</p>
4446
166
4447
167
    	<p><img alt="SA Display Group Members" src="sa_display_group_members.png"
4448
168
	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
4449
169
	   	width="408" height="270"></p>
4450
170
4451
171
    </blockquote>
4452
172
4453
173
	<a name="Display_Statistic" id="Display_Statistic"></a><h1>Display Statistic</h1>
4454
174
    <p>Click on "Statistic" shows a page giving statistic detail of all the system Displys on the followings. You can define
4455
175
    the filters i.e. Date, Display &amp; Media, for the required statistical data display.</p>
4456
176
4457
177
     <ul>
4458
178
     	<li><h3>Layout ran</h3>Statistical data on layouts run for each Display.</li>
4459
179
     	<li><h3>Library Media ran</h3>Statistical data on Media played for each Display.</li>
4460
180
     	<li><h3>Media on Layouts ran</h3>Statistical data on Media played on all layouts run for each Display.</li>
4461
181
     </ul>
4462
182
4463
183
    <p><img alt="SA Display Statistic" src="sa_display_statistic.png"
4464
184
	   style="display: block; text-align: center; margin-left: auto; margin-right: auto"
4465
185
	   width="648" height="650"></p>
4466
186
4467
187
	<?php include('../../template/footer.php'); ?>
4468
188
	</body>
4469
189
</html>
4633
190
\ No newline at end of file
164
\ No newline at end of file
4634
191
165
4635
=== added file 'server/manual/content/admin/displaystats.php'
4636
--- server/manual/content/admin/displaystats.php	1970-01-01 00:00:00 +0000
4637
+++ server/manual/content/admin/displaystats.php	2014-01-19 13:57:27 +0000
4638
@@ -0,0 +1,44 @@
4639
1
<?php
4640
2
/*
4641
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4642
4
 * Copyright (C) 2006-2013 Daniel Garner
4643
5
 *
4644
6
 * This file is part of Xibo.
4645
7
 *
4646
8
 * Xibo is free software: you can redistribute it and/or modify
4647
9
 * it under the terms of the GNU Affero General Public License as published by
4648
10
 * the Free Software Foundation, either version 3 of the License, or
4649
11
 * any later version. 
4650
12
 *
4651
13
 * Xibo is distributed in the hope that it will be useful,
4652
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4653
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4654
16
 * GNU Affero General Public License for more details.
4655
17
 *
4656
18
 * You should have received a copy of the GNU Affero General Public License
4657
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4658
20
 */ 
4659
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4660
22
?>
4661
23
<h1 id="Display_Statistic">Display Statistics <small>Proof of Play</small></h1>
4662
24
4663
25
<p>Display clients collect statistics for layouts and media shown and their play durations. These statistics can be viewed in the Displays section using the Statistics sub menu.</p>
4664
26
4665
27
<p>A specific display can be viewed across a date range.</p>
4666
28
4667
29
<p><img class="img-thumbnail" alt="Display Statistics" src="content/admin/sa_display_statistic.png"></p>
4668
30
4669
31
<dl class="dl-horizontal">
4670
32
	<dt>Layouts Shown</dt>
4671
33
	<dd>All layouts shown in the range selected.</dd>
4672
34
</dl>
4673
35
<dl class="dl-horizontal">
4674
36
	<dt>Library Media Shown</dt>
4675
37
	<dd>All media shown in the range selected.</dd>
4676
38
</dl>
4677
39
<dl class="dl-horizontal">
4678
40
	<dt>Media on Layouts Shown</dt>
4679
41
	<dd>All Layouts shown with a breakdown of the associated media on those Layouts.</dd>
4680
42
</dl>
4681
43
4682
44
<p class="alert alert-warning">Statistics reporting may need to be enabled on the display client application.</p>
4683
0
45
4684
=== added file 'server/manual/content/admin/eer_1.4.png'
4685
1
Binary files server/manual/content/admin/eer_1.4.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/eer_1.4.png	2014-01-19 13:57:27 +0000 differ
46
Binary files server/manual/content/admin/eer_1.4.png	1970-01-01 00:00:00 +0000 and server/manual/content/admin/eer_1.4.png	2014-01-19 13:57:27 +0000 differ
4686
=== modified file 'server/manual/content/admin/modules.php'
4687
--- server/manual/content/admin/modules.php	2013-05-01 19:24:35 +0000
4688
+++ server/manual/content/admin/modules.php	2014-01-19 13:57:27 +0000
4689
@@ -1,66 +1,75 @@
4708
1
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
1
<?php
4709
2
<?php include('../../template.php'); ?>
2
/*
4710
3
<html>
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4711
4
	<head>
4
 * Copyright (C) 2006-2013 Daniel Garner
4712
5
		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5
 *
4713
6
		<title><?php echo PRODUCT_NAME; ?> Documentation</title>
6
 * This file is part of Xibo.
4714
7
		<link rel=stylesheet type="text/css" href="../../css/doc.css">
7
 *
4715
8
		<meta http-equiv="Content-Type" content="text/html" />
8
 * Xibo is free software: you can redistribute it and/or modify
4716
9
		<meta name="keywords" content="digital signage, signage, narrow-casting, <?php echo PRODUCT_NAME; ?>, open source, agpl" />
9
 * it under the terms of the GNU Affero General Public License as published by
4717
10
		<meta name="description" content="<?php echo PRODUCT_NAME; ?> is an open source digital signage solution. It supports all main media types and can be interfaced to other sources of data using CSV, Databases or RSS." />
10
 * the Free Software Foundation, either version 3 of the License, or
4718
11
11
 * any later version. 
4719
12
		<link href="img/favicon.ico" rel="shortcut icon"/>
12
 *
4720
13
		<!-- Javascript Libraries -->
13
 * Xibo is distributed in the hope that it will be useful,
4721
14
		<script type="text/javascript" src="lib/jquery.pack.js"></script>
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4722
15
		<script type="text/javascript" src="lib/jquery.dimensions.pack.js"></script>
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4723
16
		<script type="text/javascript" src="lib/jquery.ifixpng.js"></script>
16
 * GNU Affero General Public License for more details.
4724
17
	</head>
17
 *
4725
18
	<body>
18
 * You should have received a copy of the GNU Affero General Public License
4726
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4727
20
 */ 
4728
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4729
22
?>
4730
19
		
23
		
4778
20
		<h1>Modules</h1>
24
<h1>Modules</h1>
4779
21
    	<p><?php echo PRODUCT_NAME; ?> server content handling is done by Modules.</p>
25
<p>All content displayed in <?php echo PRODUCT_NAME; ?> is added/edited and served by a media module. There are 13 media modules to choose from and more are being added as new releases are made.</p>
4780
22
    	<p>Click "Administration -> Modules" load the modules parameters for edit.</p>
26
4781
23
      
27
<p>Modules can be enabled and disabled using the CMS administrator menu, Modules sub menu. Each module also has a range of settings available.</p>
4782
24
    	<p><img alt="SA_Modules" src="sa_modules.png"
28
4783
25
	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
29
<p><img  class="img-thumbnail" alt="Module List" src="content/admin/sa_modules.png"></p>
4784
26
	   	width="644" height="418"></p>
30
4785
27
31
<p>Each module has the following properties.</p>
4786
28
		<p><?php echo PRODUCT_NAME; ?> server modules table contains parameters for user edit.</p>
32
4787
29
		<ul>
33
<dl class="dl-horizontal">
4788
30
			<li><strong>Name:</strong>
34
    <dt>Name</dt>
4789
31
      		<p>System given Name for the specific module.</p</li>
35
    <dd>System given Name for the specific module.</dd>
4790
32
			<li><strong>Description:</strong>
36
</dl>
4791
33
      		<p>A breif description of the modules.</p</li>
37
4792
34
			<li><strong>Library Media:</strong>
38
<dl class="dl-horizontal">
4793
35
      		<p>Indicated if the content is saved in the <?php echo PRODUCT_NAME; ?> Library. Unchecked indicate the specific content is only save
39
    <dt>Description</dt>
4794
36
      		with the Layout-Regions.</p</li>
40
    <dd>A breif description of the module.</dd>
4795
37
			<li><strong>Valid Extensions:</strong>
41
</dl>
4796
38
      		<p>Valid file extensions that are supported by the specific module.</p</li>
42
4797
39
			<li><strong>Image Uri:</strong>
43
<dl class="dl-horizontal">
4798
40
      		<p>Link to the module icon for UI display, usually leave as it.</p></li>
44
    <dt>Library Media</dt>
4799
41
			<li><strong>Enabled:</strong>
45
    <dd>Indicated if the content is saved in the <?php echo PRODUCT_NAME; ?> Library. Unchecked indicate the specific content is only saved with the Layout-Regions.</dd>
4800
42
      		<p>System administrator may enable/disable the specific content for <?php echo PRODUCT_NAME; ?> user access.</p</li>
46
</dl>
4801
43
		</ul>
47
4802
44
48
<dl class="dl-horizontal">
4803
45
		<h2>Edit</h2>
49
    <dt>Valid Extensions</dt>
4804
46
		<p>Click Edit button for the specific content type load the following form for user changes.</p>
50
    <dd>File extensions that are supported by the specific module.</dd>
4805
47
51
</dl>
4806
48
		<ul>
52
4807
49
		<li><h3>Content Without Extension:</h3>
53
<dl class="dl-horizontal">
4808
50
    	<p>Admininstrator may enable or disable the content for user access.</p>
54
    <dt>Image Uri</dt>
4809
51
    
55
    <dd>Link to the module icon for UI display - this can also be provided by your Theme.</dd>
4810
52
    	<p><img alt="SA_Modules" src="sa_modules_text.png"
56
</dl>
4811
53
	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
57
4812
54
	   	width="358" height="179"></p></li>
58
<dl class="dl-horizontal">
4813
55
59
    <dt>Preview Enabled</dt>
4814
56
		<li><h3>Content With Extension:</h3>
60
    <dd>Should this module output a preview in the Layout Designer.</dd>
4815
57
    	<p>Administrator may add other valid files extensions that are supported by the <?php echo PRODUCT_NAME; ?> Client Display e.g. mp4.</p>
61
</dl>
4816
58
    
62
4817
59
    	<p><img alt="SA_Modules" src="sa_modules_video.png"
63
<dl class="dl-horizontal">
4818
60
	   	style="display: block; text-align: center; margin-left: auto; margin-right: auto"
64
    <dt>Enabled</dt>
4819
61
	   	width="358" height="211"></p></li>
65
    <dd>Can this module be used?</dd>
4820
62
    </ul>    
66
</dl>
4821
63
67
4822
64
	<?php include('../../template/footer.php'); ?>
68
4823
65
	</body>
69
<h2>Modules Settings</h2>
4824
66
</html>
70
<p>A Module can have a selection of its settings adjusted, exactly which ones depends on the module.</p>
4825
71
4826
72
<h3>File based Modules</h3>
4827
73
<p>At times it may be necessary to add or removed the allowed extensions on a particular file based module. A typical use case would be if a client is being used which does not support that particular type of file.</p>
4828
74
4829
75
<p><img class="img-thumbnail" alt="Modules" src="content/admin/sa_modules_video.png"></p>
4830
67
76
4831
=== modified file 'server/manual/content/admin/overview.php'
4832
68
Binary files server/manual/content/admin/overview.php	2013-03-05 19:25:50 +0000 and server/manual/content/admin/overview.php	2014-01-19 13:57:27 +0000 differ
77
Binary files server/manual/content/admin/overview.php	2013-03-05 19:25:50 +0000 and server/manual/content/admin/overview.php	2014-01-19 13:57:27 +0000 differ
4833
=== added file 'server/manual/content/admin/release_notes.php'
4834
--- server/manual/content/admin/release_notes.php	1970-01-01 00:00:00 +0000
4835
+++ server/manual/content/admin/release_notes.php	2014-01-19 13:57:27 +0000
4836
@@ -0,0 +1,23 @@
4837
1
<?php
4838
2
/*
4839
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4840
4
 * Copyright (C) 2006-2013 Daniel Garner
4841
5
 *
4842
6
 * This file is part of Xibo.
4843
7
 *
4844
8
 * Xibo is free software: you can redistribute it and/or modify
4845
9
 * it under the terms of the GNU Affero General Public License as published by
4846
10
 * the Free Software Foundation, either version 3 of the License, or
4847
11
 * any later version. 
4848
12
 *
4849
13
 * Xibo is distributed in the hope that it will be useful,
4850
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4851
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4852
16
 * GNU Affero General Public License for more details.
4853
17
 *
4854
18
 * You should have received a copy of the GNU Affero General Public License
4855
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4856
20
 */ 
4857
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4858
22
?>
4859
23
<?php include('content/admin/release_notes_' . PRODUCT_VERSION . '.php'); ?>
4860
0
\ No newline at end of file
24
\ No newline at end of file
4861
1
25
4862
=== added file 'server/manual/content/admin/release_notes_1.0.0.php'
4863
--- server/manual/content/admin/release_notes_1.0.0.php	1970-01-01 00:00:00 +0000
4864
+++ server/manual/content/admin/release_notes_1.0.0.php	2014-01-19 13:57:27 +0000
4865
@@ -0,0 +1,74 @@
4866
1
<?php
4867
2
/*
4868
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4869
4
 * Copyright (C) 2006-2013 Daniel Garner
4870
5
 *
4871
6
 * This file is part of Xibo.
4872
7
 *
4873
8
 * Xibo is free software: you can redistribute it and/or modify
4874
9
 * it under the terms of the GNU Affero General Public License as published by
4875
10
 * the Free Software Foundation, either version 3 of the License, or
4876
11
 * any later version. 
4877
12
 *
4878
13
 * Xibo is distributed in the hope that it will be useful,
4879
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4880
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4881
16
 * GNU Affero General Public License for more details.
4882
17
 *
4883
18
 * You should have received a copy of the GNU Affero General Public License
4884
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4885
20
 */ 
4886
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4887
22
?>
4888
23
<table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
4889
24
<ul>
4890
25
<li class="toclevel-1 tocsection-1"><a href="#Xibo_1.0.1_-_Codename_.22Halley.22"><span class="tocnumber">1</span> <span class="toctext">Xibo 1.0.1 - Codename "Halley"</span></a></li>
4891
26
<li class="toclevel-1 tocsection-2"><a href="#Requirements"><span class="tocnumber">2</span> <span class="toctext">Requirements</span></a></li>
4892
27
<li class="toclevel-1 tocsection-3"><a href="#Upgrading"><span class="tocnumber">3</span> <span class="toctext">Upgrading</span></a></li>
4893
28
<li class="toclevel-1 tocsection-4"><a href="#Bug_Fixes"><span class="tocnumber">4</span> <span class="toctext">Bug Fixes</span></a></li>
4894
29
<li class="toclevel-1 tocsection-5"><a href="#Known_Issues_and_Limitations"><span class="tocnumber">5</span> <span class="toctext">Known Issues and Limitations</span></a></li>
4895
30
</ul>
4896
31
</td></tr></table>
4897
32
<h3> <span class="mw-headline" id="Xibo_1.0.1_-_Codename_.22Halley.22">Xibo 1.0.1 - Codename "Halley"</span></h3>
4898
33
<p>This is a bug fix release mainly aimed at people that are having trouble installing Xibo. If you already have a working version of Xibo 1.0.0 there is no need for you to upgrade to this latest release.
4899
34
</p><p>You can download this release from <a rel="nofollow" class="external free" href="https://launchpad.net/xibo/1.0/1.0.1">https://launchpad.net/xibo/1.0/1.0.1</a>
4900
35
</p>
4901
36
<h3> <span class="mw-headline" id="Requirements"> Requirements </span></h3>
4902
37
<p>You should use the 1.0.0 client with this version of the Xibo server.
4903
38
</p><p>Xibo now recommends PHP 5.2.0 or higher. Xibo will function in most cases with 5.1.0 but you may experience some problems with experimental PHP functions. In particular Xibo may present a restricted list of timezones in the Admin Interface.
4904
39
</p>
4905
40
<h3> <span class="mw-headline" id="Upgrading"> Upgrading </span></h3>
4906
41
<ul><li> Backup settings.php from your installation
4907
42
</li><li> The upgrader will attempt to backup your database, but manually taking a backup would be a good idea.
4908
43
</li><li> Replace your existing installation with the new version from the tar.gz or zip file
4909
44
</li><li> Replace your settings.php file
4910
45
</li><li> Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a> as normal
4911
46
</li><li> You will be prompted that an upgrade is required.
4912
47
</li><li> Enter your xibo_admin password, and follow the upgrade wizard.
4913
48
</li><li> The upgrade should run, and finally ask you to log in as you would normally.
4914
49
</li></ul>
4915
50
<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>
4916
51
</p><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>
4917
52
</p><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>
4918
53
</p>
4919
54
<h3> <span class="mw-headline" id="Bug_Fixes">Bug Fixes</span></h3>
4920
55
<p>Fixes for the following Bugs
4921
56
</p>
4922
57
<ul><li> 358996 - [Linux Server] Install block on configuration of database
4923
58
</li><li> 369674 - Xibo requires PHP 5.1.0 (with compile options) or 5.2.0 otherwise, but only checks for 5.0.2
4924
59
</li><li> 362320 - Retired layouts shown in Default Layout select
4925
60
</li><li> 361125 - The file name is not displayed in Layout / Region Options
4926
61
</li></ul>
4927
62
<h3> <span class="mw-headline" id="Known_Issues_and_Limitations"> Known Issues and Limitations </span></h3>
4928
63
<p>Xibo is a young project. There are plenty of new features in the pipeline, but to provide a stable platform for users wanting Xibo now, the 1.0 series of releases are now feature-frozen (no new features will be implemented). All new development work will go in to the 1.1 series - which will be unstable.
4929
64
</p><p>Once we are happy with 1.1, we will release Xibo 1.2 which will be the next stable release series and the direct upgrade path for 1.0. Any future releases of Xibo 1.0 will be bug fix releases only.
4930
65
</p><p>Therefore there are the following known issues and limitations with Xibo 1.0.0-final:
4931
66
</p>
4932
67
<ul><li> Internationalisation: Xibo currently deals with non-english characters badly. You are strongly recommended to avoid using non-english characters wherever possible. <a rel="nofollow" class="external autonumber" href="https://blueprints.launchpad.net/xibo/translate-xibo">[1]</a>
4933
68
</li><li> Tickers slow when only one layout scheduled. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/336589">[2]</a>
4934
69
</li><li> The backgrounds of Text and RSS media items are not transparent if the background of a layout is a GIF image. Please use JPEG images as a work around. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/348506">[3]</a>
4935
70
</li><li> Videos will not loop if they are the only media in a region. Add a short empty text field as a work around. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/346260">[4]</a>
4936
71
</li><li> Overlapping regions are handled badly. The existing server/client were never developed to support overlapping regions, but they do work in some circumstances which is why we have decided to leave this functionality intact, but with the caveat that they may not work as you expect. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/321377">[5]</a> <a rel="nofollow" class="external autonumber" href="https://answers.launchpad.net/xibo/+question/64768">[6]</a>
4937
72
</li><li> Client will not run under VirtualBox. We think this is a VirtualBox bug as it's a low-level Windows API call that is failing. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/338021">[7]</a>
4938
73
</li><li> Backgrounds of FlashMedia items are not transparent. This is a limitation of the Adobe Flash C# control. <a rel="nofollow" class="external autonumber" href="https://bugs.launchpad.net/xibo/+bug/341634">[8]</a>
4939
74
</li></ul>
4940
0
\ No newline at end of file
75
\ No newline at end of file
4941
1
76
4942
=== added file 'server/manual/content/admin/release_notes_1.0.1.php'
4943
--- server/manual/content/admin/release_notes_1.0.1.php	1970-01-01 00:00:00 +0000
4944
+++ server/manual/content/admin/release_notes_1.0.1.php	2014-01-19 13:57:27 +0000
4945
@@ -0,0 +1,74 @@
4946
1
<?php
4947
2
/*
4948
3
 * Xibo - Digital Signage - http://www.xibo.org.uk
4949
4
 * Copyright (C) 2006-2013 Daniel Garner
4950
5
 *
4951
6
 * This file is part of Xibo.
4952
7
 *
4953
8
 * Xibo is free software: you can redistribute it and/or modify
4954
9
 * it under the terms of the GNU Affero General Public License as published by
4955
10
 * the Free Software Foundation, either version 3 of the License, or
4956
11
 * any later version. 
4957
12
 *
4958
13
 * Xibo is distributed in the hope that it will be useful,
4959
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4960
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4961
16
 * GNU Affero General Public License for more details.
4962
17
 *
4963
18
 * You should have received a copy of the GNU Affero General Public License
4964
19
 * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
4965
20
 */ 
4966
21
defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
4967
22
?>
4968
23
<table id="toc" class="toc"><tr><td><div id="toctitle"><h2>Contents</h2></div>
4969
24
<ul>
4970
25
<li class="toclevel-1 tocsection-1"><a href="#Xibo_1.0.1_-_Codename_.22Halley.22"><span class="tocnumber">1</span> <span class="toctext">Xibo 1.0.1 - Codename "Halley"</span></a></li>
4971
26
<li class="toclevel-1 tocsection-2"><a href="#Requirements"><span class="tocnumber">2</span> <span class="toctext">Requirements</span></a></li>
4972
27
<li class="toclevel-1 tocsection-3"><a href="#Upgrading"><span class="tocnumber">3</span> <span class="toctext">Upgrading</span></a></li>
4973
28
<li class="toclevel-1 tocsection-4"><a href="#Bug_Fixes"><span class="tocnumber">4</span> <span class="toctext">Bug Fixes</span></a></li>
4974
29
<li class="toclevel-1 tocsection-5"><a href="#Known_Issues_and_Limitations"><span class="tocnumber">5</span> <span class="toctext">Known Issues and Limitations</span></a></li>
4975
30
</ul>
4976
31
</td></tr></table>
4977
32
<h3> <span class="mw-headline" id="Xibo_1.0.1_-_Codename_.22Halley.22">Xibo 1.0.1 - Codename "Halley"</span></h3>
4978
33
<p>This is a bug fix release mainly aimed at people that are having trouble installing Xibo. If you already have a working version of Xibo 1.0.0 there is no need for you to upgrade to this latest release.
4979
34
</p><p>You can download this release from <a rel="nofollow" class="external free" href="https://launchpad.net/xibo/1.0/1.0.1">https://launchpad.net/xibo/1.0/1.0.1</a>
4980
35
</p>
4981
36
<h3> <span class="mw-headline" id="Requirements"> Requirements </span></h3>
4982
37
<p>You should use the 1.0.0 client with this version of the Xibo server.
4983
38
</p><p>Xibo now recommends PHP 5.2.0 or higher. Xibo will function in most cases with 5.1.0 but you may experience some problems with experimental PHP functions. In particular Xibo may present a restricted list of timezones in the Admin Interface.
4984
39
</p>
4985
40
<h3> <span class="mw-headline" id="Upgrading"> Upgrading </span></h3>
4986
41
<ul><li> Backup settings.php from your installation
4987
42
</li><li> The upgrader will attempt to backup your database, but manually taking a backup would be a good idea.
4988
43
</li><li> Replace your existing installation with the new version from the tar.gz or zip file
4989
44
</li><li> Replace your settings.php file
4990
45
</li><li> Browse to <a rel="nofollow" class="external free" href="http://your.server/path">http://your.server/path</a> as normal
4991
46
</li><li> You will be prompted that an upgrade is required.
4992
47
</li><li> Enter your xibo_admin password, and follow the upgrade wizard.
4993
48
</li><li> The upgrade should run, and finally ask you to log in as you would normally.
4994
49
</li></ul>
4995
50
<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>
4996
51
</p><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>
4997
52
</p><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>
4998
53
</p>
4999
54
<h3> <span class="mw-headline" id="Bug_Fixes">Bug Fixes</span></h3>
5000
55
<p>Fixes for the following Bugs
Reviewer	Review Type	Date Requested	Status
Xibo Maintainters		2014-01-19	Pending
Review via email: mp+202214@code.launchpad.net