[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.84,1.85
|
From: |
Dan Kuykendall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.84,1.85 class.boicalendar.inc.php,1.19,1.20 class.bopreferences.inc.php,1.6,1.7 class.uicalendar.inc.php,1.88,1.89 hook_email.inc.php,1.3,1.4 hook_home.inc.php,1.34,1.35 hook_home_day.inc.php,1.1,1.2 hook_home_month.inc.php,1.1,1.2 hook_home_week.inc.php,1.1,1.2 hook_home_year.inc.php,1.1,1.2 |
|
Date: |
Sat, 28 Sep 2002 16:01:45 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv27342/calendar/inc
Modified Files:
class.bocalendar.inc.php class.boicalendar.inc.php
class.bopreferences.inc.php class.uicalendar.inc.php
hook_email.inc.php hook_home.inc.php hook_home_day.inc.php
hook_home_month.inc.php hook_home_week.inc.php
hook_home_year.inc.php
Log Message:
removed common->phpgw_exit() and fixed all references to it in the core apps
and api
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** class.bocalendar.inc.php 21 Sep 2002 21:50:30 -0000 1.84
--- class.bocalendar.inc.php 28 Sep 2002 20:01:43 -0000 1.85
***************
*** 567,571 ****
)
);
!
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
$overlapping_events = False;
--- 567,571 ----
)
);
! exit;
}
$overlapping_events = False;
***************
*** 576,580 ****
{
ExecMethod('calendar.uicalendar.index');
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 576,581 ----
{
ExecMethod('calendar.uicalendar.index');
!
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
***************
*** 733,737 ****
)
);
!
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 734,738 ----
)
);
! exit;
}
***************
*** 766,770 ****
)
);
!
$GLOBALS['phpgw']->common->phpgw_exit(True);
}
else
--- 767,771 ----
)
);
! exit;
}
else
***************
*** 796,800 ****
{
Execmethod('calendar.uicalendar.index');
! // $GLOBALS['phpgw']->common->phpgw_exit();
}
}
--- 797,802 ----
{
Execmethod('calendar.uicalendar.index');
! //
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! // exit;
}
}
Index: class.boicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.boicalendar.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.boicalendar.inc.php 24 Jun 2002 23:24:24 -0000 1.19
--- class.boicalendar.inc.php 28 Sep 2002 20:01:43 -0000 1.20
***************
*** 2904,2908 ****
)
);
! $GLOBALS['phpwg']->common->phpgw_exit();
}
$uploaddir =
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;
--- 2904,2909 ----
)
);
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
$uploaddir =
$GLOBALS['phpgw_info']['server']['temp_dir'] . SEP;
***************
*** 2941,2945 ****
)
);
! $GLOBALS['phpwg']->common->phpgw_exit();
}
--- 2942,2947 ----
)
);
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
***************
*** 3203,3207 ****
)
);
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 3205,3210 ----
)
);
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bopreferences.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.bopreferences.inc.php 21 Sep 2002 21:50:30 -0000 1.6
--- class.bopreferences.inc.php 28 Sep 2002 20:01:43 -0000 1.7
***************
*** 100,104 ****
Header('Location:
'.$GLOBALS['phpgw']->link('/preferences/index.php'));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
}
--- 100,105 ----
Header('Location:
'.$GLOBALS['phpgw']->link('/preferences/index.php'));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
}
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** class.uicalendar.inc.php 22 Sep 2002 12:24:45 -0000 1.88
--- class.uicalendar.inc.php 28 Sep 2002 20:01:43 -0000 1.89
***************
*** 289,293 ****
{
Header('Location: '. $this->page('',$params));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 289,294 ----
{
Header('Location: '. $this->page('',$params));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
***************
*** 643,647 ****
{
echo lang('Invalid entry id.').'</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 644,648 ----
{
echo lang('Invalid entry id.').'</center>'."\n";
! exit;
}
***************
*** 649,653 ****
{
echo lang('You do not have permission to read
this record!').'</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 650,654 ----
{
echo lang('You do not have permission to read
this record!').'</center>'."\n";
! exit;
}
***************
*** 657,661 ****
{
echo lang("Sorry, this event does not
exist").'.'.'</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 658,662 ----
{
echo lang("Sorry, this event does not
exist").'.'.'</center>'."\n";
! exit;
}
***************
*** 686,690 ****
{
echo '</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 687,691 ----
{
echo '</center>'."\n";
! exit;
}
***************
*** 847,851 ****
{
Header('Location:
'.$this->page('view','&cal_id='.$cal_id));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
if(@isset($GLOBALS['HTTP_POST_VARS']['edit_type']) &&
$GLOBALS['HTTP_POST_VARS']['edit_type'] == 'single')
--- 848,853 ----
{
Header('Location:
'.$this->page('view','&cal_id='.$cal_id));
!
$GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
if(@isset($GLOBALS['HTTP_POST_VARS']['edit_type']) &&
$GLOBALS['HTTP_POST_VARS']['edit_type'] == 'single')
***************
*** 879,883 ****
{
Header('Location: '.$this->index());
! $GLOBALS['phpgw']->common->phpgw_exit();
}
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
--- 881,886 ----
{
Header('Location: '.$this->index());
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
***************
*** 926,930 ****
Header('Location: '.$this->index());
! $GLOBALS['phpgw']->common->phpgw_exit();
}
}
--- 929,934 ----
Header('Location: '.$this->index());
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
}
***************
*** 953,957 ****
{
echo lang('Invalid entry id.').'</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 957,961 ----
{
echo lang('Invalid entry id.').'</center>'."\n";
! exit;
}
***************
*** 959,963 ****
{
echo lang('You do not have permission to read
this record!').'</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 963,967 ----
{
echo lang('You do not have permission to read
this record!').'</center>'."\n";
! exit;
}
***************
*** 967,976 ****
{
echo lang('Sorry, this event does not
exist').'.'.'</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
elseif(!isset($event['recur_exception']))
{
echo lang('Sorry, this event does not have
exceptions defined').'.'.'</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 971,980 ----
{
echo lang('Sorry, this event does not
exist').'.'.'</center>'."\n";
! exit;
}
elseif(!isset($event['recur_exception']))
{
echo lang('Sorry, this event does not have
exceptions defined').'.'.'</center>'."\n";
! exit;
}
***************
*** 981,985 ****
{
echo '</center>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit(True);
}
--- 985,989 ----
{
echo '</center>'."\n";
! exit;
}
***************
*** 1047,1051 ****
}
Header('Location:
'.$this->page('',($cd?'&cd='.$cd:'')));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 1051,1056 ----
}
Header('Location:
'.$this->page('',($cd?'&cd='.$cd:'')));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
***************
*** 1108,1112 ****
{
Header('Location:
'.$this->page('','&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day)));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 1113,1118 ----
{
Header('Location:
'.$this->page('','&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day)));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
***************
*** 1140,1144 ****
}
Header('Location:
'.$this->page('','&date='.$date.($cd?'&cd='.$cd:'')));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 1146,1151 ----
}
Header('Location:
'.$this->page('','&date='.$date.($cd?'&cd='.$cd:'')));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
***************
*** 1261,1265 ****
Header('Location: '.$this->page('',''));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 1268,1273 ----
Header('Location: '.$this->page('',''));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
***************
*** 2053,2057 ****
// attempt to send them back to where they
where.
Header('Location: ' .
$GLOBALS['phpgw']->link($from));
! $GLOBALS['phpgw']->common->phpgw_exit();
}
--- 2061,2066 ----
// attempt to send them back to where they
where.
Header('Location: ' .
$GLOBALS['phpgw']->link($from));
! $GLOBALS['phpgw_info']['flags']['nodisplay'] =
True;
! exit;
}
Index: hook_email.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_email.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hook_email.inc.php 1 Aug 2001 11:06:17 -0000 1.3
--- hook_email.inc.php 28 Sep 2002 20:01:43 -0000 1.4
***************
*** 21,25 ****
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $phpgw->common->phpgw_exit();
}
unset($d1);
--- 21,26 ----
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
unset($d1);
Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** hook_home.inc.php 19 Aug 2002 12:42:06 -0000 1.34
--- hook_home.inc.php 28 Sep 2002 20:01:43 -0000 1.35
***************
*** 19,23 ****
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit();
}
unset($d1);
--- 19,24 ----
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
unset($d1);
Index: hook_home_day.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_day.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** hook_home_day.inc.php 5 Nov 2001 03:48:14 -0000 1.1
--- hook_home_day.inc.php 28 Sep 2002 20:01:43 -0000 1.2
***************
*** 19,23 ****
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit();
}
unset($d1);
--- 19,24 ----
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
unset($d1);
Index: hook_home_month.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_month.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** hook_home_month.inc.php 5 Nov 2001 03:48:14 -0000 1.1
--- hook_home_month.inc.php 28 Sep 2002 20:01:43 -0000 1.2
***************
*** 19,23 ****
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit();
}
unset($d1);
--- 19,24 ----
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
unset($d1);
Index: hook_home_week.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_week.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** hook_home_week.inc.php 5 Nov 2001 03:48:14 -0000 1.1
--- hook_home_week.inc.php 28 Sep 2002 20:01:43 -0000 1.2
***************
*** 19,23 ****
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit();
}
unset($d1);
--- 19,24 ----
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
unset($d1);
Index: hook_home_year.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home_year.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** hook_home_year.inc.php 5 Nov 2001 03:48:14 -0000 1.1
--- hook_home_year.inc.php 28 Sep 2002 20:01:43 -0000 1.2
***************
*** 19,23 ****
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw']->common->phpgw_exit();
}
unset($d1);
--- 19,24 ----
{
echo 'Failed attempt to break in via an old Security
Hole!<br>'."\n";
! $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
! exit;
}
unset($d1);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.84,1.85 class.boicalendar.inc.php,1.19,1.20 class.bopreferences.inc.php,1.6,1.7 class.uicalendar.inc.php,1.88,1.89 hook_email.inc.php,1.3,1.4 hook_home.inc.php,1.34,1.35 hook_home_day.inc.php,1.1,1.2 hook_home_month.inc.php,1.1,1.2 hook_home_week.inc.php,1.1,1.2 hook_home_year.inc.php,1.1,1.2,
Dan Kuykendall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: todo/inc class.bopreferences.inc.php,1.3,1.4 class.ui.inc.php,1.18,1.19 hook_home.inc.php,1.4,1.5
- Next 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
- Previous by thread:
[Phpgroupware-cvs] CVS: todo/inc class.bopreferences.inc.php,1.3,1.4 class.ui.inc.php,1.18,1.19 hook_home.inc.php,1.4,1.5
- Next 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
- Index(es):