Merge pull request #271 from virtualtam/php53

PHP: ensure 5.3 compatibility

3 files changed, 135 insertions, 4 deletions

diff --git a/application/Config.php b/application/Config.php
index 0b01b524..ec799d7f 100755
--- a/application/Config.php
+++ b/application/Config.php
@@ -19,10 +19,10 @@
 function writeConfig($config, $isLoggedIn)

 {

     // These fields are required in configuration.

-    $MANDATORY_FIELDS = [

+    $MANDATORY_FIELDS = array(

         'login', 'hash', 'salt', 'timezone', 'title', 'titleLink',

         'redirector', 'disablesessionprotection', 'privateLinkByDefault'

-    ];

+    );

 

     if (!isset($config['config']['CONFIG_FILE'])) {

         throw new MissingFieldConfigException('CONFIG_FILE');

@@ -126,4 +126,4 @@ class UnauthorizedConfigException extends Exception
     {

         $this->message = 'You are not authorized to alter config.';

     }

-}
\ No newline at end of file
+}

diff --git a/application/TimeZone.php b/application/TimeZone.php
new file mode 100644
index 00000000..ccbef918
--- /dev/null
+++ b/application/TimeZone.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Generates the timezone selection form and JavaScript.
+ *
+ * Note: 'UTC/UTC' is mapped to 'UTC' to form a valid option
+ *
+ * Example: preselect Europe/Paris
+ *  list($htmlform, $js) = templateTZform('Europe/Paris');
+ *
+ * @param string $preselected_timezone preselected timezone (optional)
+ *
+ * @return an array containing the generated HTML form and Javascript code
+ **/
+function generateTimeZoneForm($preselected_timezone='')
+{
+    // Select the first available timezone if no preselected value is passed
+    if ($preselected_timezone == '') {
+        $l = timezone_identifiers_list();
+        $preselected_timezone = $l[0];
+    }
+
+    // Try to split the provided timezone
+    $spos = strpos($preselected_timezone, '/');
+    $pcontinent = substr($preselected_timezone, 0, $spos);
+    $pcity = substr($preselected_timezone, $spos+1);
+
+    // Display config form:
+    $timezone_form = '';
+    $timezone_js = '';
+
+    // The list is in the form 'Europe/Paris', 'America/Argentina/Buenos_Aires'...
+    // We split the list in continents/cities.
+    $continents = array();
+    $cities = array();
+
+    // TODO: use a template to generate the HTML/Javascript form
+
+    foreach (timezone_identifiers_list() as $tz) {
+        if ($tz == 'UTC') {
+            $tz = 'UTC/UTC';
+        }
+        $spos = strpos($tz, '/');
+
+        if ($spos !== false) {
+            $continent = substr($tz, 0, $spos);
+            $city = substr($tz, $spos+1);
+            $continents[$continent] = 1;
+
+            if (!isset($cities[$continent])) {
+                $cities[$continent] = '';
+            }
+            $cities[$continent] .= '<option value="'.$city.'"';
+            if ($pcity == $city) {
+                $cities[$continent] .= ' selected="selected"';
+            }
+            $cities[$continent] .= '>'.$city.'</option>';
+        }
+    }
+
+    $continents_html = '';
+    $continents = array_keys($continents);
+
+    foreach ($continents as $continent) {
+        $continents_html .= '<option  value="'.$continent.'"';
+        if ($pcontinent == $continent) {
+            $continents_html .= ' selected="selected"';
+        }
+        $continents_html .= '>'.$continent.'</option>';
+    }
+
+    // Timezone selection form
+    $timezone_form = 'Continent:';
+    $timezone_form .= '<select name="continent" id="continent" onChange="onChangecontinent();">';
+    $timezone_form .= $continents_html.'</select>';
+    $timezone_form .= '&nbsp;&nbsp;&nbsp;&nbsp;City:';
+    $timezone_form .= '<select name="city" id="city">'.$cities[$pcontinent].'</select><br />';
+
+    // Javascript handler - updates the city list when the user selects a continent
+    $timezone_js = '<script>';
+    $timezone_js .= 'function onChangecontinent() {';
+    $timezone_js .= 'document.getElementById("city").innerHTML =';
+    $timezone_js .= ' citiescontinent[document.getElementById("continent").value]; }';
+    $timezone_js .= 'var citiescontinent = '.json_encode($cities).';';
+    $timezone_js .= '</script>';
+
+    return array($timezone_form, $timezone_js);
+}
+
+/**
+ * Tells if a continent/city pair form a valid timezone
+ *
+ * Note: 'UTC/UTC' is mapped to 'UTC'
+ *
+ * @param string $continent the timezone continent
+ * @param string $city      the timezone city
+ *
+ * @return whether continent/city is a valid timezone
+ */
+function isTimeZoneValid($continent, $city)
+{
+    if ($continent == 'UTC' && $city == 'UTC') {
+        return true;
+    }
+
+    return in_array(
+        $continent.'/'.$city,
+        timezone_identifiers_list()
+    );
+}
+?>
diff --git a/application/Utils.php b/application/Utils.php
index 658b97bc..cd4724fa 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -48,7 +48,7 @@ function endsWith($haystack, $needle, $case=true)
  */
 function nl2br_escaped($html)
 {
-    return str_replace('>','&gt;',str_replace('<','&lt;',nl2br($html)));
+    return str_replace('>', '&gt;', str_replace('<', '&lt;', nl2br($html)));
 }
 
 /**
@@ -117,3 +117,24 @@ function generateLocation($referer, $host, $loopTerms = array())
 
     return $final_referer;
 }
+
+/**
+ * Checks the PHP version to ensure Shaarli can run
+ *
+ * @param string $minVersion minimum PHP required version
+ * @param string $curVersion current PHP version (use PHP_VERSION)
+ *
+ * @throws Exception    the PHP version is not supported
+ */
+function checkPHPVersion($minVersion, $curVersion)
+{
+    if (version_compare($curVersion, $minVersion) < 0) {
+        throw new Exception(
+            'Your PHP version is obsolete!'
+            .' Shaarli requires at least PHP '.$minVersion.', and thus cannot run.'
+            .' Your PHP version has known security vulnerabilities and should be'
+            .' updated as soon as possible.'
+        );
+    }
+}
+?>