From e04bd969cb1566afd69a1efdf5fb502829d6491e Mon Sep 17 00:00:00 2001 From: patdenice Date: Wed, 14 Oct 2009 16:13:25 +0000 Subject: Replace another depreciated functions. Depreciated functions were removed in trunk in commit 3747 by Eric. git-svn-id: http://piwigo.org/svn/branches/2.0@4036 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_user.inc.php | 4 ++-- tools/create_listing_file.php | 4 ++-- upload.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 383674cfb..bc3efed9e 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -75,11 +75,11 @@ function register_user($login, $password, $mail_address, { array_push($errors, l10n('reg_err_login1')); } - if (preg_match("/^.* $/", $login)) + if (preg_match('/^.* $/', $login)) { array_push($errors, l10n('reg_err_login2')); } - if (preg_match("/^ .*$/", $login)) + if (preg_match('/^ .*$/', $login)) { array_push($errors, l10n('reg_err_login3')); } diff --git a/tools/create_listing_file.php b/tools/create_listing_file.php index 13fb057ab..f4ca4f8fe 100644 --- a/tools/create_listing_file.php +++ b/tools/create_listing_file.php @@ -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 .= '

Image generation

'."\n"; diff --git a/upload.php b/upload.php index 14380a736..d1cffa25d 100644 --- a/upload.php +++ b/upload.php @@ -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') ); -- cgit v1.2.3