[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.Template.inc.php,1.26,1.27 cl
|
From: |
Dan Kuykendall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.Template.inc.php,1.26,1.27 class.app_registry.inc.php,1.9,1.10 class.common.inc.php,1.157,1.158 class.db_mssql.inc.php,1.22,1.23 class.db_mysql.inc.php,1.34,1.35 class.db_pgsql.inc.php,1.31,1.32 class.error.inc.php,1.10,1.11 class.msg_base_sock.inc.php,1.2,1.3 class.msg_imap_sock.inc.php,1.2,1.3 class.msg_pop3_sock.inc.php,1.2,1.3 class.portalbox.inc.php,1.8,1.9 functions.inc.php,1.154,1.155 xml_functions.inc.php,1.27,1.28 |
|
Date: |
Sat, 28 Sep 2002 16:01:47 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv27342/phpgwapi/inc
Modified Files:
class.Template.inc.php class.app_registry.inc.php
class.common.inc.php class.db_mssql.inc.php
class.db_mysql.inc.php class.db_pgsql.inc.php
class.error.inc.php class.msg_base_sock.inc.php
class.msg_imap_sock.inc.php class.msg_pop3_sock.inc.php
class.portalbox.inc.php functions.inc.php
xml_functions.inc.php
Log Message:
removed common->phpgw_exit() and fixed all references to it in the core apps
and api
Index: class.Template.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.Template.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.Template.inc.php 30 May 2002 21:13:07 -0000 1.26
--- class.Template.inc.php 28 Sep 2002 20:01:44 -0000 1.27
***************
*** 482,486 ****
}
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 482,487 ----
}
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
Index: class.app_registry.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.app_registry.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.app_registry.inc.php 1 Mar 2002 10:34:12 -0000 1.9
--- class.app_registry.inc.php 28 Sep 2002 20:01:44 -0000 1.10
***************
*** 170,179 ****
{
echo '<p>IO error:
'.$this->client->errstr.'</p>';
! $GLOBALS['phpgw']->common->phpgw_exit();
}
if ($resp->faultCode())
{
echo '<p>There was an error:
'.$resp->faultCode().' '.$resp->faultString().'</p>';
! $GLOBALS['phpgw']->common->phpgw_exit();
}
return xmlrpc_decode($resp->value());
--- 170,181 ----
{
echo '<p>IO error:
'.$this->client->errstr.'</p>';
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
if ($resp->faultCode())
{
echo '<p>There was an error:
'.$resp->faultCode().' '.$resp->faultString().'</p>';
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
return xmlrpc_decode($resp->value());
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -r1.157 -r1.158
*** class.common.inc.php 28 Sep 2002 15:20:19 -0000 1.157
--- class.common.inc.php 28 Sep 2002 20:01:44 -0000 1.158
***************
*** 302,327 ****
}
- // 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
--- 302,305 ----
***************
*** 1519,1526 ****
$this->phpgw_appfooter();
}
- $GLOBALS['phpgw']->db->disconnect();
$this->phpgw_header();
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
}
/* Clean up mcrypt */
--- 1497,1505 ----
$this->phpgw_appfooter();
}
$this->phpgw_header();
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
}
+
+ $GLOBALS['phpgw']->db->disconnect();
/* Clean up mcrypt */
***************
*** 1537,1541 ****
}
}
- // echo 'an app is trying to run the phpgw_footer() more
than once<br>';
}
--- 1516,1519 ----
Index: class.db_mssql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_mssql.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.db_mssql.inc.php 15 Feb 2002 01:25:20 -0000 1.22
--- class.db_mssql.inc.php 28 Sep 2002 20:01:44 -0000 1.23
***************
*** 357,361 ****
{
echo "<p><b>Session halted.</b>";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
}
--- 357,361 ----
{
echo "<p><b>Session halted.</b>";
! exit;
}
}
Index: class.db_mysql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_mysql.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.db_mysql.inc.php 17 Apr 2002 15:31:53 -0000 1.34
--- class.db_mysql.inc.php 28 Sep 2002 20:01:44 -0000 1.35
***************
*** 562,566 ****
{
echo '<p><b>Session halted.</b>';
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
}
--- 562,566 ----
{
echo '<p><b>Session halted.</b>';
! exit;
}
}
Index: class.db_pgsql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.db_pgsql.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.db_pgsql.inc.php 10 Feb 2002 12:04:10 -0000 1.31
--- class.db_pgsql.inc.php 28 Sep 2002 20:01:44 -0000 1.32
***************
*** 541,545 ****
{
echo $s;
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
}
--- 541,545 ----
{
echo $s;
! exit;
}
}
Index: class.error.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.error.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.error.inc.php 12 Jan 2002 22:12:40 -0000 1.10
--- class.error.inc.php 28 Sep 2002 20:01:44 -0000 1.11
***************
*** 109,113 ****
// Commit stack to log
$GLOBALS['phpgw']->log->commit();
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
}
--- 109,113 ----
// Commit stack to log
$GLOBALS['phpgw']->log->commit();
! exit;
}
}
Index: class.msg_base_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg_base_sock.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.msg_base_sock.inc.php 26 May 2002 20:09:01 -0000 1.2
--- class.msg_base_sock.inc.php 28 Sep 2002 20:01:44 -0000 1.3
***************
*** 381,385 ****
echo 'Error: '.$this->error['code'].' :
'.$this->error['msg'].' - '.$this->error['desc']."<br>\r\n";
$this->close();
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 381,386 ----
echo 'Error: '.$this->error['code'].' :
'.$this->error['msg'].' - '.$this->error['desc']."<br>\r\n";
$this->close();
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
***************
*** 1067,1071 ****
if ($i==count($str)-1 && $str[$i] == "`")
{
! $GLOBALS['phpgw']->common->phpgw_exit();
}
$pos=1;
--- 1068,1073 ----
if ($i==count($str)-1 && $str[$i] == "`")
{
!
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
$pos=1;
Index: class.msg_imap_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg_imap_sock.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.msg_imap_sock.inc.php 26 May 2002 20:19:16 -0000 1.2
--- class.msg_imap_sock.inc.php 28 Sep 2002 20:01:44 -0000 1.3
***************
*** 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.msg_pop3_sock.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg_pop3_sock.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.msg_pop3_sock.inc.php 26 May 2002 20:32:54 -0000 1.2
--- class.msg_pop3_sock.inc.php 28 Sep 2002 20:01:44 -0000 1.3
***************
*** 120,124 ****
{
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();
--- 120,125 ----
{
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.portalbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.portalbox.inc.php 27 Sep 2002 23:41:49 -0000 1.8
--- class.portalbox.inc.php 28 Sep 2002 20:01:44 -0000 1.9
***************
*** 73,77 ****
{
echo 'Programming Error:
'.$this->getvar('classname').'->getvar('.$var.')!<br>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit();
}
//echo "Var = ".$var."<br>\n";
--- 73,78 ----
{
echo 'Programming Error:
'.$this->getvar('classname').'->getvar('.$var.')!<br>'."\n";
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
//echo "Var = ".$var."<br>\n";
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -r1.154 -r1.155
*** functions.inc.php 28 Sep 2002 15:20:19 -0000 1.154
--- functions.inc.php 28 Sep 2002 20:01:44 -0000 1.155
***************
*** 578,582 ****
$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);
}
}
--- 578,582 ----
$continue_app_data = False;
$GLOBALS['phpgw']->template->set_var('phpgw_body',"user has no rights to this
app!!!<br>\n");
! exit;
}
}
Index: xml_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/xml_functions.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** xml_functions.inc.php 1 Mar 2002 10:34:12 -0000 1.27
--- xml_functions.inc.php 28 Sep 2002 20:01:44 -0000 1.28
***************
*** 116,120 ****
Header('Content-length: ' . strlen($payload));
print $payload;
! $GLOBALS['phpgw']->common->phpgw_exit(False);
}
--- 116,121 ----
Header('Content-length: ' . strlen($payload));
print $payload;
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.Template.inc.php,1.26,1.27 class.app_registry.inc.php,1.9,1.10 class.common.inc.php,1.157,1.158 class.db_mssql.inc.php,1.22,1.23 class.db_mysql.inc.php,1.34,1.35 class.db_pgsql.inc.php,1.31,1.32 class.error.inc.php,1.10,1.11 class.msg_base_sock.inc.php,1.2,1.3 class.msg_imap_sock.inc.php,1.2,1.3 class.msg_pop3_sock.inc.php,1.2,1.3 class.portalbox.inc.php,1.8,1.9 functions.inc.php,1.154,1.155 xml_functions.inc.php,1.27,1.28,
Dan Kuykendall <address@hidden> <=
- Prev by Date:
[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
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.13,1.14
- Previous by thread:
[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
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.13,1.14
- Index(es):