[PHPLIB-DEV] cvs commit From: sylvan (phplib-dev <email protected>)
Date: 01/17/00

From: sylvan
Date: Mon Jan 17 17:16:47 2000
Modified files:
      php-lib/pages/admin/new_user.php3
      php-lib/pages/admin/new_user_alt.php3
      php-lib/pages/admin/new_user_md5.php3
      php-lib/pages/admin/view_sessions.php3
      php-lib/php/auth_sql.inc

Log message:
Tracking down those "p_"s that no one cared of...

Index: php-lib/pages/admin/new_user.php3
diff -u php-lib/pages/admin/new_user.php3:1.10 php-lib/pages/admin/new_user.php3:1.11
--- php-lib/pages/admin/new_user.php3:1.10 Thu Oct 14 12:38:21 1999
+++ php-lib/pages/admin/new_user.php3 Mon Jan 17 17:16:16 2000
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1998,1999 Jan Legenhausen, Kristian Koehntopp
  *
- * $Id: new_user.php3,v 1.10 1999/10/14 10:38:21 kk Exp $
+ * $Id: new_user.php3,v 1.11 2000/01/17 16:16:16 sylvan Exp $
  *
  * NOTE: This script requires that you have set up your PHPLIB
  * with working Auth and Perm subclasses and that your
@@ -125,7 +125,7 @@
                         }
          /* Does the user already exist?
                                 NOTE: This should be a transaction, but it isn't... */
- $db->query("select * from auth_user where username='$username'");
+ $db->query("select * from auth_user where p_username='$username'");
                         if ($db->nf()>0) {
                                 my_error("User <B>$username</B> already exists!");
                                 break;
@@ -147,7 +147,7 @@
                                 printf("u_edit, u_id +%s+<br>", $u_id);
                         if (!$perm->have_perm("admin")) { // user is not admin
                                 if($auth->auth["uid"] == $u_id) { // user changes his own account
- $query = "update auth_user set password='$password' where user_id='$u_id'";
+ $query = "update auth_user set p_password='$password' where p_user_id='$u_id'";
                                         $db->query($query);
                                         if ($db->affected_rows() == 0) {
                                                 my_error("<b>Failed:</b> $query");
@@ -164,7 +164,7 @@
                                 }
                                 // Update user information.
                                 $permlist = addslashes(implode($perms,","));
- $query = "update auth_user set username='$username', password='$password', perms='$permlist' where user_id='$u_id'";
+ $query = "update auth_user set p_username='$username', p_password='$password', p_perms='$permlist' where p_user_id='$u_id'";
                                 $db->query($query);
                                 if ($db->affected_rows() == 0) {
                                         my_error("<b>Failed:</b> $query");
@@ -180,7 +180,7 @@
                                 break;
                         }
                         // Delete that user.
- $query = "delete from auth_user where user_id='$u_id' and username='$username'";
+ $query = "delete from auth_user where p_user_id='$u_id' and p_username='$username'";
                         $db->query($query);
                         if ($db->affected_rows() == 0) {
                                 my_error("<b>Failed:</b> $query");
@@ -227,7 +227,7 @@
   endif;
   
   ## Traverse the result set
- $db->query("select * from auth_user order by username");
+ $db->query("select * from auth_user order by p_username");
   while ($db->next_record()):
 
 ?>
@@ -237,29 +237,29 @@
 <?php
   if ($perm->have_perm("admin")):
  ?>
- <td><input type="text" name="username" size=12 maxlength=32 value="<?php $db->p("username") ?>"></td>
- <td><input type="text" name="password" size=12 maxlength=32 value="<?php $db->p("password") ?>"></td>
- <td><?php print $perm->perm_sel("perms", $db->f("perms")) ?></td>
+ <td><input type="text" name="username" size=12 maxlength=32 value="<?php $db->p("p_username") ?>"></td>
+ <td><input type="text" name="password" size=12 maxlength=32 value="<?php $db->p("p_password") ?>"></td>
+ <td><?php print $perm->perm_sel("perms", $db->f("p_perms")) ?></td>
 
   <td align=right>
- <input type="hidden" name="u_id" value="<?php $db->p("user_id") ?>">
+ <input type="hidden" name="u_id" value="<?php $db->p("p_user_id") ?>">
    <input type="submit" name="u_kill" value="Kill">
    <input type="submit" name="u_edit" value="Change">
   </td>
 <?php
- elseif ($auth->auth["uname"] == $db->f("username")):
+ elseif ($auth->auth["uname"] == $db->f("p_username")):
  ?>
- <td><?php $db->p("username") ?></td>
- <td><input type="text" name="password" size=12 maxlength=32 value="<?php $db->p("password") ?>"></td>
- <td><?php $db->p("perms") ?></td>
+ <td><?php $db->p("p_username") ?></td>
+ <td><input type="text" name="password" size=12 maxlength=32 value="<?php $db->p("p_password") ?>"></td>
+ <td><?php $db->p("p_perms") ?></td>
   <td align=right>
- <input type="hidden" name="u_id" value="<?php $db->p("user_id") ?>">
+ <input type="hidden" name="u_id" value="<?php $db->p("p_user_id") ?>">
    <input type="submit" name="u_edit" value="Change">
   </td>
  <?php else: ?>
- <td><?php $db->p("username") ?></td>
+ <td><?php $db->p("p_username") ?></td>
   <td>**********</td>
- <td><?php $db->p("perms") ?></td>
+ <td><?php $db->p("p_perms") ?></td>
   <td align=right>&nbsp;</td>
 <?php
  endif;
Index: php-lib/pages/admin/new_user_alt.php3
diff -u php-lib/pages/admin/new_user_alt.php3:1.4 php-lib/pages/admin/new_user_alt.php3:1.5
--- php-lib/pages/admin/new_user_alt.php3:1.4 Thu Oct 14 12:38:21 1999
+++ php-lib/pages/admin/new_user_alt.php3 Mon Jan 17 17:16:16 2000
@@ -5,7 +5,7 @@
  * Copyright (c) 1998,1999 Jan Legenhausen, Kristian Koehntopp
  * modified 1999 carmelo guarneri
  *
- * $Id: new_user_alt.php3,v 1.4 1999/10/14 10:38:21 kk Exp $
+ * $Id: new_user_alt.php3,v 1.5 2000/01/17 16:16:16 sylvan Exp $
  *
  * NOTE: This script requires that you have set up your PHPLIB
  * with working Auth and Perm subclasses and that your
@@ -130,7 +130,7 @@
     
     ## Does the user already exist?
     ## NOTE: This should be a transaction, but it isn't...
- $db->query("select * from auth_user where username='$username'");
+ $db->query("select * from auth_user where p_username='$username'");
     if ($db->nf()>0) {
       my_error("User <B>$username</B> already exists!");
       break;
@@ -158,7 +158,7 @@
     
     ## Handle users changing their own password...
     if (!$perm->have_perm("admin")) {
- $query = "update auth_user set password='$password' where uid='$u_id'";
+ $query = "update auth_user set p_password='$password' where p_uid='$u_id'";
       $db->query($query);
       if ($db->affected_rows() == 0) {
         my_error("<b>Failed:</b> $query");
@@ -176,7 +176,7 @@
     }
     
     ## Update user information.
- $query = "update auth_user set username='$username', password='$password', perms='$perms' where uid='$u_id'";
+ $query = "update auth_user set p_username='$username', p_password='$password', p_perms='$perms' where p_uid='$u_id'";
     $db->query($query);
     if ($db->affected_rows() == 0) {
       my_error("<b>Failed:</b> $query");
@@ -195,7 +195,7 @@
     }
     
     ## Delete that user.
- $query = "delete from auth_user where uid='$u_id' and username='$username'";
+ $query = "delete from auth_user where p_uid='$u_id' and p_username='$username'";
     $db->query($query);
     if ($db->affected_rows() == 0) {
       my_error("<b>Failed:</b> $query");
@@ -221,7 +221,7 @@
 
   $qrview=new Template_Table;
   $qrview->start("u_row.ihtml", "u_head.ihtml", "u_foot.ihtml");
- $db->query("select * from auth_user order by username");
+ $db->query("select * from auth_user order by p_username");
   $qrview->show_result($db);
 ?>
 <?php
Index: php-lib/pages/admin/new_user_md5.php3
diff -u php-lib/pages/admin/new_user_md5.php3:1.5 php-lib/pages/admin/new_user_md5.php3:1.6
--- php-lib/pages/admin/new_user_md5.php3:1.5 Fri Dec 10 09:51:57 1999
+++ php-lib/pages/admin/new_user_md5.php3 Mon Jan 17 17:16:16 2000
@@ -4,7 +4,7 @@
  *
  * (C) Copyright 1998 Jan Legenhausen, Kristian Koehntopp
  *
- * $Id: new_user_md5.php3,v 1.5 1999/12/10 08:51:57 mbravo Exp $
+ * $Id: new_user_md5.php3,v 1.6 2000/01/17 16:16:16 sylvan Exp $
  *
  * NOTE: This script requires that you have set up your PHPLIB
  * with working Auth and Perm subclasses and that your
@@ -140,7 +140,7 @@
     
     ## Does the user already exist?
     ## NOTE: This should be a transaction, but it isn't...
- $db->query("select * from auth_user_md5 where username='$username'");
+ $db->query("select * from auth_user_md5 where p_username='$username'");
     if ($db->nf()>0) {
       my_error("User <B>$username</B> already exists!");
       break;
@@ -170,7 +170,7 @@
     
     ## Handle users changing their own password...
     if (!$perm->have_perm("admin")) {
- $query = "update auth_user_md5 set password='$password' where user_id='$u_id'";
+ $query = "update auth_user_md5 set p_password='$password' where p_user_id='$u_id'";
       $db->query($query);
       if ($db->affected_rows() == 0) {
         my_error("<b>Failed:</b> $query");
@@ -190,7 +190,7 @@
     ## Update user information.
     ## Get permissions from the array
     $realperms=implode(',',$perms);
- $query = "update auth_user_md5 set username='$username', password='$password', perms='$realperms' where user_id='$u_id'";
+ $query = "update auth_user_md5 set p_username='$username', p_password='$password', p_perms='$realperms' where p_user_id='$u_id'";
     $db->query($query);
     if ($db->affected_rows() == 0) {
       my_error("<b>Failed:</b> $query");
@@ -209,7 +209,7 @@
     }
     
     ## Delete that user.
- $query = "delete from auth_user_md5 where user_id='$u_id' and username='$username'";
+ $query = "delete from auth_user_md5 where p_user_id='$u_id' and p_username='$username'";
     $db->query($query);
     if ($db->affected_rows() == 0) {
       my_error("<b>Failed:</b> $query");
@@ -276,7 +276,7 @@
 
 <?
   ## Traverse the result set
- $db->query("select * from auth_user_md5 order by username");
+ $db->query("select * from auth_user_md5 order by p_username");
   while ($db->next_record()):
 
 ?>
Index: php-lib/pages/admin/view_sessions.php3
diff -u php-lib/pages/admin/view_sessions.php3:1.8 php-lib/pages/admin/view_sessions.php3:1.9
--- php-lib/pages/admin/view_sessions.php3:1.8 Fri Oct 29 12:14:58 1999
+++ php-lib/pages/admin/view_sessions.php3 Mon Jan 17 17:16:16 2000
@@ -81,7 +81,7 @@
   if (is_array($sid)) {
     reset($sid);
     while(list($k, $v) = each($sid)) {
- $query = sprintf("delete from %s where name = '%s' and sid = '%s'",
+ $query = sprintf("delete from %s where p_name = '%s' and p_sid = '%s'",
                  $sess->that->database_table,
                  $sess->name,
                  $k);
@@ -110,7 +110,7 @@
 </table>
 <?php
     
- $query = sprintf("select * from active_sessions where name = '%s' order by name asc, changed desc",
+ $query = sprintf("select * from active_sessions where p_name = '%s' order by p_name asc, p_changed desc",
               $sess->name);
   $db->query($query);
 
@@ -126,6 +126,6 @@
 </table>
 </form>
 <?php page_close() ?>
-<!-- $Id: view_sessions.php3,v 1.8 1999/10/29 10:14:58 athompso Exp $ -->
+<!-- $Id: view_sessions.php3,v 1.9 2000/01/17 16:16:16 sylvan Exp $ -->
 </body>
 </html>
Index: php-lib/php/auth_sql.inc
diff -u php-lib/php/auth_sql.inc:1.2 php-lib/php/auth_sql.inc:1.3
--- php-lib/php/auth_sql.inc:1.2 Fri Nov 12 08:11:24 1999
+++ php-lib/php/auth_sql.inc Mon Jan 17 17:16:16 2000
@@ -5,7 +5,7 @@
  * Copyright (c) 1998,1999 NetUSE GmbH
  * Boris Erdmann, Kristian Koehntopp
  *
- * $Id: auth_sql.inc,v 1.2 1999/11/12 07:11:24 kk Exp $
+ * $Id: auth_sql.inc,v 1.3 2000/01/17 16:16:16 sylvan Exp $
  *
  */
 
@@ -80,7 +80,7 @@
     
     $this->db->query(sprintf("select p_user_id, p_pwenc, p_password, p_perms ".
                              " from %s ".
- " where username = '%s' ",
+ " where p_username = '%s' ",
                           $this->database_table,
                           addslashes($username)));
 

-
PHPLIB Developers Mailing List. Send messages to <phplib-dev <email protected>>.
To unsubscribe, send "unsubscribe" to <phplib-dev-request <email protected>> in
the body, not the subject, of your message.