[Phpgroupware-cvs] CVS: email/inc class.mail_msg_base.inc.php,1.54,1.55 class.mail_msg_wrappers.inc.php,1.19,1.20

[Angelo Tony Puglisi <address@hidden>]

Update of /cvsroot/phpgroupware//email/inc
In directory subversions:/tmp/cvs-serv7966/email/inc

Modified Files:
        class.mail_msg_base.inc.php class.mail_msg_wrappers.inc.php 
Log Message:
propagate acctnum thru arg special handlers

Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** class.mail_msg_base.inc.php 8 Jan 2002 15:06:03 -0000       1.54
--- class.mail_msg_base.inc.php 9 Jan 2002 00:30:53 -0000       1.55
***************
*** 530,546 ****
                        }
                }
!               if ($this->debug_logins > 1) { echo 'mail_msg: begin_request: 
(acctnum search) locate acctnum in feed args $found_acctnum result 
['.serialize($found_acctnum).'] <br>'; }
                
                // grab GPC values, only pass an acctnumm to that function if 
we already found it
                if ($found_acctnum == True)
                {
!                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: grab_class_args_gpc is being called WITH already found acctnum: 
('.serialize($acctnum).')<br>'; }
!                       $this->grab_class_args_gpc($acctnum);
                }
                else
                {
!                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: grab_class_args_gpc is being called with NO acctnum yet having 
been found<br>'; }
!                       $this->grab_class_args_gpc();
                }
                if ($this->debug_logins > 2) { echo 'mail_msg: begin_request: 
POST "grab_class_args_gpc": $this->get_all_args() dump <pre>';  
print_r($this->get_all_args()); echo '</pre>'; }
                // grab_class_args_gpc will look for an acctnum in GPC values 
if one is not yet found
--- 530,565 ----
                        }
                }
!               if ($this->debug_logins > 1) { echo 'mail_msg: begin_request: 
(acctnum search) locate acctnum in feed args $found_acctnum boolean result: 
['.serialize($found_acctnum).'] <br>'; }
                
                // grab GPC values, only pass an acctnumm to that function if 
we already found it
                if ($found_acctnum == True)
                {
!                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: grab_class_args_gpc, if called, will be called WITH already 
found acctnum: ('.serialize($acctnum).')<br>'; }
!                       $feed_acctnum = $acctnum;
!                       //$this->grab_class_args_gpc($acctnum);
                }
                else
                {
!                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: grab_class_args_gpc, if called,  will be called with NO acctnum 
yet having been found<br>'; }
!                       $feed_acctnum = '';
!                       //$this->grab_class_args_gpc();
                }
+               
+               // Grab GPC vars, they'll go into the "args" data
+               // feed the $feed_acctnum to the function
+               // Note: which acctnum arg array would this be talking to?
+               if ( ($this->get_isset_arg('already_grab_class_args_gpc', 
$feed_acctnum))
+               && ((string)$this->get_arg_value('already_grab_class_args_gpc', 
$feed_acctnum) != '') )
+               {
+                       // somewhere, there's already been a call to 
grab_class_args_gpc(), do NOT re-run
+                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: "already_grab_class_args_gpc" is set, do not re-grab<br>'; }
+                       if ($this->debug_logins > 2) { echo 'mail_msg: 
begin_request: "already_grab_class_args_gpc" pre-existing $this->get_all_args() 
dump:<pre>'; print_r($this->get_all_args()) ; echo '</pre>';}
+               }
+               else
+               {
+                       if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: "already_grab_class_args_gpc" is NOT set, call 
grab_class_args_gpc() now<br>'; }
+                       $this->grab_class_args_gpc($feed_acctnum);
+               }
+               
                if ($this->debug_logins > 2) { echo 'mail_msg: begin_request: 
POST "grab_class_args_gpc": $this->get_all_args() dump <pre>';  
print_r($this->get_all_args()); echo '</pre>'; }
                // grab_class_args_gpc will look for an acctnum in GPC values 
if one is not yet found
***************
*** 651,668 ****
                
                // ----  Things To Be Done Whether You Login Or Not  -----
-               // Grab GPC vars, they'll go into the "args" data
-               // already did this above
-               //if ( ($this->get_isset_arg('already_grab_class_args_gpc'))
-               //&& 
((string)$this->get_arg_value('already_grab_class_args_gpc') != '') )
-               //{
-               //      // somewhere, there's already been a call to 
grab_class_args_gpc(), do NOT re-run
-               //      if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: "already_grab_class_args_gpc" is set, do not re-grab<br>'; }
-               //      if ($this->debug_logins > 2) { echo 'mail_msg: 
begin_request: "already_grab_class_args_gpc" pre-existing $this->get_all_args() 
dump:<pre>'; print_r($this->get_all_args()) ; echo '</pre>';}
-               //}
-               //else
-               //{
-               //      if ($this->debug_logins > 1) { echo 'mail_msg: 
begin_request: "already_grab_class_args_gpc" is NOT set, call 
grab_class_args_gpc() now<br>'; }
-               //      $this->grab_class_args_gpc();
-               //}
                
                //if ($this->debug_logins > 2) { echo 'mail_msg: begin_request: 
PRE create_email_preferences GLOBALS[phpgw_info][user][preferences][email] 
dump:<pre>'; print_r($GLOBALS['phpgw_info']['user']['preferences']['email']) ; 
echo '</pre>';}
--- 670,673 ----
***************
*** 1112,1116 ****
        PRIVATE
        */
!       function get_mailsvr_callstr()
        {
                if (stristr($this->skip_args_special_handlers, 
'get_mailsvr_callstr'))
--- 1117,1121 ----
        PRIVATE
        */
!       function get_mailsvr_callstr($acctnum='')
        {
                if (stristr($this->skip_args_special_handlers, 
'get_mailsvr_callstr'))
***************
*** 1121,1127 ****
                }
                
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_callstr: ENTERING <br>'; }
                // do we have "level one cache" class var data that we can use?
!               $class_cached_mailsvr_callstr = 
$this->_direct_access_arg_value('mailsvr_callstr');
                if ($class_cached_mailsvr_callstr != '')
                {
--- 1126,1140 ----
                }
                
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_callstr: ENTERING , feed $acctnum: ['.$acctnum.']<br>'; }
!               
!               if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
!               {
!                       $acctnum = $this->get_acctnum();
!               }
!               if ($this->debug_args_special_handlers > 1) { echo 'mail_msg: 
get_mailsvr_callstr: after testing feed arg, using $acctnum: 
['.$acctnum.']<br>'; }
!               
                // do we have "level one cache" class var data that we can use?
!               $class_cached_mailsvr_callstr = 
$this->_direct_access_arg_value('mailsvr_callstr', $acctnum);
                if ($class_cached_mailsvr_callstr != '')
                {
***************
*** 1132,1140 ****
                
                // what's the name or IP of the mail server
!               $mail_server = $this->get_pref_value('mail_server');
!                               
                // determine the Mail Server Call String
                // construct the email server call string from the opening 
bracket "{"  to the closing bracket  "}"
!               switch($this->get_pref_value('mail_server_type'))
                {
                        case 'imaps':   // IMAP over SSL
--- 1145,1153 ----
                
                // what's the name or IP of the mail server
!               $mail_server = $this->get_pref_value('mail_server', $acctnum);
!               
                // determine the Mail Server Call String
                // construct the email server call string from the opening 
bracket "{"  to the closing bracket  "}"
!               switch($this->get_pref_value('mail_server_type', $acctnum))
                {
                        case 'imaps':   // IMAP over SSL
***************
*** 1154,1162 ****
                                break;
                }
!               $server_call = '{' .$mail_server .':' 
.$this->get_pref_value('mail_port') . $extra . '}';
                        
                // cache the result
!               $this->set_arg_value('mailsvr_callstr', $server_call);
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_callstr: LEAVING, returning $server_call: 
'.serialize($server_call).'<br>'; }
                return $server_call;
        }
--- 1167,1175 ----
                                break;
                }
!               $server_call = '{' .$mail_server .':' 
.$this->get_pref_value('mail_port', $acctnum) . $extra . '}';
                        
                // cache the result
!               $this->set_arg_value('mailsvr_callstr', $server_call, $acctnum);
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_callstr: LEAVING, returning $server_call: 
'.serialize($server_call).' for $acctnum ['.$acctnum.']<br>'; }
                return $server_call;
        }
***************
*** 1170,1174 ****
        PRIVATE
        */
!       function get_mailsvr_namespace()
        {
                if (stristr($this->skip_args_special_handlers, 
'get_mailsvr_namespace'))
--- 1183,1187 ----
        PRIVATE
        */
!       function get_mailsvr_namespace($acctnum='')
        {
                if (stristr($this->skip_args_special_handlers, 
'get_mailsvr_namespace'))
***************
*** 1179,1183 ****
                }
                
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_namespace: ENTERING <br>'; }
                // UWash patched for Maildir style: $Maildir.Junque ?????
                // Cyrus and Courier style =" INBOX"
--- 1192,1204 ----
                }
                
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_namespace: ENTERING , feed $acctnum: ['.$acctnum.']<br>'; }
!               
!               if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
!               {
!                       $acctnum = $this->get_acctnum();
!               }
!               if ($this->debug_args_special_handlers > 1) { echo 'mail_msg: 
get_mailsvr_namespace: after testing feed arg, using $acctnum: 
['.$acctnum.']<br>'; }
!               
                // UWash patched for Maildir style: $Maildir.Junque ?????
                // Cyrus and Courier style =" INBOX"
***************
*** 1185,1189 ****
  
                // do we have cached data that we can use?
!               $class_cached_mailsvr_namespace = 
$this->_direct_access_arg_value('mailsvr_namespace');
                if ($class_cached_mailsvr_namespace != '')
                {
--- 1206,1210 ----
  
                // do we have cached data that we can use?
!               $class_cached_mailsvr_namespace = 
$this->_direct_access_arg_value('mailsvr_namespace', $acctnum);
                if ($class_cached_mailsvr_namespace != '')
                {
***************
*** 1193,1197 ****
                }
                
!               
                // -----------
                // TRY CACHED DATA FROM PREFS DB
--- 1214,1218 ----
                }
                
!               /*
                // -----------
                // TRY CACHED DATA FROM PREFS DB
***************
*** 1207,1222 ****
                        return $cached_data;
                }
! 
                // no cached data of any kind we can use ...
                
                // we *may* need this data later
!               $mailsvr_stream = $this->get_arg_value('mailsvr_stream');
!               $server_str = $this->get_arg_value('mailsvr_callstr');
                
!               if (($this->get_pref_value('imap_server_type') == 'UW-Maildir')
!               || ($this->get_pref_value('imap_server_type') == 'UWash'))
                {
!                       if (($this->get_isset_pref('mail_folder'))
!                       && (trim($this->get_pref_value('mail_folder')) != ''))
                        {
                                // if the user fills this option correctly, 
this should yield an unqualified foldername which
--- 1228,1244 ----
                        return $cached_data;
                }
!               */
                // no cached data of any kind we can use ...
                
                // we *may* need this data later
!               $mailsvr_stream = $this->get_arg_value('mailsvr_stream', 
$acctnum);
!               $server_str = $this->get_arg_value('mailsvr_callstr', $acctnum);
!               if ($this->debug_args_special_handlers > 1) { echo 'mail_msg: 
get_mailsvr_namespace: got these for later use: $mailsvr_stream: 
['.$mailsvr_stream.'] ; $server_str: ['.$server_str.']<br>'; }
                
!               if (($this->get_pref_value('imap_server_type', $acctnum) == 
'UW-Maildir')
!               || ($this->get_pref_value('imap_server_type', $acctnum) == 
'UWash'))
                {
!                       if (($this->get_isset_pref('mail_folder', $acctnum))
!                       && (trim($this->get_pref_value('mail_folder', 
$acctnum)) != ''))
                        {
                                // if the user fills this option correctly, 
this should yield an unqualified foldername which
***************
*** 1224,1228 ****
                                // appropriate $HOME variable (I THINK) ...
                                // DO I NEED to add the "~" here too?
!                               $name_space = 
trim($this->get_pref_value('mail_folder'));
                        }
                        else
--- 1246,1250 ----
                                // appropriate $HOME variable (I THINK) ...
                                // DO I NEED to add the "~" here too?
!                               $name_space = 
trim($this->get_pref_value('mail_folder', $acctnum));
                        }
                        else
***************
*** 1255,1264 ****
                        // see http://www.faqs.org/rfcs/rfc2060.html  section 
6.3.8 (which is not entirely clear on this)
                        // FIXME: abstract this class dcom call in 
mail_msg_wrappers
!                       if ($this->debug_args_special_handlers > 1) { echo 
'mail_msg: get_mailsvr_namespace: issuing: 
$this->a['.$this->acctnum.'][dcom]->listmailbox('.$mailsvr_stream.', 
'.$server_str.', %)'.'<br>'; }
                        
!                       //$tmp_a = $this->a[$this->acctnum];
!                       //$name_space = 
$tmp_a['dcom']->listmailbox($mailsvr_stream, $server_str, '%');
!                       $this_acctnum = $this->acctnum;
!                       $name_space = 
$GLOBALS['phpgw_dcom_'.$this_acctnum]->dcom->listmailbox($mailsvr_stream, 
$server_str, '%');
                        
                        if ($this->debug_args_special_handlers > 2) { echo 
'mail_msg: get_mailsvr_namespace: raw $name_space dump<pre>'; 
print_r($name_space); echo '</pre>'; }
--- 1277,1283 ----
                        // see http://www.faqs.org/rfcs/rfc2060.html  section 
6.3.8 (which is not entirely clear on this)
                        // FIXME: abstract this class dcom call in 
mail_msg_wrappers
!                       if ($this->debug_args_special_handlers > 1) { echo 
'mail_msg: get_mailsvr_namespace: issuing: 
$GLOBALS[phpgw_dcom_'.$acctnum.']->dcom->listmailbox('.$mailsvr_stream.', 
'.$server_str.', %)'.'<br>'; }
                        
!                       $name_space = 
$GLOBALS['phpgw_dcom_'.$acctnum]->dcom->listmailbox($mailsvr_stream, 
$server_str, '%');
                        
                        if ($this->debug_args_special_handlers > 2) { echo 
'mail_msg: get_mailsvr_namespace: raw $name_space dump<pre>'; 
print_r($name_space); echo '</pre>'; }
***************
*** 1314,1320 ****
                
                // cache the result in "level one cache" class var holder
!               $this->set_arg_value('mailsvr_namespace', $name_space);
!               //$this->a[$this->acctnum] = $tmp_a;
                
                // -----------
                // SAVE DATA TO PREFS DB CACHE
--- 1333,1340 ----
                
                // cache the result in "level one cache" class var holder
!               if ($this->debug_args_special_handlers > 1) { echo 'mail_msg: 
get_mailsvr_namespace: set "level 1 cache, class var" arg 
$this->set_arg_value(mailsvr_namespace, '.$name_space.', '.$acctnum.']) <br>'; }
!               $this->set_arg_value('mailsvr_namespace', $name_space, 
$acctnum);
                
+               /*
                // -----------
                // SAVE DATA TO PREFS DB CACHE
***************
*** 1322,1325 ****
--- 1342,1347 ----
                $my_function_name = 'get_mailsvr_namespace';
                $this->set_cached_data($my_function_name,'string',$name_space);
+               */
+               
                if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_namespace: LEAVING, returning $name_space: 
'.serialize($name_space).'<br>'; }
                return $name_space;
***************
*** 1334,1338 ****
        PRIVATE
        */
!       function get_mailsvr_delimiter()
        {
                if (stristr($this->skip_args_special_handlers, 
'get_mailsvr_delimiter'))
--- 1356,1360 ----
        PRIVATE
        */
!       function get_mailsvr_delimiter($acctnum='')
        {
                if (stristr($this->skip_args_special_handlers, 
'get_mailsvr_delimiter'))
***************
*** 1343,1352 ****
                }
                
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_delimiter: ENTERING <br>'; }
                // UWash style: "/"
                // all other imap servers *should* be "."
  
                // do we have cached data that we can use?
!               $class_cached_mailsvr_delimiter = 
$this->_direct_access_arg_value('mailsvr_delimiter');
                if ($class_cached_mailsvr_delimiter != '')
                {
--- 1365,1382 ----
                }
                
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_delimiter: ENTERING , feed $acctnum: ['.$acctnum.']<br>'; }
!               
!               if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
!               {
!                       $acctnum = $this->get_acctnum();
!               }
!               if ($this->debug_args_special_handlers > 1) { echo 'mail_msg: 
get_mailsvr_delimiter: after testing feed arg, using $acctnum: 
['.$acctnum.']<br>'; }
!               
                // UWash style: "/"
                // all other imap servers *should* be "."
  
                // do we have cached data that we can use?
!               $class_cached_mailsvr_delimiter = 
$this->_direct_access_arg_value('mailsvr_delimiter', $acctnum);
                if ($class_cached_mailsvr_delimiter != '')
                {
***************
*** 1356,1362 ****
                }
                
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_delimiter: $this->get_pref_value(imap_server_type) returns: 
['.$this->get_pref_value('imap_server_type').'] ; api var SEP: 
['.serialize(SEP).']<br>'; }
!               
!               if ($this->get_pref_value('imap_server_type') == 'UWash')
                {
                        //$delimiter = '/';
--- 1386,1391 ----
                }
                
!               //if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_delimiter: $this->get_pref_value(imap_server_type, '.$acctnum.') 
returns: ['.$this->get_pref_value('imap_server_type', $acctnum).'] ; api var 
SEP: ['.serialize(SEP).']<br>'; }
!               if ($this->get_pref_value('imap_server_type', $acctnum) == 
'UWash')
                {
                        //$delimiter = '/';
***************
*** 1366,1369 ****
--- 1395,1399 ----
                        // unix = /  and win = \ (win maybe even "\\" because 
the backslash needs escaping???
                        // currently the filesystem seterator is provided by 
phpgw api as constant "SEP"
+                       if ($this->debug_args_special_handlers > 1) { echo 
'mail_msg: get_mailsvr_delimiter: imap_server_type is UWash<br>'; }
                        if (!SEP)
                        {
***************
*** 1382,1399 ****
                        // see http://www.rfc-editor.org/rfc/rfc2342.txt
                        // however as of PHP 4.0 this is not implemented
                        $delimiter = '.';
                }
                // cache the result to "level 1 cache" class arg holder var
!               $this->set_arg_value('mailsvr_delimiter', $delimiter);
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_delimiter: LEAVING, returning: '.serialize($delimiter).'<br>'; }
                return $delimiter;
        }
  
!       function get_mailsvr_supports_folders()
        {
                // Does This Mailbox Support Folders (i.e. more than just 
INBOX)?
!               if (($this->get_pref_value('mail_server_type') == 'imap')
!               || ($this->get_pref_value('mail_server_type') == 'imaps')
!               || ($this->newsmode))
                {
                        return True;
--- 1412,1441 ----
                        // see http://www.rfc-editor.org/rfc/rfc2342.txt
                        // however as of PHP 4.0 this is not implemented
+                       if ($this->debug_args_special_handlers > 1) { echo 
'mail_msg: get_mailsvr_delimiter: imap_server_type is OTHER than UWash<br>'; }
                        $delimiter = '.';
                }
                // cache the result to "level 1 cache" class arg holder var
!               if ($this->debug_args_special_handlers > 1) { echo 'mail_msg: 
get_mailsvr_delimiter: set "level 1 cache, class var" arg 
$this->set_arg_value(mailsvr_delimiter, '.$delimiter.', '.$acctnum.']) <br>'; }
!               $this->set_arg_value('mailsvr_delimiter', $delimiter, $acctnum);
!               
!               if ($this->debug_args_special_handlers > 0) { echo 'mail_msg: 
get_mailsvr_delimiter: LEAVING, returning: '.serialize($delimiter).' for 
$acctnum ['.$acctnum.']<br>'; }
                return $delimiter;
        }
  
!       function get_mailsvr_supports_folders($acctnum='')
        {
+               if ((!isset($acctnum))
+               || ((string)$acctnum == ''))
+               {
+                       $acctnum = $this->get_acctnum();
+               }
+               
                // Does This Mailbox Support Folders (i.e. more than just 
INBOX)?
!               
!               //if (($this->get_pref_value('mail_server_type',$acctnum ) == 
'imap')
!               //|| ($this->get_pref_value('mail_server_type', $acctnum) == 
'imaps')
!               //|| ($this->newsmode))
!               $mail_server_type = $this->get_pref_value('mail_server_type', 
$acctnum);
!               if (stristr($mail_server_type, 'imap'))
                {
                        return True;

Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.mail_msg_wrappers.inc.php     8 Jan 2002 15:06:03 -0000       1.19
--- class.mail_msg_wrappers.inc.php     9 Jan 2002 00:30:53 -0000       1.20
***************
*** 1755,1758 ****
--- 1755,1764 ----
                function _get_arg_is_known($arg_name='', 
$calling_function_name='')
                {
+                       // skip this unless debug level 4
+                       if ($this->debug_args_oop_access < 4)
+                       {
+                               return False;
+                       }
+                       
                        if ($arg_name == '')
                        {
***************
*** 1804,1821 ****
                                if ($this->debug_args_oop_access > 1) { echo 
'mail_msg(_wrappers): get_isset_arg: obtained $acctnum from 
$this->get_acctnum(): ['.$acctnum.']'.'<br>'; }
                        }
-                       /*
-                       // OBSOLETED
-                       if ((isset($arg_name))
-                       && ((string)$arg_name != '')
-                       && (isset($this->a[$acctnum]['args'][$arg_name])))
-                       {
-                               return True;
-                       }
-                       else
-                       {
-                               // arg not set, or invalid input $arg_name
-                               return False;
-                       }
-                       */
                        
                        /*
--- 1810,1813 ----
***************
*** 1831,1836 ****
                        */
                        
!                       // Best Version at this time, if something is not set, 
no handoff support function will fill it
!                       // before we can return false
                        
                        // $arg_name has sub-levels
--- 1823,1828 ----
                        */
                        
!                       // Best Version at this time, if something is not set, 
DO NOT handoff to a support function to fill it
!                       // that way we can return false if something is indeed 
NOT set
                        
                        // $arg_name has sub-levels
***************
*** 1860,1863 ****
--- 1852,1856 ----
                        }
                        // if we get here, it was not set
+                       if ($this->debug_args_oop_access > 0) { echo 
'mail_msg(_wrappers): get_isset_arg: LEAVING returning False<br>'; }
                        return False;
                }
***************
*** 1905,1920 ****
                                if ($arg_name == 'mailsvr_callstr')
                                {
!                                       if ($this->debug_args_oop_access > 0) { 
echo 'mail_msg(_wrappers): get_arg_value: LEAVING with HANDOFF to 
get_mailsvr_callstr()<br>'; }
!                                       return $this->get_mailsvr_callstr();
                                }
                                elseif ($arg_name == 'mailsvr_namespace')
                                {
!                                       if ($this->debug_args_oop_access > 0) { 
echo 'mail_msg(_wrappers): get_arg_value: LEAVING with HANDOFF to 
get_mailsvr_namespace()<br>'; }
!                                       return $this->get_mailsvr_namespace();
                                }
                                elseif ($arg_name == 'mailsvr_delimiter')
                                {
!                                       if ($this->debug_args_oop_access > 0) { 
echo 'mail_msg(_wrappers): get_arg_value: LEAVING with HANDOFF to 
get_mailsvr_delimiter()<br>'; }
!                                       return $this->get_mailsvr_delimiter();
                                }
                                elseif ($arg_name == 'folder_list')
--- 1898,1913 ----
                                if ($arg_name == 'mailsvr_callstr')
                                {
!                                       if ($this->debug_args_oop_access > 0) { 
echo 'mail_msg(_wrappers): get_arg_value: LEAVING with HANDOFF to 
get_mailsvr_callstr('.$acctnum.')<br>'; }
!                                       return 
$this->get_mailsvr_callstr($acctnum);
                                }
                                elseif ($arg_name == 'mailsvr_namespace')
                                {
!                                       if ($this->debug_args_oop_access > 0) { 
echo 'mail_msg(_wrappers): get_arg_value: LEAVING with HANDOFF to 
get_mailsvr_namespace('.$acctnum.')<br>'; }
!                                       return 
$this->get_mailsvr_namespace($acctnum);
                                }
                                elseif ($arg_name == 'mailsvr_delimiter')
                                {
!                                       if ($this->debug_args_oop_access > 0) { 
echo 'mail_msg(_wrappers): get_arg_value: LEAVING with HANDOFF to 
get_mailsvr_delimiter('.$acctnum.')<br>'; }
!                                       return 
$this->get_mailsvr_delimiter($acctnum);
                                }
                                elseif ($arg_name == 'folder_list')