falon / RBL

contrib/ipImap/report/result.php

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

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

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

 	}

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;

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

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

contrib/ipImap/report/calendar/calendar_functions.php

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

 	}

 

contrib/ipImap/report/calendar/calendar_info.php

Spacing +12 added lines, -12 removed lines

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

 require_once("classes/tc_date.php");

 

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

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

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

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

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

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

 

 $tobj = new tc_calendar("");

 $version = $tobj->version;

@@ -12,22 +12,22 @@ 
 

 $tdate = new tc_date();

 

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

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

 

 $wan_enabled = 0;

 $new_version = 0;

-if($wan_enabled = @fsockopen("www.google.com", 80, $errno, $errstr, 1)){

-	if($check_version && $wan_enabled){

-		if(function_exists("file_get_contents")){

+if ($wan_enabled = @fsockopen("www.google.com", 80, $errno, $errstr, 1)) {

+	if ($check_version && $wan_enabled) {

+		if (function_exists("file_get_contents")) {

 			$new_version = @file_get_contents("http://www.triconsole.com/php/tc_calendar_version.php?v=".$version);

 		}

 	}

 }

-elseif(function_exists("file_get_contents")){

+elseif (function_exists("file_get_contents")) {

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

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

-	if($check_version && $wan_enabled){

-		if(function_exists("file_get_contents")){

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

+	if ($check_version && $wan_enabled) {

+		if (function_exists("file_get_contents")) {

 #			$new_version = @file_get_contents("http://www.triconsole.com/php/tc_calendar_version.php?v=".$version);

 		}

 	}

@@ -36,7 +36,7 @@ 
 define("L_ABOUT", "<b>PHP Datepicker Calendar</b><br />Version: <b>".strval($version)."</b>".($new_version ? "<br /><b><font color=\"red\">Update available <a href=\"$WEB_SUPPORT\" target=\"_blank\">here</a> !</font></b>" : "").($wan_enabled ? ($show_fb_info ? "<br /><div class=\"fb-like\" data-href=\"https://www.facebook.com/DatePicker\" data-send=\"false\" data-layout=\"button_count\" data-show-faces=\"false\" data-font=\"tahoma\" ref=\"std_about_info\"></div>" : "") : "")."<br />&copy;2006-".$tdate->getDate("Y")." <b><a href=\"$WEB_SUPPORT\" target=\"_blank\" title=\"http://triconsole.com\">$AUTHOR</a></b>".($show_servertime_info ? "<br />Server Timezone:".($timezone ? "<br />$timezone" : "")."<br /><span id=\"timecontainer\">".$tdate->getDate("Y-m-d H:i:s")."</span>" : ""));

 

 ?>

-<?php if($wan_enabled && $show_fb_info){ ?>

+<?php if ($wan_enabled && $show_fb_info) { ?>

 <link href="calendar_info.css" rel="stylesheet" type="text/css" />

     <div id="fb-root"></div>

     <script>

contrib/ipImap/report/calendar/calendar_form.php

Spacing +155 added lines, -155 removed lines

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

 $timezone = getParameter("tmz");

 

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

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

 @date_default_timezone_set($timezone);

 

 $cdate = new tc_date();

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

 $sly = getParameter("selected_year");

 

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

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

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

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

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

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

 

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

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

@@ -73,63 +73,63 @@ 
 $theme = getParameter("thm");

 

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

-if(!$show_not_allow){

+if (!$show_not_allow) {

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

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

 }

 

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

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

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

-else{

-	if($slm != "00"){

+else {

+	if ($slm != "00") {

 		$m = $slm;

-	}else{

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

+	}else {

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

 			//compare which one is more

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

-			if($year_allow2 >= $year_end){

+			if ($year_allow2>=$year_end) {

 				//use time_allow2

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

-			}else{

+			}else {

 				//use year_end

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

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

 			}

-		}elseif($ta2_set){

+		}elseif ($ta2_set) {

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

-		}elseif($year_end > 0){

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

-		}else{

+		}elseif ($year_end>0) {

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

+		}else {

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

 		}

 	}

 }

 

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

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

 

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

 

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

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

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

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

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

 

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

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

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

 else

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

 

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

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

 

 // ensure m-y fits date allow range

 if (!$show_not_allow) {

 	if ($ta1_set) {

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

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

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

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

 	}

 	if ($ta2_set) {

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

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

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

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

 	}

 }

 

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

 

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

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

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

 

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

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

-	if($time_allow1 != ""){

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

+	if ($time_allow1 != "") {

 		//get date of time allow1

-		if($cdate->validDate($time_allow1)){

+		if ($cdate->validDate($time_allow1)) {

 			//check valid if today is after date_allow1

-			if(!$cdate->dateAfter($time_allow1, $today)){

+			if (!$cdate->dateAfter($time_allow1, $today)) {

 				//reset default calendar display

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

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

@@ -168,23 +168,23 @@ 
 $year_end = $cobj->year_end;

 

 //check year display in valid range

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

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

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

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

 

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

 

-if($m == 1){

+if ($m == 1) {

 	$previous_month = 12;

 	$previous_year = $y-1;

-}else{

+}else {

 	$previous_month = $m-1;

 	$previous_year = $y;

 }

 

-if($m == 12){

+if ($m == 12) {

 	$next_month = 1;

 	$next_year = $y+1;

-}else{

+}else {

 	$next_month = $m+1;

 	$next_year = $y;

 }

@@ -193,13 +193,13 @@ 
 

 $firstdate = $cdate->getDayOfWeek($y."-".$m."-1"); //first date of month, 0 (for Sunday) through 6 (for Saturday)

 

-if($firstdate == $startDate){

+if ($firstdate == $startDate) {

 	//skip last month

 	$startwrite = $total_lastmonth+1;

-}elseif($firstdate < $startDate){

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

-}else{

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

+}elseif ($firstdate<$startDate) {

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

+}else {

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

 }

 

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

@@ -212,7 +212,7 @@ 
 $row_count = 0;

 

 //write previous month

-for($day=$startwrite; $day<=$total_lastmonth; $day++){

+for ($day = $startwrite; $day<=$total_lastmonth; $day++) {

 	$calendar_rows[$row_count][] = array($day, "", "othermonth", "");

 	$dayinweek_counter++;

 

@@ -220,7 +220,7 @@ 
 	$prev_d = $y."-".$prev_m."-".$day;

 

 	$wknum = $cdate->getWeekNumber($prev_d);

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

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

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

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

 }

@@ -228,31 +228,31 @@ 
 $pvMonthTime = $previous_year."-".$previous_month."-".$total_lastmonth;

 

 //check lastmonth is on allowed date

-if($ta1_set && !$show_not_allow){

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

+if ($ta1_set && !$show_not_allow) {

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

 		$show_previous = true;

 	}else $show_previous = false;

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

 

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

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

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

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

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

 }

 

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

 

 $select_days = array();

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

+if ($sld>0 && $slm>0 && $sly>0) {

 	$sldate = "$sly-$slm-$sld";

 

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

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

 		$this_day = $cdate->addDay("Y-m-d", $i, $sldate);

 		$select_days[] = $this_day;

 	}

 }

 

 //write current month

-for($day=1; $day<=$total_thismonth; $day++){

+for ($day = 1; $day<=$total_thismonth; $day++) {

 	$date_str = $y."-".str_pad($m, 2, "0", STR_PAD_LEFT)."-".str_pad($day, 2, "0", STR_PAD_LEFT);

 

 	$date_num = $cdate->getDayOfWeek($date_str);

@@ -267,40 +267,40 @@ 
 	$dateLink = true;

 

 	//check date allowed

-	if($ta1_set && $ta2_set){

+	if ($ta1_set && $ta2_set) {

 		//both date specified

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

-	}elseif($ta1_set){

+	}elseif ($ta1_set) {

 		//only date 1 specified

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

-	}elseif($ta2_set){

+	}elseif ($ta2_set) {

 		//only date 2 specified

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

-	}else{

+	}else {

 		//no date allow specified, assume show all

 		$dateLink = true;

 	}

 

-	if($dateLink){

+	if ($dateLink) {

 		//check for disable days

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

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

 			$dateLink = false;

 		}

 	}

 

 	//check specific date

-	if($dateLink){

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

+	if ($dateLink) {

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

 			//check if it is current date

 			$sp_found = false;

 

 			//check on yearly recursive

-			if(isset($sp_dates[2]) && is_array($sp_dates[2])){

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

-					if($sp_time != ""){

-						$sp_time_md = (int)$cdate->getDate('md', $sp_time); //date('md', $sp_time);

-						$this_md = (int)$cdate->getDate('md', $date_str); //date('md', $currentTime);

-						if($sp_time_md == $this_md){

+			if (isset($sp_dates[2]) && is_array($sp_dates[2])) {

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

+					if ($sp_time != "") {

+						$sp_time_md = (int) $cdate->getDate('md', $sp_time); //date('md', $sp_time);

+						$this_md = (int) $cdate->getDate('md', $date_str); //date('md', $currentTime);

+						if ($sp_time_md == $this_md) {

 							$sp_found = true;

 							break;

 						}

@@ -309,11 +309,11 @@ 
 			}

 

 			//check on monthly recursive

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

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

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

-						$sp_time_d = (int)$cdate->getDate('d', $sp_time); //date('d', $sp_time);

-						if($sp_time_d == $day){

+			if (isset($sp_dates[1]) && is_array($sp_dates[1]) && !$sp_found) {

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

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

+						$sp_time_d = (int) $cdate->getDate('d', $sp_time); //date('d', $sp_time);

+						if ($sp_time_d == $day) {

 							$sp_found = true;

 							break;

 						}

@@ -322,11 +322,11 @@ 
 			}

 

 			//check on no recursive

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

+			if (isset($sp_dates[0]) && is_array($sp_dates[0]) && !$sp_found) {

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

 			}

 

-			switch($sp_type){

+			switch ($sp_type) {

 				case 0:

 				default:

 					//disabled specific and enabled others

@@ -340,23 +340,23 @@ 
 		}

 	}

 

-	if($date_pair_value){

+	if ($date_pair_value) {

 		//check date_pair1 & 2

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

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

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

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

 				$htmlClass[] = "select";

 		}

 

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

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

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

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

 				$htmlClass[] = "select";

 		}

 	}

 

 	$htmlClass[] = strtolower($day_txt);

 

-	if($dateLink){

-		if(in_array($date_str, $select_days) && !in_array("select", $htmlClass)){

+	if ($dateLink) {

+		if (in_array($date_str, $select_days) && !in_array("select", $htmlClass)) {

 			$htmlClass[] = "select";

 		}

 

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

 

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

-	}else{

+	}else {

 		$htmlClass[] = "disabledate";

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

 

@@ -372,12 +372,12 @@ 
 		$calendar_rows[$row_count][] = array($day, "", $class, "$y".str_pad($m, 2, "0", STR_PAD_LEFT).str_pad($day, 2, "0", STR_PAD_LEFT));

 

 		//check if selected date is a disabled date

-		if($date_str == $sly."-".str_pad($slm, 2, "0", STR_PAD_LEFT)."-".str_pad($sld, 2, "0", STR_PAD_LEFT)){

+		if ($date_str == $sly."-".str_pad($slm, 2, "0", STR_PAD_LEFT)."-".str_pad($sld, 2, "0", STR_PAD_LEFT)) {

 			//disabled

 			//$sly = $slm = $sld = "";

 		}

 	}

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

+	if (($startDate == 0 && $date_num == 6) || ($startDate>0 && $date_num == $startDate-1)) {

 		$row_count++;

 

 		$dayinweek_counter = 0;

@@ -385,19 +385,19 @@ 
 

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

 

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

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

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

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

 }

 

 //write next other month

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

-if($write_end_days > 0){

-	for($day=1; $day<=$write_end_days; $day++){

+if ($write_end_days>0) {

+	for ($day = 1; $day<=$write_end_days; $day++) {

 		$calendar_rows[$row_count][] = array($day, "", "othermonth", "");

 

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

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

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

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

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

 	}

@@ -405,14 +405,14 @@ 
 }

 

 //write fulfil row to 6 rows

-for($day=$row_count; $day<6; $day++){

+for ($day = $row_count; $day<6; $day++) {

 	$tmpday = $write_end_days+1;

-	for($f=$tmpday; $f<=($tmpday+6); $f++){

+	for ($f = $tmpday; $f<=($tmpday+6); $f++) {

 		$calendar_rows[$row_count][] = array($f, "", "othermonth", "");

 

 		$wknum = $cdate->getWeekNumber($cdate->addMonth("Y-m-d", 1, ($y."-".$m."-".$f))); //date('W', mktime(0,0,0, $m+1, $f, $y));

 

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

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

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

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

 	}

@@ -420,20 +420,20 @@ 
 }

 

 //check next month is on allowed date

-if($ta2_set && !$show_not_allow){

+if ($ta2_set && !$show_not_allow) {

 	$nxMonthTime = $next_year."-".$next_month."-1";

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

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

 		$show_next = true;

 	}else $show_next = false;

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

 ?>

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

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

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

 <head>

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

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

 <link href="calendar.css" rel="stylesheet" type="text/css" />

-<?php if($theme_path){ ?>

+<?php if ($theme_path) { ?>

 <link href="<?php echo($theme_path); ?>" rel="stylesheet" type="text/css" />

 <?php } ?>

 <script type="text/javascript">

@@ -442,8 +442,8 @@ 
 var today_month = "<?php echo($cdate->getDate('m')); ?>";

 var today_year = "<?php echo($cdate->getDate('Y')); ?>";

 var obj_name = "<?php echo($objname); ?>";

-var current_month = "<?php echo($m);?>";

-var current_year = "<?php echo($y);?>";

+var current_month = "<?php echo($m); ?>";

+var current_year = "<?php echo($y); ?>";

 

 var this_time = "<?php echo(date("F d, Y H:i:s", time())); ?>";

 //-->

@@ -454,12 +454,12 @@ 
 function submitNow(dvalue, mvalue, yvalue){

 	<?php

 	//write auto submit script

-	if($auto_submit){

+	if ($auto_submit) {

 		echo("if(yvalue>0 && mvalue>0 && dvalue>0){\n");

-		if($form_name){

+		if ($form_name) {

 			//submit value by post form

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

-		}elseif($target_url){

+		}elseif ($target_url) {

 			//submit value by get method

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

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

@@ -474,25 +474,25 @@ 
 <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">

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

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

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

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

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

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

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

 		<?php } ?>

 

 		<?php

-		if(sizeof($cobj->warning_msgs)>0){

+		if (sizeof($cobj->warning_msgs)>0) {

 			echo("<div id=\"calendar-alert\">".implode(", ", $cobj->warning_msgs)."</div>");

 		}

 		?>

 

-		<form id="calendarform" name="calendarform" method="post" action="<?php echo($thispage);?>">

+		<form id="calendarform" name="calendarform" method="post" action="<?php echo($thispage); ?>">

 			<table align="center" cellpadding="1" cellspacing="0">

 			<tr>

 				<td align="right"><select name="m" onchange="javascript:submitCalendar();" class="font">

 					<?php

 					$monthnames = $cobj->getMonthNames();

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

-						$selected = ($f == (int)$m) ? " selected='selected'" : "";

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

+						$selected = ($f == (int) $m) ? " selected='selected'" : "";

 						echo("<option value=\"".str_pad($f, 2, "0", STR_PAD_LEFT)."\"".$selected.">".$monthnames[$f-1]."</option>");

 					}

 					?>

@@ -501,7 +501,7 @@ 
 					$thisyear = $cdate->getDate('Y');

 

 					//write year options

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

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

 						$selected = ($year == $y) ? " selected='selected'" : "";

 						echo("<option value=\"".$year."\"".$selected.">".$year."</option>");

 					}

@@ -510,44 +510,44 @@ 
 				</td>

 				</tr>

 			</table>

-			<input name="selected_day" type="hidden" id="selected_day" value="<?php echo($sld);?>" />

-			<input name="selected_month" type="hidden" id="selected_month" value="<?php echo($slm);?>" />

-			<input name="selected_year" type="hidden" id="selected_year" value="<?php echo($sly);?>" />

-			<input name="year_start" type="hidden" id="year_start" value="<?php echo($cobj->year_start_input);?>" />

-			<input name="year_end" type="hidden" id="year_end" value="<?php echo($cobj->year_end_input);?>" />

-			<input name="objname" type="hidden" id="objname" value="<?php echo($objname);?>" />

-			<input name="dp" type="hidden" id="dp" value="<?php echo($dp);?>" />

-

-			<input name="da1" type="hidden" id="da1" value="<?php echo($time_allow1);?>" />

-			<input name="da2" type="hidden" id="da2" value="<?php echo($time_allow2);?>" />

-			<input name="sna" type="hidden" id="sna" value="<?php echo($show_not_allow);?>" />

-			<input name="aut" type="hidden" id="aut" value="<?php echo($auto_submit);?>" />

-			<input name="frm" type="hidden" id="frm" value="<?php echo($form_name);?>" />

-			<input name="tar" type="hidden" id="tar" value="<?php echo($target_url);?>" />

-			<input name="inp" type="hidden" id="inp" value="<?php echo($show_input);?>" />

-			<input name="fmt" type="hidden" id="fmt" value="<?php echo($date_format);?>" />

-			<input name="dis" type="hidden" id="dis" value="<?php echo($dsb_txt);?>" />

-

-			<input name="pr1" type="hidden" id="pr1" value="<?php echo($date_pair1);?>" />

-			<input name="pr2" type="hidden" id="pr2" value="<?php echo($date_pair2);?>" />

-			<input name="prv" type="hidden" id="prv" value="<?php echo($date_pair_value);?>" />

-			<input name="pth" type="hidden" id="pth" value="<?php echo($path);?>" />

-

-			<input name="spd" type="hidden" id="spd" value="<?php echo(htmlspecialchars($cobj->check_json_encode($sp_dates), ENT_QUOTES));?>" />

-			<input name="spt" type="hidden" id="spt" value="<?php echo($sp_type);?>" />

-

-			<input name="och" type="hidden" id="och" value="<?php echo(urldecode($tc_onchanged));?>" />

-

-			<input name="str" type="hidden" id="str" value="<?php echo($startDate);?>" />

-			<input name="rtl" type="hidden" id="rtl" value="<?php echo($rtl);?>" />

-			<input name="wks" type="hidden" id="wks" value="<?php echo($show_weeks);?>" />

-			<input name="int" type="hidden" id="int" value="<?php echo($interval);?>" />

-

-			<input name="hid" type="hidden" id="hid" value="<?php echo($auto_hide);?>" />

-			<input name="hdt" type="hidden" id="hdt" value="<?php echo($auto_hide_time);?>" />

-

-			<input name="tmz" type="hidden" id="tmz" value="<?php echo($timezone);?>" />

-			<input name="thm" type="hidden" id="thm" value="<?php echo($theme);?>" />

+			<input name="selected_day" type="hidden" id="selected_day" value="<?php echo($sld); ?>" />

+			<input name="selected_month" type="hidden" id="selected_month" value="<?php echo($slm); ?>" />

+			<input name="selected_year" type="hidden" id="selected_year" value="<?php echo($sly); ?>" />

+			<input name="year_start" type="hidden" id="year_start" value="<?php echo($cobj->year_start_input); ?>" />

+			<input name="year_end" type="hidden" id="year_end" value="<?php echo($cobj->year_end_input); ?>" />

+			<input name="objname" type="hidden" id="objname" value="<?php echo($objname); ?>" />

+			<input name="dp" type="hidden" id="dp" value="<?php echo($dp); ?>" />

+

+			<input name="da1" type="hidden" id="da1" value="<?php echo($time_allow1); ?>" />

+			<input name="da2" type="hidden" id="da2" value="<?php echo($time_allow2); ?>" />

+			<input name="sna" type="hidden" id="sna" value="<?php echo($show_not_allow); ?>" />

+			<input name="aut" type="hidden" id="aut" value="<?php echo($auto_submit); ?>" />

+			<input name="frm" type="hidden" id="frm" value="<?php echo($form_name); ?>" />

+			<input name="tar" type="hidden" id="tar" value="<?php echo($target_url); ?>" />

+			<input name="inp" type="hidden" id="inp" value="<?php echo($show_input); ?>" />

+			<input name="fmt" type="hidden" id="fmt" value="<?php echo($date_format); ?>" />

+			<input name="dis" type="hidden" id="dis" value="<?php echo($dsb_txt); ?>" />

+

+			<input name="pr1" type="hidden" id="pr1" value="<?php echo($date_pair1); ?>" />

+			<input name="pr2" type="hidden" id="pr2" value="<?php echo($date_pair2); ?>" />

+			<input name="prv" type="hidden" id="prv" value="<?php echo($date_pair_value); ?>" />

+			<input name="pth" type="hidden" id="pth" value="<?php echo($path); ?>" />

+

+			<input name="spd" type="hidden" id="spd" value="<?php echo(htmlspecialchars($cobj->check_json_encode($sp_dates), ENT_QUOTES)); ?>" />

+			<input name="spt" type="hidden" id="spt" value="<?php echo($sp_type); ?>" />

+

+			<input name="och" type="hidden" id="och" value="<?php echo(urldecode($tc_onchanged)); ?>" />

+

+			<input name="str" type="hidden" id="str" value="<?php echo($startDate); ?>" />

+			<input name="rtl" type="hidden" id="rtl" value="<?php echo($rtl); ?>" />

+			<input name="wks" type="hidden" id="wks" value="<?php echo($show_weeks); ?>" />

+			<input name="int" type="hidden" id="int" value="<?php echo($interval); ?>" />

+

+			<input name="hid" type="hidden" id="hid" value="<?php echo($auto_hide); ?>" />

+			<input name="hdt" type="hidden" id="hdt" value="<?php echo($auto_hide_time); ?>" />

+

+			<input name="tmz" type="hidden" id="tmz" value="<?php echo($timezone); ?>" />

+			<input name="thm" type="hidden" id="thm" value="<?php echo($theme); ?>" />

 

 			<!-- focus var //-->

 			<input name="fcs" type="hidden" id="fcs" value="0" />

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

 

 			//write calendar day header

-			foreach($day_headers as $dh){

+			foreach ($day_headers as $dh) {

 				echo("<td align=\"center\" class=\"header\"><div>".$dh."</div></td>");

 			}

 			echo("</tr>");

 

-			for($row=0; $row<sizeof($calendar_rows); $row++){

+			for ($row = 0; $row<sizeof($calendar_rows); $row++) {

 				echo("<tr>");

 

-				if ($show_weeks){

+				if ($show_weeks) {

 					asort($week_rows[$row]);

 

 					//get week number with highest member

@@ -581,7 +581,7 @@ 
 					echo("<td align=\"center\" class=\"wk\"><div>".$cw_keys[(sizeof($cw_keys)-1)]."</div></td>");

 				}

 

-				foreach($calendar_rows[$row] as $column){

+				foreach ($calendar_rows[$row] as $column) {

 					$this_day = isset($column[0]) ? $column[0] : "";

 					$this_link = isset($column[1]) ? $column[1] : "";

 					$this_class = isset($column[2]) ? $column[2] : "";

@@ -589,9 +589,9 @@ 
 

 					$id_str = ($this_id) ? " id=\"".$this_id."\"" : "";

 

-					if($this_link){

+					if ($this_link) {

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

-					}else{

+					}else {

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

 					}

 				}

@@ -602,21 +602,21 @@ 
 		</div>

 

 		<?php

-		if(($previous_year >= $year_start || $next_year <= $year_end) && ($show_previous || $show_next)){

+		if (($previous_year>=$year_start || $next_year<=$year_end) && ($show_previous || $show_next)) {

 		?>

 		<div id="calendar-footer">

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

 				<?php

-				if($previous_year >= $year_start && $show_previous){

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

+				if ($previous_year>=$year_start && $show_previous) {

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

 				<?php

 				}else echo("&nbsp;");

 				?>

 			</div>

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

 				<?php

-				if($next_year <= $year_end && $show_next){

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

+				if ($next_year<=$year_end && $show_next) {

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

 				<?php

 				}else echo("&nbsp;");

 				?>

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

 				$footer_links = array();

 

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

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

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

 

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

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

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

 

-				if(sizeof($footer_links)>0){

+				if (sizeof($footer_links)>0) {

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

 				}

 				?>

contrib/ipImap/getip.php

Spacing +16 added lines, -16 removed lines

@@ -1,16 +1,16 @@ 
 #!/usr/bin/php
 <?php
 /* Config */
-$path='/web/RBL/';
+$path = '/web/RBL/';
 include_once($path.'config.php');
 require_once($path.'function.php');
-if ( !isset($version) ) {
+if (!isset($version)) {
         openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
+        syslog(LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
         closelog();
         exit(255);
 }
-include_once(dirname(__FILE__) . '/function.php');
+include_once(dirname(__FILE__).'/function.php');
 $conf = parse_ini_file($confImap_file);
 
 
@@ -19,8 +19,8 @@ 
 openlog($tag, LOG_PID, $fac);
 
 
-if ( !$imapListActive ) {
-	syslog (LOG_INFO, $conf['user'].': This plugin isn\'t active.');
+if (!$imapListActive) {
+	syslog(LOG_INFO, $conf['user'].': This plugin isn\'t active.');
 	closelog();
 	exit(255);
 }
@@ -31,20 +31,20 @@ 
 $arr_tpl_data = array(date("Y-m-d", time()));
 
 
-if ( !$conf['onlyReport'] ) {
+if (!$conf['onlyReport']) {
 
 	/* check you select a right list */
-	if ( !$tables[$conf['list']['spam']]['bl'] ) {
+	if (!$tables[$conf['list']['spam']]['bl']) {
        		syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
 	       	exit (254);
 	}
-	if ( $tables[$conf['list']['ham']]['bl'] ) {
+	if ($tables[$conf['list']['ham']]['bl']) {
         	syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
 	        exit (254);
 	}
 
 	/* Make MYSQL connection Array */
-	$mysqlconf= array(
+	$mysqlconf = array(
 		'dbhost' => $dbhost,
 		'userdb' => $userdb,
 		'pwd'	 => $pwd,
@@ -55,7 +55,7 @@ 
 
 else {
 	$mysqlconf = NULL;
-	syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.') ;
+	syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.');
 }
 
 
@@ -67,16 +67,16 @@ 
 
 
 /* The hard work has hidden in imapReport */
-$learnfromArray = array('ham','spam');
-foreach ( $learnfromArray as $learnfrom ) {
+$learnfromArray = array('ham', 'spam');
+foreach ($learnfromArray as $learnfrom) {
 	$conf['reportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['reportFile']["$learnfrom"]);
 	$conf['badreportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['badreportFile']["$learnfrom"]);
-	imapReport ($conf,$mysqlconf,$splservice,$tables,$learnfrom);
+	imapReport($conf, $mysqlconf, $splservice, $tables, $learnfrom);
 }
 
-if ( !$conf['onlyReport'] ) {
+if (!$conf['onlyReport']) {
 	/* Close connection */
-	syslog (LOG_INFO, $conf['user'].': Successfully end of session.');
+	syslog(LOG_INFO, $conf['user'].': Successfully end of session.');
 }
 closelog();
 ?>