From a9fd74ab92799bea724c7e5d313ced37c001543d Mon Sep 17 00:00:00 2001
From: michael <michael@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Wed, 8 Jan 2003 13:56:54 +0000
Subject: [PATCH] updated sql for new db table fieldnames

---
 lib/Session.inc | 11 +++++------
 lib/owl.lib.php |  7 ++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/Session.inc b/lib/Session.inc
index 042b4a5..6f71855 100644
--- a/lib/Session.inc
+++ b/lib/Session.inc
@@ -49,8 +49,7 @@ class Session {
         $current = time();
         // insert session information into db
         $sql = new Owl_DB;
-        $result = $sql->query("insert into $default->owl_sessions_table (sessid, uid, lastused, ip) values ('$sessionID', '$userID', '$current', '$ip')");
-        
+        $result = $sql->query("insert into $default->owl_sessions_table (id, user_id, lastused, ip) values ('$sessionID', '$userID', '$current', '$ip')");        
         if(!'result') {
             die("$lang_err_sess_write");
         }
@@ -67,7 +66,7 @@ class Session {
         session_start();
         // remove the session information from the database
         $sql = new Owl_DB;
-        $query = "delete from $default->owl_sessions_table where sessid = '" . session_id() . "'";
+        $query = "delete from $default->owl_sessions_table where id = '" . session_id() . "'";
         $sql->query($query);
 
         // remove the php4 session
@@ -86,7 +85,7 @@ class Session {
         // deletes any sessions for this userID where the default timeout has elapsed.
         $time = time() -  $default->owl_timeout;
         $sql = new Owl_DB;
-        $sql->query("delete from $default->owl_sessions_table where uid = '" . $userID . "' and lastused <= $time ");
+        $sql->query("delete from $default->owl_sessions_table where user_id = '" . $userID . "' and lastused <= $time ");
     }
     
     /**
@@ -107,7 +106,7 @@ class Session {
         
         // this should be an existing session, so check the db
         $sql = new Owl_DB; 
-        $sql->query("select * from $default->owl_sessions_table where sessid = '$sessionID'");
+        $sql->query("select * from $default->owl_sessions_table where id = '$sessionID'");
         $numrows = $sql->num_rows($sql);
         $time = time();
         
@@ -138,7 +137,7 @@ class Session {
                         // session verified, so update last user time
                         $lastused = time();
                         $userID = $sessionStatus["userID"];
-                        $sql->query("update $default->owl_sessions_table set lastused = '$lastused' where uid = '$userID'");
+                        $sql->query("update $default->owl_sessions_table set lastused = '$lastused' where user_id = '$userID'");
 
                     } else {
                         // session time out status
diff --git a/lib/owl.lib.php b/lib/owl.lib.php
index 2b8a573..0b43a6a 100755
--- a/lib/owl.lib.php
+++ b/lib/owl.lib.php
@@ -1278,8 +1278,7 @@ function getprefs ( )
     global $default;
 
     $sql = new Owl_DB;
-    //$sql->query("select * from $default->owl_prefs_table");
-    $sql->query("select * from prefs");
+    $sql->query("select * from $default->owl_prefs_table");
     $sql->next_record();
 
     $default->owl_email_from        = $sql->f("email_from");
@@ -1637,6 +1636,7 @@ if (substr(phpversion(),0,5) >= "4.1.0") {
     }
 }
 
+/*
 // initialise session var
 if(!isset($sess)) {
     $sess = 0;
@@ -1649,6 +1649,7 @@ if(!isset($loginname)) {
 if(!isset($login)) {
     $login = 0;
 }
+*/
 
 // set default language
 if(isset($default->owl_lang)) {
@@ -1660,7 +1661,7 @@ if(isset($default->owl_lang)) {
     } else {
 
         $sql = new Owl_DB;
-        $sql->query("select * from $default->owl_sessions_table where sessid = '$sess'");       
+        $sql->query("select * from $default->owl_sessions_table where id = '$sess'");       
         $sql->next_record();
         $numrows = $sql->num_rows($sql);
         $getuid = $sql->f("uid");
--
libgit2 0.21.4