[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.mail_msg_base.inc.php class.mai...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] email/inc class.mail_msg_base.inc.php class.mai... |
|
Date: |
Wed, 30 Aug 2006 16:25:28 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: email
Changes by: Dave Hall <skwashd> 06/08/30 16:25:28
Modified files:
inc : class.mail_msg_base.inc.php
class.mail_msg_wrappers.inc.php
class.msg_bootstrap.inc.php
class.so_mail_msg.inc.php
class.svc_debug.inc.php functions.inc.php
hook_home.inc.php
Log message:
E_ALL
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_base.inc.php?cvsroot=phpgroupware&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_wrappers.inc.php?cvsroot=phpgroupware&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.msg_bootstrap.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.so_mail_msg.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.svc_debug.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/email/inc/functions.inc.php?cvsroot=phpgroupware&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/email/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.59&r2=1.60
Patches:
Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- class.mail_msg_base.inc.php 11 May 2005 18:52:06 -0000 1.82
+++ class.mail_msg_base.inc.php 30 Aug 2006 16:25:28 -0000 1.83
@@ -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.82 2005/05/11 18:52:06
powerstat Exp $
+ * @version $Id: class.mail_msg_base.inc.php,v 1.83 2006/08/30 16:25:28
skwashd Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Originally Based on Aeromail http://the.cushman.net/
*/
@@ -443,7 +443,7 @@
if ($this->use_cached_prefs == True)
{
// any preferences page menuaction is a NO NO
to cached prefs
- if (stristr($this->ref_GET['menuaction'],
'preferences.'))
+ if ( isset($this->ref_GET['menuaction']) &&
stristr($this->ref_GET['menuaction'], 'preferences.'))
{
if ($this->debug_logins > 1) {
$this->dbug->out('mail_msg.initialize_mail_msg('.__LINE__.'): manual
*constructor*: string "preferences." is in menuaction so NO CACHED PREFS,
setting $this->use_cached_prefs to False<br />'); }
$this->use_cached_prefs = False;
@@ -453,8 +453,9 @@
// UNDER DEVELOPMENT bulk data query from AngleMail DB
// only necessary to grab huge bulk data for INDEX page
// and some other menuactions too, but we will add more
later
- if ((stristr($this->ref_GET['menuaction'],
'email.uiindex'))
- || (stristr($this->ref_GET['menuaction'],
'email.uimessage.message')))
+ if ( isset($this->ref_GET['menuaction'])
+ && (stristr($this->ref_GET['menuaction'],
'email.uiindex')
+ || stristr($this->ref_GET['menuaction'],
'email.uimessage.message') ) )
{
if ($this->debug_logins > 1) {
$this->dbug->out('mail_msg.initialize_mail_msg('.__LINE__.'): manual
*constructor*: calling $this->so->so_prop_use_group_data(True)<br />'); }
//$this->so->use_group_data = True;
@@ -930,10 +931,9 @@
}
// ok if we actually got cached_prefs then maybe we can
use them
- if (($this->use_cached_prefs == True)
- && ((string)$cached_prefs != $this->nothing)
- && (is_array($cached_prefs))
- && (isset($cached_prefs['extra_and_default_acounts'])))
+ if ($this->use_cached_prefs == true
+ && is_array($cached_prefs)
+ &&
isset($cached_prefs['extra_and_default_acounts']) )
{
if ($this->debug_logins > 1) {
$this->dbug->out('mail_msg.begin_request('.__LINE__.'): raw $cached_prefs
deemed to actually have usable data, so process it<br />'); }
// UN-defang the filters
@@ -5216,8 +5216,8 @@
*/
function is_serialized_smarter($string_data)
{
- if ((is_string($string_data))
- && (unserialize($string_data) == False))
+ if (is_string($string_data)
+ && @unserialize($string_data) == false)
{
// when you unserialize a normal
(not-serialized) string, you get False
// HOWEVER slashes may b0rk unserialize, do not
be fooled, it is still serialized
@@ -5225,18 +5225,12 @@
if (stristr($string_data, ':"stdClass":'))
{
// unserialize failed but the source
str appears to look like a serialized thing
- return True;
+ return true;
}
- else
- {
// second test still says this is not
serialized str
- return False;
- }
- }
- else
- {
- return True;
+ return false;
}
+ return true;
}
// PHP3 SAFE Version of "substr_count"
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- class.mail_msg_wrappers.inc.php 11 May 2005 18:52:06 -0000 1.41
+++ class.mail_msg_wrappers.inc.php 30 Aug 2006 16:25:28 -0000 1.42
@@ -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.mail_msg_wrappers.inc.php,v 1.41 2005/05/11
18:52:06 powerstat Exp $
+ * @version $Id: class.mail_msg_wrappers.inc.php,v 1.42 2006/08/30
16:25:28 skwashd Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -3777,6 +3777,7 @@
}
else
{
+ $input_folder_arg = '';
if (($this->get_isset_arg('folder'))
&&
((string)trim($this->get_arg_value('folder')) != ''))
{
@@ -5439,9 +5440,10 @@
// that way we can return false if something is indeed
NOT set
// $arg_name has sub-levels
- if ((isset($arg_name))
- && ((string)$arg_name != '')
- && (strstr($arg_name, '][')))
+ if ( isset($arg_name)
+ && isset($this->a[$acctnum]['args'])
+ && (string)$arg_name != ''
+ && strstr($arg_name, '][') )
{
// request for $arg_name['sub-element']
if ($this->debug_args_oop_access > 1) {
$this->dbug->out('mail_msg(_wrappers): get_isset_arg: $arg_name is requesting
sub-level array element(s), use EVAL, $arg_name: '.serialize($arg_name).'<br
/>'); }
@@ -5449,7 +5451,7 @@
//$code = '$evaled =
$this->a[$acctnum][\'args\']'.$arg_name.';';
$code = '$evaled =
$this->a[$acctnum]["args"]'.$arg_name.';';
if ($this->debug_args_oop_access > 1) {
$this->dbug->out(' * $code: '.$code.'<br />'); }
- eval($code);
+ @eval($code); // the @ is needed here, cos the
annoying code design
if ($this->debug_args_oop_access > 1) {
$this->dbug->out(' * $evaled: '.$evaled.'<br />'); }
if (isset($evaled))
{
Index: class.msg_bootstrap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.msg_bootstrap.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.msg_bootstrap.inc.php 11 May 2005 18:06:58 -0000 1.5
+++ class.msg_bootstrap.inc.php 30 Aug 2006 16:25:28 -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.msg_bootstrap.inc.php,v 1.5 2005/05/11 18:06:58
powerstat Exp $
+ * @version $Id: class.msg_bootstrap.inc.php,v 1.6 2006/08/30 16:25:28
skwashd Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -41,7 +41,7 @@
function msg_bootstrap()
{
- if (defined(BS_LOGIN_NEVER) == False)
+ if (defined('BS_LOGIN_NEVER') == False)
{
define('BS_LOGIN_NOT_SPECIFIED',0);
// never log in no matter what
Index: class.so_mail_msg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.so_mail_msg.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.so_mail_msg.inc.php 11 May 2005 18:06:58 -0000 1.4
+++ class.so_mail_msg.inc.php 30 Aug 2006 16:25:28 -0000 1.5
@@ -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.4 2005/05/11 18:06:58
powerstat Exp $
+ * @version $Id: class.so_mail_msg.inc.php,v 1.5 2006/08/30 16:25:28
skwashd Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -446,7 +446,7 @@
$func_returns =
$this->so_fill_data_group($data_key, True);
if ($GLOBALS['phpgw']->msg->debug_so_class > 1)
{ $GLOBALS['phpgw']->msg->dbug->out('so_mail_msg: so_get_data('.__LINE__.'):
fill group data function returns $func_returns
['.serialize($func_returns).']<br />'); }
}
- elseif (
+ else if (
($this->use_group_data == True)
&& ($this->so_have_data_group() == True)
&& ($this->data_group_done_filled < 3)
@@ -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($accountid,$GLOBALS['phpgw']->session->account_id);
+ $account_id = get_account_id('',
$GLOBALS['phpgw']->session->account_id);
$data_key =
$GLOBALS['phpgw']->db->db_addslashes($data_key);
$GLOBALS['phpgw']->db->query("SELECT content
FROM phpgw_anglemail WHERE "
Index: class.svc_debug.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.svc_debug.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.svc_debug.inc.php 11 May 2005 18:06:59 -0000 1.4
+++ class.svc_debug.inc.php 30 Aug 2006 16:25:28 -0000 1.5
@@ -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.svc_debug.inc.php,v 1.4 2005/05/11 18:06:59
powerstat Exp $
+ * @version $Id: class.svc_debug.inc.php,v 1.5 2006/08/30 16:25:28
skwashd Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -45,12 +45,12 @@
// fill a timestamp
if ($this->t_on_creation == '##NOTHING##')
{
- $this->t_on_creation = array();
- $this->t_on_creation['raw'] = microtime();
- // we'll finish it later
- $this->t_on_creation['useful'] == '##NOTHING##';
+ $this->t_on_creation = array
+ (
+ 'raw' => microtime(),
+ 'useful' => '##NOTHING##'
+ );
}
- return;
}
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/functions.inc.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- functions.inc.php 11 May 2005 14:08:27 -0000 1.120
+++ functions.inc.php 30 Aug 2006 16:25:28 -0000 1.121
@@ -2,31 +2,22 @@
/**
* EMail
*
- * @author Mark C3ushman <address@hidden>
- * @copyright Copyright (C) xxxx Mark C3ushman
+ * @author Mark Cushman <address@hidden>
+ * @copyright Copyright (C) xxxx Mark Cushman
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: functions.inc.php,v 1.120 2005/05/11 14:08:27 powerstat
Exp $
+ * @version $Id: functions.inc.php,v 1.121 2006/08/30 16:25:28 skwashd
Exp $
* @internal Based on Aeromail http://the.cushman.net/
*/
- $d1 = strtolower(substr(APP_INC,0,3));
- if($d1 == 'htt' || $d1 == 'ftp' )
- {
- echo "Failed attempt to break in via an old Security Hole!<br
/>\n";
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
- unset($d1);
-
- // ---- Turn Off Magic Quotes Runtime -----
- /*!
- @concept Turn Off Magic Quotes Runtime
- @discussion magic_quotes_runtime essentially handles slashes when
communicating with databases.
+ /*
+ magic_quotes_runtime essentially handles slashes when
communicating with databases.
PHP MANUAL says:
If magic_quotes_runtime is enabled, most functions that return
data from any sort of
external source including databases and text files will have
quotes escaped with a backslash.
- this is undesirable - turn it off.
+
+ this is undesirable so we turn it off
*/
- set_magic_quotes_runtime(0);
+ @set_magic_quotes_runtime(0);
?>
Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_home.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- hook_home.inc.php 11 May 2005 14:08:27 -0000 1.59
+++ hook_home.inc.php 30 Aug 2006 16:25:28 -0000 1.60
@@ -6,17 +6,9 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
* @subpackage hooks
- * @version $Id: hook_home.inc.php,v 1.59 2005/05/11 14:08:27 powerstat
Exp $
+ * @version $Id: hook_home.inc.php,v 1.60 2006/08/30 16:25:28 skwashd
Exp $
*/
- $d1 =
strtolower(substr($GLOBALS['phpgw_info']['server']['app_inc'],0,3));
- if($d1 == 'htt' || $d1 == 'ftp' )
- {
- echo "Failed attempt to break in via an old Security Hole!<br
/>\n";
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
- unset($d1);
-
// does this array item actually exist before we create the mail_msg,
where is it created?
//if
($GLOBALS['phpgw_info']['user']['preferences']['email']['mainscreen_showmail']
== True)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc class.mail_msg_base.inc.php class.mai...,
Dave Hall <=