Changeset 3747

Timestamp:

Aug 17, 2009, 6:21:09 PM (15 years ago)

Author:

Eric

Message:

PHP 5.3 compatibility - Deprecated functions were replace as follows :
ereg() -> preg_match()
ereg_replace() -> preg_replace()
eregi() -> preg_match() with the 'i' modifier
eregi_replace() -> preg_replace() with the 'i' modifier
set_magic_quotes_runtime() -> No more usefull. Fixed it by adding "@" prefix.

Location:

trunk

Files:

• admin/thumbnail.php (modified) (1 diff)
• include/common.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)
• install.php (modified) (1 diff)
• tools/create_listing_file.php (modified) (2 diffs)
• upload.php (modified) (2 diffs)

trunk/admin/thumbnail.php

@@ -232 +232 @@
   
   // checking criteria
-  if (!ereg('^[0-9]{2,3}$', $_POST['width']) or $_POST['width'] < 10)
+  if (!preg_match('/^[0-9]{2,3}$/', $_POST['width']) or $_POST['width'] < 10)
   {
     array_push($page['errors'], l10n('tn_err_width').' 10');
   }
-  if (!ereg('^[0-9]{2,3}$', $_POST['height']) or $_POST['height'] < 10)
+  if (!preg_match('/^[0-9]{2,3}$/', $_POST['height']) or $_POST['height'] < 10)
   {
     array_push($page['errors'], l10n('tn_err_height').' 10');

trunk/include/common.inc.php

@@ -29 +29 @@
 $t2 = $t1[1].'.'.$t2[1];
 
-set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 
 //

trunk/include/functions_user.inc.php

@@ -76 +76 @@
     array_push($errors, l10n('reg_err_login1'));
   }
-  if (ereg("^.* $", $login))
+  if (preg_match('/^.* $/', $login))
   {
     array_push($errors, l10n('reg_err_login2'));
   }
-  if (ereg("^ .*$", $login))
+  if (preg_match('/^ .*$/', $login))
   {
     array_push($errors, l10n('reg_err_login3'));

trunk/install.php

@@ -73 +73 @@
 }
 
-set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+@set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
 //
 // addslashes to vars if magic_quotes_gpc is off this is a security

trunk/tools/create_listing_file.php

@@ -204 +204 @@
     
     // Backup GD major version
-    $pwg_conf['gd_version_full'] = ereg_replace('[[:alpha:][:space:]()]+', '', $info['GD Version']);
+    $pwg_conf['gd_version_full'] = preg_replace('/[[:alpha:][:space:]()]+/', '', $info['GD Version']);
     list($pwg_conf['gd_version_major']) = preg_split('/[.]+/', $pwg_conf['gd_version_full']);
     
@@ -1088 +1088 @@
     {
       $info = gd_info();
-      $gd_full_version = ereg_replace('[[:alpha:][:space:]()]+', '', $info['GD Version']);
+      $gd_full_version = preg_replace('/[[:alpha:][:space:]()]+/', '', $info['GD Version']);
       list($gd_version) = preg_split('/[.]+/', $gd_full_version);
       

trunk/upload.php

@@ -58 +58 @@
   $result = array();
   $result['error'] = array();
-  //echo $_FILES['picture']['name']."<br>".$temp_name;
+  //echo $_FILES['picture']['name']."<br />".$temp_name;
   $extension = get_extension( $_FILES['picture']['name'] );
   if (!in_array($extension, $conf['picture_ext']))
@@ -189 +189 @@
     array_push( $error, l10n('upload_filenotfound') );
   }
-  if ( !ereg( "([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)",
+  if ( !preg_match( '/([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)/',
              $_POST['mail_address'] ) )
   {