stack-cvs

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23487/scripts

Modified Files:
	stackDatabase.php stackUser.php 
Log Message:


Index: stackDatabase.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackDatabase.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** stackDatabase.php	8 Jul 2005 16:36:10 -0000	1.29
--- stackDatabase.php	8 Jul 2005 16:56:23 -0000	1.30
***************
*** 1218,1224 ****
      
      if (array_key_exists('id',$user)) {
!        $userid = $user['id'];
         unset($user['id']);
!     }
  
      $qu  = '';
--- 1218,1224 ----
      
      if (array_key_exists('id',$user)) {
!        $userid  = $user['id'];
         unset($user['id']);
!     } 
  
      $qu  = '';
***************
*** 1227,1230 ****
--- 1227,1232 ----
              if ('' != trim ($user[$key])) {
                  $qu  .= ", $key = '".addslashes($user[$key])."' ";
+             } else {
+                 $qu  .= ", $key = NULL ";
              }
          }
***************
*** 1236,1244 ****
  
      // GET the last ID      
!     $result= stack_db_query('SELECT LAST_INSERT_ID() FROM stackUser');
!     $row = mysql_fetch_row($result); 
      $result = $row[0];
  
!     return $user;
  }
  
--- 1238,1246 ----
  
      // GET the last ID      
!     $result = stack_db_query('SELECT LAST_INSERT_ID() FROM stackUser');
!     $row    = mysql_fetch_row($result); 
      $result = $row[0];
  
!     return $result;
  }
  

Index: stackUser.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackUser.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** stackUser.php	8 Jul 2005 16:36:11 -0000	1.10
--- stackUser.php	8 Jul 2005 16:56:23 -0000	1.11
***************
*** 154,162 ****
            $user[$key] = $val;
         }
         stack_user_information_validate($user,$errors);
  
         if (!nsf($errors,'user')) {
               if ('' != trim($user['password'])) {
!                  $user = stack_db_user_update($user);
               } else {
                   $errors['user']['password'] = '<font color="red">Password must be non-empty.</font>';
--- 154,164 ----
            $user[$key] = $val;
         }
+        $user['id'] = $userID;
+ 
         stack_user_information_validate($user,$errors);
  
         if (!nsf($errors,'user')) {
               if ('' != trim($user['password'])) {
!                  $mysqlrow = stack_db_user_update($user);
               } else {
                   $errors['user']['password'] = '<font color="red">Password must be non-empty.</font>';
***************
*** 166,170 ****
           }
      
-        $user['id'] = $userID;
     }
  
--- 168,171 ----