progress on recurrence

6 files changed, 157 insertions, 128 deletions

diff --git a/functions/init/date_range.php b/functions/init/date_range.php
index 565d0d1..b957b75 100644
--- a/functions/init/date_range.php
+++ b/functions/init/date_range.php
@@ -31,9 +31,9 @@ switch ($current_view){
 	case 'week':
 	case 'day':
 		$mArray_begin = mktime (0,0,0,$start_month,21,($start_year));
-		$mArray_end = mktime (0,0,0,$end_month,12,($end_year));
+		$mArray_end = mktime (0,0,0,$end_month,31,($end_year));
 		break;
 	default:
 		$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
-		$mArray_end = mktime (0,0,0,1,12,($this_year + 1));
+		$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
 }
diff --git a/functions/list_functions.php b/functions/list_functions.php
index 8a6344d..0ec2474 100644
--- a/functions/list_functions.php
+++ b/functions/list_functions.php
@@ -48,11 +48,11 @@ function list_months() {
 
 
 function list_years() {
-	global $getdate, $this_year, $cal, $num_years;
+	global $getdate, $this_year, $cal, $phpiCal_config;
 	$year_time = strtotime($getdate);
 	$return = '';
-	for ($i=0; $i < $num_years; $i++) {
-		$offset = $num_years - $i;
+	for ($i=0; $i < $phpiCal_config->num_years; $i++) {
+		$offset = $phpiCal_config->num_years - $i;
 		$prev_time = strtotime("-$offset year", $year_time);
 		$prev_date = date("Ymd", $prev_time);
 		$prev_year = date("Y", $prev_time);
@@ -63,7 +63,7 @@ function list_years() {
 	$getdate_year = date("Y", $year_time);
 	$return .= "<option value=\"year.php?cal=$cal&amp;getdate=$getdate_date\" selected=\"selected\">$getdate_year</option>\n";
 	
-	for ($i=0; $i < $num_years; $i++) {
+	for ($i=0; $i < $phpiCal_config->num_years; $i++) {
 		$offset = $i + 1;
 		$next_time = strtotime("+$offset year", $year_time);
 		$next_date = date("Ymd", $next_time);
diff --git a/functions/parse/end_vevent.php b/functions/parse/end_vevent.php
index de8539f..54c0c9a 100644
--- a/functions/parse/end_vevent.php
+++ b/functions/parse/end_vevent.php
@@ -189,8 +189,7 @@ foreach ($rrule_array as $key => $val) {
 $recur = @$recur_array[($start_date)][($hour.$minute)][$uid]['recur']; 
 
 /* ============================ Load $recur_data ============================
-$recur_data is an array of unix times for instances of an event.  This code handles repeats.
-Note that dates with exceptions are counted as instances.
+$recur_data is an array of unix times for days of recurrences of an event.  This code handles repeats at the day level or above.  The next loop handles the times.
 RDATE is currently not supported
 
 A. Set up the time range to scan for events.
@@ -210,22 +209,26 @@ Note that start_range_unixtime and end_range_unixtime are not the same as start_
 
 $end_range_unixtime = $mArray_end+60*60*24;
 $start_date_unixtime = strtotime($start_date);
-$next_range_unixtime = $start_date_unixtime;			
+$next_range_unixtime = $start_date_unixtime;
+
+#conditions where we can not iterate over the whole range
+if($count == 1000000 && $interval == 1) $next_range_unixtime = $mArray_begin;
+// if the beginning of our range is less than the start of the item, we may as well set it equal to it
+if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime;
+
 if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime;
+if($freq_type == 'year') $end_range_unixtime	+= 366*24*60*60;
 if(!isset($rrule_array['FREQ'])){ 
 	$end_range_unixtime = strtotime($end_date);
 	$count = 1;
 }
-// if the beginning of our range is less than the start of the item, we may as well set it equal to it
-if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime;
-	
 // convert wkst to a 3 char day for strtotime to work		
 $wkst3char = two2threeCharDays($wkst);
 
 /* The while loop below increments $next_range_time by $freq type. For the larger freq types, there is only 
 one $next_range_time per repeat, but the BYXXX rules may write more than one event in that repeat cycle
 $next_date_time handles those instances within a $freq_type */
-#echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tstart range time:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."</pre>";
+echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tstart range time:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n";
 $recur_data = array();
 while ($next_range_unixtime <= $end_range_unixtime && $count > 0) {
 	$year = date('Y', $next_range_unixtime); 
@@ -242,17 +245,17 @@ while ($next_range_unixtime <= $end_range_unixtime && $count > 0) {
 			add_recur(expand_byday($next_range_unixtime));
 			break;
 		case 'month':
-			$times = expand_bymonthday(array($next_range_unixtime));
+			$time = mktime(12,0,0,$month,date("d",$start_unixtime),$year);
+			$times = expand_bymonthday(array($time));
 			foreach($times as $time){ 
 				add_recur(expand_byday($time));
 			}
 			break;
 		case 'year':
-			$times = expand_bymonth($next_range_unixtime);
-			$times = expand_byweekno($times);
+			$times = expand_bymonth($next_range_unixtime); 
+			$times = expand_byweekno($times); 
 			$times = expand_byyearday($times);
 			$times = expand_bymonthday($times);
-			
 			foreach($times as $time){ 
 				add_recur(expand_byday($time));
 			}
@@ -261,16 +264,12 @@ while ($next_range_unixtime <= $end_range_unixtime && $count > 0) {
 			add_recur($start_unixtime);
 			break 2;
 	}
-	$next_range_unixtime = strtotime('+'.$interval.' '.$freq_type, $next_range_unixtime); 
+	$next_range_unixtime = strtotime('+'.$interval.' '.$freq_type, $next_range_unixtime); echo "\nnext $interval $freq_type".date("Ymd",$next_range_unixtime)."\n";
 } #end while loop
 sort($recur_data);
-echo "<pre>$summary recur_data:";
-#var_dump($recur_data);
-foreach($recur_data as $time) echo "\n".date("Ymd his",$time);
-echo "</pre>";
 
-# use recur_data array to write the master array
-// use the same code to write the data instead of always changing it 5 times						
+/* ============================ Use $recur_data array to write the master array ============================*/
+// This used to use 5 different blocks to write the array... can it be reduced further?						
 $recur_data_hour = @substr($start_unixtime,0,2);
 $recur_data_minute = @substr($start_unixtime,2,2);
 foreach($recur_data as $recur_data_unixtime) {
@@ -278,90 +277,55 @@ foreach($recur_data as $recur_data_unixtime) {
 	$recur_data_month = date('m', $recur_data_unixtime);
 	$recur_data_day = date('d', $recur_data_unixtime);
 	$recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day;
-	if ( !in_array($recur_data_date, $except_dates) ) {
-		if (isset($allday_start) && $allday_start != '') {
-			$start_time2 = $recur_data_unixtime;
-			$end_time2 = strtotime('+'.$diff_allday_days.' days', $recur_data_unixtime);
-			while ($start_time2 < $end_time2) {
-				$start_date2 = date('Ymd', $start_time2);
-				$master_array[($start_date2)][('-1')][$uid] = array (
-					'event_text' => $summary, 
-					'description' => $description, 
-					'location' => $location, 
-					'organizer' => serialize($organizer), 
-					'attendee' => serialize($attendee), 
-					'calnumber' => $calnumber, 
-					'calname' => $actual_calname, 
-					'url' => $url, 
-					'status' => $status, 
-					'class' => $class, 
-					'recur' => $recur );
-				$start_time2 = strtotime('+1 day', $start_time2);
-			}
-		} else {
-			$start_unixtime_tmp = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year);
-			$end_unixtime_tmp = $start_unixtime_tmp + $length;
-			
-			if (($end_time >= $phpiCal_config->bleed_time) && ($bleed_check == '-1')) {
-				$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
-				$end_date_tmp = date('Ymd',$end_unixtime_tmp);
-				while ($start_tmp < $end_unixtime_tmp) {
-					$start_date_tmp = date('Ymd',$start_tmp);
-					if ($start_date_tmp == $recur_data_year.$recur_data_month.$recur_data_day) {
-						$time_tmp = $hour.$minute;
-						$start_time_tmp = $start_time;
-					} else {
-						$time_tmp = '0000';
-						$start_time_tmp = '0000';
-					}
-					if ($start_date_tmp == $end_date_tmp) {
-						$end_time_tmp = $end_time;
-					} else {
-						$end_time_tmp = '2400';
-						$display_end_tmp = $end_time;
-					}
-					
-					// Let's double check the until to not write past it
-					$until_check = $start_date_tmp.$time_tmp.'00'; 
-					if ($abs_until > $until_check) {
-						$master_array[$start_date_tmp][$time_tmp][$uid] = array (
-							'event_start' => $start_time_tmp, 
-							'event_end' => $end_time_tmp, 
-							'start_unixtime' => $start_unixtime_tmp, 
-							'end_unixtime' => $end_unixtime_tmp, 
-							'event_text' => $summary, 
-							'event_length' => $length, 
-							'event_overlap' => 0, 
-							'description' => $description, 
-							'status' => $status, 
-							'class' => $class, 
-							'spans_day' => true, 
-							'location' => $location, 
-							'organizer' => serialize($organizer), 
-							'attendee' => serialize($attendee), 
-							'calnumber' => $calnumber, 
-							'calname' => $actual_calname, 
-							'url' => $url, 
-							'recur' => $recur);
-						if (isset($display_end_tmp)){
-							$master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp;
-						}
-						checkOverlap($start_date_tmp, $time_tmp, $uid);
-					}
-					$start_tmp = strtotime('+1 day',$start_tmp);
+
+	if (isset($allday_start) && $allday_start != '') {
+		$start_time2 = $recur_data_unixtime;
+		$end_time2 = strtotime('+'.$diff_allday_days.' days', $recur_data_unixtime);
+		while ($start_time2 < $end_time2) {
+			$start_date2 = date('Ymd', $start_time2);
+			$master_array[($start_date2)][('-1')][$uid] = array (
+				'event_text' => $summary, 
+				'description' => $description, 
+				'location' => $location, 
+				'organizer' => serialize($organizer), 
+				'attendee' => serialize($attendee), 
+				'calnumber' => $calnumber, 
+				'calname' => $actual_calname, 
+				'url' => $url, 
+				'status' => $status, 
+				'class' => $class, 
+				'recur' => $recur );
+			$start_time2 = strtotime('+1 day', $start_time2);
+		}
+	} else {
+		$start_unixtime_tmp = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year);
+		$end_unixtime_tmp = $start_unixtime_tmp + $length;
+		
+		if (($end_time >= $phpiCal_config->bleed_time) && ($bleed_check == '-1')) {
+			$start_tmp = strtotime(date('Ymd',$start_unixtime_tmp));
+			$end_date_tmp = date('Ymd',$end_unixtime_tmp);
+			while ($start_tmp < $end_unixtime_tmp) {
+				$start_date_tmp = date('Ymd',$start_tmp);
+				if ($start_date_tmp == $recur_data_year.$recur_data_month.$recur_data_day) {
+					$time_tmp = $hour.$minute;
+					$start_time_tmp = $start_time;
+				} else {
+					$time_tmp = '0000';
+					$start_time_tmp = '0000';
 				}
-			} else {
-				if ($bleed_check == '-1') {
+				if ($start_date_tmp == $end_date_tmp) {
+					$end_time_tmp = $end_time;
+				} else {
+					$end_time_tmp = '2400';
 					$display_end_tmp = $end_time;
-					$end_time_tmp1 = '2400';
-						
 				}
-				if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
-			
+				
 				// Let's double check the until to not write past it
-					$master_array[($recur_data_date)][($hour.$minute)][$uid] = array (
-						'event_start' => $start_time, 
-						'event_end' => $end_time_tmp1, 
+				$until_check = $start_date_tmp.$time_tmp.'00'; 
+				if ($abs_until > $until_check) {
+					$master_array[$start_date_tmp][$time_tmp][$uid] = array (
+						'event_start' => $start_time_tmp, 
+						'event_end' => $end_time_tmp, 
 						'start_unixtime' => $start_unixtime_tmp, 
 						'end_unixtime' => $end_unixtime_tmp, 
 						'event_text' => $summary, 
@@ -370,7 +334,7 @@ foreach($recur_data as $recur_data_unixtime) {
 						'description' => $description, 
 						'status' => $status, 
 						'class' => $class, 
-						'spans_day' => false, 
+						'spans_day' => true, 
 						'location' => $location, 
 						'organizer' => serialize($organizer), 
 						'attendee' => serialize($attendee), 
@@ -379,13 +343,48 @@ foreach($recur_data as $recur_data_unixtime) {
 						'url' => $url, 
 						'recur' => $recur);
 					if (isset($display_end_tmp)){
-						$master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp;
+						$master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp;
 					}
-					checkOverlap($recur_data_date, ($hour.$minute), $uid);
-				
+					checkOverlap($start_date_tmp, $time_tmp, $uid);
+				}
+				$start_tmp = strtotime('+1 day',$start_tmp);
+			}
+		} else {
+			if ($bleed_check == '-1') {
+				$display_end_tmp = $end_time;
+				$end_time_tmp1 = '2400';
+					
 			}
+			if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time;
+		
+			// Let's double check the until to not write past it
+				$master_array[($recur_data_date)][($hour.$minute)][$uid] = array (
+					'event_start' => $start_time, 
+					'event_end' => $end_time_tmp1, 
+					'start_unixtime' => $start_unixtime_tmp, 
+					'end_unixtime' => $end_unixtime_tmp, 
+					'event_text' => $summary, 
+					'event_length' => $length, 
+					'event_overlap' => 0, 
+					'description' => $description, 
+					'status' => $status, 
+					'class' => $class, 
+					'spans_day' => false, 
+					'location' => $location, 
+					'organizer' => serialize($organizer), 
+					'attendee' => serialize($attendee), 
+					'calnumber' => $calnumber, 
+					'calname' => $actual_calname, 
+					'url' => $url, 
+					'recur' => $recur);
+				if (isset($display_end_tmp)){
+					$master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp;
+				}
+				checkOverlap($recur_data_date, ($hour.$minute), $uid);
+			
 		}
 	}
+
 }
 
 unset($recur_data);
diff --git a/functions/parse/recur_functions.php b/functions/parse/recur_functions.php
index 5cab6cf..6b970b6 100644
--- a/functions/parse/recur_functions.php
+++ b/functions/parse/recur_functions.php
@@ -24,13 +24,13 @@ BYxxx rule parts modify the recurrence in some manner. BYxxx rule
 */
 
 function add_recur($times,$freq=''){
-	global $recur_data, $count, $mArray_begin, $mArray_end;	
+	global $recur_data, $count, $mArray_begin, $mArray_end, $except_dates;	
 	if (!is_array($times)) $times = array($times);
 	$times = array_unique($times);
-	sort($times);
+	sort($times); 
 	/*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR,
    BYMINUTE, BYSECOND and BYSETPOS*/
-	$times = restrict_bymonth($times,$freq); 
+	$times = restrict_bymonth($times,$freq); 	
 	$times = restrict_byweekno($times,$freq);
 	$times = restrict_byyearday($times,$freq);
 	$times = restrict_bymonthday($times,$freq);
@@ -38,15 +38,19 @@ function add_recur($times,$freq=''){
 	$times = restrict_bysetpos($times,$freq);
 
 	foreach ($times as $time){ 
-		if(isset($time) ) $count--; 
+	echo "time:". date("Ymd",$time);
+		if(isset($time) && !in_array(date("Ymd",$time), $except_dates)) $count--; 
 		if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time;
 	}
 	return;
 }
 function expand_bymonth($time){
 	global $bymonth, $year, $start_unixtime;
-	if(empty($bymonth)) $bymonth = date("m", $start_unixtime); 
-	foreach ($bymonth as $m) $times[] = strtotime("$year".str_pad($m,2,"0",STR_PAD_LEFT).date("d",$start_unixtime));
+	if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); 
+	foreach ($bymonth as $m){ 
+		$time = mktime(12,0,0,$m,date("d",$start_unixtime),$year); #echo "exm:".date("Ymd",$time)."\n";
+		$times[] = $time;
+	}	
 	return $times;	
 }
 function expand_byweekno($times){
@@ -82,13 +86,13 @@ function expand_byyearday($times){
 function expand_bymonthday($times){
 	global $bymonthday, $year, $month;
 	if (empty($bymonthday)) return $times;
-	foreach($times as $time) foreach($bymonthday as $monthday) $new_times[] = strtotime("$year.$month".str_pad($monthday,2,"0",STR_PAD_LEFT));
+	foreach($times as $time) foreach($bymonthday as $monthday) $new_times[] = mktime(12,0,0,$month,$monthday,$year);
 	return $new_times;
 }
 
 function expand_byday($time){
 	global $freq_type, $byday, $wkst3char, $year, $month, $start_unixtime;
-	if (empty($byday)) return array(strtotime("$year$month".date("d",$start_unixtime)));
+	if (empty($byday)) return array($time);
 	$the_sunday = dateOfWeek(date("Ymd",$time), $wkst3char);
 #	echo "$freq_type, ".print_r($byday,true)."$wkst3char $the_sunday";
 	foreach($byday as $key=>$day) {
@@ -113,10 +117,10 @@ function expand_byday($time){
 			case 'month':
 			case 'year':
 				$week_arr = array(1,2,3,4,5);
-				if(!isset($byday_arr[2])) $week_arr = array($byday_arr[2]);
+				if(isset($byday_arr[2])) $week_arr = array($byday_arr[2]); 
 				$month_start = strtotime(date("Ym01",$time));
 				foreach($week_arr as $week){
-					$next_date_time = strtotime($byday_arr[1].$week.$on_day, $month_start); 
+					$next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start);
 					# check that we're still in the same month
 					if (date("m",$next_date_time) == date("m",$month_start) ) $times[] = $next_date_time; 
 				}
@@ -126,6 +130,7 @@ function expand_byday($time){
 				$next_date_time = strtotime($byday_arr[1].$byday_arr[2].$on_day, $month_start); 
 		}
 	}
+	dump_times($times);
 	return $times;
 }
 
@@ -133,12 +138,16 @@ function expand_byday($time){
 function restrict_bymonth($times,$freq=''){
 	global $bymonth;
 	if (empty($bymonth)) return $times;
-	foreach ($times as $time) if(in_array(date("m", $time), $bymonth)) $new_times[] = $time;
+	$new_times=array();
+	foreach ($times as $time){ 
+		if(in_array(date("m", $time), $bymonth)) $new_times[] = $time;
+	}	
 	return $new_times;
 }
 function restrict_byweekno($times,$freq=''){
 	global $byweekno;
 	if(empty($byweekno)) return $times;
+	$new_times=array();
 	foreach ($times as $time) if(in_array(date("W", $time), $byweekno)) $new_times[] = $time;
 	return $new_times;
 
@@ -146,6 +155,7 @@ function restrict_byweekno($times,$freq=''){
 function restrict_byyearday($times,$freq=''){
 	global $byyearday;
 	if(empty($byyearday)) return $times;
+	$new_times=array();
 	foreach ($times as $time) if(in_array(date("z", $time), $byyearday)) $new_times[] = $time;
 	return $new_times;
 }
@@ -153,13 +163,24 @@ function restrict_byyearday($times,$freq=''){
 function restrict_bymonthday($times,$freq=''){
 	global $bymonthday;
 	if(empty($bymonthday)) return $times;
+	$new_times=array();
 	foreach ($times as $time) if(in_array(date("j", $time), $bymonthday)) $new_times[] = $time;
 	return $new_times;
 }
 function restrict_byday($times,$freq=''){
 	global $byday;
 	if(empty($byday)) return $times;
-	foreach($byday as $key=>$day) $byday3[] = two2threeCharDays($day);	
+	foreach($byday as $key=>$day) {
+		/* set $byday_arr
+				[0] => byday string, e.g. 4TH
+				[1] => sign/modifier
+				[2] => 4 number
+				[3] => TH day abbr
+		*/
+		ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr);
+		$byday3[] = two2threeCharDays($byday_arr[3]);
+	}
+	$new_times=array();
 	foreach ($times as $time) if(in_array(strtolower(date("D", $time)), $byday3)) $new_times[] = $time;
 	return $new_times;	
 }
@@ -167,9 +188,18 @@ function restrict_byday($times,$freq=''){
 function restrict_bysetpos($times,$freq=''){
 	global $rrule_array, $bysetpos;
 	if(empty($bysetpos)) return $times;
+	$new_times=array();
 	$n = count($times);
 	foreach($bysetpos as $setpos){
 		$new_times[] = array_slice($times, $setpos, 1);
 	}
 	return $new_times;	
-}
\ No newline at end of file
+}
+
+function dump_times($recur_data){
+	global $summary;
+	echo "<pre>$summary recur_data:";
+	var_dump($recur_data);
+	foreach($recur_data as $time) echo "\n".date("Ymd his",$time);
+	echo "</pre>";
+}
diff --git a/month.php b/month.php
index 0982718..9811669 100644
--- a/month.php
+++ b/month.php
@@ -4,7 +4,7 @@ $current_view = "month";
 require_once(BASE.'functions/ical_parser.php');
 require_once(BASE.'functions/list_functions.php');
 require_once(BASE.'functions/template.php');
-header("Content-Type: text/html; charset=$charset");
+header("Content-Type: text/html; charset=$phpiCal_config->charset");
 if ($phpiCal_config->minical_view == 'current') $minical_view = 'month';
 
 $unix_time 				= strtotime($getdate);
diff --git a/year.php b/year.php
index f795efe..7bec7a7 100644
--- a/year.php
+++ b/year.php
@@ -4,7 +4,7 @@ $current_view = 'year';
 require_once(BASE.'functions/ical_parser.php');
 require_once(BASE.'functions/list_functions.php');
 require_once(BASE.'functions/template.php');
-header("Content-Type: text/html; charset=$charset");
+header("Content-Type: text/html; charset=$phpiCal_config->charset");
 
 ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
 $this_day 	= $day_array2[3]; 
@@ -65,7 +65,7 @@ $page->replace_tags(array(
 	'calendar_name'		=> $cal_displayname,
 	'display_date'		=> $this_year,
 	'sidebar_date'		=> $sidebar_date,
-	'rss_powered'	 	=> $phpiCal_config->rss_powered,
+	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
 	'todo_available' 	=> '',
@@ -78,14 +78,14 @@ $page->replace_tags(array(
 	'next_year'			=> $next_year,
 	'prev_year'			=> $prev_year,
 	'show_goto' 		=> '',
-	'show_user_login'	=> $show_user_login,
+	'show_user_login'	=> $phpiCal_config->show_user_login,
 	'invalid_login'		=> $invalid_login,
 	'login_querys'		=> $login_querys,
 	'is_logged_in' 		=> $is_logged_in,
 	'username'			=> $username,
 	'logout_querys'		=> $logout_querys,
 	'list_icals' 		=> $list_icals,
-	'list_icals_pick' 		=> $list_icals_pick,
+	'list_icals_pick'	=> $list_icals_pick,
 	'list_years' 		=> $list_years,
 	'list_months' 		=> $list_months,
 	'list_weeks' 		=> $list_weeks,
@@ -103,7 +103,7 @@ $page->replace_tags(array(
 	'l_week'			=> $lang['l_week'],
 	'l_month'			=> $lang['l_month'],
 	'l_year'			=> $lang['l_year'],
-	'l_search'				=> $lang['l_search'],
+	'l_search'			=> $lang['l_search'],
 	'l_subscribe'		=> $lang['l_subscribe'],
 	'l_download'		=> $lang['l_download'],
 	'l_pick_multiple'	=> $lang['l_pick_multiple'],
@@ -127,7 +127,7 @@ if ($phpiCal_config->allow_login == 'yes') {
 	'l_logout'			=> $lang['l_logout']
 	));
 }
-if ($show_search != 'yes') {
+if ($phpiCal_config->show_search != 'yes') {
 	$page->nosearch($page);
 }