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":

Spacing +9 added lines, -9 removed lines

@@ -1,13 +1,13 @@ 
 <?php

-function filterInput($str, $type = "text"){

-	switch(strtolower($type)){

+function filterInput($str, $type = "text") {

+	switch (strtolower($type)) {

 		case "number":

-			if(is_numeric($str))

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

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

 				return array(true, $str);

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

 			break;

@@ -19,23 +19,23 @@ 
 	}

 }

 

-function getParameter($name, $type='text', $default=""){

+function getParameter($name, $type = 'text', $default = "") {

 	$v = isset($_REQUEST[$name]) ? trim($_REQUEST[$name]) : $default;

 

 	$results = filterInput($v, $type);

 	$result_txt = isset($results[1]) ? $results[1] : "";

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

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

 		return $result_txt;

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

 }

 

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

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

 	$content = $txt;

 

 	//$content = unhtmlentities($content);

 	$content = htmlspecialchars_decode($content, ENT_QUOTES);

 

-	foreach($maps as $map_key=>$map_value){

+	foreach ($maps as $map_key=>$map_value) {

 		$content = str_replace($map_key, $map_value, $content);

 	}

 

@@ -43,7 +43,7 @@ 
 	$content = stripslashes($content);

 	$content = stripslashes($content);

 

-	if(!$allow_tag){

+	if (!$allow_tag) {

 		$content = strip_tags($content);

 	}

 

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

Indentation +7 added lines, -7 removed lines

@@ -117,17 +117,17 @@
 

 	//check for leapyear

 	function is_leapyear($year){

-    	return ($year % 4 == 0) ?

-    		!($year % 100 == 0 && $year % 400 <> 0)	: false;

-    }

+		return ($year % 4 == 0) ?

+			!($year % 100 == 0 && $year % 400 <> 0)	: false;

+	}

 

 	//get the total day of each month in year

-    function total_days($month,$year){

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

+	function total_days($month,$year){

+		$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];

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

 		}else return 31;

-    }

+	}

 

 	//Deprecate since v1.6

 	function getDayNum($day){

Spacing +195 added lines, -195 removed lines

@@ -12,7 +12,7 @@ 
 

 require_once('tc_date.php');

 

-class tc_calendar{

+class tc_calendar {

 	public $version = "3.75";

 	public $check_new_version = false;

 

@@ -98,12 +98,12 @@ 
 	private $theme = "default";

 

 	//calendar constructor

-	function __construct($objname, $date_picker = false, $show_input = true, $timezone = ""){

+	function __construct($objname, $date_picker = false, $show_input = true, $timezone = "") {

 		$this->objname = $objname;

 		//$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');

@@ -116,36 +116,36 @@ 
 	}

 

 	//check for leapyear

-	function is_leapyear($year){

+	function is_leapyear($year) {

     	return ($year % 4 == 0) ?

-    		!($year % 100 == 0 && $year % 400 <> 0)	: false;

+    		!($year % 100 == 0 && $year % 400 <> 0) : false;

     }

 

 	//get the total day of each month in year

-    function total_days($month,$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){

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

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

 		}else return 31;

     }

 

 	//Deprecate since v1.6

-	function getDayNum($day){

+	function getDayNum($day) {

 		$headers = $this->getDayHeaders();

 		return isset($headers[$day]) ? $headers[$day] : 0;

 	}

 

 	//get the day headers start from sunday till saturday

-	function getDayHeaders(){

+	function getDayHeaders() {

 		$rtn_hdrs = array();

 		$hdrs = array("0"=>"Su", "1"=>"Mo", "2"=>"Tu", "3"=>"We", "4"=>"Th", "5"=>"Fr", "6"=>"Sa");

 

 		$startdate = $this->startDate;

 

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

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

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

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

 			//if(isset($hdrs[(string)$startdate]))

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

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

 

 			$startdate++;

 		}

@@ -153,11 +153,11 @@ 
 		return $rtn_hdrs;

 	}

 

-	function setIcon($icon){

+	function setIcon($icon) {

 		$this->icon = $icon;

 	}

 

-	function setText($txt){

+	function setText($txt) {

 		$this->txt = $txt;

 	}

 

@@ -165,12 +165,12 @@ 
 	//input the date format according to php date format

 	// for example: 'd F y' or 'Y-m-d'

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

-	function setDateFormat($format){

+	function setDateFormat($format) {

 		$this->date_format = $format;

 	}

 

 	//set default selected date

-	function setDate($day, $month, $year){

+	function setDate($day, $month, $year) {

 		//get system timezone before set the date

 		$this->system_timezone = date_default_timezone_get();

 		$this->system_timezone_offset = date('Z');

@@ -185,7 +185,7 @@ 
 		$this->year = $year;

 	}

 

-	function setDateYMD($date){

+	function setDateYMD($date) {

 		list($year, $month, $day) = explode("-", $date, 3);

 		$this->day = $day;

 		$this->month = $month;

@@ -193,52 +193,52 @@ 
 	}

 

 	//specified location of the calendar_form.php

-	function setPath($path){

+	function setPath($path) {

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

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

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

 		$this->path = $path;

 	}

 

-	function writeScript(){

+	function writeScript() {

 		$this->processScript();

 	}

 

-	function getScript(){

+	function getScript() {

 		return $this->processScript(true);

 	}

 

-	function processScript($buffer = false){

+	function processScript($buffer = false) {

 		$str = "";

 

 		//check valid default date

-		if(!$this->checkDefaultDateValid()){

+		if (!$this->checkDefaultDateValid()) {

 			//unset default date

 			$this->setDate(00, 00, 0000);

 		}

 

 		//check date set to the timezone

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

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

 			//date has been set

-			if($this->timezone != "" && $this->system_timezone != "" && $this->timezone != $this->system_timezone){

+			if ($this->timezone != "" && $this->system_timezone != "" && $this->timezone != $this->system_timezone) {

 				//echo("<br />TZ! ".$this->system_timezone);

 				//echo("<br />OFFSET: ".$this->system_timezone_offset.",".$this->timezone_offset);

 				//timezone has been set and different from system timezone

 				$a_date = $this->year."-".$this->month."-".$this->day." ".$this->system_timezone_h.":".$this->system_timezone_i.":".$this->system_timezone_s;

 				//echo(", date: $a_date");

 

-				if ((version_compare(PHP_VERSION, '5.3.0') <= 0 && checkdate($this->month, $this->day, $this->year)) || true) {

+				if ((version_compare(PHP_VERSION, '5.3.0')<=0 && checkdate($this->month, $this->day, $this->year)) || true) {

 					//get the timezone difference

 					$tz_sys_ms = $this->system_timezone_offset;

 					$tz_new_ms = $this->timezone_offset;

 

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

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

+					$timezone_diff_hr = $timezone_diff / 3600;

 					//echo("<br />Diff: ".$timezone_diff_hr);

 

 					$a_time = strtotime($a_date);

@@ -255,7 +255,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');

@@ -269,21 +269,21 @@ 
 		$str .= $this->writeHidden();

 

 		//check whether it is a date picker

-		if($this->date_picker){

+		if ($this->date_picker) {

 			$str .= "<div style=\"position: relative; z-index: ".$this->zindex."; display: inline-block; vertical-align: top;\" id=\"container_".$this->objname."\" onmouseover=\"javascript:focusCalendar('".$this->objname."');\" onmouseout=\"javascript:unFocusCalendar('".$this->objname."', ".$this->zindex.");\">";

 

-			if($this->show_input){

+			if ($this->show_input) {

 				$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>";

 			}

 

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

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

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

 			$str .= "</a>";

@@ -291,123 +291,123 @@ 
 			$str .= $this->writeCalendarContainer();

 

 			$str .= "</div>";

-		}else{

+		}else {

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

 		}

 

-		if($buffer){

+		if ($buffer) {

 			return $str;

-		}else{

+		}else {

 			echo($str);

 		}

 	}

 

-	function writeCalendarContainer(){

+	function writeCalendarContainer() {

 		$params = array();

 		$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) : "";

 

-		if($this->date_picker){

+		if ($this->date_picker) {

 			$div_display = "hidden";

 			$div_position = "absolute";

 

 			$line_height = $this->line_height;

 

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

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

 				$img_attribs = getimagesize($this->icon);

 				$line_height = $img_attribs[1]+2;

 			}

@@ -415,7 +415,7 @@ 
 			$div_align = "";

 

 			//adjust alignment

-			switch($this->v_align){

+			switch ($this->v_align) {

 				case "top":

 					$div_align .= "bottom:".$line_height."px;";

 					break;

@@ -424,7 +424,7 @@ 
 					$div_align .= "top:".$line_height."px;";

 			}

 

-			switch($this->h_align){

+			switch ($this->h_align) {

 				case "left":

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

 					break;

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

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

 			}

-		}else{

+		}else {

 			$div_display = "visible";

 			$div_position = "relative";

 			$div_align = "";

@@ -452,15 +452,15 @@ 
 	}

 

 	//write the select box of days

-	function writeDay(){

+	function writeDay() {

 		$total_days = $this->total_days($this->month, $this->year);

 

 		$str = "";

 		$str .= "<select name=\"".$this->objname."_day\" id=\"".$this->objname."_day\" onChange=\"javascript:tc_setDay('".$this->objname."', this[this.selectedIndex].value);\" class=\"tcday\"".($this->rtl ? " dir=\"rtl\"" : "").">";

 		$str .= "<option value=\"00\"".($this->rtl ? " dir=\"rtl\"" : "").">Day</option>";

-		for($i=1; $i<=$total_days; $i++){

-			$selected = ((int)$this->day == $i) ? " selected='selected'" : "";

-			$str .= "<option value=\"".str_pad($i, 2 , "0", STR_PAD_LEFT)."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$i."</option>";

+		for ($i = 1; $i<=$total_days; $i++) {

+			$selected = ((int) $this->day == $i) ? " selected='selected'" : "";

+			$str .= "<option value=\"".str_pad($i, 2, "0", STR_PAD_LEFT)."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$i."</option>";

 		}

 		$str .= "</select> ";

 

@@ -468,14 +468,14 @@ 
 	}

 

 	//write the select box of months

-	function writeMonth(){

+	function writeMonth() {

 		$str = "";

 		$str .= "<select name=\"".$this->objname."_month\" id=\"".$this->objname."_month\" onChange=\"javascript:tc_setMonth('".$this->objname."', this[this.selectedIndex].value);\" class=\"tcmonth\"".($this->rtl ? " dir=\"rtl\"" : "").">";

 		$str .= "<option value=\"00\"".($this->rtl ? " dir=\"rtl\"" : "").">Month</option>";

 

 		$monthnames = $this->getMonthNames();

-		for($i=1; $i<=sizeof($monthnames); $i++){

-			$selected = ((int)$this->month == $i) ? " selected='selected'" : "";

+		for ($i = 1; $i<=sizeof($monthnames); $i++) {

+			$selected = ((int) $this->month == $i) ? " selected='selected'" : "";

 			$str .= "<option value=\"".str_pad($i, 2, "0", STR_PAD_LEFT)."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$monthnames[$i-1]."</option>";

 		}

 		$str .= "</select> ";

@@ -484,7 +484,7 @@ 
 	}

 

 	//write the year textbox

-	function writeYear(){

+	function writeYear() {

 		$str = "";

 		//echo("<input type=\"textbox\" name=\"".$this->objname."_year\" id=\"".$this->objname."_year\" value=\"$this->year\" maxlength=4 size=5 onBlur=\"javascript:tc_setYear('".$this->objname."', this.value, '$this->path');\" onKeyPress=\"javascript:if(yearEnter(event)){ tc_setYear('".$this->objname."', this.value, '$this->path'); return false; }\"> ");

 		$str .= "<select name=\"".$this->objname."_year\" id=\"".$this->objname."_year\" onChange=\"javascript:tc_setYear('".$this->objname."', this[this.selectedIndex].value);\" class=\"tcyear\"".($this->rtl ? " dir=\"rtl\"" : "").">";

@@ -494,21 +494,21 @@ 
 		$year_end = $this->year_end;

 

 		//check year to be selected in case of time_allow is set

-		if(!$this->show_not_allow && ($this->time_allow1 || $this->time_allow2)){

-			if($this->time_allow1 && $this->time_allow2){

+		if (!$this->show_not_allow && ($this->time_allow1 || $this->time_allow2)) {

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

 			}

 		}

 

-		for($i=$year_end; $i>=$year_start; $i--){

-			$selected = ((int)$this->year == $i) ? " selected='selected'" : "";

+		for ($i = $year_end; $i>=$year_start; $i--) {

+			$selected = ((int) $this->year == $i) ? " selected='selected'" : "";

 			$str .= "<option value=\"".$i."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$i."</option>";

 		}

 		$str .= "</select> ";

@@ -517,14 +517,14 @@ 
 	}

 

 	function eHidden($suffix, $value) {

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

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

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

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

 			return "<input type=\"hidden\" name=\"".$this->objname.$suffix."\" id=\"".$this->objname.$suffix."\" value=\"".$value."\" />";

 		}

 	}

 

 	//write hidden components

-	function writeHidden(){

+	function writeHidden() {

 		$str = "";

 

 		$str .= $this->eHidden('', $this->getDate());

@@ -574,8 +574,8 @@ 
 	// Deprecated since version 2.9

 	// Auto sizing is applied

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

-	function setWidth($width){

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

+	function setWidth($width) {

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

 	}

 

 	//set height of calendar

@@ -583,27 +583,27 @@ 
 	// Deprecated since version 2.9

 	// Auto sizing is applied

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

-	function setHeight($height){

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

+	function setHeight($height) {

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

 	}

 

-	function setYearInterval($start, $end){

+	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){

+		if ($start<$end) {

 			$this->year_start = $start;

 			$this->year_end = $end;

-		}else{

+		}else {

 			$this->year_start = $end;

 			$this->year_end = $start;

 		}

 	}

 

-	function getMonthNames(){

+	function getMonthNames() {

 		return array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");

 	}

 

@@ -611,24 +611,24 @@ 
 	// Deprecated since version 3.61

 	// override by startDate()

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

-	function startMonday($flag){

+	function startMonday($flag) {

 		//$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)

+	function startDate($num) {

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

 			$this->startDate = $num;

 	}

 

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

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

 		$time_from = $this->mydate->validDate($from) ? $from : null;

 		$time_to = $this->mydate->validDate($to) ? $to : null;

 

 		// sanity check, ensure time_from earlier than time_to

-		if($time_from != null && $time_to != null && $this->mydate->dateAfter($time_to, $time_from, true)){

+		if ($time_from != null && $time_to != null && $this->mydate->dateAfter($time_to, $time_from, true)) {

 			$tmp = $time_from;

 			$time_from = $time_to;

 			$time_to = $tmp;

@@ -637,40 +637,40 @@ 
 		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;

 	}

 

-	function autoSubmit($auto, $form_name, $target = ""){

+	function autoSubmit($auto, $form_name, $target = "") {

 		$this->auto_submit = $auto;

 		$this->form_container = $form_name;

 		$this->target_url = $target;

 	}

 

-	function getDate(){

+	function getDate() {

 		return str_pad($this->year, 4, "0", STR_PAD_LEFT)."-".str_pad($this->month, 2, "0", STR_PAD_LEFT)."-".str_pad($this->day, 2, "0", STR_PAD_LEFT);

 	}

 

-	function showInput($flag){

+	function showInput($flag) {

 		$this->show_input = $flag;

 	}

 

-	function writeDateContainer(){

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

+	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";

 

@@ -681,47 +681,47 @@ 
 	// This function disable day column as specified value

 	// day values : Sun, Mon, Tue, Wed, Thu, Fri, Sat

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

-	function disabledDay($day){

+	function disabledDay($day) {

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

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

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

 			$this->dsb_days[] = $day;

 	}

 

-	function setAlignment($h_align, $v_align){

+	function setAlignment($h_align, $v_align) {

 		$this->h_align = $h_align;

 		$this->v_align = $v_align;

 	}

 

-	function setDatePair($calendar_name1, $calendar_name2, $pair_value = "0000-00-00 00:00:00"){

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

+	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")

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

 				$this->date_pair_value = $pair_value;

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

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

 			$this->date_pair2 = $calendar_name2;

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

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

 				$this->date_pair_value = $pair_value;

 		}

 	}

 

-	function setSpecificDate($dates, $type=0, $recursive=""){

-		if(is_array($dates)){

+	function setSpecificDate($dates, $type = 0, $recursive = "") {

+		if (is_array($dates)) {

 			$recursive = strtolower($recursive);

 

 			//change specific date to time

-			foreach($dates as $sp_date){

-				if($this->mydate->validDate($sp_date)){

-					switch($recursive){

+			foreach ($dates as $sp_date) {

+				if ($this->mydate->validDate($sp_date)) {

+					switch ($recursive) {

 						case "month": //add to monthly

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

+							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]))

+							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]))

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

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

 					}

 				}

@@ -762,7 +762,7 @@ 
 	}

 	*/

 

-	function checkDefaultDateValid($reset = true){

+	function checkDefaultDateValid($reset = true) {

 		$date_str = $this->year."-".str_pad($this->month, 2, "0", STR_PAD_LEFT)."-".str_pad($this->day, 2, "0", STR_PAD_LEFT);

 		//$default_datetime = $this->mydate->getTimestamp($date_str);

 /*

@@ -776,72 +776,72 @@ 
 		$end_interval = $this->year_end."-12-31";

 

 		//check if set date is before start_interval

-		if($this->mydate->dateBefore($start_interval, $date_str)){

+		if ($this->mydate->dateBefore($start_interval, $date_str)) {

 			return false;

 		}

 

 		//check if set date is after end_interval

-		if($this->mydate->dateAfter($end_interval, $date_str)){

+		if ($this->mydate->dateAfter($end_interval, $date_str)) {

 			return false;

 		}

 

 		//check with allow date

-		if($this->time_allow1 && $this->time_allow2){

-			if($this->mydate->dateBefore($this->time_allow1, $date_str, false) || $this->mydate->dateAfter($this->time_allow2, $date_str, false)){

+		if ($this->time_allow1 && $this->time_allow2) {

+			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

-		if(is_array($this->sp_dates) && sizeof($this->sp_dates) > 0){

+		if (is_array($this->sp_dates) && sizeof($this->sp_dates)>0) {

 			//check if it is current date

 			$sp_found = false;

 

-			if(isset($this->sp_dates[2])){

-				foreach($this->sp_dates[2] as $sp_time){

+			if (isset($this->sp_dates[2])) {

+				foreach ($this->sp_dates[2] as $sp_time) {

 					$this_md = $this->mydate->getDate("md", $date_str);

 					$sp_time_md = $this->mydate->getDate("md", $sp_time);

-					if($sp_time_md == $this_md){

+					if ($sp_time_md == $this_md) {

 						$sp_found = true;

 						break;

 					}

 				}

 			}

 

-			if(isset($this->sp_dates[1]) && !$sp_found){

-				foreach($this->sp_dates[1] as $sp_time){

+			if (isset($this->sp_dates[1]) && !$sp_found) {

+				foreach ($this->sp_dates[1] as $sp_time) {

 					$sp_time_d = $this->mydate->getDate("d", $sp_time);

-					if($sp_time_d == $this->day){

+					if ($sp_time_d == $this->day) {

 						$sp_found = true;

 						break;

 					}

 				}

 			}

 

-			if(isset($this->sp_dates[0]) && !$sp_found){

+			if (isset($this->sp_dates[0]) && !$sp_found) {

 				$sp_found = in_array($date_str, $this->sp_dates[0]);

 			}

 

-			switch($this->sp_type){

+			switch ($this->sp_type) {

 				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;

 			}

 		}

 

-		if(is_array($this->dsb_days) && sizeof($this->dsb_days) > 0){

+		if (is_array($this->dsb_days) && sizeof($this->dsb_days)>0) {

 			$day_txt = $this->mydate->getDate("D", $date_str);

-			if(in_array(strtolower($day_txt), $this->dsb_days) !== false){

+			if (in_array(strtolower($day_txt), $this->dsb_days) !== false) {

 				return false;

 			}

 		}

@@ -849,16 +849,16 @@ 
 		return true;

 	}

 

-	function check_json_encode($obj){

+	function check_json_encode($obj) {

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

-		if(is_array($obj)){

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

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

+				foreach ($obj as $arr) {

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

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

 					else $return_arr[] = "[]";

 				}

@@ -870,17 +870,17 @@ 
 	function &check_json_decode($str){

 		//should replace with better solution in the future

 

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

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

 

-			if($str && strlen($str) > 2){

+			if ($str && strlen($str)>2) {

 				$str = substr($str, 1, strlen($str)-2);

 

-				if($str && strlen($str) > 2){

+				if ($str && strlen($str)>2) {

 					$str = substr($str, 1, strlen($str)-2);

 

 					$return_arr = array();

@@ -888,15 +888,15 @@ 
 					$offset = 0;

 

 					$arr = explode("],[", $str);

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

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

 						$this_v = $arr[$i];

-						if($this_v == "")

+						if ($this_v == "")

 							$return_arr[] = array();

-						else{

+						else {

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

 

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

-								if(substr($this_arr[$j], 0, 1)=="\"" && substr($this_arr[$j], strlen($this_arr[$j])-1, 1)=="\""){

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

+								if (substr($this_arr[$j], 0, 1) == "\"" && substr($this_arr[$j], strlen($this_arr[$j])-1, 1) == "\"") {

 									$this_arr[$j] = substr($this_arr[$j], 1, strlen($this_arr[$j])-2);

 								}

 							}

@@ -910,17 +910,17 @@ 
 		}

 	}

 

-	function setOnChange($value){

+	function setOnChange($value) {

 		$this->tc_onchanged = $value;

 	}

 

-	function showWeeks($flag){

+	function showWeeks($flag) {

 		$this->show_week = $flag;

 	}

 

-	function setAutoHide($auto, $time = ""){

+	function setAutoHide($auto, $time = "") {

 		$this->auto_hide = ($auto) ? 1 : 0;

-		if($time != "" && $time >= 0){

+		if ($time != "" && $time>=0) {

 			$this->auto_hide_time = $time;

 		}

 	}

@@ -928,66 +928,66 @@ 
 	//*****************

 	// Validate the today date of calendar

 	//*****************

-	function validTodayDate(){

+	function validTodayDate() {

 		$today = $this->mydate->getDate();

 

 		//check if today is year 2038 and later

-		if(!$this->mydate->compatible && $this->mydate->getDate("Y") >= 2038){

+		if (!$this->mydate->compatible && $this->mydate->getDate("Y")>=2038) {

 			return false;

 		}

 

 		//check if today is in range of date allow

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

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

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

 				return false;

 		}

 

-		if($this->time_allow2 > 0){

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

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

 				return false;

 		}

 		return true;

 	}

 

 	//Tooltips

-	function setToolTips($dates, $tooltip="", $recursive=""){

+	function setToolTips($dates, $tooltip = "", $recursive = "") {

 

-		if(is_array($dates)){

+		if (is_array($dates)) {

 			$recursive = strtolower($recursive);

 

 			//change specific date to time

-			foreach($dates as $tt_date){

+			foreach ($dates as $tt_date) {

 				$tt_time = $tt_date;

 //				if($tt_time > 0){

-				switch($recursive){

+				switch ($recursive) {

 					case "year": //add to yearly

-						if(!in_array($tt_time, $this->tt_dates[2])){

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

 						}

 						break;

 					case "month": //add to monthly

-						if(!in_array($tt_time, $this->tt_dates[1])){

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

 						}

 						break;

 					default: //add to no recursive

-						if(!in_array($tt_time, $this->tt_dates[0])){

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

 						}

@@ -997,23 +997,23 @@ 
 		}

 	}

 

-	function setTimezone($tz){

+	function setTimezone($tz) {

 		$this->timezone = $tz;

 		@date_default_timezone_set($tz);

 		$this->timezone_offset = date('Z');

 		//echo("new timezone: ".$this->timezone);

 	}

 

-	function setTheme($theme){

+	function setTheme($theme) {

 		$this->theme = $theme;

 	}

 

-	function getThemes(){

+	function getThemes() {

 		$themes = array();

 		$themesDirectory = dir('./css/');

-		while($thname = $themesDirectory->read())

+		while ($thname = $themesDirectory->read())

 		{

-			if(is_dir('./css/'.$thname) && file_exists('./css/'.$thname.'/calendar.css') && !preg_match("/^[\.]/", $thname))

+			if (is_dir('./css/'.$thname) && file_exists('./css/'.$thname.'/calendar.css') && !preg_match("/^[\.]/", $thname))

 			{

 				$themes[$thname] = "./css/".$thname."/calendar.css";

 			};

@@ -1023,7 +1023,7 @@ 
 		return $themes;

 	}

 

-	function getThemePath($theme){

+	function getThemePath($theme) {

 		$all_themes = $this->getThemes();

 		return isset($all_themes[$theme]) ? $all_themes[$theme] : "";

 	}

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

Spacing +52 added lines, -52 removed lines

@@ -7,88 +7,88 @@ 
 

 require_once('tc_date_main.php');

 

-class tc_date extends tc_date_main{

+class tc_date extends tc_date_main {

 	var $compatible;

 

-	function tc_date(){

+	function tc_date() {

 		//check if we should use DateTime that comes with 5.3.0 and later

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

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

 			$this->compatible = false;

 		}else $this->compatible = true;

 

-		if(!$this->compatible){

+		if (!$this->compatible) {

 			$this->tc_date_main();

-		}else{

+		}else {

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

 		}

 	}

 

-	function getDayOfWeek($cdate = ""){

-		if(!$this->compatible){

+	function getDayOfWeek($cdate = "") {

+		if (!$this->compatible) {

 			return tc_date_main::getDayOfWeek($cdate);

-		}else{

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

+		}else {

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

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

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

 			}else return "";

 		}

 	}

 

-	function getWeekNumber($cdate = ""){

-		if(!$this->compatible){

+	function getWeekNumber($cdate = "") {

+		if (!$this->compatible) {

 			return tc_date_main::getWeekNumber($cdate);

-		}else{

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

+		}else {

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

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

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

 			}else return "";

 		}

 	}

 

-	function setDate($sdate){

-		if(!$this->compatible){

+	function setDate($sdate) {

+		if (!$this->compatible) {

 			tc_date_main::setDate($sdate);

-		}else{

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

+		}else {

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

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

 		}

 	}

 

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

-		if(!$this->compatible){

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

+		if (!$this->compatible) {

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

-		}else{

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

+		}else {

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

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

 				return $tmp_date->format($format);

 			}else return "";

 		}

 	}

 

-	function setTimestamp($stime){

-		if(!$this->compatible){

+	function setTimestamp($stime) {

+		if (!$this->compatible) {

 			tc_date_main::setTimestamp($stime);

-		}else{

+		}else {

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

 		}

 	}

 

-	function getTimestamp($cdate = ""){

-		if(!$this->compatible){

+	function getTimestamp($cdate = "") {

+		if (!$this->compatible) {

 			return tc_date_main::getTimestamp($cdate);

-		}else{

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

+		}else {

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

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

 				return $tmp_date->getTimestamp();

 			}else return 0;

 		}

 	}

 

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

-		if($stime){

-			if(!$this->compatible){

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

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

@@ -96,35 +96,35 @@ 
 		}else return "";

 	}

 

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

-		if(!$this->compatible){

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

 		}

 	}

 

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

-		if(!$this->compatible){

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

 		}

 	}

 

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

-		if(!$this->compatible){

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

 		}

 	}

 

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

-		if($this->compatible){

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

+		if ($this->compatible) {

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

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

 			return $tmp_date->format($format);

@@ -133,10 +133,10 @@ 
 

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

 	//if date1 omitted use set date

-	function differentDate($date2, $date1 = ""){

-		if(!$this->compatible){

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

@@ -148,10 +148,10 @@ 
 

 	//check if date1 is before date2

 	//if date1 omitted use set date

-	function dateBefore($date2, $date1 = "", $equal = true){

-		if(!$this->compatible){

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

@@ -162,10 +162,10 @@ 
 

 	//check if date1 is after date2

 	//if date1 omitted use set date

-	function dateAfter($date2, $date1 = "", $equal = true){

-		if(!$this->compatible){

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

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

index.php

Spacing +4 added lines, -4 removed lines

@@ -14,10 +14,10 @@ 
 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
@@ -26,10 +26,10 @@ 
 END;
 
 
-$option=NULL;
+$option = NULL;
 $desc = array_keys($tables);
 foreach ($desc as $description) { 
-	$disabled = $tables["$description"]['active']==TRUE ? '' : ' disabled';  
+	$disabled = $tables["$description"]['active'] == TRUE ? '' : ' disabled';  
 	$option .= '<option value="'.$description."\"$disabled>$description</option>";
 	}
 

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">

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

Indentation +34 added lines, -34 removed lines

@@ -47,8 +47,8 @@ 
 
 /* check you select a blocklist */
 if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
-        exit (254);
+		syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+		exit (254);
 }
 
 
@@ -68,33 +68,33 @@ 
 $tolist = array();
 
 if ( !file_exists($splfile) ) {
-        syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
-        exit (254);
+		syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
+		exit (254);
 }
 
 if (($handle = gzopen($splfile, 'r')) !== FALSE) {
-        $row = -1;
-        while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
-                $row++;
-                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;
-        }
-        fclose($handle);
+		$row = -1;
+		while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
+				$row++;
+				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;
+		}
+		fclose($handle);
 }
 
 /* Make MYSQL connection */
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-        syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-        . $mysqli->connect_error);
-        exit (254);
+		syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+		. $mysqli->connect_error);
+		exit (254);
 
 }
 
@@ -103,28 +103,28 @@ 
 foreach ( array_keys($tolist) as $value) {
 	$quantity = $conf['quantity'];
 	$reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
-                        /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+		if ( $tolist["$value"][3] >= $threshold ) {
+				if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
+						syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+						/* Send a email to domain admin if you list an email */
+						if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
 				/* Sometime uid are in the form of <user>@<domain> ... */
 				if ( strpos($value, '@') !== FALSE ) {
-                                	$domain = array_pop(explode('@',$value,2));
+									$domain = array_pop(explode('@',$value,2));
 					if ( strpos($domain, '@') === FALSE ) {
-                                		$recip = emailToNotify($domainNotify_file,$domain);
-                                		$subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
+										$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.");
+														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 {
 		$reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
 		syslog (LOG_INFO, "$user: ".$reason);

Spacing +31 added lines, -31 removed lines

@@ -10,32 +10,32 @@ 
 #
 */
 
-$shortopts = "c:";  // Required value
+$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');
 
  /* Syslog */
-$tag            .= 'SplunkLister';
+$tag .= 'SplunkLister';
 
-$conf = parse_ini_file( dirname(__FILE__) . '/' . $options['c'] );
+$conf = parse_ini_file(dirname(__FILE__).'/'.$options['c']);
 
  /* Splunk inherited parameters */
-$threshold = $conf['threshold'];         /* Threshold value on trigger condition; the same which engage the alert */
-$splfile = $argv[10];    		/* Full path of result Splunk file, see at
+$threshold = $conf['threshold']; /* Threshold value on trigger condition; the same which engage the alert */
+$splfile = $argv[10]; /* Full path of result Splunk file, see at
                            		   http://docs.splunk.com/Documentation/Splunk/6.2.2/Alert/Configuringscriptedalerts
                            		   It is 8+2 because of -c <conf> */
  /* Blacklist name */
-$typedesc  = $conf['typedesc'];
+$typedesc = $conf['typedesc'];
 
  /* How long to list's parameters */
-$unit = $conf['unit'];          /* MySQL language ;) */
+$unit = $conf['unit']; /* MySQL language ;) */
 
  /* Syslog */
-$tag            .= $conf['tag'];
+$tag .= $conf['tag'];
 
 /************** End of conf *************************/
 
@@ -46,8 +46,8 @@ 
 $user = 'Splunk';
 
 /* check you select a blocklist */
-if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+if (!$tables["$typedesc"]['bl']) {
+        syslog(LOG_EMERG, "$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
         exit (254);
 }
 
@@ -67,8 +67,8 @@ 
 
 $tolist = array();
 
-if ( !file_exists($splfile) ) {
-        syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
+if (!file_exists($splfile)) {
+        syslog(LOG_ERR, "$user: File <$splfile> not found! Exit.");
         exit (254);
 }
 
@@ -80,7 +80,7 @@ 
                 $thisVal = $data[1];
                 unset($data[1]);
                 $data = array_values($data);
-                if ( !in_array($thisVal,array_keys($tolist))  )
+                if (!in_array($thisVal, array_keys($tolist)))
                         $tolist["$thisVal"] = $data;
                 else if ($data[3]>$tolist[$thisVal][3])
                         $tolist["$thisVal"] = $data;
@@ -92,47 +92,47 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-        syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+        syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
         . $mysqli->connect_error);
         exit (254);
 
 }
 
-syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
 
-foreach ( array_keys($tolist) as $value) {
+foreach (array_keys($tolist) as $value) {
 	$quantity = $conf['quantity'];
 	$reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+        if ($tolist["$value"][3]>=$threshold) {
+                if (searchAndList($mysqli, $user, $tables, $typedesc, $value, $unit, $quantity, $reason)) {
+                        syslog(LOG_INFO, "$user: ".'Listing reason: '.$reason);
                         /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+                        if (($tables["$typedesc"]['field'] == 'email') OR ($tables["$typedesc"]['field'] == 'username')) {
 				/* Sometime uid are in the form of <user>@<domain> ... */
-				if ( strpos($value, '@') !== FALSE ) {
-                                	$domain = array_pop(explode('@',$value,2));
-					if ( strpos($domain, '@') === FALSE ) {
-                                		$recip = emailToNotify($domainNotify_file,$domain);
+				if (strpos($value, '@') !== FALSE) {
+                                	$domain = array_pop(explode('@', $value, 2));
+					if (strpos($domain, '@') === FALSE) {
+                                		$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,
-								$subject,$value,"$quantity $unit",$reason) )
+                                        		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 {
 		$reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
-		syslog (LOG_INFO, "$user: ".$reason);
+		syslog(LOG_INFO, "$user: ".$reason);
 	}
 }
 
 /* Close connection */
-syslog (LOG_INFO, "$user: ".'Successfully end of session.');
+syslog(LOG_INFO, "$user: ".'Successfully end of session.');
 $mysqli->close();
 closelog();
 

contrib/rbldns/exportdns.php

Indentation +23 added lines, -23 removed lines

@@ -2,7 +2,7 @@ 
 <?php
 
 if (PHP_SAPI != "cli")
-    exit;
+	exit;
 
 $home = '/var/www/html/RBL';
 require_once($home.'/config.php');
@@ -20,30 +20,30 @@ 
 
 $opts = getopt('f:t:');
 if ( isset($opts['f']) ) {
-        $filetemplate = $opts['f'];
+		$filetemplate = $opts['f'];
 } else {
 	print "\nNo option for '-f' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( isset($opts['t']) ) {
-        $tablename = $opts['t'];
+		$tablename = $opts['t'];
 } else {
 	print "\nNo option for '-t' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( ($typedescN = array_search( $tablename, array_column($tables, 'name'))) === FALSE ) {
-        print "\nDB <$tablename> doesn't exist!\n";
-        syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
-        exit ( usage() );
+		print "\nDB <$tablename> doesn't exist!\n";
+		syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
+		exit ( usage() );
 }
 $typedesc = array_keys($tables)[$typedescN];
 
 if (! file_exists($filetemplate) ) {
-        print "\nFile <$filetemplate> doesn't exists!\n";
+		print "\nFile <$filetemplate> doesn't exists!\n";
 	syslog (LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if (! in_array( $typedesc, array_keys($tables) ) ) {
@@ -53,7 +53,7 @@ 
 
 if (! $tables["$typedesc"]['active'] ) {
 	print "\nList <$typedesc> is not active. Please provide an active list name.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 
@@ -73,10 +73,10 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 
 syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
@@ -87,14 +87,14 @@ 
 	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 		if (isListed($riga)) {
 			switch ( $tables["$typedesc"]['field'] ) {
-                                  case 'ip':
-                                        $element[] = long2ip($riga['ip']);
-                                        break;
-                                  case 'network':
-                                        $element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
-                                        break;
-                                  default:
-                                        $element[] = $riga["$type"];
+								  case 'ip':
+										$element[] = long2ip($riga['ip']);
+										break;
+								  case 'network':
+										$element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
+										break;
+								  default:
+										$element[] = $riga["$type"];
 			}
 		}
 	}

Spacing +26 added lines, -26 removed lines

@@ -19,74 +19,74 @@ 
 $user = username();
 
 $opts = getopt('f:t:');
-if ( isset($opts['f']) ) {
+if (isset($opts['f'])) {
         $filetemplate = $opts['f'];
-} else {
+}else {
 	print "\nNo option for '-f' given.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
-if ( isset($opts['t']) ) {
+if (isset($opts['t'])) {
         $tablename = $opts['t'];
-} else {
+}else {
 	print "\nNo option for '-t' given.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
-if ( ($typedescN = array_search( $tablename, array_column($tables, 'name'))) === FALSE ) {
+if (($typedescN = array_search($tablename, array_column($tables, 'name'))) === FALSE) {
         print "\nDB <$tablename> doesn't exist!\n";
-        syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
-        exit ( usage() );
+        syslog(LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
+        exit (usage());
 }
 $typedesc = array_keys($tables)[$typedescN];
 
-if (! file_exists($filetemplate) ) {
+if (!file_exists($filetemplate)) {
         print "\nFile <$filetemplate> doesn't exists!\n";
-	syslog (LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
-        exit ( usage() );
+	syslog(LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
+        exit (usage());
 }
 
-if (! in_array( $typedesc, array_keys($tables) ) ) {
+if (!in_array($typedesc, array_keys($tables))) {
 	print "\nUnknown list <$typedesc>. Please provide an existent list name.\n";
-	exit ( usage() );
+	exit (usage());
 }
 
-if (! $tables["$typedesc"]['active'] ) {
+if (!$tables["$typedesc"]['active']) {
 	print "\nList <$typedesc> is not active. Please provide an active list name.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
 
 
-$now=new DateTime('NOW');
+$now = new DateTime('NOW');
 $timeunix = $now->format('U');
 $dateRFC822 = $now->format('r');
 $year = $now->format('Y');
-$rbltype= ($tables["$typedesc"]['bl']) ? 'Blocklist' : 'Whitelist';
+$rbltype = ($tables["$typedesc"]['bl']) ? 'Blocklist' : 'Whitelist';
 
 
 $tmpl = file_get_contents($filetemplate);
-$arr_tpl_vars = array('{rblname}','{rbltype}','{date822}','{year}','{unixtimestamp}','{rblname64}','{hostname}');
-$arr_tpl_data = array($typedesc,$rbltype,$dateRFC822,$year,$timeunix,base64_encode($typedesc),gethostname());
+$arr_tpl_vars = array('{rblname}', '{rbltype}', '{date822}', '{year}', '{unixtimestamp}', '{rblname64}', '{hostname}');
+$arr_tpl_data = array($typedesc, $rbltype, $dateRFC822, $year, $timeunix, base64_encode($typedesc), gethostname());
 $headerList = str_replace($arr_tpl_vars, $arr_tpl_data, $tmpl);
 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+            syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            exit ($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
 
-syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
 
-$result = searchentry ($mysqli,'ALL',$tables["$typedesc"]);
+$result = searchentry($mysqli, 'ALL', $tables["$typedesc"]);
 if ($result->num_rows) {
 	$element = array();
 	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 		if (isListed($riga)) {
-			switch ( $tables["$typedesc"]['field'] ) {
+			switch ($tables["$typedesc"]['field']) {
                                   case 'ip':
                                         $element[] = long2ip($riga['ip']);
                                         break;
@@ -104,6 +104,6 @@ 
 $mysqli->close();
 
 /* Print to file */
-file_put_contents( $tables["$typedesc"]['name'], $headerList . implode("\n",$element) );
+file_put_contents($tables["$typedesc"]['name'], $headerList.implode("\n", $element));
 closelog();
 ?>

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 #!/usr/bin/php
 <?php
 
-if (PHP_SAPI != "cli")
+if (PHP_SAPI != "cli") {
     exit;
+}
 
 $home = '/var/www/html/RBL';
 require_once($home.'/config.php');

contrib/ipImap/report/result.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 print '<p>List of available Reports for '.date('l, d M Y', strtotime($theDate)).'</p><ul>';
 foreach($dir as $file)
 {
-        if ( basename($file) != basename(__FILE__) ) {
+		if ( basename($file) != basename(__FILE__) ) {
 		$modalDiv = 'openModal'.basename($file);
 		echo '<li><a href="#'.$modalDiv.'">'.str_replace("-$theDate.html",'',basename($file)).'</a></li>';
 #                echo '<li><pre><a href="'.basename($file).'" title="'.str_replace("-$theDate.html",'',basename($file))." of $theDate".'" onClick="Modalbox.show(this.href, {title: this.title, height: 600}); return false;">'.str_replace("-$theDate.html",'',basename($file)).'</a></pre></li>';

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@
 
 
 print '<p>List of available Reports for '.date('l, d M Y', strtotime($theDate)).'</p><ul>';
-foreach($dir as $file)
+foreach ($dir as $file)
 {
-        if ( basename($file) != basename(__FILE__) ) {
+        if (basename($file) != basename(__FILE__)) {
 		$modalDiv = 'openModal'.basename($file);
-		echo '<li><a href="#'.$modalDiv.'">'.str_replace("-$theDate.html",'',basename($file)).'</a></li>';
+		echo '<li><a href="#'.$modalDiv.'">'.str_replace("-$theDate.html", '', basename($file)).'</a></li>';
 #                echo '<li><pre><a href="'.basename($file).'" title="'.str_replace("-$theDate.html",'',basename($file))." of $theDate".'" onClick="Modalbox.show(this.href, {title: this.title, height: 600}); return false;">'.str_replace("-$theDate.html",'',basename($file)).'</a></pre></li>';
 		print <<<MODAL
 <div id="$modalDiv" class="overlay">

contrib/ipImap/report/index.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 <?php
 $reports = array();
 foreach (glob("*.{htm,html}", GLOB_BRACE) as $filename) {
-    $reports[$filename] = filemtime($filename);
+	$reports[$filename] = filemtime($filename);
 }
 arsort($reports);
 $newest = array_shift($reports);

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
 /* Write Calendar */
 	  $myCalendar = new tc_calendar("calSpam");
 	  $myCalendar->setIcon("calendar/images/iconCalendar.gif");
-	  $myCalendar->setDate(date('d',$newest), date('m',$newest), date('Y',$newest));
+	  $myCalendar->setDate(date('d', $newest), date('m', $newest), date('Y', $newest));
 	  $myCalendar->setPath("calendar/");
-	  $myCalendar->setYearInterval(date('Y',$oldest), date('Y', $newest));
+	  $myCalendar->setYearInterval(date('Y', $oldest), date('Y', $newest));
 	  $myCalendar->dateAllow(date('Y-m-d', $oldest), date('Y-m-d', $newest));
 	  $myCalendar->setDateFormat('j F Y');
 	  $myCalendar->startDate(1);

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

Spacing +33 added lines, -33 removed lines

@@ -5,81 +5,81 @@ 
 // written by TJ @triconsole

 //*************************************

 

-class tc_date_main{

+class tc_date_main {

 	var $mydate;

 

-	function tc_date_main(){

+	function tc_date_main() {

 		$this->mydate = strtotime(date('Y-m-d'));

 	}

 

-	function getDayOfWeek($cdate = ""){

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

+	function getDayOfWeek($cdate = "") {

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

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

 			return date('w', $tmp_date);

 		}

 	}

 

-	function getWeekNumber($cdate = ""){

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

+	function getWeekNumber($cdate = "") {

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

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

 			return date('W', $tmp_date);

 		}

 	}

 

-	function setDate($sdate){

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

+	function setDate($sdate) {

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

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

 	}

 

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

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

+	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 "";

 	}

 

-	function setTimestamp($stime){

+	function setTimestamp($stime) {

 		$this->mydate = $stime;

 	}

 

-	function getTimestamp($cdate = ""){

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

+	function getTimestamp($cdate = "") {

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

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

 			return $tmp_date;

 		}else return 0;

 	}

 

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

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

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

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

 			return date($format, $stime);

 		}else return "0000-00-00";

 	}

 

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

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

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

+			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";

 	}

 

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

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

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

+			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";

 	}

 

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

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

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

+			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";

 	}

 

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

 	//if date1 omitted use set date

-	function differentDate($date2, $date1 = ""){

-		if($this->validDate($date2)){

+	function differentDate($date2, $date1 = "") {

+		if ($this->validDate($date2)) {

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

 

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

@@ -89,8 +89,8 @@ 
 

 	//check if date1 is before date2

 	//if date1 omitted use set date

-	function dateBefore($date2, $date1 = "", $equal = true){

-		if($this->validDate($date2)){

+	function dateBefore($date2, $date1 = "", $equal = true) {

+		if ($this->validDate($date2)) {

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

 			$date2 = strtotime($date2);

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

@@ -99,19 +99,19 @@ 
 

 	//check if date1 is after date2

 	//if date1 omitted use set date

-	function dateAfter($date2, $date1 = "", $equal = true){

-		if($this->validDate($date2)){

+	function dateAfter($date2, $date1 = "", $equal = true) {

+		if ($this->validDate($date2)) {

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

 			$date2 = strtotime($date2);

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

 		}else return false;

 	}

 

-	function validDate($date_str){

-		if($date_str != ""){

+	function validDate($date_str) {

+		if ($date_str != "") {

 			$date_arr = explode("-", $date_str, 3);

 

-			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]))){

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

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