[geeklog-hg] geeklog: Removed POSIX functions deprecated with PHP-5.3

[geeklog-cvs at lists.geeklog.net]

changeset 8785:3b0b7cc0e3b0
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3b0b7cc0e3b0
user: kenji at grebe.flets-west.jp
date: Sun Jul 22 00:51:52 2012 +0900
description:
Removed POSIX functions deprecated with PHP-5.3

diffstat:

 public_html/admin/install/configinfo.php |   2 +-
 public_html/lib-common.php               |   8 ++++----
 system/databases/mssql.class.php         |   6 +++---
 system/lib-mbyte.php                     |  30 ++++++++++++++++++++++++------
 4 files changed, 32 insertions(+), 14 deletions(-)

diffs (154 lines):

diff -r 737b8ad88221 -r 3b0b7cc0e3b0 public_html/admin/install/configinfo.php
--- a/public_html/admin/install/configinfo.php	Sat Jul 21 22:15:37 2012 +0900
+++ b/public_html/admin/install/configinfo.php	Sun Jul 22 00:51:52 2012 +0900
@@ -79,7 +79,7 @@
         ob_end_clean();
     } elseif (is_bool($value)) {
         $value = ($value === false) ? 'false' : 'true';
-    } elseif (eregi('[a-z]+html', $option)) {
+    } elseif (MBYTE_eregi('[a-z]+html', $option)) {
         $value = htmlentities($value);
     } elseif (!isset($value)) {
         $value = ' ';
diff -r 737b8ad88221 -r 3b0b7cc0e3b0 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Jul 21 22:15:37 2012 +0900
+++ b/public_html/lib-common.php	Sun Jul 22 00:51:52 2012 +0900
@@ -6861,8 +6861,8 @@
     switch( $interval )
     {
         case "y":
-            list($year1, $month1, $day1) = split('-', date('Y-m-d', $date1));
-            list($year2, $month2, $day2) = split('-', date('Y-m-d', $date2));
+            list($year1, $month1, $day1) = explode('-', date('Y-m-d', $date1));
+            list($year2, $month2, $day2) = explode('-', date('Y-m-d', $date2));
             $time1 = (date('H',$date1)*3600) + (date('i',$date1)*60) + (date('s',$date1));
             $time2 = (date('H',$date2)*3600) + (date('i',$date2)*60) + (date('s',$date2));
             $diff = $year2 - $year1;
@@ -6879,8 +6879,8 @@
             }
             break;
         case "m":
-            list($year1, $month1, $day1) = split('-', date('Y-m-d', $date1));
-            list($year2, $month2, $day2) = split('-', date('Y-m-d', $date2));
+            list($year1, $month1, $day1) = explode('-', date('Y-m-d', $date1));
+            list($year2, $month2, $day2) = explode('-', date('Y-m-d', $date2));
             $time1 = (date('H',$date1)*3600) + (date('i',$date1)*60) + (date('s',$date1));
             $time2 = (date('H',$date2)*3600) + (date('i',$date2)*60) + (date('s',$date2));
             $diff = ($year2 * 12 + $month2) - ($year1 * 12 + $month1);
diff -r 737b8ad88221 -r 3b0b7cc0e3b0 system/databases/mssql.class.php
--- a/system/databases/mssql.class.php	Sat Jul 21 22:15:37 2012 +0900
+++ b/system/databases/mssql.class.php	Sun Jul 22 00:51:52 2012 +0900
@@ -367,7 +367,7 @@
                 $testSQL=substr($sql,0,$isIn);
                 
                 $limitclause=trim($limitclause);
-                eregi("limit ([^,]+),(.*)", $limitclause,$arrayStr); 
+                MBYTE_eregi("limit ([^,]+),(.*)", $limitclause,$arrayStr); 
                 
                 $left=trim($arrayStr[1]);
                 $rightStr=trim($arrayStr[2]);
@@ -1047,7 +1047,7 @@
                 $rightStr=ltrim(substr($string,$startLoc+8,strlen($string)));
 
                 //eregi("\((.*),([^\)]+\))", $rightStr,$left); 
-                 eregi("\(([^,]+),([^\)]+\))", $rightStr,$left); 
+                 MBYTE_eregi("\(([^,]+),([^\)]+\))", $rightStr,$left); 
                 
               
                  
@@ -1073,7 +1073,7 @@
                     $replaceString='DATE_SUB(' . $firstParm . ',' . $left[2] . ')';
                     }
  
-                $secondParmArray=split(" ",$secondParm);
+                $secondParmArray = explode(' ',$secondParm);
                 $intervalTime=$secondParmArray[1];
                 $typeForInterval=$secondParmArray[2];
                 if($intervalTime>0){
diff -r 737b8ad88221 -r 3b0b7cc0e3b0 system/lib-mbyte.php
--- a/system/lib-mbyte.php	Sat Jul 21 22:15:37 2012 +0900
+++ b/system/lib-mbyte.php	Sun Jul 22 00:51:52 2012 +0900
@@ -45,7 +45,7 @@
 
     $language = array ();
     $fd = opendir ($_CONF['path_language']);
-	
+    
     while (($file = @readdir ($fd)) !== false) {
         if ((substr ($file, 0, 1) != '.') && preg_match ('/\.php$/i', $file)
                 && is_file ($_CONF['path_language'] . $file)
@@ -77,7 +77,7 @@
         }
     }
     asort ($language);
-	
+    
     return $language;	
 }
 
@@ -97,11 +97,15 @@
                 // Normal situation in live environment
                 if (function_exists('mb_eregi_replace')) {
                     $mb_enabled = mb_internal_encoding('UTF-8');
+                    mb_regex_encoding('UTF-8');
+                    mb_regex_set_options('l');
                 }
             } elseif ($test == 'test') {
                 // Just for tests, true if we want function to exist
                 if ($enabled) {
                     $mb_enabled = mb_internal_encoding('UTF-8');
+                    mb_regex_encoding('UTF-8');
+                    mb_regex_set_options('l');
                 }
             } elseif ($test == 'test-reset') {
                 // Just for tests, allow resetting $mb_enabled
@@ -119,7 +123,7 @@
 function MBYTE_strlen($str)
 {
     static $mb_enabled;
-	
+    
     if (!isset($mb_enabled)) {
         $mb_enabled = MBYTE_checkEnabled();
     }
@@ -214,7 +218,7 @@
     return $result;
 }
 
-function MBYTE_eregi($pattern, $str, $regs = NULL)
+function MBYTE_eregi($pattern, $str, &$regs = NULL)
 {
     static $mb_enabled;
 
@@ -224,7 +228,21 @@
     if ($mb_enabled) {
         $result = mb_eregi($pattern, $str, $regs);
     } else {
-        $result = eregi($pattern, $str, $regs);
+        $result = preg_match('/' . addcslashes($pattern, '/') . '/i', $str, $regs);
+
+        if ($regs === NULL) {
+            $result = 1;
+        } else {
+            if ($result === 1) {
+                $result = strlen($regs[0]);
+
+                if ($result === 0) {
+                    $result = 1;
+                }
+            } else if ($result === 0) {
+                $result = FALSE;
+            }
+        }
     }
 
     return $result;
@@ -240,7 +258,7 @@
     if ($mb_enabled) {
         $result = mb_eregi_replace($pattern, $replace, $str);
     } else {
-        $result = eregi_replace($pattern, $replace, $str);
+        $result = preg_replace('/' . addcslashes($pattern, '/') . '/i', $replace, $str);
     }
 
     return $result;