ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2832 from connortechnology/fix_2831 

Fix 2831
This commit is contained in:
Isaac Connor 2020-02-11 17:09:07 -05:00 committed by GitHub
parent 3717e6b702 289bde869d
commit 050d02f1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
View File

@ -785,7 +785,7 @@ our @options = (
},
{
name => 'ZM_TIMEZONE',
default => 'UTC',
default => '',
description => 'The timezone that php should use.',
help => q`
This should be set equal to the system timezone of the mysql server`,

3
web/includes/config.php.in
View File

@ -193,7 +193,8 @@ if ( ! defined('ZM_SERVER_ID') ) {
}
}
ini_set('date.timezone', ZM_TIMEZONE);
if ( ZM_TIMEZONE )
ini_set('date.timezone', ZM_TIMEZONE);
function process_configfile($configFile) {
if ( is_readable( $configFile ) ) {

3
web/index.php
View File

@ -202,7 +202,8 @@ isset($action) || $action = NULL;
if ( (!$view and !$request) or ($view == 'console') ) {
// Verify the system, php, and mysql timezones all match
date_default_timezone_set(ZM_TIMEZONE);
#if ( ZM_TIMEZONE )
#date_default_timezone_set(ZM_TIMEZONE);
check_timezone();
}

1
web/lang/en_gb.php
View File

@ -771,6 +771,7 @@ $SLANG = array(
'TurboPanSpeed' => 'Turbo Pan Speed',
'TurboTiltSpeed' => 'Turbo Tilt Speed',
'Type' => 'Type',
'TZUnset' => 'Unset - use value in php.ini',
'Unarchive' => 'Unarchive',
'Undefined' => 'Undefined',
'Units' => 'Units',

58
web/skins/classic/views/options.php
View File

@ -393,41 +393,41 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR)) as $
$configCats[$tab]['ZM_SKIN_DEFAULT']['Hint'] = join('|', array_map('basename', glob('skins/*',GLOB_ONLYDIR)));
$configCats[$tab]['ZM_CSS_DEFAULT']['Hint'] = join('|', array_map ( 'basename', glob('skins/'.ZM_SKIN_DEFAULT.'/css/*',GLOB_ONLYDIR) ));
$configCats[$tab]['ZM_BANDWIDTH_DEFAULT']['Hint'] = $bandwidth_options;
function timezone_list() {
static $timezones = null;
static $timezones = null;
if ($timezones === null) {
$timezones = [];
$offsets = [];
$now = new DateTime('now', new DateTimeZone('UTC'));
if ( $timezones === null ) {
$timezones = [];
$offsets = [];
$now = new DateTime('now', new DateTimeZone('UTC'));
foreach (DateTimeZone::listIdentifiers() as $timezone) {
$now->setTimezone(new DateTimeZone($timezone));
$offsets[] = $offset = $now->getOffset();
$timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
foreach ( DateTimeZone::listIdentifiers() as $timezone ) {
$now->setTimezone(new DateTimeZone($timezone));
$offsets[] = $offset = $now->getOffset();
$timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
}
array_multisort($offsets, $timezones);
}
return $timezones;
}
array_multisort($offsets, $timezones);
}
function format_GMT_offset($offset) {
$hours = intval($offset / 3600);
$minutes = abs(intval($offset % 3600 / 60));
return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
}
return $timezones;
}
function format_GMT_offset($offset) {
$hours = intval($offset / 3600);
$minutes = abs(intval($offset % 3600 / 60));
return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
}
function format_timezone_name($name) {
$name = str_replace('/', ', ', $name);
$name = str_replace('_', ' ', $name);
$name = str_replace('St ', 'St. ', $name);
return $name;
}
$configCats[$tab]['ZM_TIMEZONE']['Hint'] = timezone_list();
}
function format_timezone_name($name) {
$name = str_replace('/', ', ', $name);
$name = str_replace('_', ' ', $name);
$name = str_replace('St ', 'St. ', $name);
return $name;
}
$configCats[$tab]['ZM_TIMEZONE']['Hint'] = array(''=> translate('TZUnset')) + timezone_list();
} # end if tab == system
?>
<form name="optionsForm" class="form-horizontal" method="post" action="?">
<input type="hidden" name="view" value="<?php echo $view ?>"/>