Knah-Tsaeb
/
MyShaarli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #551 from ArthurHoaro/hotfix/timezone 

Use correct 'UTC' timezone
This commit is contained in:
Arthur 2016-05-05 13:21:36 +02:00
parent 47be060983 12ff86c961
commit 86deafe0ff
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/TimeZone.php
View File

@ -101,10 +101,6 @@ function generateTimeZoneForm($preselectedTimezone='')
*/
function isTimeZoneValid($continent, $city)
{
if ($continent == 'UTC' && $city == 'UTC') {
return true;
}
return in_array(
$continent.'/'.$city,
timezone_identifiers_list()

20
index.php
View File

@ -1277,11 +1277,15 @@ function renderPage()
{
if (!empty($_POST['title']) )
{
if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away!
if (!tokenOk($_POST['token'])) {
die('Wrong token.'); // Go away!
}
$tz = 'UTC';
if (!empty($_POST['continent']) && !empty($_POST['city']))
if (isTimeZoneValid($_POST['continent'],$_POST['city']))
$tz = $_POST['continent'].'/'.$_POST['city'];
if (!empty($_POST['continent']) && !empty($_POST['city'])
&& isTimeZoneValid($_POST['continent'], $_POST['city'])
) {
$tz = $_POST['continent'] . '/' . $_POST['city'];
}
$GLOBALS['timezone'] = $tz;
$GLOBALS['title']=$_POST['title'];
$GLOBALS['titleLink']=$_POST['titleLink'];
@ -2108,10 +2112,10 @@ function install()
if (!empty($_POST['setlogin']) && !empty($_POST['setpassword']))
{
$tz = 'UTC';
if (!empty($_POST['continent']) && !empty($_POST['city'])) {
if (isTimeZoneValid($_POST['continent'], $_POST['city'])) {
$tz = $_POST['continent'].'/'.$_POST['city'];
}
if (!empty($_POST['continent']) && !empty($_POST['city'])
&& isTimeZoneValid($_POST['continent'], $_POST['city'])
) {
$tz = $_POST['continent'].'/'.$_POST['city'];
}
$GLOBALS['timezone'] = $tz;
// Everything is ok, let's create config file.

2
tests/TimeZoneTest.php
View File

@ -67,7 +67,6 @@ class TimeZoneTest extends PHPUnit_Framework_TestCase
{
$this->assertTrue(isTimeZoneValid('America', 'Argentina/Ushuaia'));
$this->assertTrue(isTimeZoneValid('Europe', 'Oslo'));
$this->assertTrue(isTimeZoneValid('UTC', 'UTC'));
}
/**
@ -78,5 +77,6 @@ class TimeZoneTest extends PHPUnit_Framework_TestCase
$this->assertFalse(isTimeZoneValid('CEST', 'CEST'));
$this->assertFalse(isTimeZoneValid('Europe', 'Atlantis'));
$this->assertFalse(isTimeZoneValid('Middle_Earth', 'Moria'));
$this->assertFalse(isTimeZoneValid('UTC', 'UTC'));
}
}