[Phpgroupware-cvs] email/inc class.mail_msg_base.inc.php class.so_...

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    email
Changes by:     Dave Hall <skwashd>     06/08/31 02:39:41

Modified files:
        inc            : class.mail_msg_base.inc.php 
                         class.so_mail_msg.inc.php 

Log message:
        more notices

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_base.inc.php?cvsroot=phpgroupware&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.so_mail_msg.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6

Patches:
Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- class.mail_msg_base.inc.php 30 Aug 2006 16:25:28 -0000      1.83
+++ class.mail_msg_base.inc.php 31 Aug 2006 02:39:41 -0000      1.84
@@ -9,7 +9,7 @@
        * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package email
-       * @version $Id: class.mail_msg_base.inc.php,v 1.83 2006/08/30 16:25:28 
skwashd Exp $
+       * @version $Id: class.mail_msg_base.inc.php,v 1.84 2006/08/31 02:39:41 
skwashd Exp $
        * @internal Based on AngleMail http://www.anglemail.org/
        * @internal Originally Based on Aeromail http://the.cushman.net/
        */
@@ -1028,7 +1028,8 @@
                                // fill email's 
$GLOBALS['phpgw_info']['user']['preferences'] with the data for backwards 
compatibility (we don't use that)
                                // damn, where did email's prefs get filled 
already? Where are they getting filled, anyway do not re-fill if not needed
                                // NO - IT IS POSSIBLE THIS MAY NOT CATCH ALL 
PREF CHANGES IN CORNER CASES
-                               if 
(is_array($GLOBALS['phpgw_info']['user']['preferences']['email']) == False)
+                               if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['email'])
+                                       && 
is_array($GLOBALS['phpgw_info']['user']['preferences']['email']) )
                                {
                                        
//$GLOBALS['phpgw_info']['user']['preferences'] = $this->unprocessed_prefs;
                                        
$GLOBALS['phpgw_info']['user']['preferences']['email'] = array();

Index: class.so_mail_msg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.so_mail_msg.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.so_mail_msg.inc.php   30 Aug 2006 16:25:28 -0000      1.5
+++ class.so_mail_msg.inc.php   31 Aug 2006 02:39:41 -0000      1.6
@@ -7,7 +7,7 @@
        * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package email
-       * @version $Id: class.so_mail_msg.inc.php,v 1.5 2006/08/30 16:25:28 
skwashd Exp $
+       * @version $Id: class.so_mail_msg.inc.php,v 1.6 2006/08/31 02:39:41 
skwashd Exp $
        * @internal Based on AngleMail http://www.anglemail.org/
        */
 
@@ -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($accountid,$GLOBALS['phpgw']->session->account_id);
+                       $account_id = get_account_id(0, 
$GLOBALS['phpgw']->session->account_id);
                        $data_key = 
$GLOBALS['phpgw']->db->db_addslashes($data_key);
                        // for compression, first choice is BZ2, second choice 
is GZ
                        //if (($compression)
@@ -999,7 +999,7 @@
                        // ok we are allowed to do session caching ...
                        // since $data may be boolean, boolean True will == any 
filled string
                        // so for accuracy here we need to case $data as a 
string to do a real == statement
-                       if ((string)$data == '##NOTHING##')
+                       if ( is_scalar($data) && $data == '##NOTHING##')
                        {
                                // means we are GETTING data from appsession
                                if ($GLOBALS['phpgw']->msg->debug_so_class > 1) 
{ 
$GLOBALS['phpgw']->msg->dbug->out('so_mail_msg.so_appsession_passthru('.__LINE__.'):
 request to get data<br />'); }