Changeset 2881 in subversion

Timestamp:

Aug 27, 2009 9:38:26 AM (4 years ago)

Author:

alec

Message:

• Don't require date.timezone setting in installer (#1485989)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• installer/check.php (modified) (5 diffs)
• installer/rcube_install.php (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Don't require date.timezone setting in installer (#1485989)
 - Fix date sorting problem with Courier IMAP server (#1486065)
 - Unselect pressed buttons on mouse up (#1485987)

trunk/roundcubemail/installer/check.php

@@ -18 +18 @@
 $ini_checks = array('file_uploads' => 1, 'session.auto_start' => 0,
     'zend.ze1_compatibility_mode' => 0, 'mbstring.func_overload' => 0,
-    'suhosin.session.encrypt' => 0, 'date.timezone' => '-NOTEMPTY-');
+    'suhosin.session.encrypt' => 0);
+
+$optional_checks = array('date.timezone' => '-NOTEMPTY-');
 
 $source_urls = array(
@@ -69 +71 @@
 ?>
 
-<p class="hint">The next couple of extensions are <em>optional</em> but recommended to get the best performance:</p>
+<p class="hint">The next couple of extensions are <em>optional</em> and recommended to get the best performance:</p>
 <?php
 
@@ -128 +130 @@
 
 <h3>Checking php.ini/.htaccess settings</h3>
+<p class="hint">The following settings are <em>required</em> to run RoundCube:</p>
 
 <?php
@@ -137 +140 @@
             $RCI->fail($var, "cannot be empty and needs to be set");
         } else {
-            switch ($var) {
-                case 'date.timezone':
-                    if (date_default_timezone_set($status) === false) {
-                        $RCI->fail($var, "is '$status', but the settings is wrong");
-                        echo '<br />';
-                        continue;
-                    }
-                    break;
-            }
             $RCI->pass($var);
         }
@@ -155 +149 @@
     } else {
       $RCI->fail($var, "is '$status', should be '$val'");
+    }
+    echo '<br />';
+}
+?>
+
+<p class="hint">The following settings are <em>optional</em> and recommended:</p>
+
+<?php
+
+foreach ($optional_checks as $var => $val) {
+    $status = ini_get($var);
+    if ($val === '-NOTEMPTY-') {
+        if (empty($status)) {
+            $RCI->optfail($var, "Could be set");
+        } else {
+            $RCI->pass($var);
+        }
+        echo '<br />';
+        continue;
+    }
+    if ($status == $val) {
+        $RCI->pass($var);
+    } else {
+      $RCI->optfail($var, "is '$status', could be '$val'");
     }
     echo '<br />';

trunk/roundcubemail/installer/rcube_install.php

@@ -468 +468 @@
     $this->_showhint($message, $url);
   }
+
+
+  /**
+   * Display an error status for optional settings/features
+   *
+   * @param string Test name
+   * @param string Error message
+   * @param string URL for details
+   */
+  function optfail($name, $message = '', $url = '')
+  {
+    echo Q($name) . ':&nbsp; <span class="na">NOT OK</span>';
+    $this->_showhint($message, $url);
+  }