replaced two DB queries with one that is indexed.

diff --git a/include/db.php b/include/db.php
index 3be949468495aa373c2da51c051ee10e66d2bbb7..6568e75c5d7bc3b0298765e32243abf51f5d250e 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -141,16 +141,6 @@ function DB_get_version()
   return $version[0];
 }
 
   return $version[0];
 }
 

-function DB_get_passwd_by_name($name)
-{
-  $r = DB_query_array("SELECT password FROM User WHERE fullname=".DB_quote_smart($name)."");
-
-  if($r)
-    return $r[0];
-  else
-    return "";
-}
-

 function DB_get_passwd_by_userid($id)
 {
   $r = DB_query_array("SELECT password FROM User WHERE id=".DB_quote_smart($id)."");
 function DB_get_passwd_by_userid($id)
 {
   $r = DB_query_array("SELECT password FROM User WHERE id=".DB_quote_smart($id)."");

diff --git a/include/user.php b/include/user.php
index 6169495e1c54b6fd0ef7e309e06947993bb20283..546ea8d0470ed0e494701c23882055fdd6528877 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -25,11 +25,15 @@ if(!isset($HOST))
   exit;
 
 /* test id and password, should really be done in one step */
   exit;
 
 /* test id and password, should really be done in one step */

-if(isset($_SESSION['name']))
+if(isset($_SESSION['id']))

   {
   {

-    $name = $_SESSION['name'];
-    $email     = DB_get_email('name',$name);
-    $password  = DB_get_passwd_by_name($name);
+    $myid = $_SESSION['id'];
+    $r = DB_query_array("SELECT email,password FROM User WHERE id=".DB_quote_smart($myid)."");
+    if($r)
+      {
+       $email     = $r[0];
+       $password  = $r[1];
+      };

   };
 
 global  $ADMIN_NAME;
   };
 
 global  $ADMIN_NAME;