falon / RBL

contrib/ipImap/report/calendar/classes/tc_calendar.php

Braces +212 added lines, -98 removed lines

@@ -103,7 +103,9 @@ 
 		//$this->year_display_from_current = 50;

 		$this->date_picker = $date_picker;

 

-		if($timezone != "") $this->setTimezone($timezone);

+		if($timezone != "") {
+			$this->setTimezone($timezone);
+		}
 

 		//set default year display from current year

 		$thisyear = date('Y');

@@ -126,7 +128,9 @@ 
     	$days = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);

 		if($month > 0 && $year > 0){

 	    	return ($month == 2 && $this->is_leapYear($year)) ? 29 : $days[$month-1];

-		}else return 31;

+		} else {
+			return 31;
+		}
     }

 

 	//Deprecate since v1.6

@@ -143,7 +147,9 @@ 
 		$startdate = $this->startDate;

 

 		for($i=0; $i<=6; $i++){

-			if($startdate >= sizeof($hdrs)) $startdate = 0;

+			if($startdate >= sizeof($hdrs)) {
+				$startdate = 0;
+			}
 			//if(isset($hdrs[(string)$startdate]))

 				$rtn_hdrs[] = $hdrs[(string)$startdate];

 

@@ -195,7 +201,9 @@ 
 	//specified location of the calendar_form.php

 	function setPath($path){

 		$last_char = substr($path, strlen($path)-1, strlen($path));

-		if($last_char != "/") $path .= "/";

+		if($last_char != "/") {
+			$path .= "/";
+		}
 		$this->path = $path;

 	}

 

@@ -233,9 +241,9 @@ 
 

 					if($tz_sys_ms>=0 && $tz_new_ms<=0){

 						$timezone_diff = 0-($tz_sys_ms+abs($tz_new_ms));

-					}elseif($tz_sys_ms<=0 && $tz_new_ms>=0){

+					} elseif($tz_sys_ms<=0 && $tz_new_ms>=0){

 						$timezone_diff = abs($tz_sys_ms)+$tz_new_ms;

-					}else{

+					} else{

 						$timezone_diff = $tz_sys_ms-$tz_new_ms;

 					}

 					$timezone_diff_hr = $timezone_diff/3600;

@@ -255,7 +263,7 @@ 
 					$this->year = date("Y", $n_time);

 					$this->month = date("m", $n_time);

 					$this->day = date("d", $n_time);

-				}else{

+				} else{

 					$date = new DateTime($a_date, new DateTimeZone($this->system_timezone));

 					$date->setTimezone(new DateTimeZone($this->timezone));

 					$this->year = $date->format('Y');

@@ -276,7 +284,7 @@ 
 				$str .= $this->writeDay();

 				$str .= $this->writeMonth();

 				$str .= $this->writeYear();

-			}else{

+			} else{

 				$str .= " <a href=\"javascript:toggleCalendar('".$this->objname."', ".$this->auto_hide.", ".$this->auto_hide_time.");\" class=\"tclabel\">";

 				$str .= $this->writeDateContainer();

 				$str .= "</a>";

@@ -285,19 +293,21 @@ 
 			$str .= " <a href=\"javascript:toggleCalendar('".$this->objname."', ".$this->auto_hide.", ".$this->auto_hide_time.");\">";

 			if(is_file($this->icon)){

 				$str .= "<img src=\"".$this->icon."\" id=\"tcbtn_".$this->objname."\" name=\"tcbtn_".$this->objname."\" border=\"0\" align=\"absmiddle\" style=\"vertical-align:middle;\" alt=\"".$this->txt."\" title=\"".$this->txt."\" />";

-			}else $str .= $this->txt;

+			} else {
+				$str .= $this->txt;
+			}
 			$str .= "</a>";

 

 			$str .= $this->writeCalendarContainer();

 

 			$str .= "</div>";

-		}else{

+		} else{

 			$str .= $this->writeCalendarContainer();

 		}

 

 		if($buffer){

 			return $str;

-		}else{

+		} else{

 			echo($str);

 		}

 	}

@@ -307,97 +317,157 @@ 
 		$params[] = "objname=".$this->objname;

 

 		$param = $this->day;

-		if($param != "") $params[] = "selected_day=".$param;

+		if($param != "") {
+			$params[] = "selected_day=".$param;
+		}
 

 		$param = $this->month;

-		if($param != "") $params[] = "selected_month=".$param;

+		if($param != "") {
+			$params[] = "selected_month=".$param;
+		}
 

 		$param = $this->year;

-		if($param != "") $params[] = "selected_year=".$param;

+		if($param != "") {
+			$params[] = "selected_year=".$param;
+		}
 

 		$param = $this->year_start_input;

-		if($param != "") $params[] = "year_start=".$param;

+		if($param != "") {
+			$params[] = "year_start=".$param;
+		}
 

 		$param = $this->year_end_input;

-		if($param != "") $params[] = "year_end=".$param;

+		if($param != "") {
+			$params[] = "year_end=".$param;
+		}
 

 		$param = ($this->date_picker) ? 1 : 0;

-		if($param != "") $params[] = "dp=".$param;

+		if($param != "") {
+			$params[] = "dp=".$param;
+		}
 

 		$param = $this->time_allow1;

-		if($param != "") $params[] = "da1=".$param;

+		if($param != "") {
+			$params[] = "da1=".$param;
+		}
 

 		$param = $this->time_allow2;

-		if($param != "") $params[] = "da2=".$param;

+		if($param != "") {
+			$params[] = "da2=".$param;
+		}
 

 		$param = $this->show_not_allow;

-		if($param != "") $params[] = "sna=".$param;

+		if($param != "") {
+			$params[] = "sna=".$param;
+		}
 

 		$param = $this->auto_submit;

-		if($param != "") $params[] = "aut=".$param;

+		if($param != "") {
+			$params[] = "aut=".$param;
+		}
 

 		$param = $this->form_container;

-		if($param != "") $params[] = "frm=".$param;

+		if($param != "") {
+			$params[] = "frm=".$param;
+		}
 

 		$param = $this->target_url;

-		if($param != "") $params[] = "tar=".$param;

+		if($param != "") {
+			$params[] = "tar=".$param;
+		}
 

 		$param = $this->show_input;

-		if($param != "") $params[] = "inp=".$param;

+		if($param != "") {
+			$params[] = "inp=".$param;
+		}
 

 		$param = $this->date_format;

-		if($param != "") $params[] = "fmt=".$param;

+		if($param != "") {
+			$params[] = "fmt=".$param;
+		}
 

 		$param = implode(",", $this->dsb_days);

-		if($param != "") $params[] = "dis=".$param;

+		if($param != "") {
+			$params[] = "dis=".$param;
+		}
 

 		$param = $this->date_pair1;

-		if($param != "") $params[] = "pr1=".$param;

+		if($param != "") {
+			$params[] = "pr1=".$param;
+		}
 

 		$param = $this->date_pair2;

-		if($param != "") $params[] = "pr2=".$param;

+		if($param != "") {
+			$params[] = "pr2=".$param;
+		}
 

 		$param = $this->date_pair_value;

-		if($param != "") $params[] = "prv=".$param;

+		if($param != "") {
+			$params[] = "prv=".$param;
+		}
 

 		$param = $this->path;

-		if($param != "") $params[] = "pth=".$param;

+		if($param != "") {
+			$params[] = "pth=".$param;
+		}
 

 		$param = htmlspecialchars($this->check_json_encode($this->sp_dates), ENT_QUOTES);

-		if($param != "") $params[] = "spd=".$param;

+		if($param != "") {
+			$params[] = "spd=".$param;
+		}
 

 		$param = $this->sp_type;

-		if($param != "") $params[] = "spt=".$param;

+		if($param != "") {
+			$params[] = "spt=".$param;
+		}
 

 		$param = rawurlencode($this->tc_onchanged);

-		if($param != "") $params[] = "och=".$param;

+		if($param != "") {
+			$params[] = "och=".$param;
+		}
 

 		$param = $this->startDate;

-		if($param != "") $params[] = "str=".$param;

+		if($param != "") {
+			$params[] = "str=".$param;
+		}
 

 		$param = $this->rtl;

-		if($param != "") $params[] = "rtl=".$param;

+		if($param != "") {
+			$params[] = "rtl=".$param;
+		}
 

 		$param = $this->show_week;

-		if($param != "") $params[] = "wks=".$param;

+		if($param != "") {
+			$params[] = "wks=".$param;
+		}
 

 		$param = $this->interval;

-		if($param != "") $params[] = "int=".$param;

+		if($param != "") {
+			$params[] = "int=".$param;
+		}
 

 		$param = $this->auto_hide;

-		if($param != "") $params[] = "hid=".$param;

+		if($param != "") {
+			$params[] = "hid=".$param;
+		}
 

 		$param = $this->auto_hide_time;

-		if($param != "") $params[] = "hdt=".$param;

+		if($param != "") {
+			$params[] = "hdt=".$param;
+		}
 

 		$param = $this->timezone;

-		if($param != "") $params[] = "tmz=".$param;

+		if($param != "") {
+			$params[] = "tmz=".$param;
+		}
 

 		//$param = $this->system_timezone;

 		//if($param != "") $params[] = "stz=".$param;

 

 		$param = $this->theme;

-		if($param != "") $params[] = "thm=".$param;

+		if($param != "") {
+			$params[] = "thm=".$param;
+		}
 

 		$paramStr = (sizeof($params)>0) ? "?".implode("&", $params) : "";

 

@@ -432,7 +502,7 @@ 
 				default:

 					$div_align .= "right:0px;";

 			}

-		}else{

+		} else{

 			$div_display = "visible";

 			$div_position = "relative";

 			$div_align = "";

@@ -498,10 +568,10 @@ 
 			if($this->time_allow1 && $this->time_allow2){

 				$year_start = $this->mydate->getDate("Y", $this->time_allow1);

 				$year_end = $this->mydate->getDate("Y", $this->time_allow2);

-			}elseif($this->time_allow1){

+			} elseif($this->time_allow1){

 				//only date 1 specified

 				$year_start = $this->mydate->getDate("Y", $this->time_allow1);

-			}elseif($this->time_allow2){

+			} elseif($this->time_allow2){

 				//only date 2 specified

 				$year_end = $this->mydate->getDate("Y", $this->time_allow2);

 			}

@@ -518,7 +588,9 @@ 
 

 	function eHidden($suffix, $value) {

 		if(trim($value) != ""){

-			if($suffix) $suffix = "_".$suffix;

+			if($suffix) {
+				$suffix = "_".$suffix;
+			}
 			return "<input type=\"hidden\" name=\"".$this->objname.$suffix."\" id=\"".$this->objname.$suffix."\" value=\"".$value."\" />";

 		}

 	}

@@ -575,7 +647,9 @@ 
 	// Auto sizing is applied

 	//---------------------------

 	function setWidth($width){

-		if($width) $this->width = $width;

+		if($width) {
+			$this->width = $width;
+		}
 	}

 

 	//set height of calendar

@@ -584,20 +658,26 @@ 
 	// Auto sizing is applied

 	//---------------------------

 	function setHeight($height){

-		if($height) $this->height = $height;

+		if($height) {
+			$this->height = $height;
+		}
 	}

 

 	function setYearInterval($start, $end){

 		$this->year_start_input = $start;

 		$this->year_end_input = $end;

 

-		if(!$start) $start = $this->year_start;

-		if(!$end) $end = $this->year_end;

+		if(!$start) {
+			$start = $this->year_start;
+		}
+		if(!$end) {
+			$end = $this->year_end;
+		}
 

 		if($start < $end){

 			$this->year_start = $start;

 			$this->year_end = $end;

-		}else{

+		} else{

 			$this->year_start = $end;

 			$this->year_end = $start;

 		}

@@ -615,12 +695,15 @@ 
 		//$this->startMonday = $flag;

 

 		//change it so that it will not cause an error after version 3.61

-		if($flag) $this->startDate = 1;

+		if($flag) {
+			$this->startDate = 1;
+		}
 	}

 

 	function startDate($num){

-		if(is_numeric($num) && $num >= 0 && $num <= 6)

-			$this->startDate = $num;

+		if(is_numeric($num) && $num >= 0 && $num <= 6) {
+					$this->startDate = $num;
+		}
 	}

 

 	function dateAllow($from = "", $to = "", $show_not_allow = true){

@@ -637,19 +720,27 @@ 
 		if ($time_from != null) {

 			$this->time_allow1 = $time_from;

 			$y = $this->mydate->getDate('Y', $time_from);

-			if($this->year_start && $y > $this->year_start) $this->year_start = $y;

+			if($this->year_start && $y > $this->year_start) {
+				$this->year_start = $y;
+			}
 

 			//setup year end from year start

-			if($time_to == null && !$this->year_end) $this->year_end = $this->year_start + $this->year_display_from_current;

+			if($time_to == null && !$this->year_end) {
+				$this->year_end = $this->year_start + $this->year_display_from_current;
+			}
 		}

 

 		if ($time_to>0) {

 			$this->time_allow2 = $time_to;

 			$y = $this->mydate->getDate('Y', $time_to);

-			if($this->year_end && $y < $this->year_end) $this->year_end = $y;

+			if($this->year_end && $y < $this->year_end) {
+				$this->year_end = $y;
+			}
 

 			//setup year start from year end

-			if($time_from == null && !$this->year_start) $this->year_start = $this->year_end - $this->year_display_from_current;

+			if($time_from == null && !$this->year_start) {
+				$this->year_start = $this->year_end - $this->year_display_from_current;
+			}
 		}

 

 		$this->show_not_allow = $show_not_allow;

@@ -672,7 +763,9 @@ 
 	function writeDateContainer(){

 		if($this->day && $this->month && $this->year){

 			$dd = $this->mydate->getDate($this->date_format, $this->year."-".$this->month."-".$this->day);

-		}else $dd = "Select Date";

+		} else {
+			$dd = "Select Date";
+		}
 

 		return "<div id=\"divCalendar_".$this->objname."_lbl\" class=\"date-tccontainer\">$dd</div>";

 	}

@@ -683,8 +776,9 @@ 
 	//------------------------------------------------------

 	function disabledDay($day){

 		$day = strtolower($day); //make it not case-sensitive

-		if(in_array($day, $this->dsb_days) === false)

-			$this->dsb_days[] = $day;

+		if(in_array($day, $this->dsb_days) === false) {
+					$this->dsb_days[] = $day;
+		}
 	}

 

 	function setAlignment($h_align, $v_align){

@@ -695,12 +789,14 @@ 
 	function setDatePair($calendar_name1, $calendar_name2, $pair_value = "0000-00-00 00:00:00"){

 		if($calendar_name1 != $this->objname){

 			$this->date_pair1 = $calendar_name1;

-			if($pair_value != "0000-00-00 00:00:00")

-				$this->date_pair_value = $pair_value;

-		}elseif($calendar_name2 != $this->objname){

+			if($pair_value != "0000-00-00 00:00:00") {
+							$this->date_pair_value = $pair_value;
+			}
+		} elseif($calendar_name2 != $this->objname){

 			$this->date_pair2 = $calendar_name2;

-			if($pair_value != "0000-00-00 00:00:00")

-				$this->date_pair_value = $pair_value;

+			if($pair_value != "0000-00-00 00:00:00") {
+							$this->date_pair_value = $pair_value;
+			}
 		}

 	}

 

@@ -713,16 +809,19 @@ 
 				if($this->mydate->validDate($sp_date)){

 					switch($recursive){

 						case "month": //add to monthly

-							if(!in_array($sp_date, $this->sp_dates[1]))

-								$this->sp_dates[1][] = $sp_date;

+							if(!in_array($sp_date, $this->sp_dates[1])) {
+															$this->sp_dates[1][] = $sp_date;
+							}
 							break;

 						case "year": //add to yearly

-							if(!in_array($sp_date, $this->sp_dates[2]))

-								$this->sp_dates[2][] = $sp_date;

+							if(!in_array($sp_date, $this->sp_dates[2])) {
+															$this->sp_dates[2][] = $sp_date;
+							}
 							break;

 						default: //add to no recursive

-							if(!in_array($sp_date, $this->sp_dates[0]))

-								$this->sp_dates[0][] = $sp_date;

+							if(!in_array($sp_date, $this->sp_dates[0])) {
+															$this->sp_dates[0][] = $sp_date;
+							}
 					}

 				}

 			}

@@ -790,10 +889,14 @@ 
 			if($this->mydate->dateBefore($this->time_allow1, $date_str, false) || $this->mydate->dateAfter($this->time_allow2, $date_str, false)){

 				return false;

 			}

-		}elseif($this->time_allow1){

-			if($this->mydate->dateBefore($this->time_allow1, $date_str, false)) return false;

-		}elseif($this->time_allow2){

-			if($this->mydate->dateAfter($this->time_allow2, $date_str, false)) return false;

+		} elseif($this->time_allow1){

+			if($this->mydate->dateBefore($this->time_allow1, $date_str, false)) {
+				return false;
+			}
+		} elseif($this->time_allow2){

+			if($this->mydate->dateAfter($this->time_allow2, $date_str, false)) {
+				return false;
+			}
 		}

 

 		//check with specific date

@@ -830,11 +933,15 @@ 
 				case 0:

 				default:

 					//disabled specific and enabled others

-					if($sp_found) return false;

+					if($sp_found) {
+						return false;
+					}
 					break;

 				case 1:

 					//enabled specific and disabled others

-					if(!$sp_found) return false;

+					if(!$sp_found) {
+						return false;
+					}
 					break;

 			}

 		}

@@ -854,17 +961,21 @@ 
 		if(is_array($obj)){

 			if(function_exists("json_encode") && false){

 				return json_encode($obj);

-			}else{

+			} else{

 				//only array is assumed for now

 				$return_arr = array();

 				foreach($obj as $arr){

-					if(is_array($arr) && sizeof($arr)>0)

-						$return_arr[] = "[\"".implode("\",\"", $arr)."\"]";

-					else $return_arr[] = "[]";

+					if(is_array($arr) && sizeof($arr)>0) {
+											$return_arr[] = "[\"".implode("\",\"", $arr)."\"]";
+					} else {
+						$return_arr[] = "[]";
+					}
 				}

 				return "[".implode(",", $return_arr)."]";

 			}

-		}else return "";

+		} else {
+			return "";
+		}
 	}

 

 	function &check_json_decode($str){

@@ -872,7 +983,7 @@ 
 

 		if(function_exists("json_decode") && false){

 			return json_decode($str);

-		}else{

+		} else{

 			//only array is assume for now

 			$str = stripslashes(rawurldecode($str));

 			$str = trim($str);

@@ -890,9 +1001,9 @@ 
 					$arr = explode("],[", $str);

 					for($i=0; $i<sizeof($arr); $i++){

 						$this_v = $arr[$i];

-						if($this_v == "")

-							$return_arr[] = array();

-						else{

+						if($this_v == "") {
+													$return_arr[] = array();
+						} else{

 							$this_arr = explode(",", $this_v);

 

 							for($j=0; $j<sizeof($this_arr); $j++){

@@ -905,8 +1016,12 @@ 
 						}

 					}

 					return $return_arr;

-				}else return array();

-			}else return array();

+				} else {
+					return array();
+				}
+			} else {
+				return array();
+			}
 		}

 	}

 

@@ -939,14 +1054,16 @@ 
 		//check if today is in range of date allow

 		if($this->time_allow1 != ""){

 			//check valid if today is after date_allow1

-			if($this->mydate->validDate($this->time_allow1) && !$this->mydate->dateAfter($this->time_allow1, $today))

-				return false;

+			if($this->mydate->validDate($this->time_allow1) && !$this->mydate->dateAfter($this->time_allow1, $today)) {
+							return false;
+			}
 		}

 

 		if($this->time_allow2 > 0){

 			//check valid if today is before date_allow2

-			if($this->mydate->validDate($this->time_allow2) && !$this->mydate->dateBefore($this->time_allow2, $today))

-				return false;

+			if($this->mydate->validDate($this->time_allow2) && !$this->mydate->dateBefore($this->time_allow2, $today)) {
+							return false;
+			}
 		}

 		return true;

 	}

@@ -966,8 +1083,7 @@ 
 						if(!in_array($tt_time, $this->tt_dates[2])){

 							$this->tt_dates[2][] = $tt_time;

 							$this->tt_tooltips[2][] = $tooltip;

-						}

-						else{

+						} else{

 							$tt_key = array_search($tt_time, $this->tt_dates[2]);

 							$this->tt_tooltips[2][$tt_key] = $this->tt_tooltips[2][$tt_key]."\n".$tooltip;

 						}

@@ -976,8 +1092,7 @@ 
 						if(!in_array($tt_time, $this->tt_dates[1])){

 							$this->tt_dates[1][] = $tt_time;

 							$this->tt_tooltips[1][] = $tooltip;

-						}

-						else{

+						} else{

 							$tt_key = array_search($tt_time, $this->tt_dates[1]);

 							$this->tt_tooltips[1][$tt_key] = $this->tt_tooltips[1][$tt_key]."\n".$tooltip;

 						}

@@ -986,8 +1101,7 @@ 
 						if(!in_array($tt_time, $this->tt_dates[0])){

 							$this->tt_dates[0][] = $tt_time;

 							$this->tt_tooltips[0][] = $tooltip;

-						}

-						else{

+						} else{

 							$tt_key = array_search($tt_time, $this->tt_dates[0]);

 							$this->tt_tooltips[0][$tt_key] = $this->tt_tooltips[0][$tt_key]."\n".$tooltip;

 						}

contrib/ipImap/report/calendar/classes/tc_date_main.php

Braces +36 added lines, -13 removed lines

@@ -27,15 +27,18 @@ 
 	}

 

 	function setDate($sdate){

-		if($this->validDate($sdate))

-			$this->mydate = strtotime($sdate);

+		if($this->validDate($sdate)) {
+					$this->mydate = strtotime($sdate);
+		}
 	}

 

 	function getDate($format = "Y-m-d", $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 			$tmp_date = ($cdate != "") ? strtotime($cdate) : $this->mydate;

 			return date($format, $tmp_date);

-		}else return "";

+		} else {
+			return "";
+		}
 	}

 

 	function setTimestamp($stime){

@@ -46,34 +49,44 @@ 
 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 			$tmp_date = ($cdate != "") ? strtotime($cdate) : $this->mydate;

 			return $tmp_date;

-		}else return 0;

+		} else {
+			return 0;
+		}
 	}

 

 	function getDateFromTimestamp($stime, $format = "Y-m-d"){

 		if($stime && $stime > 0){

 			return date($format, $stime);

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	function addDay($format = "Y-m-d", $timespan, $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 			$tmp_date = ($cdate != "") ? strtotime($cdate) : $this->mydate;

 			return date($format, mktime(0,0,0,date('m', $tmp_date),(date('d', $tmp_date)+$timespan),date('Y', $tmp_date)));

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	function addMonth($format = "Y-m-d", $timespan, $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 			$tmp_date = ($cdate != "") ? strtotime($cdate) : $this->mydate;

 			return date($format, mktime(0,0,0,(date('m', $tmp_date)+$timespan),date('d', $tmp_date),date('Y', $tmp_date)));

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	function addYear($format = "Y-m-d", $timespan, $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 			$tmp_date = ($cdate != "") ? strtotime($cdate) : $this->mydate;

 			return date($format, mktime(0,0,0,date('m', $tmp_date),date('d', $tmp_date),(date('Y', $tmp_date)+$timespan)));

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	//return the number of day different between date1 and date2

@@ -84,7 +97,9 @@ 
 

 			$date_diff = $date1-strtotime($date2);

 			return abs($date_diff);

-		}else return false;

+		} else {
+			return false;
+		}
 	}

 

 	//check if date1 is before date2

@@ -94,7 +109,9 @@ 
 			$date1 = ($date1 != "") ? strtotime($date1) : $this->mydate;

 			$date2 = strtotime($date2);

 			return ($equal) ? $date1<=$date2 : $date1<$date2;

-		}else return false;

+		} else {
+			return false;
+		}
 	}

 

 	//check if date1 is after date2

@@ -104,7 +121,9 @@ 
 			$date1 = ($date1 != "") ? strtotime($date1) : $this->mydate;

 			$date2 = strtotime($date2);

 			return ($equal) ? $date1>=$date2 : $date1>$date2;

-		}else return false;

+		} else {
+			return false;
+		}
 	}

 

 	function validDate($date_str){

@@ -113,8 +132,12 @@ 
 

 			if((isset($date_arr[0]) && is_numeric($date_arr[0])) && (isset($date_arr[1]) && is_numeric($date_arr[1])) && (isset($date_arr[2]) && is_numeric($date_arr[2]))){

 				return (checkdate($date_arr[1], $date_arr[2], $date_arr[0])) ? true : false;

-			}else return false;

-		}else return false;

+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}

 }

 ?>
\ No newline at end of file

contrib/ipImap/report/calendar/classes/tc_date.php

Braces +38 added lines, -23 removed lines

@@ -14,11 +14,13 @@ 
 		//check if we should use DateTime that comes with 5.3.0 and later

 		if (version_compare(PHP_VERSION, '5.3.0') <= 0) {

 			$this->compatible = false;

-		}else $this->compatible = true;

+		} else {
+			$this->compatible = true;
+		}
 

 		if(!$this->compatible){

 			$this->tc_date_main();

-		}else{

+		} else{

 			$this->mydate = new DateTime('now');

 		}

 	}

@@ -26,49 +28,56 @@ 
 	function getDayOfWeek($cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::getDayOfWeek($cdate);

-		}else{

+		} else{

 			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;

 				return $tmp_date->format('w');

-			}else return "";

+			} else {
+				return "";
+			}
 		}

 	}

 

 	function getWeekNumber($cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::getWeekNumber($cdate);

-		}else{

+		} else{

 			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;

 				return $tmp_date->format('W');

-			}else return "";

+			} else {
+				return "";
+			}
 		}

 	}

 

 	function setDate($sdate){

 		if(!$this->compatible){

 			tc_date_main::setDate($sdate);

-		}else{

-			if(tc_date_main::validDate($sdate))

-				$this->mydate = new DateTime($sdate);

+		} else{

+			if(tc_date_main::validDate($sdate)) {
+							$this->mydate = new DateTime($sdate);
+			}
 		}

 	}

 

 	function getDate($format = "Y-m-d", $cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::getDate($format, $cdate);

-		}else{

+		} else{

 			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;

 				return $tmp_date->format($format);

-			}else return "";

+			} else {
+				return "";
+			}
 		}

 	}

 

 	function setTimestamp($stime){

 		if(!$this->compatible){

 			tc_date_main::setTimestamp($stime);

-		}else{

+		} else{

 			$this->mydate->setTimestamp($stime);

 		}

 	}

@@ -76,11 +85,13 @@ 
 	function getTimestamp($cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::getTimestamp($cdate);

-		}else{

+		} else{

 			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;

 				return $tmp_date->getTimestamp();

-			}else return 0;

+			} else {
+				return 0;
+			}
 		}

 	}

 

@@ -88,18 +99,20 @@ 
 		if($stime){

 			if(!$this->compatible){

 				return tc_date_main::getDateFromTimestamp($stime, $format);

-			}else{

+			} else{

 				$tmp_date = new DateTime();

 				$tmp_date->setTimestamp($stime);

 				return $tmp_date->format($format);

 			}

-		}else return "";

+		} else {
+			return "";
+		}
 	}

 

 	function addDay($format = "Y-m-d", $timespan, $cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::addDay($format, $timespan, $cdate);

-		}else{

+		} else{

 			$timespan = "P".$timespan."D";

 			return $this->addDate($format, $timespan, $cdate);

 		}

@@ -108,7 +121,7 @@ 
 	function addMonth($format = "Y-m-d", $timespan, $cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::addMonth($format, $timespan, $cdate);

-		}else{

+		} else{

 			$timespan = "P".$timespan."M";

 			return $this->addDate($format, $timespan, $cdate);

 		}

@@ -117,7 +130,7 @@ 
 	function addYear($format = "Y-m-d", $timespan, $cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::addYear($format, $timespan, $cdate);

-		}else{

+		} else{

 			$timespan = "P".$timespan."Y";

 			return $this->addDate($format, $timespan, $cdate);

 		}

@@ -128,7 +141,9 @@ 
 			$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;

 			$tmp_date->add(new DateInterval($timespan));

 			return $tmp_date->format($format);

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	//return the number of day different between date1 and date2

@@ -136,7 +151,7 @@ 
 	function differentDate($date2, $date1 = ""){

 		if(!$this->compatible){

 			return tc_date_main::differentDate($date2, $date1);

-		}else{

+		} else{

 			$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');

 

 			$date1 = new DateTime($date1);

@@ -151,7 +166,7 @@ 
 	function dateBefore($date2, $date1 = "", $equal = true){

 		if(!$this->compatible){

 			return tc_date_main::dateBefore($date2, $date1, $equal);

-		}else{

+		} else{

 			$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');

 

 			$date1 = new DateTime($date1);

@@ -165,7 +180,7 @@ 
 	function dateAfter($date2, $date1 = "", $equal = true){

 		if(!$this->compatible){

 			return tc_date_main::dateAfter($date2, $date1, $equal);

-		}else{

+		} else{

 			$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');

 

 			$date1 = new DateTime($date1);

contrib/ipImap/report/calendar/calendar_functions.php

Braces +14 added lines, -8 removed lines

@@ -2,14 +2,18 @@ 
 function filterInput($str, $type = "text"){

 	switch(strtolower($type)){

 		case "number":

-			if(is_numeric($str))

-				return array(true, $str);

-			else return array(false, "Invalid input - '$str', required number");

+			if(is_numeric($str)) {
+							return array(true, $str);
+			} else {
+				return array(false, "Invalid input - '$str', required number");
+			}
 			break;

 		case "boolean":

-			if($str == "" || $str == 0 || $str == 1 || is_bool($str))

-				return array(true, $str);

-			else return array(false, "Invalid input - '$str', required boolean");

+			if($str == "" || $str == 0 || $str == 1 || is_bool($str)) {
+							return array(true, $str);
+			} else {
+				return array(false, "Invalid input - '$str', required boolean");
+			}
 			break;

 		default:

 			//$str = addslashes($str);

@@ -26,8 +30,10 @@ 
 	$result_txt = isset($results[1]) ? $results[1] : "";

 	if(isset($results[0]) && $results[0] === true){

 		return $result_txt;

-	}else exit("Error returned '$name' - ".$result_txt);

-}

+	} else {
+		exit("Error returned '$name' - ".$result_txt);
+	}
+	}

 

 function getTranslatedTxt($txt, $allow_tag = false, $maps = array()){

 	$content = $txt;

contrib/ipImap/report/calendar/calendar_info.php

Braces +13 added lines, -6 removed lines

@@ -2,9 +2,15 @@ 
 require_once("classes/tc_calendar.php");

 require_once("classes/tc_date.php");

 

-if(!isset($show_calendar_info)) $show_calendar_info = true;

-if(!isset($show_fb_info)) $show_fb_info = true;

-if(!isset($show_servertime_info)) $show_servertime_info = true;

+if(!isset($show_calendar_info)) {
+	$show_calendar_info = true;
+}
+if(!isset($show_fb_info)) {
+	$show_fb_info = true;
+}
+if(!isset($show_servertime_info)) {
+	$show_servertime_info = true;
+}
 

 $tobj = new tc_calendar("");

 $version = $tobj->version;

@@ -12,7 +18,9 @@ 
 

 $tdate = new tc_date();

 

-if(!isset($timezone)) $timezone = date_default_timezone_get();

+if(!isset($timezone)) {
+	$timezone = date_default_timezone_get();
+}
 

 $wan_enabled = 0;

 $new_version = 0;

@@ -22,8 +30,7 @@ 
 			$new_version = @file_get_contents("http://www.triconsole.com/php/tc_calendar_version.php?v=".$version);

 		}

 	}

-}

-elseif(function_exists("file_get_contents")){

+} elseif(function_exists("file_get_contents")){

 	$ctx = stream_context_create(array('http' => array('timeout' => 1)));

 	$wan_enabled = @file_get_contents("http://www.google.com",null,$ctx,0,1);

 	if($check_version && $wan_enabled){

contrib/ipImap/report/calendar/calendar_form.php

Braces +136 added lines, -67 removed lines

@@ -13,7 +13,9 @@ 
 //timezone var, need to setup before any other tasks

 $timezone = getParameter("tmz");

 

-if(!$timezone) $timezone = date_default_timezone_get();

+if(!$timezone) {
+	$timezone = date_default_timezone_get();
+}
 @date_default_timezone_set($timezone);

 

 $cdate = new tc_date();

@@ -23,9 +25,15 @@ 
 $slm = getParameter("selected_month");

 $sly = getParameter("selected_year");

 

-if(!is_numeric($sld)) $sld = "00";

-if(!is_numeric($slm)) $slm = "00";

-if(!is_numeric($sly)) $sly = "0000";

+if(!is_numeric($sld)) {
+	$sld = "00";
+}
+if(!is_numeric($slm)) {
+	$slm = "00";
+}
+if(!is_numeric($sly)) {
+	$sly = "0000";
+}
 

 $year_start = getParameter("year_start", "number", 0);

 $year_end = getParameter("year_end", "number", 0);

@@ -74,62 +82,79 @@ 
 

 //check year to be select in case of date_allow is set

 if(!$show_not_allow){

-  if ($ta1_set && $cdate->validDate($time_allow1)) $year_start = $cdate->getDate('Y', $time_allow1);

-  if ($ta2_set && $cdate->validDate($time_allow2)) $year_end = $cdate->getDate('Y', $time_allow2);

-}

-

-if(isset($_REQUEST["m"]))

-	$m = getParameter("m", "number");

-else{

+  if ($ta1_set && $cdate->validDate($time_allow1)) {
+  	$year_start = $cdate->getDate('Y', $time_allow1);
+  }
+  if ($ta2_set && $cdate->validDate($time_allow2)) {
+  	$year_end = $cdate->getDate('Y', $time_allow2);
+  }
+  }

+

+if(isset($_REQUEST["m"])) {
+	$m = getParameter("m", "number");
+} else{

 	if($slm != "00"){

 		$m = $slm;

-	}else{

+	} else{

 		if($ta2_set && $year_end > 0){

 			//compare which one is more

 			$year_allow2 = $cdate->getDate('Y', $time_allow2);

 			if($year_allow2 >= $year_end){

 				//use time_allow2

 				$m = ($cdate->dateBefore($time_allow2)) ? $cdate->getDate("m") : $cdate->getDate('m', $time_allow2);

-			}else{

+			} else{

 				//use year_end

 				$m = ($year_end > $cdate->getDate("Y")) ? $cdate->getDate("m") : 12;

 			}

-		}elseif($ta2_set){

+		} elseif($ta2_set){

 			$m = ($cdate->dateBefore($time_allow2)) ? $cdate->getDate("m") : $cdate->getDate('m', $time_allow2);

-		}elseif($year_end > 0){

+		} elseif($year_end > 0){

 			$m = ($year_end > $cdate->getDate("Y")) ? $cdate->getDate("m") : 12; //date('m')

-		}else{

+		} else{

 			$m = $cdate->getDate("m");

 		}

 	}

 }

 

-if($m < 1 && $m > 12) $m = $cdate->getDate("m");

+if($m < 1 && $m > 12) {
+	$m = $cdate->getDate("m");
+}
 

 $m = str_pad($m, 2, "0", STR_PAD_LEFT);

 

 $cyr = ($sly != "0000") ? true : false;

-if($cyr && $sly && $sly < $year_start) $sly = $year_start;

-if($cyr && $sly && $sly > $year_end) $sly = $year_end;

-

-if(isset($_REQUEST["y"]))

-	$y = getParameter("y", "number");

-else

-	$y = ($cyr) ? $sly : $cdate->getDate("Y");

-

-if($y <= 0) $y = $cdate->getDate("Y");

+if($cyr && $sly && $sly < $year_start) {
+	$sly = $year_start;
+}
+if($cyr && $sly && $sly > $year_end) {
+	$sly = $year_end;
+}
+

+if(isset($_REQUEST["y"])) {
+	$y = getParameter("y", "number");
+} else {
+	$y = ($cyr) ? $sly : $cdate->getDate("Y");
+}
+

+if($y <= 0) {
+	$y = $cdate->getDate("Y");
+}
 

 // ensure m-y fits date allow range

 if (!$show_not_allow) {

 	if ($ta1_set) {

 		$m1 = $cdate->getDate('m', $time_allow1);

 		$y1 = $cdate->getDate('Y', $time_allow1);

-		if ($y == $y1 && (int)$m < (int)$m1) $m = $m1;

+		if ($y == $y1 && (int)$m < (int)$m1) {
+			$m = $m1;
+		}
 	}

 	if ($ta2_set) {

 		$m2 = $cdate->getDate('m', $time_allow2);

 		$y2 = $cdate->getDate('Y', $time_allow2);

-		if ($y == $y2 && (int)$m > (int)$m2) $m = $m2;

+		if ($y == $y2 && (int)$m > (int)$m2) {
+			$m = $m2;
+		}
 	}

 }

 

@@ -147,7 +172,9 @@ 
 $cobj->setTimezone($timezone); //set for further usage, nothing for now

 

 $theme_path = ($theme != "") ? $cobj->getThemePath($theme) : "";

-if(!is_file($theme_path)) $theme_path = "";

+if(!is_file($theme_path)) {
+	$theme_path = "";
+}
 

 //check and show default calendar month and year on valid range of date_allow

 if(!isset($_REQUEST["m"])){

@@ -168,15 +195,19 @@ 
 $year_end = $cobj->year_end;

 

 //check year display in valid range

-if($y >= $year_end) $y = $year_end;

-if($y <= $year_start) $y = $year_start;

+if($y >= $year_end) {
+	$y = $year_end;
+}
+if($y <= $year_start) {
+	$y = $year_start;
+}
 

 $total_thismonth = $cobj->total_days($m, $y);

 

 if($m == 1){

 	$previous_month = 12;

 	$previous_year = $y-1;

-}else{

+} else{

 	$previous_month = $m-1;

 	$previous_year = $y;

 }

@@ -184,7 +215,7 @@ 
 if($m == 12){

 	$next_month = 1;

 	$next_year = $y+1;

-}else{

+} else{

 	$next_month = $m+1;

 	$next_year = $y;

 }

@@ -196,9 +227,9 @@ 
 if($firstdate == $startDate){

 	//skip last month

 	$startwrite = $total_lastmonth+1;

-}elseif($firstdate < $startDate){

+} elseif($firstdate < $startDate){

 	$startwrite = $total_lastmonth - (6-($startDate-$firstdate));

-}else{

+} else{

 	$startwrite = $total_lastmonth - ($firstdate - $startDate - 1);

 }

 

@@ -222,8 +253,10 @@ 
 	$wknum = $cdate->getWeekNumber($prev_d);

 	if(!isset($week_rows[$row_count][$wknum])){

 		$week_rows[$row_count][$wknum] = 1;

-	}else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;

-}

+	} else {
+		$week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
+	}
+	}

 

 $pvMonthTime = $previous_year."-".$previous_month."-".$total_lastmonth;

 

@@ -231,13 +264,20 @@ 
 if($ta1_set && !$show_not_allow){

 	if($cdate->dateBefore($pvMonthTime, $time_allow1)){

 		$show_previous = true;

-	}else $show_previous = false;

-}else $show_previous = true; //always show when not set

+	} else {
+		$show_previous = false;
+	}
+	} else {
+	$show_previous = true;
+}
+//always show when not set

 

 $date_num = $cdate->getDayOfWeek(($previous_year."-".$previous_month."-".$total_lastmonth));

 if(($startDate == 0 && $date_num == 6) || ($startDate > 0 && $date_num == $startDate-1) && $startwrite<$total_lastmonth){

-	if(isset($calendar_rows[0])) $row_count++;

-}

+	if(isset($calendar_rows[0])) {
+		$row_count++;
+	}
+	}

 

 $dp_time = ($date_pair_value) ? $date_pair_value : "";

 

@@ -270,13 +310,13 @@ 
 	if($ta1_set && $ta2_set){

 		//both date specified

 		$dateLink = ($cdate->dateBefore($date_str, $time_allow1) && $cdate->dateAfter($date_str, $time_allow2)) ? true : false;

-	}elseif($ta1_set){

+	} elseif($ta1_set){

 		//only date 1 specified

 		$dateLink = $cdate->dateBefore($date_str, $time_allow1) ? true : false;

-	}elseif($ta2_set){

+	} elseif($ta2_set){

 		//only date 2 specified

 		$dateLink = $cdate->dateAfter($date_str, $time_allow2) ? true : false;

-	}else{

+	} else{

 		//no date allow specified, assume show all

 		$dateLink = true;

 	}

@@ -343,13 +383,15 @@ 
 	if($date_pair_value){

 		//check date_pair1 & 2

 		if($date_pair1 && $date_pair_value != "0000-00-00" && $cdate->dateAfter($date_pair_value, $date_str) && (($slm>0 && $sld>0 && $sly>0) && $cdate->dateBefore("$sly-$slm-$sld", $date_str))){ //set date only after date_pair1

-			if(!in_array("select", $htmlClass))

-				$htmlClass[] = "select";

+			if(!in_array("select", $htmlClass)) {
+							$htmlClass[] = "select";
+			}
 		}

 

 		if($date_pair2 && $date_pair_value != "0000-00-00" && $cdate->dateBefore($date_pair_value, $date_str) && (($slm>0 && $sld>0 && $sly>0) && $cdate->dateAfter("$sly-$slm-$sld", $date_str))){ //set date only before date_pair2

-			if(!in_array("select", $htmlClass))

-				$htmlClass[] = "select";

+			if(!in_array("select", $htmlClass)) {
+							$htmlClass[] = "select";
+			}
 		}

 	}

 

@@ -364,7 +406,7 @@ 
 		$class = implode(" ", $htmlClass);

 

 		$calendar_rows[$row_count][] = array($day, "javascript:selectDay('".str_pad($day, 2, "0", STR_PAD_LEFT)."');", $class, "$y".str_pad($m, 2, "0", STR_PAD_LEFT).str_pad($day, 2, "0", STR_PAD_LEFT));

-	}else{

+	} else{

 		$htmlClass[] = "disabledate";

 		$class = implode(" ", $htmlClass);

 

@@ -381,14 +423,18 @@ 
 		$row_count++;

 

 		$dayinweek_counter = 0;

-	}else $dayinweek_counter++;

+	} else {
+		$dayinweek_counter++;
+	}
 

 	$wknum = $cdate->getWeekNumber(($y."-".$m."-".$day));

 

 	if(!isset($week_rows[$row_count][$wknum])){

 		$week_rows[$row_count][$wknum] = 1;

-	}else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;

-}

+	} else {
+		$week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
+	}
+	}

 

 //write next other month

 $write_end_days = (6-$dayinweek_counter)+1;

@@ -399,7 +445,9 @@ 
 		$wknum = $cdate->getWeekNumber($cdate->addMonth("Y-m-d", 1, ($y."-".$m."-".$day))); //date('W', mktime(0,0,0, $m+1, $day, $y));

 		if(!isset($week_rows[$row_count][$wknum])){

 			$week_rows[$row_count][$wknum] = 1;

-		}else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;

+		} else {
+			$week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
+		}
 	}

 	 $row_count++;

 }

@@ -414,7 +462,9 @@ 
 

 		if(!isset($week_rows[$row_count][$wknum])){

 			$week_rows[$row_count][$wknum] = 1;

-		}else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;

+		} else {
+			$week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
+		}
 	}

 	$write_end_days += 6;

 }

@@ -424,11 +474,19 @@ 
 	$nxMonthTime = $next_year."-".$next_month."-1";

 	if($cdate->dateAfter($nxMonthTime, $time_allow2)){

 		$show_next = true;

-	}else $show_next = false;

-}else $show_next = true; //always show when not set

+	} else {
+		$show_next = false;
+	}
+	} else {
+	$show_next = true;
+}
+//always show when not set

 ?>

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml"<?php if($rtl) echo(" dir=\"rtl\""); ?>>

+<html xmlns="http://www.w3.org/1999/xhtml"<?php if($rtl) {
+	echo(" dir=\"rtl\"");
+}
+?>>

 <head>

 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

 <title>TriConsole.com - PHP Calendar Date Picker</title>

@@ -459,7 +517,7 @@ 
 		if($form_name){

 			//submit value by post form

 			echo("window.parent.document.".$form_name.".submit();\n");

-		}elseif($target_url){

+		} elseif($target_url){

 			//submit value by get method

 			echo("var date_selected = yvalue + \"-\" + mvalue + \"-\" + dvalue;\n");

 			echo("window.parent.location.href='".$target_url."?".$objname."='+date_selected;\n");

@@ -474,7 +532,10 @@ 
 <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">

 <span id="calendar-page" class="font">

 	<div id="calendar-header" align="center">

-		<?php if($show_calendar_info) include("calendar_info.php"); ?>

+		<?php if($show_calendar_info) {
+	include("calendar_info.php");
+}
+?>

 		<?php if($dp && !$auto_hide){ ?>

 		<div style="float: right;" class="closeme"><a href="javascript:closeMe();"><img src="images/close.gif" border="0" alt="Close" title="Close" /></a></div>

 		<?php } ?>

@@ -561,7 +622,9 @@ 
 

 			echo("<tr>");

 

-			if ($show_weeks) echo("<td align=\"center\" class=\"header wk-hdr\"><div>".$cobj->week_hdr."</div></td>");

+			if ($show_weeks) {
+				echo("<td align=\"center\" class=\"header wk-hdr\"><div>".$cobj->week_hdr."</div></td>");
+			}
 

 			//write calendar day header

 			foreach($day_headers as $dh){

@@ -591,7 +654,7 @@ 
 

 					if($this_link){

 						echo("<td".$id_str." align=\"center\" class=\"".$this_class."\"><div><a href=\"".$this_link."\">".$this_day."</a></div></td>");

-					}else{

+					} else{

 						echo("<td".$id_str." align=\"center\" class=\"".$this_class."\"><div>".$this_day."</div></td>");

 					}

 				}

@@ -610,7 +673,9 @@ 
 				if($previous_year >= $year_start && $show_previous){

 				?><a href="javascript:move('<?php echo(str_pad($previous_month, 2, "0", STR_PAD_LEFT));?>', '<?php echo($previous_year);?>');"><img src="images/btn_<?php echo($rtl ? "next" : "previous"); ?>.gif" width="16" height="16" border="0" alt="Previous" title="Previous" /></a>

 				<?php

-				}else echo("&nbsp;");

+				} else {
+					echo("&nbsp;");
+				}
 				?>

 			</div>

 			<div style="float: <?php echo($rtl ? "left" : "right"); ?>;" class="btn">

@@ -618,18 +683,22 @@ 
 				if($next_year <= $year_end && $show_next){

 				?><a href="javascript:move('<?php echo(str_pad($next_month, 2, "0", STR_PAD_LEFT));?>', '<?php echo($next_year);?>');"><img src="images/btn_<?php echo($rtl ? "previous" : "next"); ?>.gif" width="16" height="16" border="0" alt="Next" title="Next" /></a>

 				<?php

-				}else echo("&nbsp;");

+				} else {
+					echo("&nbsp;");
+				}
 				?>

 			</div>

 			<div class="links">

 				<?php

 				$footer_links = array();

 

-				if($cobj->validTodayDate() && ($m != $cdate->getDate('m') || $y != $cdate->getDate('Y')))

-					$footer_links[] = "<a href=\"javascript:today();\" class=\"txt\" alt=\"Today\" title=\"Today\">Today</a>";

+				if($cobj->validTodayDate() && ($m != $cdate->getDate('m') || $y != $cdate->getDate('Y'))) {
+									$footer_links[] = "<a href=\"javascript:today();\" class=\"txt\" alt=\"Today\" title=\"Today\">Today</a>";
+				}
 

-				if($sld>0 && $slm>0 && $sly>0)

-					$footer_links[] = "<a href=\"javascript:unsetValue();\" class=\"txt\" alt=\"Unset\" title=\"Unset\">Unset</a>";

+				if($sld>0 && $slm>0 && $sly>0) {
+									$footer_links[] = "<a href=\"javascript:unsetValue();\" class=\"txt\" alt=\"Unset\" title=\"Unset\">Unset</a>";
+				}
 

 				if(sizeof($footer_links)>0){

 					echo(implode(" | ", $footer_links));

contrib/ipImap/getip.php

Braces +1 added lines, -3 removed lines

@@ -51,9 +51,7 @@
 		'db'	 => $db,
 		'dbport' => $dbport
 	);
-}
-
-else {
+} else {
 	$mysqlconf = NULL;
 	syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.') ;
 }

delist.php

Braces +3 added lines, -2 removed lines

@@ -18,10 +18,11 @@
 }
 syslog(LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info) ;
 
-if (changestatus($mysqli,username(),$_POST['value'],'0',$type,$table))
+if (changestatus($mysqli,username(),$_POST['value'],'0',$type,$table)) {
  print 'OK '.$_POST["type"].' <'.$_POST['value'].'> delisted.';
-else
+} else {
  print 'ERROR in delist <'.$_POST['value'].'>; check log';
+}
 print '</td>';
 $mysqli->close();
 closelog();

relistForm.php

Braces +6 added lines, -3 removed lines

@@ -3,9 +3,12 @@
         $type = $tables["$typedesc"]['field'];
         $table = $tables["$typedesc"]['name'];
 	$adm = unserialize($_POST["adm"]);
-	if (in_array($_POST["user"],array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
-	else $extopt = NULL;
-?>
+	if (in_array($_POST["user"],array_keys(array_filter($adm)))) {
+		$extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+	} else {
+		$extopt = NULL;
+	}
+	?>
 
 
 <td  colspan="9">