[Phpgroupware-cvs] phpgwapi/inc/sessions class.sessions_db.inc.php

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     07/10/11 13:30:47

Modified files:
        inc/sessions   : class.sessions_db.inc.php 

Log message:
        some cleanups

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/sessions/class.sessions_db.inc.php?cvsroot=phpgwapi&r1=1.2&r2=1.3

Patches:
Index: class.sessions_db.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/sessions/class.sessions_db.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.sessions_db.inc.php   27 Dec 2006 06:09:59 -0000      1.2
+++ class.sessions_db.inc.php   11 Oct 2007 13:30:47 -0000      1.3
@@ -10,7 +10,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.sessions_db.inc.php,v 1.2 2006/12/27 06:09:59 
skwashd Exp $
+       * @version $Id: class.sessions_db.inc.php,v 1.3 2007/10/11 13:30:47 
skwashd Exp $
        * @link http://www.sanisoft.com/phplib/manual/session.php
        */
 
@@ -135,19 +135,11 @@
                                $GLOBALS['phpgw']->db->next_record();
 
                                // I added these into seperate steps for easier 
debugging
-                               $data = $GLOBALS['phpgw']->db->f('content');
-                               // Changed by Skeeter 2001 Mar 04 0400Z
-                               // This was not properly decoding structures 
saved into session data properly
-//                             $data = 
$GLOBALS['phpgw']->common->decrypt($data);
-//                             return stripslashes($data);
-                               // Changed by milosch 2001 Dec 20
-                               // do not stripslashes here unless this proves 
to be a problem.
-                               // Changed by milosch 2001 Dec 25
-                               /* do not decrypt and return if no data 
(decrypt returning garbage) */
+                               $data = $GLOBALS['phpgw']->db->f('content', 
true);
                                if($data)
                                {
                                        $data = 
$GLOBALS['phpgw']->crypto->decrypt($data);
-//                                     echo 'appsession returning: '; 
_debug_array($data);
+                                       // echo 'appsession returning: '; 
_debug_array($data);
                                        return $data;
                                }
                        }
@@ -157,8 +149,7 @@
                                        . "sessionid = '".$this->sessionid."' 
AND loginid = '".$this->account_id."'"
                                        . " AND app = '".$appname."' AND 
location = '".$location."'",__LINE__,__FILE__);
 
-                               $encrypteddata = 
$GLOBALS['phpgw']->crypto->encrypt($data);
-                               $encrypteddata = 
$GLOBALS['phpgw']->db->db_addslashes($encrypteddata);
+                               $encrypteddata = 
$GLOBALS['phpgw']->db->db_addslashes($GLOBALS['phpgw']->crypto->encrypt($data));
 
                                if ($GLOBALS['phpgw']->db->num_rows()==0)
                                {