Major revamp of calendar to push functionality from index.php into the

calendar so that other packages can more easily use the calendar.
Made the time limit functions in LibertyContent::getContentList more
generic.

1 files changed, 9 insertions, 117 deletions

diff --git a/index.php b/index.php
index 8381556..f3b0618 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-// $Header: /cvsroot/bitweaver/_bit_calendar/index.php,v 1.54 2007/07/10 18:59:10 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_calendar/index.php,v 1.55 2007/09/30 15:47:40 nickpalmer Exp $
 
 // Copyright( c ) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -13,57 +13,14 @@ $gBitSystem->isPackageActive( 'calendar', TRUE );
 
 $gBitSystem->verifyPermission( 'p_calendar_view' );
 
-// set up $_SESSION and $_REQUEST to make the usable later on
-// setup list of bit items displayed
-if( !empty( $_REQUEST["content_type_guid"] ) ) {
-	if( $gBitUser->isRegistered() ) {
-		$gBitUser->storePreference( 'calendar_default_guids', serialize( $_REQUEST['content_type_guid'] ) );
-	}
-	$_SESSION['calendar']['content_type_guid'] = $_REQUEST["content_type_guid"];
-} elseif( !isset( $_SESSION['calendar']['content_type_guid'] ) && $gBitUser->getPreference( 'calendar_default_guids' ) && $gBitUser->isRegistered() ) {
-	$_SESSION['calendar']['content_type_guid'] = unserialize( $gBitUser->getPreference( 'calendar_default_guids' ) );
-} elseif( !isset( $_SESSION['calendar']['content_type_guid'] ) ) {
-	$_SESSION['calendar']['content_type_guid'] = array();
-} elseif( isset( $_REQUEST["refresh"] ) && !isset( $_REQUEST["content_type_guid"] ) ) {
-	$_SESSION['calendar']['content_type_guid'] = array();
-}
-
-foreach( $gLibertySystem->mContentTypes as $cType ) {
-	$contentTypes[$cType['content_type_guid']] = $cType['content_description'];
-}
-asort($contentTypes);
-$gBitSmarty->assign( 'calContentTypes', $contentTypes );
-
 // now, lets get the ball rolling!
 $gCalendar = new Calendar();
 
-// set up the 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'] = $gCalendar->mDate->gmmktime( 0, 0, 0, $gCalendar->mDate->date( 'm', $_REQUEST['todate'], true ), $gCalendar->mDate->date( 'd', $_REQUEST['todate'], true ), $gCalendar->mDate->date( 'Y', $_REQUEST['todate'], true ) );
-	} else {
-		$_SESSION['calendar']['focus_date'] = $_REQUEST['todate'] = $gCalendar->mDate->gmmktime( 0, 0, 0, $gCalendar->mDate->date2( 'm', $_REQUEST['todate'], true ), $gCalendar->mDate->date2( 'd', $_REQUEST['todate'], true ), $gCalendar->mDate->date2( 'Y', $_REQUEST['todate'], true ) );
-	}
-} elseif( !empty( $_SESSION['calendar']['focus_date'] ) ) {
-	$_REQUEST["todate"] = $_SESSION['calendar']['focus_date'];
-} else {
-	$_SESSION['calendar']['focus_date'] = $gCalendar->mDate->gmmktime( 0, 0, 0, $gCalendar->mDate->date( 'm' ), $gCalendar->mDate->date( 'd' ), $gCalendar->mDate->date( 'Y' ) );
-	$_REQUEST["todate"] = $_SESSION['calendar']['focus_date'];
-}
-
-$focus = $_REQUEST['todate'];
-if( !empty( $_REQUEST["view_mode"] ) ) {
-	$_SESSION['calendar']['view_mode'] = $_REQUEST["view_mode"];
-} elseif( empty( $_SESSION['calendar']['view_mode'] ) ) {
-	$_SESSION['calendar']['view_mode'] = 'month';
-}
-
-$gBitSmarty->assign( 'navigation', $gCalendar->buildCalendarNavigation( $_SESSION['calendar'] ) );
-$calMonth = $gCalendar->buildCalendar( $_SESSION['calendar'] );
-$calDay = $gCalendar->buildDay( $_SESSION['calendar'] );
+// Handle the request hash storing into the session.
+$gCalendar->processRequestHash($_REQUEST, $_SESSION['calendar']);
 
-if( $gBitUser->hasPermission("p_calendar_view_changes") && $_SESSION['calendar']['content_type_guid'] ) {	
+// Setup which content types we want to view.
+if( $gBitUser->hasPermission("p_calendar_view_changes") && $_SESSION['calendar']['content_type_guid'] ) {
 	$listHash = $_SESSION['calendar'];
 } else {
 	foreach ($gLibertySystem->mContentTypes as $key => $val) {
@@ -72,74 +29,9 @@ if( $gBitUser->hasPermission("p_calendar_view_changes") && $_SESSION['calendar']
 		}
 	}
 }
-if (!empty($listHash)) {
-	$listHash['user_id'] = !empty( $_REQUEST['user_id'] ) ?	$_REQUEST['user_id'] : NULL;
-	$listHash['sort_mode'] = !empty( $_REQUEST['sort_mode'] ) ? $_REQUEST['sort_mode'] : 'event_time_asc';
-	$listHash['offset'] = 0;
-	$listHash['max_records'] = 500;
-	$bitEvents = $gCalendar->getList( $listHash );
-} else {
-	$bitEvents = array();
-}
-
-// finally we have all the stuff ready to populate the $calMonth and $calDay arrays
-foreach( $calMonth as $w => $week ) {
-	foreach( $week as $d => $day ) {
-		$dayEvents = array();
-		if( !empty( $bitEvents[$day['day']] ) ) {
-			$i = 0;
-			foreach( $bitEvents[$day['day']] as $bitEvent ) {
-				$dayEvents[$i] = $bitEvent;
-				if (!$gBitSystem->isFeatureActive('calendar_ajax_popups')) {
-					$gBitSmarty->assign( 'cellHash', $bitEvent );
-					$dayEvents[$i]["over"] = $gBitSmarty->fetch( "bitpackage:calendar/calendar_box.tpl" );
-				}
-
-				// populate $calDay array with events
-				if( !empty ( $bitEvent ) && $_SESSION['calendar']['view_mode'] == 'day' ) {
-					foreach( $calDay as $key => $t ) {
-						// special case - last item entry in array - check this first
-						
-						if( $bitEvent['timestamp'] >= $calDay[$key]['time']  && empty( $calDay[$key + 1]['time'] ) ) {
-							$calDay[$key]['items'][] = $dayEvents[$i];
-						} elseif( $bitEvent['timestamp'] >= $calDay[$key]['time'] && $bitEvent['timestamp'] <= $calDay[$key + 1]['time'] ) {
-							$calDay[$key]['items'][] = $dayEvents[$i];
-						}
-					}
-				}
-
-				$i++;
-			}
-		}
-		if( !empty( $dayEvents ) ) {
-			$calMonth[$w][$d]['items'] = array_values( $dayEvents );
-		}
-	}
-}
-$gBitSmarty->assign_by_ref( 'calDay', $calDay );
-$gBitSmarty->assign_by_ref( 'calMonth', $calMonth );
-
-// set up daynames for the calendar
-$dayNames = array(
-	tra( "Monday" ),
-	tra( "Tuesday" ),
-	tra( "Wednesday" ),
-	tra( "Thursday" ),
-	tra( "Friday" ),
-	tra( "Saturday" ),
-	tra( "Sunday" ),
-);
-
-// depending on what day we want to view first, we need to adjust the dayNames array
-for( $i = 0; $i < WEEK_OFFSET; $i++ ) {
-	$pop = array_pop( $dayNames );
-	array_unshift( $dayNames, $pop );
-}
-$gBitSmarty->assign( 'dayNames', $dayNames );
-$gBitThemes->loadAjax( 'prototype' );
-
-// TODO: make this a pref
-$gBitSmarty->assign( 'trunc', $gBitSystem->getConfig( 'title_truncate', 12 ) );
+// Build the calendar
+$gCalendar->buildCalendar($listHash, $_SESSION['calendar']);
+// And display it with a nice title.
+$gCalendar->display(tra('Calendar'));
 
-$gBitSystem->display( 'bitpackage:calendar/calendar.tpl', tra( 'Calendar' ) );
 ?>