phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: addressbook/inc class.uiXport.inc.php,1.17,1.18


From: Dan Kuykendall <address@hidden>
Subject: [Phpgroupware-cvs] CVS: addressbook/inc class.uiXport.inc.php,1.17,1.18 class.uiaddressbook.inc.php,1.49,1.50 class.uifields.inc.php,1.7,1.8 class.uivcard.inc.php,1.9,1.10 hook_home.inc.php,1.16,1.17 hook_notifywindow.inc.php,1.5,1.6
Date: Sat, 28 Sep 2002 16:01:45 -0400

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

Modified Files:
        class.uiXport.inc.php class.uiaddressbook.inc.php 
        class.uifields.inc.php class.uivcard.inc.php hook_home.inc.php 
        hook_notifywindow.inc.php 
Log Message:
removed common->phpgw_exit() and fixed all references to it in the core apps 
and api

Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiXport.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uiXport.inc.php       28 Sep 2002 15:20:18 -0000      1.17
--- class.uiXport.inc.php       28 Sep 2002 20:01:43 -0000      1.18
***************
*** 181,185 ****
                                        echo lang('<b>No conversion type 
&lt;none&gt; could be located.</b>  Please choose a conversion type from the 
list');
                                        echo '&nbsp<a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')
 . '">' . lang('OK') . '</a>';
!                                       $GLOBALS['phpgw']->common->phpgw_exit();
                                }
  
--- 181,186 ----
                                        echo lang('<b>No conversion type 
&lt;none&gt; could be located.</b>  Please choose a conversion type from the 
list');
                                        echo '&nbsp<a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiXport.export')
 . '">' . lang('OK') . '</a>';
!                                       
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
!                                       exit;
                                }
  

Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** class.uiaddressbook.inc.php 16 Sep 2002 00:08:38 -0000      1.49
--- class.uiaddressbook.inc.php 28 Sep 2002 20:01:43 -0000      1.50
***************
*** 714,718 ****
                                Header('Location: '
                                        . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 . $ab_id . '&referer=' . $referer));
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 714,719 ----
                                Header('Location: '
                                        . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 . $ab_id . '&referer=' . $referer));
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 767,771 ****
                                );
  
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 768,773 ----
                                );
  
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 777,781 ****
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 779,784 ----
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 837,841 ****
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 840,845 ----
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 875,879 ****
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 879,884 ----
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 881,885 ****
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 886,891 ----
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  

Index: class.uifields.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uifields.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uifields.inc.php      31 May 2002 18:13:07 -0000      1.7
--- class.uifields.inc.php      28 Sep 2002 20:01:43 -0000      1.8
***************
*** 36,40 ****
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 36,41 ----
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 119,123 ****
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 120,125 ----
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 195,199 ****
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 197,202 ----
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 288,292 ****
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 291,296 ----
                                $GLOBALS['phpgw']->common->phpgw_header();
                                echo lang('access not permitted');
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  

Index: class.uivcard.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uivcard.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uivcard.inc.php       28 Sep 2002 15:20:18 -0000      1.9
--- class.uivcard.inc.php       28 Sep 2002 20:01:43 -0000      1.10
***************
*** 81,85 ****
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/addressbook/index.php'));
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 81,86 ----
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/addressbook/index.php'));
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  
***************
*** 96,100 ****
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
!                               $GLOBALS['phpgw']->common->phpgw_exit();
                        }
  
--- 97,102 ----
                        {
                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
!                               $GLOBALS['phpgw_info']['flags']['nodisplay'] = 
True;
!                               exit;
                        }
  

Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/hook_home.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** hook_home.inc.php   19 Aug 2002 12:42:06 -0000      1.16
--- hook_home.inc.php   28 Sep 2002 20:01:43 -0000      1.17
***************
*** 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/addressbook/inc/hook_notifywindow.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** hook_notifywindow.inc.php   4 Dec 2001 01:13:34 -0000       1.5
--- hook_notifywindow.inc.php   28 Sep 2002 20:01:43 -0000      1.6
***************
*** 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);





reply via email to

[Prev in Thread] Current Thread [Next in Thread]