[Phpgroupware-cvs] [19009] Fix a notice ...

[Caeies]

Revision: 19009
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19009
Author:   Caeies
Date:     2008-12-10 12:03:35 +0000 (Wed, 10 Dec 2008)

Log Message:
-----------
Fix a notice ... this class needs a rework ...

Modified Paths:
--------------
    core/trunk/email/inc/class.so_mail_msg.inc.php

Modified: core/trunk/email/inc/class.so_mail_msg.inc.php
===================================================================
--- core/trunk/email/inc/class.so_mail_msg.inc.php      2008-12-10 11:57:39 UTC 
(rev 19008)
+++ core/trunk/email/inc/class.so_mail_msg.inc.php      2008-12-10 12:03:35 UTC 
(rev 19009)
@@ -262,7 +262,7 @@
                                else
                                {
                                        // WIPE CLEAN THE CACHE
-                                       $account_id = 
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+                                       $account_id = 
get_account_id((isset($accountid)?$accountid:''));
                                        $query = "DELETE FROM 
phpgw_app_sessions WHERE loginid = '".$account_id."'"
                                                ." AND app = 'email'";
                                        $GLOBALS['phpgw']->db->query($query);
@@ -372,7 +372,7 @@
                function so_set_data($data_key, $content, $compression=False)
                {
                        if ($GLOBALS['phpgw']->msg->debug_so_class > 0) { 
$GLOBALS['phpgw']->msg->dbug->out('so_mail_msg: so_set_data('.__LINE__.'): 
ENTERING, $data_key ['.$data_key.'], $compression 
['.serialize($compression).']<br />'); }
-                       $account_id = get_account_id(0, 
$GLOBALS['phpgw']->session->account_id);
+                       $account_id = get_account_id(0);
                        $data_key = 
$GLOBALS['phpgw']->db->db_addslashes($data_key);
                        // for compression, first choice is BZ2, second choice 
is GZ
                        //if (($compression)
@@ -470,7 +470,7 @@
                        || ($this->so_have_data_group() == False))
                        {
                                if ($GLOBALS['phpgw']->msg->debug_so_class > 1) 
{ $GLOBALS['phpgw']->msg->dbug->out('so_mail_msg: so_get_data('.__LINE__.'): 
group data either disabled or nothing returned, requesting individual data 
record<br />'); }
-                               $account_id = get_account_id('', 
$GLOBALS['phpgw']->session->account_id);
+                               $account_id = get_account_id('');
                                $data_key = 
$GLOBALS['phpgw']->db->db_addslashes($data_key);
                                
                                $GLOBALS['phpgw']->db->query("SELECT content 
FROM phpgw_anglemail WHERE "
@@ -642,7 +642,7 @@
                */
                function so_delete_data($data_key)
                {
-                       $account_id = 
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+                       $account_id = 
get_account_id((isset($accountid)?$accountid:''));
                        $data_key = 
$GLOBALS['phpgw']->db->db_addslashes($data_key);
                        $GLOBALS['phpgw']->db->query("DELETE FROM 
phpgw_anglemail "
                                . " WHERE account_id='" . $account_id . "' AND 
data_key='" . $data_key . "'",__LINE__,__FILE__);
@@ -655,7 +655,7 @@
                */
                function so_clear_all_data_this_user()
                {
-                       $account_id = 
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+                       $account_id = 
get_account_id((isset($accountid)?$accountid:''));
                        $GLOBALS['phpgw']->db->query("DELETE FROM 
phpgw_anglemail "
                                . " WHERE account_id='" . $account_id . 
"'",__LINE__,__FILE__);
                        $this->so_clear_data_group();
@@ -811,7 +811,7 @@
                                $data_key_mailsvr_namespace = '';
                        }
                        
-                       $account_id = 
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+                       $account_id = 
get_account_id((isset($accountid)?$accountid:''));
                        //if (($data_key)
                        //&& ($data_key_msgball)
                        //&& ($data_key_folder_status_info))