archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PHP 5.3 compatibility - Deprecated functions were replace as follows :

Browse source 
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.

git-svn-id: http://piwigo.org/svn/trunk@3747 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
Eric 2009-08-17 16:21:09 +00:00
commit bac7567b5c
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/thumbnail.php
View file

@ -231,11 +231,11 @@ if (isset($_POST['submit']))
$infos = array();
// 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');
}

2
include/common.inc.php
View file

@ -28,7 +28,7 @@ $t1 = explode( ' ', microtime() );
$t2 = explode( '.', $t1[0] );
$t2 = $t1[1].'.'.$t2[1];
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

4
include/functions_user.inc.php
View file

@ -75,11 +75,11 @@ function register_user($login, $password, $mail_address,
{
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'));
}

2
install.php
View file

@ -72,7 +72,7 @@ function execute_sqlfile($filepath, $replaced, $replacing)
}
}
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
// precaution to prevent someone trying to break out of a SQL statement.

4
tools/create_listing_file.php
View file

@ -203,7 +203,7 @@ function pwg_check_graphics()
$info = gd_info();
// 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']);
// Backup input/output format support
@ -1087,7 +1087,7 @@ function pwg_test_exit()
else
{
$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);
$g_message .= ' <h3>Image generation</h3>'."\n";

4
upload.php
View file

@ -57,7 +57,7 @@ function validate_upload( $temp_name, $my_max_file_size,
$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']))
{
@ -188,7 +188,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
{
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'] ) )
{
array_push( $error, l10n('reg_err_mail_address') );