falon / RBL

contrib/ipImap/report/calendar/calendar_functions.php

Doc Comments +3 added lines

@@ -1,4 +1,7 @@
 <?php

+/**
+ * @param string $str
+ */
 function filterInput($str, $type = "text"){

 	switch(strtolower($type)){

 		case "number":

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/classes/tc_calendar.php

Doc Comments +20 added lines

@@ -122,6 +122,11 @@ 
     }

 

 	//get the total day of each month in year

+
+    /**
+     * @param integer $month
+     * @param integer $year
+     */
     function total_days($month,$year){

     	$days = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);

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

@@ -170,6 +175,12 @@ 
 	}

 

 	//set default selected date

+
+	/**
+	 * @param integer $day
+	 * @param integer $month
+	 * @param integer $year
+	 */
 	function setDate($day, $month, $year){

 		//get system timezone before set the date

 		$this->system_timezone = date_default_timezone_get();

@@ -516,6 +527,9 @@ 
 		return $str;

 	}

 

+	/**
+	 * @param string $suffix
+	 */
 	function eHidden($suffix, $value) {

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

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

@@ -849,6 +863,9 @@ 
 		return true;

 	}

 

+	/**
+	 * @return string
+	 */
 	function check_json_encode($obj){

 		//try customize to get it work, should replace with better solution in the future

 		if(is_array($obj)){

@@ -997,6 +1014,9 @@ 
 		}

 	}

 

+	/**
+	 * @param string $tz
+	 */
 	function setTimezone($tz){

 		$this->timezone = $tz;

 		@date_default_timezone_set($tz);

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.php

Doc Comments +14 added lines

@@ -54,6 +54,9 @@ 
 		}

 	}

 

+	/**
+	 * @return string
+	 */
 	function getDate($format = "Y-m-d", $cdate = ""){

 		if(!$this->compatible){

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

@@ -123,6 +126,9 @@ 
 		}

 	}

 

+	/**
+	 * @param string $timespan
+	 */
 	function addDate($format = "Y-m-d", $timespan, $cdate = ""){

 		if($this->compatible){

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

@@ -148,6 +154,10 @@ 
 

 	//check if date1 is before date2

 	//if date1 omitted use set date

+
+	/**
+	 * @param string|boolean $date2
+	 */
 	function dateBefore($date2, $date1 = "", $equal = true){

 		if(!$this->compatible){

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

@@ -162,6 +172,10 @@ 
 

 	//check if date1 is after date2

 	//if date1 omitted use set date

+
+	/**
+	 * @param string|boolean $date2
+	 */
 	function dateAfter($date2, $date1 = "", $equal = true){

 		if(!$this->compatible){

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

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);

result.php

Braces +25 added lines, -15 removed lines

@@ -5,31 +5,38 @@ 
 $net = new \dautkom\ipv4\IPv4();
 
 $_ = $_POST['genere'];
-if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') ) {
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_EMAIL)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
+}
 
-if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') ) {
         if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid domain.</pre>');
+}
 
-if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') ) {
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid IP address.</pre>');
+}
 	
 if ( ($tables["$_"]['field']=='network') AND ($_POST['Value']!='ALL') ) {
 	$value = explode('/',$_POST['Value']);
-	if (count($value) != 2)
-		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask pair.</pre>');
-	if (!$net->address($value[0])->mask($value[1])->isValid(1))
-		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask.</pre>');
-}
+	if (count($value) != 2) {
+			exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask pair.</pre>');
+	}
+	if (!$net->address($value[0])->mask($value[1])->isValid(1)) {
+			exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask.</pre>');
+	}
+	}
 
 if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
-                exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
-	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
-		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
+        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) ) {
+                        exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
+        }
+	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) ) {
+			exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
+	}
 	switch ( $_POST['Value'] ) {
 		case 'anonymous':
 		case 'anybody':
@@ -40,9 +47,12 @@ 
 }	
 
 if (empty($_GET)) {
-	if ($tables["$_"]['bl']) print "<p><i>$_</i> is a blocklist of ".$tables["$_"]['field'].'.</p>';
-	else print "<p><i>$_</i> is a whitelist of ".$tables["$_"]['field'].'.</p>';
-}
+	if ($tables["$_"]['bl']) {
+		print "<p><i>$_</i> is a blocklist of ".$tables["$_"]['field'].'.</p>';
+	} else {
+		print "<p><i>$_</i> is a whitelist of ".$tables["$_"]['field'].'.</p>';
+	}
+	}
 
 openlog($tag, LOG_PID, $fac);
 $user = username();

index.php

Braces +5 added lines, -2 removed lines

@@ -14,11 +14,14 @@
 require_once('function.php');
 
 
-if ( $require_auth ) if ( username() == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
+if ( $require_auth ) {
+	if ( username() == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
+}
 
 
-if ( $imapListActive )
+if ( $imapListActive ) {
 	print ' <p style="text-align: right"><a href="/spamreport" target="_new">SPAM Learn Observer</a></p>';
+}
 
 print <<<END
 <form name="check" action="result.php" onSubmit="xmlhttpPost('result.php', 'check', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" enctype="text/plain" method="post" target="_self">

list.php

Braces +8 added lines, -4 removed lines

@@ -6,9 +6,12 @@ 
 $table = $tables["$typedesc"]['name'];
 
 openlog($tag, LOG_PID, $fac);
-if (empty($_POST['reason'])) die ("<p>Please, specify a reason!</p>");
-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
+if (empty($_POST['reason'])) {
+	die ("<p>Please, specify a reason!</p>");
+}
+if (preg_match( '/[^\x20-\x7f]/', $_POST['reason'])) {
 	exit('<p>ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</p>');
+}
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
@@ -20,10 +23,11 @@ 
         }
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 
-if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
+if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason'])) {
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; first time listed for '.$_POST['quantity'].$_POST['unit'].'.';
-else
+} else {
  print 'List operation ERROR; check log.';
+}
 $mysqli->close();
 closelog();
 ?>

relist.php

Braces +11 added lines, -5 removed lines

@@ -8,9 +8,12 @@ 
 <td colspan="9" style="text-align: center">
 <?php
 openlog($tag, LOG_PID, $fac);
-if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
+if (empty($_POST['reason'])) {
+	die ("Specify a reason, please!</td>");
+}
+if (preg_match( '/[^\x20-\x7f]/', $_POST['reason'])) {
         exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
+}
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
@@ -22,11 +25,14 @@ 
 }
 syslog(LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info) ;
 
-if (isFull($mysqli,$typedesc,$tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
-if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
+if (isFull($mysqli,$typedesc,$tables)) {
+	die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
+}
+if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason'])) {
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; relisted for '.$_POST['quantity'].$_POST['unit'];
-else
+} else {
  print 'ERROR in relist; check log';
+}
 $mysqli->close();
 closelog();
 print '</td>';

listForm.php

Braces +5 added lines, -2 removed lines

@@ -1,6 +1,9 @@
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
-else $extopt = NULL;
+if (in_array($user,array_keys(array_filter($adm)))) {
+	$extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+} else {
+	$extopt = NULL;
+}
 ?>
 <form style="margin:0; text-align: left;" name='ListButton<?php echo $type ?>' enctype="text/plain" method="post" target="_self" action="list.php"  onSubmit="xmlhttpPost('list.php', 'ListButton<?php echo $type ?>', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" />
 

contrib/splunk/listFromSplunk.php

Braces +21 added lines, -12 removed lines

@@ -12,8 +12,12 @@ 
 
 $shortopts = "c:";  // Required value
 $options = getopt($shortopts);
-if ( !isset($options['c']) ) exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
-if ( !file_exists(dirname(__FILE__) . '/' . $options['c']) ) exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
+if ( !isset($options['c']) ) {
+	exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
+}
+if ( !file_exists(dirname(__FILE__) . '/' . $options['c']) ) {
+	exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
+}
 
 /************** Start of conf ************************/
 require_once('config.php');
@@ -77,14 +81,18 @@ 
         $row = -1;
         while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
                 $row++;
-                if ($row == 0) continue; /* Skip heading line */
+                if ($row == 0) {
+                	continue;
+                }
+                /* Skip heading line */
                 $thisVal = $data[1];
                 unset($data[1]);
                 $data = array_values($data);
-                if ( !in_array($thisVal,array_keys($tolist))  )
-                        $tolist["$thisVal"] = $data;
-                else if ($data[3]>$tolist[$thisVal][3])
-                        $tolist["$thisVal"] = $data;
+                if ( !in_array($thisVal,array_keys($tolist))  ) {
+                                        $tolist["$thisVal"] = $data;
+                } else if ($data[3]>$tolist[$thisVal][3]) {
+                                        $tolist["$thisVal"] = $data;
+                }
         }
         fclose($handle);
 }
@@ -115,17 +123,18 @@ 
                                 		$recip = emailToNotify($domainNotify_file,$domain);
                                 		$subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
 								$tables["$typedesc"]['field'], $value);
-                                		if (!empty($recip))
-                                        		if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
+                                		if (!empty($recip)) {
+                                		                                        		if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
 								$subject,$value,"$quantity $unit",$reason) )
                                                 		syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
+                                		}
+					} else {
+						syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
 					}
-					else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
 				}
                         }
                 }
-        }
-	else {
+        } else {
 		$reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
 		syslog (LOG_INFO, "$user: ".$reason);
 	}