[Phpgroupware-cvs] CVS: email/inc class.mail_dcom_base_sock.inc.php,1.21,1.22 class.mail_dcom_imap_sock.inc.php,1.12,1.13 class.mail_dcom_pop3_sock.inc.php,1.17,1.18 class.mail_msg_base.inc.php,1.74,1.75 functions.inc.php,1.113,1.114 hook_home.inc.php,1.52,1.53 hook_notifywindow.inc.php,1.8,1.9 hook_notifywindow_simple.inc.php,1.6,1.7

[Dan Kuykendall <address@hidden>]

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

Modified Files:
        class.mail_dcom_base_sock.inc.php 
        class.mail_dcom_imap_sock.inc.php 
        class.mail_dcom_pop3_sock.inc.php class.mail_msg_base.inc.php 
        functions.inc.php hook_home.inc.php hook_notifywindow.inc.php 
        hook_notifywindow_simple.inc.php 
Log Message:
removed common->phpgw_exit() and fixed all references to it in the core apps 
and api

Index: class.mail_dcom_base_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_base_sock.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.mail_dcom_base_sock.inc.php   28 Dec 2001 11:55:52 -0000      1.21
--- class.mail_dcom_base_sock.inc.php   28 Sep 2002 20:01:43 -0000      1.22
***************
*** 379,383 ****
                        echo 'Error: '.$this->error['code'].' : 
'.$this->error['msg'].' - '.$this->error['desc']."<br>\r\n";
                        $this->close();
!                       $GLOBALS['phpgw']->common->phpgw_exit();
                }
                
--- 379,384 ----
                        echo 'Error: '.$this->error['code'].' : 
'.$this->error['msg'].' - '.$this->error['desc']."<br>\r\n";
                        $this->close();
!                       $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
!                       exit;
                }
                
***************
*** 1065,1069 ****
                                if ($i==count($str)-1 && $str[$i] == "`")
                                {
!                                       $GLOBALS['phpgw']->common->phpgw_exit();
                                }
                                $pos=1;
--- 1066,1071 ----
                                if ($i==count($str)-1 && $str[$i] == "`")
                                {
!                                       
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
!                                       exit;
                                }
                                $pos=1;

Index: class.mail_dcom_imap_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_imap_sock.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.mail_dcom_imap_sock.inc.php   14 Dec 2001 21:45:37 -0000      1.12
--- class.mail_dcom_imap_sock.inc.php   28 Sep 2002 20:01:43 -0000      1.13
***************
*** 382,386 ****
                        {
                                echo '<p><center><b>' .lang('There was an error 
trying to connect to your IMAP server.<br>Please contact your admin to check 
the servername, username or password.') .'</b></center>';
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        else
--- 382,387 ----
                        {
                                echo '<p><center><b>' .lang('There was an error 
trying to connect to your IMAP server.<br>Please contact your admin to check 
the servername, username or password.') .'</b></center>';
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
                        else

Index: class.mail_dcom_pop3_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_pop3_sock.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.mail_dcom_pop3_sock.inc.php   14 Dec 2001 21:45:37 -0000      1.17
--- class.mail_dcom_pop3_sock.inc.php   28 Sep 2002 20:01:43 -0000      1.18
***************
*** 140,144 ****
                        {
                                echo '<p><center><b>' . lang('There was an 
error trying to connect to your POP3 server.<br>Please contact your admin to 
check the servername, username or password.').'</b></center>';
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
                        $this->read_port();
--- 140,145 ----
                        {
                                echo '<p><center><b>' . lang('There was an 
error trying to connect to your POP3 server.<br>Please contact your admin to 
check the servername, username or password.').'</b></center>';
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
                        $this->read_port();

Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** class.mail_msg_base.inc.php 17 Sep 2002 02:47:35 -0000      1.74
--- class.mail_msg_base.inc.php 28 Sep 2002 20:01:43 -0000      1.75
***************
*** 1215,1219 ****
                  ."imap_last_error: ".$error_report."<br> \r\n"
                  . "</b></center></p>";
!               $GLOBALS['phpgw']->common->phpgw_exit(True);
        }
  
--- 1215,1219 ----
                  ."imap_last_error: ".$error_report."<br> \r\n"
                  . "</b></center></p>";
!               exit;
        }
  

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/functions.inc.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** functions.inc.php   22 Aug 2002 03:10:15 -0000      1.113
--- functions.inc.php   28 Sep 2002 20:01:43 -0000      1.114
***************
*** 18,22 ****
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
        unset($d1);
--- 18,23 ----
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
!               exit;
        }
        unset($d1);
***************
*** 254,258 ****
                {
                        
$GLOBALS['phpgw']->msg->login_error('email_(slash)_functions.inc.php');
!                       // this exits the script, calling 
$GLOBALS['phpgw']->common->phpgw_exit(True);
                }
        }
--- 255,259 ----
                {
                        
$GLOBALS['phpgw']->msg->login_error('email_(slash)_functions.inc.php');
!                       // this exits the script
                }
        }

Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_home.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** hook_home.inc.php   23 Apr 2002 03:22:19 -0000      1.52
--- hook_home.inc.php   28 Sep 2002 20:01:43 -0000      1.53
***************
*** 16,20 ****
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
        unset($d1);
--- 16,21 ----
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
!               exit;
        }
        unset($d1);

Index: hook_notifywindow.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_notifywindow.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** hook_notifywindow.inc.php   11 Feb 2002 21:25:39 -0000      1.8
--- hook_notifywindow.inc.php   28 Sep 2002 20:01:43 -0000      1.9
***************
*** 16,20 ****
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
        unset($d1);
--- 16,21 ----
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
!               exit;
        }
        unset($d1);

Index: hook_notifywindow_simple.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_notifywindow_simple.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** hook_notifywindow_simple.inc.php    4 Mar 2002 00:56:56 -0000       1.6
--- hook_notifywindow_simple.inc.php    28 Sep 2002 20:01:43 -0000      1.7
***************
*** 16,20 ****
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
        unset($d1);
--- 16,21 ----
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
!               exit;
        }
        unset($d1);