[phpBT-dev] CVS: phpbt/admin user.php,1.16,1.17

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt/admin
In directory usw-pr-cvs1:/tmp/cvs-serv13494/admin

Modified Files:
	user.php 
Log Message:
Moving towards the new user schema -- still work to do on the email -> login conversion

Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/user.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- user.php	2001/08/23 01:39:03	1.16
+++ user.php	2001/08/25 18:39:11	1.17
@@ -38,10 +38,10 @@
   if (!$userid) {
     if (ENCRYPTPASS) $mpassword = md5($fpassword);
     else $mpassword = $fpassword;
-    $q->query("insert into user (user_id, first_name, last_name, email, password, user_level, created_date) values (".$q->nextid('user').", '$ffirstname', '$flastname', '$femail', '$mpassword', $usertype, $now)");
+    $q->query("insert into auth_user (user_id, first_name, last_name, email, password, user_level, created_date) values (".$q->nextid('user').", '$ffirstname', '$flastname', '$femail', '$mpassword', $usertype, $now)");
   } else {
     if (ENCRYPTPASS) {
-      $oldpass = $q->grab_field("select password from user where user_id = $userid");
+      $oldpass = $q->grab_field("select password from auth_user where user_id = $userid");
       if ($oldpass != $fpassword) {
         $pquery = "password = '".md5($fpassword)."',";
       } else {
@@ -50,7 +50,7 @@
     } else {
       $pquery = "password = '$fpassword',";
     }
-    $q->query("update user set first_name = '$ffirstname', last_name = '$flastname', email = '$femail', $pquery user_level = $usertype where user_id = '$userid'");
+    $q->query("update auth_user set first_name = '$ffirstname', last_name = '$flastname', email = '$femail', $pquery user_level = $usertype where user_id = '$userid'");
   }
   header("Location: $me?");
 }
@@ -59,7 +59,7 @@
   global $q, $me, $t, $firstname, $lastname, $email, $password, $usertype, $STRING;
 
   if ($userid && !$error) {
-    $row = $q->grab("select * from user where user_id = '$userid'");
+    $row = $q->grab("select * from auth_user where user_id = '$userid'");
     $t->set_var(array(
       'action' => $STRING['edit'],
       'fuserid' => $row['user_id'],
@@ -102,7 +102,7 @@
     'records' => $nr));
 
   $q->query("select user_id, concat(first_name,' ',last_name) as fullname, email,
-    created_date, user_level from user order by $order $sort
+    created_date, user_level from auth_user order by $order $sort
     limit $llimit, $selrange");
 
   if (!$q->num_rows()) {