Changeset 979 in subversion

Timestamp:

Jan 31, 2008 8:09:21 PM (5 years ago)

Author:

till

Message:

• minor cs
• some comments and @todo
• simplified if()'s

Location:

branches/devel-vnext/program/include

Files:

• bootstrap.php (modified) (1 diff)
• globals.php (modified) (17 diffs)

branches/devel-vnext/program/include/bootstrap.php

@@ -13 +13 @@
  |   any request.                                                        |
  +-----------------------------------------------------------------------+
- | Author: Tll Klampaeckel <till@php.net>                                |
+ | Author: Till Klampaeckel <till@php.net>                               |
  |         Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+

branches/devel-vnext/program/include/globals.php

@@ -1 +1 @@
 <?php
-
 /*
  +-----------------------------------------------------------------------+
@@ -69 +68 @@
 /**
  * Send HTTP headers to prevent caching this page
+ * 
+ * @return void
  */
 function send_nocacheing_headers() {
@@ -85 +86 @@
  *
  * @param int Expiration time in seconds
+ * @return void
  */
 function send_future_expire_header($offset = 2600000) {
@@ -103 +105 @@
  * @param int Modified date as unix timestamp
  * @param string Etag value for caching
+ * @return void
  */
 function send_modified_header($mdate, $etag = null) {
@@ -109 +112 @@
     }
     $iscached = false;
-    if ($_SERVER['HTTP_IF_MODIFIED_SINCE'] && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $mdate) {
+    if ($_SERVER['HTTP_IF_MODIFIED_SINCE']
+        && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $mdate) {
         $iscached = true;
     }
@@ -171 +175 @@
             foreach ($var as $key => $value) {
                 // enclose key with quotes if it is not variable-name conform
-                if (!ereg('^[_a-zA-Z]{1}[_a-zA-Z0-9]*$', $key) /* || is_js_reserved_word($key) */)
-                $key = "'$key'";
-
+                if (!ereg('^[_a-zA-Z]{1}[_a-zA-Z0-9]*$', $key) /* || is_js_reserved_word($key) */) {
+                    $key = "'$key'";
+                }
                 $pairs[] = sprintf("%s%s", $is_assoc ? $key.':' : '', json_serialize($value));
             }
@@ -225 +229 @@
     if(in_array($str, array('false', '0', 'no', 'nein', ''), TRUE)) {
         return FALSE;
-    } else {
-        return TRUE;
-    }
+    }
+    return TRUE;
 }
 
@@ -245 +248 @@
         $bytes = floatval($regs[1]);
         switch (strtolower($regs[2])) {
-            case 'g':
-                $bytes *= 1073741824;
-                break;
-            case 'm':
-                $bytes *= 1048576;
-                break;
-            case 'k':
-                $bytes *= 1024;
-                break;
+        case 'g':
+            $bytes *= 1073741824;
+            break;
+        case 'm':
+            $bytes *= 1048576;
+            break;
+        case 'k':
+            $bytes *= 1024;
+            break;
         }
     }
@@ -269 +272 @@
 function show_bytes($bytes) {
     if ($bytes > 1073741824) {
-        $gb = $bytes/1073741824;
+        $gb  = $bytes/1073741824;
         $str = sprintf($gb>=10 ? "%d GB" : "%.1f GB", $gb);
     } else if ($bytes > 1048576) {
-        $mb = $bytes/1048576;
+        $mb  = $bytes/1048576;
         $str = sprintf($mb>=10 ? "%d MB" : "%.1f MB", $mb);
     } else if ($bytes > 1024) {
@@ -327 +330 @@
     if (function_exists('mb_strlen')) {
         return mb_strlen($str);
-    } else {
-        return strlen($str);
-    }
+    }
+    return strlen($str);
 }
 
@@ -338 +340 @@
     if (function_exists('mb_strtolower')) {
         return mb_strtolower($str);
-    } else {
-        return strtolower($str);
+    }
+    return strtolower($str);
     }
 }
@@ -349 +351 @@
     if (function_exists('mb_substr')) {
         return mb_substr($str, $start, $len);
-    } else {
-        return substr($str, $start, $len);
-    }
+    }
+    return substr($str, $start, $len);
 }
 
@@ -360 +361 @@
     if (function_exists('mb_strpos')) {
         return mb_strpos($haystack, $needle, $offset);
-    } else {
-        return strpos($haystack, $needle, $offset);
-    }
+    }
+        return strpos($haystack, $needle, $offset);
 }
 
@@ -371 +371 @@
     if (function_exists('mb_strrpos')) {
         return mb_strrpos($haystack, $needle, $offset);
-    } else {
-        return strrpos($haystack, $needle, $offset);
-    }
+    }
+        return strrpos($haystack, $needle, $offset);
 }
 
@@ -444 +443 @@
  * @param int Factor to multiply with the offset
  * @return int Unix timestamp
+ * @todo Check the switch() - it looks weird.
  */
 function get_offset_time($offset_str, $factor = 1) {
@@ -456 +456 @@
     $ts = mktime();
     switch ($unit) {
-        case 'w':
-            $amount *= 7;
-        case 'd':
-            $amount *= 24;
-        case 'h':
-            $amount *= 60;
-        case 'm':
-            $amount *= 60;
-        case 's':
-            $ts += $amount * $factor;
+    case 'w':
+        $amount *= 7;
+    case 'd':
+        $amount *= 24;
+    case 'h':
+        $amount *= 60;
+    case 'm':
+        $amount *= 60;
+    case 's':
+        $ts += $amount * $factor;
     }
 
@@ -483 +483 @@
     if ($pver[0] >= 5) {
         return strrpos($haystack, $needle);
-    } else {
-        $index = strpos(strrev($haystack), strrev($needle));
-        if ($index === false) {
-            return false;
-        }
-        $index = strlen($haystack) - strlen($needle) - $index;
-        return $index;
-    }
-}
-
-?>
+    }
+    $index = strpos(strrev($haystack), strrev($needle));
+    if ($index === false) {
+        return false;
+    }
+    $index = strlen($haystack) - strlen($needle) - $index;
+    return $index;
+}