Changeset 1269

Timestamp:

07/14/10 09:50:52 (3 years ago)

Author:

gogo

Message:

Patch for Mootools File Manager for deprecation of ereg in php.

Location:

trunk/plugins/MootoolsFileManager/mootools-filemanager/Backend

Files:

• Assets/getid3/getid3.php (modified) (2 diffs)
• Upload.php (modified) (1 diff)

trunk/plugins/MootoolsFileManager/mootools-filemanager/Backend/Assets/getid3/getid3.php

@@ -111 +111 @@
         // Check memory limit.
         $memory_limit = ini_get('memory_limit');
-        if (eregi('([0-9]+)M', $memory_limit, $matches)) {
+        if (preg_match('/([0-9]+)M/i', $memory_limit, $matches)) {
             // could be stored as "16M" rather than 16777216 for example
             $memory_limit = $matches[1] * 1048576;
@@ -1494 +1494 @@
                 $return_string .= str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
             } else {
-                $return_string .= ' '.(ereg("[\x20-\x7E]", $string{$i}) ? $string{$i} : '€');
+                $return_string .= ' '.(preg_match("/[\x20-\x7E]/", $string{$i}) ? $string{$i} : '€');
             }
             if ($spaces) {

trunk/plugins/MootoolsFileManager/mootools-filemanager/Backend/Upload.php

@@ -96 +96 @@
                 $mime = null;
                 $ini = error_reporting(0);
-                if (function_exists('finfo_open') && $f = finfo_open(FILEINFO_MIME, getenv('MAGIC'))){
+                if (function_exists('finfo_open') && $f = @finfo_open(FILEINFO_MIME, getenv('MAGIC'))){
                         $mime = finfo_file($f, $file);
                         finfo_close($f);