diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-12-18 22:34:09 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-12-18 22:34:09 +0000 |
| commit | 3096c1e2f1f8f755e795c2766d15a339696e800d (patch) | |
| tree | 6a9a9ac09515a636d82ce926731b0a2cfb1eb765 /modules | |
| parent | 302b267e93928d3777681a81e2b47d463cfed49a (diff) | |
| download | calendar-3096c1e2f1f8f755e795c2766d15a339696e800d.tar.gz calendar-3096c1e2f1f8f755e795c2766d15a339696e800d.tar.bz2 calendar-3096c1e2f1f8f755e795c2766d15a339696e800d.zip | |
merge recent changes into HEAD
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mod_calendar.php | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/modules/mod_calendar.php b/modules/mod_calendar.php index 27f0a1c..cc7840c 100644 --- a/modules/mod_calendar.php +++ b/modules/mod_calendar.php @@ -1,28 +1,15 @@ <?php -/** - * @version $Header: /cvsroot/bitweaver/_bit_calendar/modules/mod_calendar.php,v 1.6 2005/12/18 08:50:01 lsces Exp $ - * @package calendar - * @subpackage modules - */ - -/** - * Required setup - */ include_once( CALENDAR_PKG_PATH.'Calendar.php' ); $cal = new Calendar(); // set up the todate -if( !empty( $_REQUEST['todate'] ) ) { +if( !empty( $_REQUEST["todate"] ) ) { // clean up todate. who knows where this has come from - if ( is_numeric( $_REQUEST['todate'] ) ) { - $_SESSION['calendar']['focus_date'] = $_REQUEST['todate'] = $cal->mDate->gmmktime( 0, 0, 0, $cal->mDate->date( 'm', $_REQUEST['todate'] ), $cal->mDate->date( 'd', $_REQUEST['todate'] ), $cal->mDate->date( 'Y', $_REQUEST['todate'] ) ); - } else { - $_SESSION['calendar']['focus_date'] = $_REQUEST['todate'] = $cal->mDate->gmmktime( 0, 0, 0, $cal->mDate->date2( 'm', $_REQUEST['todate'] ), $cal->mDate->date2( 'd', $_REQUEST['todate'] ), $cal->mDate->date2( 'Y', $_REQUEST['todate'] ) ); - } + $_SESSION['calendar']['focus_date'] = $_REQUEST['todate'] = adodb_mktime( 0, 0, 0, adodb_date( 'm', $_REQUEST['todate'] ), adodb_date( 'd', $_REQUEST['todate'] ), adodb_date( 'Y', $_REQUEST['todate'] ) ); } elseif( !empty( $_SESSION['calendar']['focus_date'] ) ) { $_REQUEST["todate"] = $_SESSION['calendar']['focus_date']; } else { - $_SESSION['calendar']['focus_date'] = $cal->mDate->gmmktime( 0, 0, 0, $cal->mDate->date( 'm' ), $cal->mDate->date( 'd' ), $cal->mDate->date( 'Y' ) ); + $_SESSION['calendar']['focus_date'] = adodb_mktime( 0, 0, 0, adodb_date( 'm' ), adodb_date( 'd' ), adodb_date( 'Y' ) ); $_REQUEST["todate"] = $_SESSION['calendar']['focus_date']; } |