We're talking Megabytes here, not millibytes :)

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index 068691c010cad0aaecaefbf96e61010d966745da..96e8fb5ebf1473faa0aefd977bd568b8aafaa14b 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -16,7 +16,7 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.4.0 RC1';
+$version = '1.4.0 [CVS-DEVEL]';
 
 /** 
  * SquirrelMail internal version number -- DO NOT CHANGE
@@ -284,24 +284,7 @@ function sq_mt_seed($Val) {
     $Max = mt_getrandmax();
     
     if (! is_int($Val)) {
-        if (function_exists('crc32')) {
             $Val = crc32($Val);
-        } else {
-            $Str = $Val;
-            $Pos = 0;
-            $Val = 0;
-            $Mask = $Max / 2;
-            $HighBit = $Max ^ $Mask;
-            while ($Pos < strlen($Str)) {
-                if ($Val & $HighBit) {
-                    $Val = (($Val & $Mask) << 1) + 1;
-                } else {
-                    $Val = ($Val & $Mask) << 1;
-                }
-                $Val ^= $Str[$Pos];
-                $Pos ++;
-            }
-        }
     }
     
     if ($Val < 0) {
@@ -366,53 +349,11 @@ function OneTimePadCreate ($length=100) {
 }
 
 /**
- * Check if we have a required PHP-version. Return TRUE if we do,
- * or FALSE if we don't.
- *
- *     To check for 4.0.1, use sqCheckPHPVersion(4,0,1)
- *     To check for 4.0b3, use sqCheckPHPVersion(4,0,-3)
- *
- * Does not handle betas like 4.0.1b1 or development versions
+ * Duplicate function: obsoleted. Use check_php_version.
  */
 function sqCheckPHPVersion($major, $minor, $release) {
-    
-    $ver = phpversion();
-    eregi('^([0-9]+)\\.([0-9]+)(.*)', $ver, $regs);
-    
-    /* Parse the version string. */
-    $vmajor  = strval($regs[1]);
-    $vminor  = strval($regs[2]);
-    $vrel    = $regs[3];
-    if($vrel[0] == '.') {
-        $vrel = strval(substr($vrel, 1));
-    }
-    if($vrel[0] == 'b' || $vrel[0] == 'B') {
-        $vrel = - strval(substr($vrel, 1));
-    }
-    if($vrel[0] == 'r' || $vrel[0] == 'R') {
-        $vrel = - strval(substr($vrel, 2))/10;
-    }
-    
-    /* Compare major version. */
-    if ($vmajor < $major) { return false; }
-    if ($vmajor > $major) { return true; }
-    
-    /* Major is the same. Compare minor. */
-    if ($vminor < $minor) { return false; }
-    if ($vminor > $minor) { return true; }
-    
-    /* Major and minor is the same as the required one. Compare release */
-    if ($vrel >= 0 && $release >= 0) {       /* Neither are beta */
-        if($vrel < $release) return false;
-    } else if($vrel >= 0 && $release < 0) {  /* This is not beta, required is beta */
-        return true;
-    } else if($vrel < 0 && $release >= 0){   /* This is beta, require not beta */
-        return false;
-    } else {                                 /* Both are beta */
-        if($vrel > $release) return false;
-    }
-    
-    return true;
+
+    return check_php_version($major, $minor, $release);
 }
 
 /**
@@ -424,7 +365,7 @@ function show_readable_size($bytes) {
     
     if ($bytes / 1024 > 1) {
         $bytes /= 1024;
-        $type = 'm';
+        $type = 'M';
     }
     
     if ($bytes < 10) {