holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed common->phpgw_exit() and fixed all references to it in the core apps and api

Browse Source
This commit is contained in:
seek3r 2002-09-28 20:01:44 +00:00
parent d8bf8e6ba6
commit 86032f02dd
46 changed files with 154 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/inc/class.uiXport.inc.php
View File

@ -180,7 +180,8 @@
$GLOBALS['phpgw']->common->phpgw_header();
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();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$buffer = $this->bo->export($conv_type,$cat_id);

18
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -713,7 +713,8 @@
Header('Location: '
. $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $ab_id . '&referer=' . $referer));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw']->template->set_file(array('add' => 'add.tpl'));
@ -766,7 +767,8 @@
. $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id=' . $_fields['ab_id'] . '&referer=' . $referer)
);
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
/* First, make sure they have permission to this entry */
@ -776,7 +778,8 @@
($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']))
{
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
/* Read in user custom fields, if any */
@ -836,7 +839,8 @@
$check[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id']))
{
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw']->template->set_file(array('delete' => 'delete.tpl'));
@ -874,13 +878,15 @@
if((!$perms) && ($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']))
{
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
if(!$ab_id)
{
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw']->template->set_file(array('view_t' => 'view.tpl'));

12
addressbook/inc/class.uifields.inc.php
View File

@ -35,7 +35,8 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw']->template->set_file(array(
@ -118,7 +119,8 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$field = $GLOBALS['HTTP_POST_VARS']['field'];
@ -194,7 +196,8 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$field = $GLOBALS['HTTP_POST_VARS']['field'] ? $GLOBALS['HTTP_POST_VARS']['field'] : $GLOBALS['HTTP_GET_VARS']['field'];
@ -287,7 +290,8 @@
{
$GLOBALS['phpgw']->common->phpgw_header();
echo lang('access not permitted');
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$field = $GLOBALS['HTTP_POST_VARS']['field'] ? $GLOBALS['HTTP_POST_VARS']['field'] : $GLOBALS['HTTP_GET_VARS']['field'];

6
addressbook/inc/class.uivcard.inc.php
View File

@ -80,7 +80,8 @@
if(!$ab_id)
{
Header('Location: ' . $GLOBALS['phpgw']->link('/addressbook/index.php'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
// First, make sure they have permission to this entry
@ -95,7 +96,8 @@
if((!$perms) && ($check[0]['owner'] != $GLOBALS['phpgw_info']['user']['account_id']))
{
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.get_list'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$extrafields = array('address2' => 'address2');

3
addressbook/inc/hook_home.inc.php
View File

@ -15,7 +15,8 @@
if($d1 == 'htt' || $d1 == 'ftp' )
{
echo "Failed attempt to break in via an old Security Hole!<br>\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

3
addressbook/inc/hook_notifywindow.inc.php
View File

@ -15,7 +15,8 @@
if($d1 == 'htt' || $d1 == 'ftp' )
{
echo "Failed attempt to break in via an old Security Hole!<br>\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

12
admin/inc/class.boaccounts.inc.php
View File

@ -117,7 +117,8 @@
$GLOBALS['phpgw']->db->unlock();
Header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function delete_user()
@ -579,7 +580,8 @@
if($GLOBALS['phpgw']->acl->check('group_access',16,'admin') || $GLOBALS['HTTP_POST_VARS']['cancel'])
{
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
elseif($GLOBALS['HTTP_POST_VARS']['submit'])
{
@ -599,7 +601,8 @@
}
}
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function validate_group($group_info)
@ -632,7 +635,8 @@
{
$ui = createobject('admin.uiaccounts');
$ui->create_edit_group($group_info,$errors);
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
}

3
admin/inc/class.boapplications.inc.php
View File

@ -90,6 +90,7 @@
}
}
Header('Location: '.$GLOBALS['phpgw']->link('/admin/index.php'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
}

9
admin/inc/class.uiapplications.inc.php
View File

@ -196,7 +196,8 @@
));
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
else
{
@ -288,7 +289,8 @@
));
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
}
@ -342,7 +344,8 @@
{
$this->bo->delete($app_name);
Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw']->common->phpgw_header();

3
admin/inc/class.uiconfig.inc.php
View File

@ -137,7 +137,8 @@
{
$GLOBALS['phpgw']->session->appsession('session_data','admin_config',-1);
Header('Location: ' . $_redir);
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
}

12
calendar/inc/class.bocalendar.inc.php
View File

@ -566,7 +566,7 @@
'readsess' => 1
)
);
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
$overlapping_events = False;
}
@ -575,7 +575,8 @@
if((!$l_cal['id'] && !$this->check_perms(PHPGW_ACL_ADD)) || ($l_cal['id'] && !$this->check_perms(PHPGW_ACL_EDIT,$l_cal['id'])))
{
ExecMethod('calendar.uicalendar.index');
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
print_debug('prior to fix_update_time()');
@ -732,7 +733,7 @@
'readsess' => 1
)
);
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
if($event['id'])
@ -765,7 +766,7 @@
'this_event' => $event
)
);
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
else
{
@ -795,7 +796,8 @@
if($send_to_ui)
{
Execmethod('calendar.uicalendar.index');
// $GLOBALS['phpgw']->common->phpgw_exit();
// $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
// exit;
}
}
}

9
calendar/inc/class.boicalendar.inc.php
View File

@ -2903,7 +2903,8 @@ class boicalendar
)
)
);
$GLOBALS['phpwg']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$uploaddir = $GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;
@ -2940,7 +2941,8 @@ class boicalendar
)
)
);
$GLOBALS['phpwg']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
if(!is_object($GLOBALS['uicalendar']))
@ -3202,7 +3204,8 @@ class boicalendar
)
)
);
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function export($l_event_id=0)

3
calendar/inc/class.bopreferences.inc.php
View File

@ -99,7 +99,8 @@
$GLOBALS['phpgw']->preferences->save_repository(True);
Header('Location: '.$GLOBALS['phpgw']->link('/preferences/index.php'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
}
}

45
calendar/inc/class.uicalendar.inc.php
View File

@ -288,7 +288,8 @@
function index($params='')
{
Header('Location: '. $this->page('',$params));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function printer_friendly($body)
@ -642,13 +643,13 @@
if ($cal_id < 1)
{
echo lang('Invalid entry id.').'</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
if(!$this->bo->check_perms(PHPGW_ACL_READ,$cal_id))
{
echo lang('You do not have permission to read this record!').'</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
$event = $this->bo->read_entry($cal_id);
@ -656,7 +657,7 @@
if(!isset($event['id']))
{
echo lang("Sorry, this event does not exist").'.'.'</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
$this->bo->repeating_events = Array();
@ -685,7 +686,7 @@
if($ret_value == '<center>'.lang('You do not have permission to read this record!').'</center>')
{
echo '</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
$p = CreateObject('phpgwapi.Template',$this->template_dir);
@ -846,7 +847,8 @@
if(!$this->bo->can_user_edit($event))
{
Header('Location: '.$this->page('view','&cal_id='.$cal_id));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
if(@isset($GLOBALS['HTTP_POST_VARS']['edit_type']) && $GLOBALS['HTTP_POST_VARS']['edit_type'] == 'single')
{
@ -878,7 +880,8 @@
if(!isset($GLOBALS['HTTP_POST_VARS']['cal_id']) || !$GLOBALS['HTTP_POST_VARS']['cal_id'])
{
Header('Location: '.$this->index());
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
@ -925,7 +928,8 @@
}
Header('Location: '.$this->index());
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
}
@ -952,13 +956,13 @@
if ($cal_id < 1)
{
echo lang('Invalid entry id.').'</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
if(!$this->bo->check_perms(PHPGW_ACL_READ))
{
echo lang('You do not have permission to read this record!').'</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
$event = $this->bo->read_entry($cal_id);
@ -966,12 +970,12 @@
if(!isset($event['id']))
{
echo lang('Sorry, this event does not exist').'.'.'</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
elseif(!isset($event['recur_exception']))
{
echo lang('Sorry, this event does not have exceptions defined').'.'.'</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
$ret_value = $this->view_event($event,True);
@ -980,7 +984,7 @@
if($ret_value == '<center>'.lang('You do not have permission to read this record!').'</center>')
{
echo '</center>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
$p = CreateObject('phpgwapi.Template',$this->template_dir);
@ -1046,7 +1050,8 @@
echo '<!-- Return Value = '.$cd.' -->'."\n";
}
Header('Location: '.$this->page('',($cd?'&cd='.$cd:'')));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function add($cd=0,$readsess=0)
@ -1107,7 +1112,8 @@
if(!$cal_id)
{
Header('Location: '.$this->page('','&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day)));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$date = sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day);
@ -1139,7 +1145,8 @@
$cd = '';
}
Header('Location: '.$this->page('','&date='.$date.($cd?'&cd='.$cd:'')));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function day()
@ -1260,7 +1267,8 @@
$this->bo->set_status(intval($GLOBALS['HTTP_GET_VARS']['cal_id']),intval($GLOBALS['HTTP_GET_VARS']['action']));
Header('Location: '.$this->page('',''));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function planner()
@ -2052,7 +2060,8 @@
// If we reach this, it is because they didn't search for anything,
// attempt to send them back to where they where.
Header('Location: ' . $GLOBALS['phpgw']->link($from));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($GLOBALS['phpgw_info']['flags']['noheader']);

3
calendar/inc/hook_email.inc.php
View File

@ -20,7 +20,8 @@
if($d1 == 'htt' || $d1 == 'ftp')
{
echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
$phpgw->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

3
calendar/inc/hook_home.inc.php
View File

@ -18,7 +18,8 @@
if($d1 == 'htt' || $d1 == 'ftp' )
{
echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

3
calendar/inc/hook_home_day.inc.php
View File

@ -18,7 +18,8 @@
if($d1 == 'htt' || $d1 == 'ftp' )
{
echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

3
calendar/inc/hook_home_month.inc.php
View File

@ -18,7 +18,8 @@
if($d1 == 'htt' || $d1 == 'ftp' )
{
echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

3
calendar/inc/hook_home_week.inc.php
View File

@ -18,7 +18,8 @@
if($d1 == 'htt' || $d1 == 'ftp' )
{
echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

3
calendar/inc/hook_home_year.inc.php
View File

@ -18,7 +18,8 @@
if($d1 == 'htt' || $d1 == 'ftp' )
{
echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
unset($d1);

3
calendar/index.php
View File

@ -37,5 +37,6 @@
);
Header('Location: '.$GLOBALS['phpgw']->link('/index.php',$parms));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
?>

3
calendar/preferences.php
View File

@ -88,7 +88,8 @@
$phpgw->preferences->save_repository(True);
Header('Location: '.$phpgw->link('/preferences/index.php'));
$phpgw->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function display_item($field,$data)

3
etemplate/doc/et_media/index.php
View File

@ -20,4 +20,5 @@
include('../header.inc.php');
header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction=et_media.et_media.edit'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;

5
etemplate/doc/etemplate.html
View File

@ -146,7 +146,8 @@ Create the file <b>/et_media/index.php</b> with the following content:</p>
include('../header.inc.php');
header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction=et_media.et_media.edit'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
</pre>
<h2>7. the code of class.et_media.inc.php</h2>
@ -483,4 +484,4 @@ a new version automaticaly.</p>
<h2><i>That's it</i> - please <a href="mailto:RalfBecker@outdoor-training.de">contact me</a> if you have further questions or comments about the tutorial</h2>
</body>
</html>
</html>

8
etemplate/inc/class.uietemplate_gtk.inc.php
View File

@ -171,14 +171,14 @@
}
/*
* Called when the window is being destroyed: destroy the session and let phpgw_exit close the db-connection
* Called when the window is being destroyed: destroy the session
*/
function destroy()
{
Gtk::main_quit();
$GLOBALS['phpgw']->session->destroy($GLOBALS['phpgw_info']['user']['sessionid'],$GLOBALS['phpgw_info']['user']['kp3']);
$GLOBALS['phpgw']->common->phpgw_exit();
exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
function button_clicked(&$var,$form_name)
@ -775,4 +775,4 @@
}
return $hbox ? $hbox : $widget;
}
};
};

3
etemplate/index.php
View File

@ -20,5 +20,6 @@
include('../header.inc.php');
header('Location: '.$GLOBALS['phpgw']->link('/index.php','menuaction=etemplate.editor.edit'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
?>

3
etemplate/phpGtk_test.php
View File

@ -41,4 +41,5 @@ $GLOBALS['phpgw_info']['flags']['currentapp'] = 'etemplate';
ExecMethod('etemplate.db_tools.edit');
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;

3
phpgwapi/inc/class.Template.inc.php
View File

@ -481,7 +481,8 @@
echo('<b>Halted.</b>');
}
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
/* public, override: haltmsg($msg)

6
phpgwapi/inc/class.app_registry.inc.php
View File

@ -169,12 +169,14 @@
if (!$resp)
{
echo '<p>IO error: '.$this->client->errstr.'</p>';
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
if ($resp->faultCode())
{
echo '<p>There was an error: '.$resp->faultCode().' '.$resp->faultString().'</p>';
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
return xmlrpc_decode($resp->value());
}

26
phpgwapi/inc/class.common.inc.php
View File

@ -301,28 +301,6 @@
return $ds;
}
// This function is used if the developer wants to stop a running app in the middle of execution
// We may need to do some clean up before hand
/*!
@function phpgw_exit
@abstract function to stop running an app
@discussion used to stop running an app in the middle of execution <br>
There may need to be some cleanup before hand
@param $call_footer boolean value to if true then call footer else exit
*/
function phpgw_exit($call_footer = False)
{
if ($call_footer)
{
$this->phpgw_footer();
}
else
{
$GLOBALS['phpgw']->db->disconnect();
}
exit;
}
/*!
@function randomstring
@abstract return a random string of size $size
@ -1518,10 +1496,11 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
{
$this->phpgw_appfooter();
}
$GLOBALS['phpgw']->db->disconnect();
$this->phpgw_header();
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
}
$GLOBALS['phpgw']->db->disconnect();
/* Clean up mcrypt */
if (@is_object($GLOBALS['phpgw']->crypto))
@ -1536,7 +1515,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
echo 'Page loaded in ' . ($GLOBALS['debug_timer_stop'] - $GLOBALS['debug_timer_start']) . ' seconds.';
}
}
// echo 'an app is trying to run the phpgw_footer() more than once<br>';
}
function hex2bin($data)

2
phpgwapi/inc/class.db_mssql.inc.php
View File

@ -356,7 +356,7 @@
if($this->Halt_On_Error != "report")
{
echo "<p><b>Session halted.</b>";
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
}

2
phpgwapi/inc/class.db_mysql.inc.php
View File

@ -561,7 +561,7 @@
if($this->Halt_On_Error != 'report')
{
echo '<p><b>Session halted.</b>';
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
}

2
phpgwapi/inc/class.db_pgsql.inc.php
View File

@ -540,7 +540,7 @@
else
{
echo $s;
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
}

2
phpgwapi/inc/class.error.inc.php
View File

@ -108,7 +108,7 @@
echo "</center>";
// Commit stack to log
$GLOBALS['phpgw']->log->commit();
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
}
}

6
phpgwapi/inc/class.msg_base_sock.inc.php
View File

@ -380,7 +380,8 @@
{
echo 'Error: '.$this->error['code'].' : '.$this->error['msg'].' - '.$this->error['desc']."<br>\r\n";
$this->close();
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
// REDUNDANT FUNCTION FROM NON-SOCK CLASS
@ -1066,7 +1067,8 @@
{
if ($i==count($str)-1 && $str[$i] == "`")
{
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$pos=1;
$d=0;

3
phpgwapi/inc/class.msg_imap_sock.inc.php
View File

@ -381,7 +381,8 @@
if (!$this->open_port($server,$port,15))
{
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();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
else
{

3
phpgwapi/inc/class.msg_pop3_sock.inc.php
View File

@ -119,7 +119,8 @@
if (!$this->open_port($server,$port,15))
{
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();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$this->read_port();
if(!$this->msg2socket('USER '.$user,"^\+ok",&$response) || !$this->msg2socket('PASS '.$pass,"^\+ok",&$response))

3
phpgwapi/inc/class.portalbox.inc.php
View File

@ -72,7 +72,8 @@
if ($var=='' || !isset($this->$var))
{
echo 'Programming Error: '.$this->getvar('classname').'->getvar('.$var.')!<br>'."\n";
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
//echo "Var = ".$var."<br>\n";
//echo $var." = ".$this->$var."<br>\n";

2
phpgwapi/inc/functions.inc.php
View File

@ -577,7 +577,7 @@
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Access not permitted']=False;
$continue_app_data = False;
$GLOBALS['phpgw']->template->set_var('phpgw_body',"user has no rights to this app!!!<br>\n");
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
}
if($continue_app_data)

3
phpgwapi/inc/xml_functions.inc.php
View File

@ -115,7 +115,8 @@
Header('Content-type: text/xml');
Header('Content-length: ' . strlen($payload));
print $payload;
$GLOBALS['phpgw']->common->phpgw_exit(False);
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
// used to store state during parsing

3
preferences/changepassword.php
View File

@ -26,7 +26,8 @@
if (! $GLOBALS['phpgw']->acl->check('changepassword', 1))
{
Header('Location: ' . $GLOBALS['phpgw']->link('/preferences/index.php/'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw']->template->set_file(array(

3
preferences/changeprofile.php
View File

@ -23,7 +23,8 @@
if ($GLOBALS['phpgw_info']['user']['permissions']['anonymous'])
{
Header('Location: ' . $GLOBALS['phpgw']->link('/'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
if ($submit)

2
preferences/inc/class.uiaclprefs.inc.php
View File

@ -56,7 +56,7 @@
if ($GLOBALS['phpgw_info']['server']['deny_user_grants_access'])
{
echo '<center><b>' . lang('Access not permitted') . '</b></center>';
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
/*

3
preferences/preferences.php
View File

@ -275,7 +275,8 @@
}
Header('Location: ' . $GLOBALS['phpgw']->link('/preferences/index.php'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
}
$GLOBALS['phpgw']->common->phpgw_header();

5
set_box.php
View File

@ -22,7 +22,6 @@
// if(basename($HTTP_REFERER) != 'home.php')
// {
// Header('Location: '.$GLOBALS['phpgw']->link('/home.php'));
// $GLOBALS['phpgw']->common->phpgw_exit();
// }
// $GLOBALS['phpgw']->preferences->delete('portal_order');
@ -103,6 +102,6 @@
}
Header('Location: '.$GLOBALS['phpgw']->link('/home.php'));
$GLOBALS['phpgw']->common->phpgw_exit();
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
exit;
?>

2
setup/inc/class.Template.inc.php
View File

@ -437,7 +437,7 @@
echo('<b>Halted.</b>');
}
$GLOBALS['phpgw']->common->phpgw_exit(True);
exit;
}
/* public, override: haltmsg($msg)