Changeset 25116

Timestamp:

Oct 24, 2013, 3:01:25 PM (10 years ago)

Author:

mistic100

Message:

bug 2988: register_user() must returns new user id

Location:

trunk

Files:

• admin/user_list.php (modified) (2 diffs)
• include/functions_user.inc.php (modified) (6 diffs)
• include/user.inc.php (modified) (1 diff)
• register.php (modified) (1 diff)

trunk/admin/user_list.php

@@ -205 +205 @@
     else
     {
-      $page['errors'] = register_user(
-        $_POST['login'], $_POST['password'], $_POST['email'], false);
+      register_user($_POST['login'],
+                    $_POST['password'],
+                    $_POST['email'],
+                    false,
+                    $page['errors']);
 
       if (count($page['errors']) == 0)
@@ -219 +222 @@
   if (isset($_POST['submit_add']))
   {
-    $page['errors'] = register_user(
-      $_POST['login'], $_POST['password'], $_POST['email'], false);
+    register_user($_POST['login'],
+                  $_POST['password'],
+                  $_POST['email'],
+                  false,
+                  $page['errors']);
 
     if (count($page['errors']) == 0)

trunk/include/functions_user.inc.php

@@ -120 +120 @@
    return $users_found[0];
 }
+
+/**
+ * create a new user
+ * @param string $login
+ * @param string $password
+ * @param string $mail_adress
+ * @param bool $with_notifications
+ * @param &array $errors
+ * @return int|bool
+ */
 function register_user($login, $password, $mail_address,
-  $with_notification = true, $errors = array())
+  $with_notification = true, &$errors = array())
 {
   global $conf;
@@ -172 +182 @@
   if (count($errors) == 0)
   {
-    // what will be the inserted id ?
-    $query = '
-SELECT MAX('.$conf['user_fields']['id'].') + 1
-  FROM '.USERS_TABLE.'
-;';
-    list($next_id) = pwg_db_fetch_row(pwg_query($query));
-
     $insert =
       array(
-        $conf['user_fields']['id'] => $next_id,
         $conf['user_fields']['username'] => pwg_db_real_escape_string($login),
         $conf['user_fields']['password'] => $conf['password_hash']($password),
@@ -188 +190 @@
 
     single_insert(USERS_TABLE, $insert);
+    $user_id = pwg_db_insert_id();
 
     // Assign by default groups
-    {
-      $query = '
+    $query = '
 SELECT id
   FROM '.GROUPS_TABLE.'
@@ -197 +199 @@
   ORDER BY id ASC
 ;';
-      $result = pwg_query($query);
-
-      $inserts = array();
-      while ($row = pwg_db_fetch_assoc($result))
-      {
-          $inserts[] = array(
-            'user_id' => $next_id,
-            'group_id' => $row['id']
-          );
-      }
+    $result = pwg_query($query);
+
+    $inserts = array();
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+        $inserts[] = array(
+          'user_id' => $user_id,
+          'group_id' => $row['id']
+        );
     }
 
@@ -220 +221 @@
         $override=null;
     }
-    create_user_infos($next_id, $override);
+    create_user_infos($user_id, $override);
 
     if ($with_notification and $conf['email_admin_on_new_user'])
@@ -245 +246 @@
     trigger_action('register_user',
       array(
-        'id'=>$next_id,
+        'id'=>$user_id,
         'username'=>$login,
         'email'=>$mail_address,
        )
       );
-  }
-
-  return $errors;
+      
+    return $user_id;
+  }
+  else
+  {
+    return false;
+  }
 }
 

trunk/include/user.inc.php

@@ -61 +61 @@
     if (!($user['id'] = get_userid($remote_user)))
     {
-      register_user($remote_user, '', '', false);
-      $user['id'] = get_userid($remote_user);
+      $user['id'] = register_user($remote_user, '', '', false);
     }
   }

trunk/register.php

@@ -53 +53 @@
   }
 
-  $page['errors'] =
-      register_user($_POST['login'],
-                    $_POST['password'],
-                    $_POST['mail_address'],
-                    true,
-                    $page['errors']);
+  register_user($_POST['login'],
+                $_POST['password'],
+                $_POST['mail_address'],
+                true,
+                $page['errors']);
 
   if (count($page['errors']) == 0)