[Phpgroupware-cvs] CVS: felamimail/inc hook_home.inc.php,1.3,1.4

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/felamimail/inc
In directory subversions:/tmp/cvs-serv2472

Modified Files:
        hook_home.inc.php 
Log Message:
GLOBALS

Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_home.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hook_home.inc.php   26 Feb 2002 00:07:12 -0000      1.3
--- hook_home.inc.php   11 Mar 2002 01:16:18 -0000      1.4
***************
*** 16,35 ****
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $phpgw->common->phpgw_exit();
        }
        unset($d1);
  
!       $tmp_app_inc = $phpgw->common->get_inc_dir('felamimail');
  
        if 
($phpgw_info['user']['preferences']['felamimail']['mainscreen_showmail'] == 
True)
        {
                // ----  Create the base email Msg Class    -----
!               $phpgw->msg = CreateObject("email.mail_msg");
                $args_array = Array();
                $args_array['folder'] = 'INBOX';
                $args_array['do_login'] = True;
!               $phpgw->msg->begin_request($args_array);
  
!               if (!$phpgw->msg->mailsvr_stream)
                {
                        $error_msg = '<b>Mail error:</b> Can not open 
connection to mail server';
--- 16,35 ----
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
        unset($d1);
  
!       $tmp_app_inc = $GLOBALS['phpgw']->common->get_inc_dir('felamimail');
  
        if 
($phpgw_info['user']['preferences']['felamimail']['mainscreen_showmail'] == 
True)
        {
                // ----  Create the base email Msg Class    -----
!               $GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
                $args_array = Array();
                $args_array['folder'] = 'INBOX';
                $args_array['do_login'] = True;
!               $GLOBALS['phpgw']->msg->begin_request($args_array);
  
!               if (!$GLOBALS['phpgw']->msg->mailsvr_stream)
                {
                        $error_msg = '<b>Mail error:</b> Can not open 
connection to mail server';
***************
*** 42,46 ****
                                .'</td>'."\r\n"
                        .'</tr>'."\r\n";
!                       //$phpgw->common->phpgw_exit(True);
                }
                else
--- 42,46 ----
                                .'</td>'."\r\n"
                        .'</tr>'."\r\n";
!                       //$GLOBALS['phpgw']->common->phpgw_exit(True);
                }
                else
***************
*** 48,52 ****
                        /*  // this is the structure you will get
                          $inbox_data['is_imap'] boolean - pop3 server do not 
know what is "new" or not
!                         $inbox_data['folder_checked'] string - the folder 
checked, as processed by the msg class
                          $inbox_data['alert_string'] string - what to show the 
user about this inbox check
                          $inbox_data['number_new'] integer - for IMAP is 
number "unseen"; for pop3 is number messages
--- 48,52 ----
                        /*  // this is the structure you will get
                          $inbox_data['is_imap'] boolean - pop3 server do not 
know what is "new" or not
!                         $inbox_data['folder_checked'] string - the folder 
checked, as processed by the msg class
                          $inbox_data['alert_string'] string - what to show the 
user about this inbox check
                          $inbox_data['number_new'] integer - for IMAP is 
number "unseen"; for pop3 is number messages
***************
*** 54,58 ****
                        */
                        $inbox_data = Array();
!                       $inbox_data = $phpgw->msg->new_message_check();
  
                        $title = '<font color="FFFFFF">'.lang('EMail').' 
'.$inbox_data['alert_string'].'</font>';
--- 54,58 ----
                        */
                        $inbox_data = Array();
!                       $inbox_data = 
$GLOBALS['phpgw']->msg->new_message_check();
  
                        $title = '<font color="FFFFFF">'.lang('EMail').' 
'.$inbox_data['alert_string'].'</font>';
***************
*** 75,84 ****
                        {
                                $msg_array = array();
!                               $msg_array = $phpgw->msg->get_message_list();
                        }
                        for($i=0; $i<$check_msgs; $i++)
                        {
!                               $msg = 
$phpgw->dcom->header($phpgw->msg->mailsvr_stream,$msg_array[$i]);
!                               $subject = $phpgw->msg->get_subject($msg,'');
                                if (strlen($subject) > 65)
                                {
--- 75,84 ----
                        {
                                $msg_array = array();
!                               $msg_array = 
$GLOBALS['phpgw']->msg->get_message_list();
                        }
                        for($i=0; $i<$check_msgs; $i++)
                        {
!                               $msg = 
$GLOBALS['phpgw']->dcom->header($GLOBALS['phpgw']->msg->mailsvr_stream,$msg_array[$i]);
!                               $subject = 
$GLOBALS['phpgw']->msg->get_subject($msg,'');
                                if (strlen($subject) > 65)
                                {
***************
*** 87,100 ****
                                $linkData = array
                                (
!                                       'mailbox'       => 
$phpgw->msg->prep_folder_out(''),
                                        'passed_id'     => $msg_array[$i],
                                        'startMessage'  => 1,
                                        'show_more'     => 0
                                );
!                               $portalbox->data[$i] = 
array($subject,$phpgw->link('/felamimail/read_body.php',$linkData));
                        }
                        // ADD FOLDER LISTBOX TO HOME PAGE (Needs to be 
TEMPLATED)
                        // Does This Mailbox Support Folders (i.e. more than 
just INBOX)?
!                       if ($phpgw->msg->get_mailsvr_supports_folders() == 
False)
                        {
                                $switchbox_tablerow = '';
--- 87,100 ----
                                $linkData = array
                                (
!                                       'mailbox'       => 
$GLOBALS['phpgw']->msg->prep_folder_out(''),
                                        'passed_id'     => $msg_array[$i],
                                        'startMessage'  => 1,
                                        'show_more'     => 0
                                );
!                               $portalbox->data[$i] = 
array($subject,$GLOBALS['phpgw']->link('/felamimail/read_body.php',$linkData));
                        }
                        // ADD FOLDER LISTBOX TO HOME PAGE (Needs to be 
TEMPLATED)
                        // Does This Mailbox Support Folders (i.e. more than 
just INBOX)?
!                       if 
($GLOBALS['phpgw']->msg->get_mailsvr_supports_folders() == False)
                        {
                                $switchbox_tablerow = '';
***************
*** 107,114 ****
                                $switchbox_listbox = '<select name="mailbox" 
onChange="document.switchbox.submit()">'
                                                . '<option>' . lang('switch 
current folder to') . ':'
!                                               . 
$phpgw->msg->all_folders_listbox('','','',$listbox_show_unseen)
                                                . '</select>';
                                // make it another TR we can insert
!                               $switchbox_action = 
$phpgw->link('/felamimail/index.php');
                                $switchbox_tablerow = 
                                        '<tr>'."\r\n"
--- 107,114 ----
                                $switchbox_listbox = '<select name="mailbox" 
onChange="document.switchbox.submit()">'
                                                . '<option>' . lang('switch 
current folder to') . ':'
!                                               . 
$GLOBALS['phpgw']->msg->all_folders_listbox('','','',$listbox_show_unseen)
                                                . '</select>';
                                // make it another TR we can insert
!                               $switchbox_action = 
$GLOBALS['phpgw']->link('/felamimail/index.php');
                                $switchbox_tablerow = 
                                        '<tr>'."\r\n"
***************
*** 121,125 ****
                                        .'</tr>'."\r\n";
                        }
!                       $phpgw->msg->end_request();
                        // output the portalbox and (if applicable) the folders 
listbox below it
                        echo '<!-- start Mailbox info -->'."\r\n"
--- 121,125 ----
                                        .'</tr>'."\r\n";
                        }
!                       $GLOBALS['phpgw']->msg->end_request();
                        // output the portalbox and (if applicable) the folders 
listbox below it
                        echo '<!-- start Mailbox info -->'."\r\n"