added support for PostgreSQL

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@465 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/wob/user.wolf b/wob/user.wolf
index 415e829..8320696 100644 (file)
--- a/wob/user.wolf
+++ b/wob/user.wolf
@@ -60,7 +60,7 @@
        
        <Table name="session">
                <Column name="sessionid" type="string:64" primarykey="yes"/>
-               <Column name="user" type="string:64" notnull="yes" foreignkey="user:uname"/>
+               <Column name="uname" type="string:64" notnull="yes" foreignkey="user:uname"/>
                <!-- unix timestamp at which to delete this session -->
                <Column name="timeout" type="int64" notnull="yes"/>
        </Table>

diff --git a/www/inc/machine/session.php b/www/inc/machine/session.php
index 4b99538..0e0777a 100644 (file)
--- a/www/inc/machine/session.php
+++ b/www/inc/machine/session.php
@@ -33,10 +33,10 @@ class Session
                $this->rights=array();
                $this->flags=array();
                $sid=$trans->getHeader("Wob-SessionId");
-               $res=$db->select("session","sessionid,user","sessionid=".$db->escapeString($sid));
+               $res=$db->select("session","sessionid,uname","sessionid=".$db->escapeString($sid));
                if(count($res)>0){
                        $this->sessid=$sid;
-                       $this->user=$res[0]["user"];
+                       $this->user=$res[0]["uname"];
                        $this->initRights();
                        $this->initFlags($res[0]["flags"]);
                }
@@ -168,7 +168,7 @@ class Session
                        $sid=getRandom(128);
                }
                $valid=time()+$ClientSessionTimeout;
-               $ret=array("sessionid"=>$sid,"user"=>$trans->getusername(),"timeout"=>$valid);
+               $ret=array("sessionid"=>$sid,"uname"=>$trans->getusername(),"timeout"=>$valid);
                $db->insert("session",$ret);
                $db->commitTransaction();