Commit a9fd74ab92799bea724c7e5d313ced37c001543d
1 parent
fac15f93
updated sql for new db table fieldnames
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@73 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
9 additions
and
9 deletions
lib/Session.inc
| @@ -49,8 +49,7 @@ class Session { | @@ -49,8 +49,7 @@ class Session { | ||
| 49 | $current = time(); | 49 | $current = time(); |
| 50 | // insert session information into db | 50 | // insert session information into db |
| 51 | $sql = new Owl_DB; | 51 | $sql = new Owl_DB; |
| 52 | - $result = $sql->query("insert into $default->owl_sessions_table (sessid, uid, lastused, ip) values ('$sessionID', '$userID', '$current', '$ip')"); | ||
| 53 | - | 52 | + $result = $sql->query("insert into $default->owl_sessions_table (id, user_id, lastused, ip) values ('$sessionID', '$userID', '$current', '$ip')"); |
| 54 | if(!'result') { | 53 | if(!'result') { |
| 55 | die("$lang_err_sess_write"); | 54 | die("$lang_err_sess_write"); |
| 56 | } | 55 | } |
| @@ -67,7 +66,7 @@ class Session { | @@ -67,7 +66,7 @@ class Session { | ||
| 67 | session_start(); | 66 | session_start(); |
| 68 | // remove the session information from the database | 67 | // remove the session information from the database |
| 69 | $sql = new Owl_DB; | 68 | $sql = new Owl_DB; |
| 70 | - $query = "delete from $default->owl_sessions_table where sessid = '" . session_id() . "'"; | 69 | + $query = "delete from $default->owl_sessions_table where id = '" . session_id() . "'"; |
| 71 | $sql->query($query); | 70 | $sql->query($query); |
| 72 | 71 | ||
| 73 | // remove the php4 session | 72 | // remove the php4 session |
| @@ -86,7 +85,7 @@ class Session { | @@ -86,7 +85,7 @@ class Session { | ||
| 86 | // deletes any sessions for this userID where the default timeout has elapsed. | 85 | // deletes any sessions for this userID where the default timeout has elapsed. |
| 87 | $time = time() - $default->owl_timeout; | 86 | $time = time() - $default->owl_timeout; |
| 88 | $sql = new Owl_DB; | 87 | $sql = new Owl_DB; |
| 89 | - $sql->query("delete from $default->owl_sessions_table where uid = '" . $userID . "' and lastused <= $time "); | 88 | + $sql->query("delete from $default->owl_sessions_table where user_id = '" . $userID . "' and lastused <= $time "); |
| 90 | } | 89 | } |
| 91 | 90 | ||
| 92 | /** | 91 | /** |
| @@ -107,7 +106,7 @@ class Session { | @@ -107,7 +106,7 @@ class Session { | ||
| 107 | 106 | ||
| 108 | // this should be an existing session, so check the db | 107 | // this should be an existing session, so check the db |
| 109 | $sql = new Owl_DB; | 108 | $sql = new Owl_DB; |
| 110 | - $sql->query("select * from $default->owl_sessions_table where sessid = '$sessionID'"); | 109 | + $sql->query("select * from $default->owl_sessions_table where id = '$sessionID'"); |
| 111 | $numrows = $sql->num_rows($sql); | 110 | $numrows = $sql->num_rows($sql); |
| 112 | $time = time(); | 111 | $time = time(); |
| 113 | 112 | ||
| @@ -138,7 +137,7 @@ class Session { | @@ -138,7 +137,7 @@ class Session { | ||
| 138 | // session verified, so update last user time | 137 | // session verified, so update last user time |
| 139 | $lastused = time(); | 138 | $lastused = time(); |
| 140 | $userID = $sessionStatus["userID"]; | 139 | $userID = $sessionStatus["userID"]; |
| 141 | - $sql->query("update $default->owl_sessions_table set lastused = '$lastused' where uid = '$userID'"); | 140 | + $sql->query("update $default->owl_sessions_table set lastused = '$lastused' where user_id = '$userID'"); |
| 142 | 141 | ||
| 143 | } else { | 142 | } else { |
| 144 | // session time out status | 143 | // session time out status |
lib/owl.lib.php
| @@ -1278,8 +1278,7 @@ function getprefs ( ) | @@ -1278,8 +1278,7 @@ function getprefs ( ) | ||
| 1278 | global $default; | 1278 | global $default; |
| 1279 | 1279 | ||
| 1280 | $sql = new Owl_DB; | 1280 | $sql = new Owl_DB; |
| 1281 | - //$sql->query("select * from $default->owl_prefs_table"); | ||
| 1282 | - $sql->query("select * from prefs"); | 1281 | + $sql->query("select * from $default->owl_prefs_table"); |
| 1283 | $sql->next_record(); | 1282 | $sql->next_record(); |
| 1284 | 1283 | ||
| 1285 | $default->owl_email_from = $sql->f("email_from"); | 1284 | $default->owl_email_from = $sql->f("email_from"); |
| @@ -1637,6 +1636,7 @@ if (substr(phpversion(),0,5) >= "4.1.0") { | @@ -1637,6 +1636,7 @@ if (substr(phpversion(),0,5) >= "4.1.0") { | ||
| 1637 | } | 1636 | } |
| 1638 | } | 1637 | } |
| 1639 | 1638 | ||
| 1639 | +/* | ||
| 1640 | // initialise session var | 1640 | // initialise session var |
| 1641 | if(!isset($sess)) { | 1641 | if(!isset($sess)) { |
| 1642 | $sess = 0; | 1642 | $sess = 0; |
| @@ -1649,6 +1649,7 @@ if(!isset($loginname)) { | @@ -1649,6 +1649,7 @@ if(!isset($loginname)) { | ||
| 1649 | if(!isset($login)) { | 1649 | if(!isset($login)) { |
| 1650 | $login = 0; | 1650 | $login = 0; |
| 1651 | } | 1651 | } |
| 1652 | +*/ | ||
| 1652 | 1653 | ||
| 1653 | // set default language | 1654 | // set default language |
| 1654 | if(isset($default->owl_lang)) { | 1655 | if(isset($default->owl_lang)) { |
| @@ -1660,7 +1661,7 @@ if(isset($default->owl_lang)) { | @@ -1660,7 +1661,7 @@ if(isset($default->owl_lang)) { | ||
| 1660 | } else { | 1661 | } else { |
| 1661 | 1662 | ||
| 1662 | $sql = new Owl_DB; | 1663 | $sql = new Owl_DB; |
| 1663 | - $sql->query("select * from $default->owl_sessions_table where sessid = '$sess'"); | 1664 | + $sql->query("select * from $default->owl_sessions_table where id = '$sess'"); |
| 1664 | $sql->next_record(); | 1665 | $sql->next_record(); |
| 1665 | $numrows = $sql->num_rows($sql); | 1666 | $numrows = $sql->num_rows($sql); |
| 1666 | $getuid = $sql->f("uid"); | 1667 | $getuid = $sql->f("uid"); |