[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc class.mail_msg_wrappers.inc.php,1.23.2
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.mail_msg_wrappers.inc.php,1.23.2.2,1.23.2.3 |
|
Date: |
Wed, 13 Mar 2002 20:50:37 -0500 |
Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv7292/email/inc
Modified Files:
Tag: Version-0_9_14-branch
class.mail_msg_wrappers.inc.php
Log Message:
Fix for GNU Bug #100587 - phpgw_parse_str() to parse_str().
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -C2 -r1.23.2.2 -r1.23.2.3
*** class.mail_msg_wrappers.inc.php 18 Feb 2002 17:19:24 -0000 1.23.2.2
--- class.mail_msg_wrappers.inc.php 14 Mar 2002 01:50:34 -0000 1.23.2.3
***************
*** 893,898 ****
$embeded_data = array();
if ($this->debug_args_input_flow > 0) { echo 'mail_msg:
decode_fake_uri: ENTERED $uri_type_string ['.$uri_type_string.'] <br>'; }
! phpgw_parse_str($uri_type_string, $embeded_data);
! if ($this->debug_args_input_flow > 2) { echo 'mail_msg:
decode_fake_uri: phpgw_parse_str('.$uri_type_string.', into $embeded_data
dump:<pre>'; print_r($embeded_data); echo '</pre>'; }
// some embeded uri-faked data needs to be raised up
one level from sub-elements to top level
--- 893,898 ----
$embeded_data = array();
if ($this->debug_args_input_flow > 0) { echo 'mail_msg:
decode_fake_uri: ENTERED $uri_type_string ['.$uri_type_string.'] <br>'; }
! parse_str($uri_type_string, $embeded_data);
! if ($this->debug_args_input_flow > 2) { echo 'mail_msg:
decode_fake_uri: parse_str('.$uri_type_string.', into $embeded_data
dump:<pre>'; print_r($embeded_data); echo '</pre>'; }
// some embeded uri-faked data needs to be raised up
one level from sub-elements to top level
***************
*** 1145,1149 ****
break;
}
! elseif ($key == 'msgball')
{
$msgball = $args_array[$key];
--- 1145,1149 ----
break;
}
! elseif ($key == 'msgball')
{
$msgball = $args_array[$key];
***************
*** 1155,1159 ****
break;
}
! elseif ($key == 'acctnum')
{
if ($this->debug_args_input_flow > 1) {
echo 'mail_msg: get_best_acctnum: (acctnum search) $args_array passed in
"acctnum" : '.serialize($args_array[$key]).'<br>'; }
--- 1155,1159 ----
break;
}
! elseif ($key == 'acctnum')
{
if ($this->debug_args_input_flow > 1) {
echo 'mail_msg: get_best_acctnum: (acctnum search) $args_array passed in
"acctnum" : '.serialize($args_array[$key]).'<br>'; }
***************
*** 1458,1462 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1458,1462 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1501,1505 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1501,1505 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1601,1605 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1601,1605 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1940,1944 ****
typically integer 0. Default is to return a fallback default
account number.
@returns (most typically) the internal account number of the
currently active email account,
! but can be set, via the $unset_returns_default param,
@discussion When multiple email accounts are enabled, all
arg/param and preference access
functions "pivot" off of this "object->acctnum" property, it
serves essentially as the array key
--- 1940,1944 ----
typically integer 0. Default is to return a fallback default
account number.
@returns (most typically) the internal account number of the
currently active email account,
! but can be set, via the $unset_returns_default param,
@discussion When multiple email accounts are enabled, all
arg/param and preference access
functions "pivot" off of this "object->acctnum" property, it
serves essentially as the array key
***************
*** 1984,1988 ****
@param $acctnum integer
@returns True if a valid param $acctnum is given and the
object->acctnum value is set, False if
! invalid data is passed in the param.
@discussion ?
@author Angles
--- 1984,1988 ----
@param $acctnum integer
@returns True if a valid param $acctnum is given and the
object->acctnum value is set, False if
! invalid data is passed in the param.
@discussion ?
@author Angles
***************
*** 2013,2017 ****
if ($this->debug_args_oop_access > 0) { echo
'mail_msg(_wrappers): get_pref_value: ENTERING, $pref_name: ['.$pref_name.']
$acctnum: ['.$acctnum.']'.'<br>'; }
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2013,2017 ----
if ($this->debug_args_oop_access > 0) { echo
'mail_msg(_wrappers): get_pref_value: ENTERING, $pref_name: ['.$pref_name.']
$acctnum: ['.$acctnum.']'.'<br>'; }
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2022,2026 ****
&& ((string)$pref_name != '')
&& (isset($this->a[$acctnum]['prefs'][$pref_name])))
! {
if ($this->debug_args_oop_access > 0) { echo
'mail_msg(_wrappers): get_pref_value: LEAVING, returning
$this->a['.$acctnum.'][prefs]['.$pref_name.'] :
['.$this->a[$acctnum]['prefs'][$pref_name].'] <br>'; }
return $this->a[$acctnum]['prefs'][$pref_name];
--- 2022,2026 ----
&& ((string)$pref_name != '')
&& (isset($this->a[$acctnum]['prefs'][$pref_name])))
! {
if ($this->debug_args_oop_access > 0) { echo
'mail_msg(_wrappers): get_pref_value: LEAVING, returning
$this->a['.$acctnum.'][prefs]['.$pref_name.'] :
['.$this->a[$acctnum]['prefs'][$pref_name].'] <br>'; }
return $this->a[$acctnum]['prefs'][$pref_name];
***************
*** 2037,2041 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2037,2041 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2044,2048 ****
if ((isset($pref_name))
&& ((string)$pref_name != ''))
! {
$this->a[$acctnum]['prefs'][$pref_name] =
$this_value;
// return True to indicate success
--- 2044,2048 ----
if ((isset($pref_name))
&& ((string)$pref_name != ''))
! {
$this->a[$acctnum]['prefs'][$pref_name] =
$this_value;
// return True to indicate success
***************
*** 2059,2063 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2059,2063 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2067,2071 ****
&& ((string)$pref_name != '')
&& (isset($this->a[$acctnum]['prefs'][$pref_name])))
! {
return True;
}
--- 2067,2071 ----
&& ((string)$pref_name != '')
&& (isset($this->a[$acctnum]['prefs'][$pref_name])))
! {
return True;
}
***************
*** 2080,2084 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2080,2084 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2087,2091 ****
if ((isset($pref_name))
&& ((string)$pref_name != ''))
! {
$this->a[$acctnum]['prefs'][$pref_name] = '';
unset($this->a[$acctnum]['prefs'][$pref_name]);
--- 2087,2091 ----
if ((isset($pref_name))
&& ((string)$pref_name != ''))
! {
$this->a[$acctnum]['prefs'][$pref_name] = '';
unset($this->a[$acctnum]['prefs'][$pref_name]);
***************
*** 2103,2107 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2103,2107 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2109,2113 ****
if (isset($this->a[$acctnum]['prefs']))
! {
return $this->a[$acctnum]['prefs'];
}
--- 2109,2113 ----
if (isset($this->a[$acctnum]['prefs']))
! {
return $this->a[$acctnum]['prefs'];
}
***************
*** 2122,2126 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2122,2126 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2128,2132 ****
$this->a[$acctnum]['prefs'] = array();
!
if ((isset($pref_array_data))
&& (count($pref_array_data > 0)))
--- 2128,2132 ----
$this->a[$acctnum]['prefs'] = array();
!
if ((isset($pref_array_data))
&& (count($pref_array_data > 0)))
***************
*** 2199,2203 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2199,2203 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2255,2259 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2255,2259 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2262,2266 ****
if ((isset($arg_name))
&& ((string)$arg_name != ''))
! {
$this->a[$acctnum]['args'][$arg_name] = '';
unset($this->a[$acctnum]['args'][$arg_name]);
--- 2262,2266 ----
if ((isset($arg_name))
&& ((string)$arg_name != ''))
! {
$this->a[$acctnum]['args'][$arg_name] = '';
unset($this->a[$acctnum]['args'][$arg_name]);
***************
*** 2281,2285 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2281,2285 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2375,2379 ****
// PRIVATE - for use by internal functions
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2375,2379 ----
// PRIVATE - for use by internal functions
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2397,2401 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2397,2401 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2431,2435 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2431,2435 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2437,2441 ****
$this->a[$acctnum]['args'] = array();
!
if ((isset($arg_array_data))
&& (count($arg_array_data > 0)))
--- 2437,2441 ----
$this->a[$acctnum]['args'] = array();
!
if ((isset($arg_array_data))
&& (count($arg_array_data > 0)))
***************
*** 2461,2465 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2461,2465 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 2467,2471 ****
if (isset($this->a[$acctnum]['args']))
! {
return $this->a[$acctnum]['args'];
}
--- 2467,2471 ----
if (isset($this->a[$acctnum]['args']))
! {
return $this->a[$acctnum]['args'];
}
***************
*** 2480,2484 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 2480,2484 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.mail_msg_wrappers.inc.php,1.23.2.2,1.23.2.3,
Mark A Peters <address@hidden> <=