aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--application/TimeZone.php4
-rw-r--r--index.php20
-rw-r--r--tests/TimeZoneTest.php2
3 files changed, 13 insertions, 13 deletions
diff --git a/application/TimeZone.php b/application/TimeZone.php
index e363d90a..26f2232d 100644
--- a/application/TimeZone.php
+++ b/application/TimeZone.php
@@ -101,10 +101,6 @@ function generateTimeZoneForm($preselectedTimezone='')
101 */ 101 */
102function isTimeZoneValid($continent, $city) 102function isTimeZoneValid($continent, $city)
103{ 103{
104 if ($continent == 'UTC' && $city == 'UTC') {
105 return true;
106 }
107
108 return in_array( 104 return in_array(
109 $continent.'/'.$city, 105 $continent.'/'.$city,
110 timezone_identifiers_list() 106 timezone_identifiers_list()
diff --git a/index.php b/index.php
index e9b0bf40..47bae6e8 100644
--- a/index.php
+++ b/index.php
@@ -1277,11 +1277,15 @@ function renderPage()
1277 { 1277 {
1278 if (!empty($_POST['title']) ) 1278 if (!empty($_POST['title']) )
1279 { 1279 {
1280 if (!tokenOk($_POST['token'])) die('Wrong token.'); // Go away! 1280 if (!tokenOk($_POST['token'])) {
1281 die('Wrong token.'); // Go away!
1282 }
1281 $tz = 'UTC'; 1283 $tz = 'UTC';
1282 if (!empty($_POST['continent']) && !empty($_POST['city'])) 1284 if (!empty($_POST['continent']) && !empty($_POST['city'])
1283 if (isTimeZoneValid($_POST['continent'],$_POST['city'])) 1285 && isTimeZoneValid($_POST['continent'], $_POST['city'])
1284 $tz = $_POST['continent'].'/'.$_POST['city']; 1286 ) {
1287 $tz = $_POST['continent'] . '/' . $_POST['city'];
1288 }
1285 $GLOBALS['timezone'] = $tz; 1289 $GLOBALS['timezone'] = $tz;
1286 $GLOBALS['title']=$_POST['title']; 1290 $GLOBALS['title']=$_POST['title'];
1287 $GLOBALS['titleLink']=$_POST['titleLink']; 1291 $GLOBALS['titleLink']=$_POST['titleLink'];
@@ -2108,10 +2112,10 @@ function install()
2108 if (!empty($_POST['setlogin']) && !empty($_POST['setpassword'])) 2112 if (!empty($_POST['setlogin']) && !empty($_POST['setpassword']))
2109 { 2113 {
2110 $tz = 'UTC'; 2114 $tz = 'UTC';
2111 if (!empty($_POST['continent']) && !empty($_POST['city'])) { 2115 if (!empty($_POST['continent']) && !empty($_POST['city'])
2112 if (isTimeZoneValid($_POST['continent'], $_POST['city'])) { 2116 && isTimeZoneValid($_POST['continent'], $_POST['city'])
2113 $tz = $_POST['continent'].'/'.$_POST['city']; 2117 ) {
2114 } 2118 $tz = $_POST['continent'].'/'.$_POST['city'];
2115 } 2119 }
2116 $GLOBALS['timezone'] = $tz; 2120 $GLOBALS['timezone'] = $tz;
2117 // Everything is ok, let's create config file. 2121 // Everything is ok, let's create config file.
diff --git a/tests/TimeZoneTest.php b/tests/TimeZoneTest.php
index b219030a..2976d116 100644
--- a/tests/TimeZoneTest.php
+++ b/tests/TimeZoneTest.php
@@ -67,7 +67,6 @@ class TimeZoneTest extends PHPUnit_Framework_TestCase
67 { 67 {
68 $this->assertTrue(isTimeZoneValid('America', 'Argentina/Ushuaia')); 68 $this->assertTrue(isTimeZoneValid('America', 'Argentina/Ushuaia'));
69 $this->assertTrue(isTimeZoneValid('Europe', 'Oslo')); 69 $this->assertTrue(isTimeZoneValid('Europe', 'Oslo'));
70 $this->assertTrue(isTimeZoneValid('UTC', 'UTC'));
71 } 70 }
72 71
73 /** 72 /**
@@ -78,5 +77,6 @@ class TimeZoneTest extends PHPUnit_Framework_TestCase
78 $this->assertFalse(isTimeZoneValid('CEST', 'CEST')); 77 $this->assertFalse(isTimeZoneValid('CEST', 'CEST'));
79 $this->assertFalse(isTimeZoneValid('Europe', 'Atlantis')); 78 $this->assertFalse(isTimeZoneValid('Europe', 'Atlantis'));
80 $this->assertFalse(isTimeZoneValid('Middle_Earth', 'Moria')); 79 $this->assertFalse(isTimeZoneValid('Middle_Earth', 'Moria'));
80 $this->assertFalse(isTimeZoneValid('UTC', 'UTC'));
81 } 81 }
82} 82}