Changeset 25018 for trunk/password.php

Timestamp:

Oct 19, 2013, 7:43:04 PM (11 years ago)

Author:

mistic100

Message:

remove all array_push (50% slower than []) + some changes missing for feature:2978

File:

• trunk/password.php (modified) (12 diffs)

trunk/password.php

@@ -54 +54 @@
   if (empty($_POST['username_or_email']))
   {
-    array_push($page['errors'], l10n('Invalid username or email'));
+    $page['errors'][] = l10n('Invalid username or email');
     return false;
   }
@@ -67 +67 @@
   if (!is_numeric($user_id))
   {
-    array_push($page['errors'], l10n('Invalid username or email'));
+    $page['errors'][] = l10n('Invalid username or email');
     return false;
   }
@@ -77 +77 @@
   if (is_a_guest($status) or is_generic($status))
   {
-    array_push($page['errors'], l10n('Password reset is not allowed for this user'));
+    $page['errors'][] = l10n('Password reset is not allowed for this user');
     return false;
   }
@@ -83 +83 @@
   if (empty($userdata['email']))
   {
-    array_push(
-      $page['errors'],
-      l10n(
-        'User "%s" has no email address, password reset is not possible',
-        $userdata['username']
-        )
+    $page['errors'][] = l10n(
+      'User "%s" has no email address, password reset is not possible',
+      $userdata['username']
       );
     return false;
@@ -131 +128 @@
   if (pwg_mail($userdata['email'], $email_params))
   {
-    array_push($page['infos'], l10n('Check your email for the confirmation link'));
+    $page['infos'][] = l10n('Check your email for the confirmation link');
     return true;
   }
   else
   {
-    array_push($page['errors'], l10n('Error sending email'));
+    $page['errors'][] = l10n('Error sending email');
     return false;
   }
@@ -153 +150 @@
   if (!preg_match('/^[a-z0-9]{20}$/i', $key))
   {
-    array_push($page['errors'], l10n('Invalid key'));
+    $page['errors'][] = l10n('Invalid key');
     return false;
   }
@@ -168 +165 @@
   if (pwg_db_num_rows($result) == 0)
   {
-    array_push($page['errors'], l10n('Invalid key'));
+    $page['errors'][] = l10n('Invalid key');
     return false;
   }
@@ -176 +173 @@
   if (is_a_guest($userdata['status']) or is_generic($userdata['status']))
   {
-    array_push($page['errors'], l10n('Password reset is not allowed for this user'));
+    $page['errors'][] = l10n('Password reset is not allowed for this user');
     return false;
   }
@@ -195 +192 @@
   if ($_POST['use_new_pwd'] != $_POST['passwordConf'])
   {
-    array_push($page['errors'], l10n('The passwords do not match'));
+    $page['errors'][] = l10n('The passwords do not match');
     return false;
   }
@@ -204 +201 @@
     if (!is_numeric($user_id))
     {
-      array_push($page['errors'], l10n('Invalid key'));
+      $page['errors'][] = l10n('Invalid key');
       return false;
     }
@@ -213 +210 @@
     if (is_a_guest() or is_generic())
     {
-      array_push($page['errors'], l10n('Password reset is not allowed for this user'));
+      $page['errors'][] = l10n('Password reset is not allowed for this user');
       return false;
     }
@@ -226 +223 @@
     );
 
-  array_push($page['infos'], l10n('Your password has been reset'));
+  $page['infos'][] = l10n('Your password has been reset');
 
   if (isset($_GET['key']))
   {
-    array_push($page['infos'], '<a href="'.get_root_url().'identification.php">'.l10n('Login').'</a>');
+    $page['infos'][] = '<a href="'.get_root_url().'identification.php">'.l10n('Login').'</a>';
   }
   else
   {
-    array_push($page['infos'], '<a href="'.get_gallery_home_url().'">'.l10n('Return to home page').'</a>');
+    $page['infos'][] = '<a href="'.get_gallery_home_url().'">'.l10n('Return to home page').'</a>';
   }