falon / RBL

GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.

Completed

Branch — master (eb5762)

by Marco

created 2017-05-03 08:47 UTC

Status

Category

Toggle Patches

contrib/ipImap/report/calendar/calendar_functions.php 3 patches

Doc Comments +3 added lines patch added patch discarded remove patch

		@@ -1,4 +1,7 @@
		block discarded – undo
1	1	<?php
	2	+/**
	3	+ * @param string $str
	4	+ */
2	5	function filterInput($str, $type = "text"){
3	6	switch(strtolower($type)){
4	7	case "number":

Please login to merge, or discard this patch.

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	}
 }
 
-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 @@  discard block
 block discarded – undo
 	$content = stripslashes($content);
 	$content = stripslashes($content);
 
-	if(!$allow_tag){
+	if (!$allow_tag) {
 		$content = strip_tags($content);
 	}
 

Please login to merge, or discard this patch.

Braces +14 added lines, -8 removed lines patch added patch discarded remove patch

@@ -2,14 +2,18 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 	$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;

Please login to merge, or discard this patch.

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

Doc Comments +20 added lines patch added patch discarded remove patch

		@@ -122,6 +122,11 @@ discard block
		block discarded – undo
122	122	}
123	123
124	124	//get the total day of each month in year
	125	+
	126	+ /**
	127	+ * @param integer $month
	128	+ * @param integer $year
	129	+ */
125	130	function total_days($month,$year){
126	131	$days = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
127	132	if($month > 0 && $year > 0){
		@@ -170,6 +175,12 @@ discard block
		block discarded – undo
170	175	}
171	176
172	177	//set default selected date
	178	+
	179	+ /**
	180	+ * @param integer $day
	181	+ * @param integer $month
	182	+ * @param integer $year
	183	+ */
173	184	function setDate($day, $month, $year){
174	185	//get system timezone before set the date
175	186	$this->system_timezone = date_default_timezone_get();
		@@ -516,6 +527,9 @@ discard block
		block discarded – undo
516	527	return $str;
517	528	}
518	529
	530	+ /**
	531	+ * @param string $suffix
	532	+ */
519	533	function eHidden($suffix, $value) {
520	534	if(trim($value) != ""){
521	535	if($suffix) $suffix = "_".$suffix;
		@@ -849,6 +863,9 @@ discard block
		block discarded – undo
849	863	return true;
850	864	}
851	865
	866	+ /**
	867	+ * @return string
	868	+ */
852	869	function check_json_encode($obj){
853	870	//try customize to get it work, should replace with better solution in the future
854	871	if(is_array($obj)){
		@@ -997,6 +1014,9 @@ discard block
		block discarded – undo
997	1014	}
998	1015	}
999	1016
	1017	+ /**
	1018	+ * @param string $tz
	1019	+ */
1000	1020	function setTimezone($tz){
1001	1021	$this->timezone = $tz;
1002	1022	@date_default_timezone_set($tz);

Please login to merge, or discard this patch.

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -117,17 +117,17 @@
 block discarded – undo
 
 	//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){

Please login to merge, or discard this patch.

Spacing +195 added lines, -195 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 
 require_once('tc_date.php');
 
-class tc_calendar{
+class tc_calendar {
 	public $version = "3.75";
 	public $check_new_version = false;
 
@@ -98,12 +98,12 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	}
 
 	//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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	//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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	}
 
 	//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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 				default:
 					$div_align .= "right:0px;";
 			}
-		}else{
+		}else {
 			$div_display = "visible";
 			$div_position = "relative";
 			$div_align = "";
@@ -452,15 +452,15 @@  discard block
 block discarded – undo
 	}
 
 	//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 @@  discard block
 block discarded – undo
 	}
 
 	//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 @@  discard block
 block discarded – undo
 	}
 
 	//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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 	}
 	*/
 
-	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 		}
 	}
 
-	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 @@  discard block
 block discarded – undo
 	//*****************
 	// 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 @@  discard block
 block discarded – undo
 		}
 	}
 
-	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 @@  discard block
 block discarded – undo
 		return $themes;
 	}
 
-	function getThemePath($theme){
+	function getThemePath($theme) {
 		$all_themes = $this->getThemes();
 		return isset($all_themes[$theme]) ? $all_themes[$theme] : "";
 	}

Please login to merge, or discard this patch.

Braces +212 added lines, -98 removed lines patch added patch discarded remove patch

@@ -103,7 +103,9 @@  discard block
 block discarded – undo
 		//$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 @@  discard block
 block discarded – undo
     	$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	//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 @@  discard block
 block discarded – undo
 
 					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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 				default:
 					$div_align .= "right:0px;";
 			}
-		}else{
+		} else{
 			$div_display = "visible";
 			$div_position = "relative";
 			$div_align = "";
@@ -498,10 +568,10 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 		//$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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	//------------------------------------------------------
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 
 		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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 						}
 					}
 					return $return_arr;
-				}else return array();
-			}else return array();
+				} else {
+					return array();
+				}
+			} else {
+				return array();
+			}
 		}
 	}
 
@@ -939,14 +1054,16 @@  discard block
 block discarded – undo
 		//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 @@  discard block
 block discarded – undo
 						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 @@  discard block
 block discarded – undo
 						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 @@  discard block
 block discarded – undo
 						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;
 						}

Please login to merge, or discard this patch.

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

Doc Comments +14 added lines patch added patch discarded remove patch

@@ -54,6 +54,9 @@  discard block
 block discarded – undo
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	function getDate($format = "Y-m-d", $cdate = ""){
 		if(!$this->compatible){
 			return tc_date_main::getDate($format, $cdate);
@@ -123,6 +126,9 @@  discard block
 block discarded – undo
 		}
 	}
 
+	/**
+	 * @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 @@  discard block
 block discarded – undo
 
 	//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 @@  discard block
 block discarded – undo
 
 	//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);

Please login to merge, or discard this patch.

Spacing +52 added lines, -52 removed lines patch added patch discarded remove patch

@@ -7,88 +7,88 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 		}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 @@  discard block
 block discarded – undo
 
 	//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 @@  discard block
 block discarded – undo
 
 	//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 @@  discard block
 block discarded – undo
 
 	//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);

Please login to merge, or discard this patch.

Braces +38 added lines, -23 removed lines patch added patch discarded remove patch

@@ -14,11 +14,13 @@  discard block
 block discarded – undo
 		//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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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);

Please login to merge, or discard this patch.

result.php 3 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
 
 if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
-        if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
+		if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid domain.</pre>');
 
 if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') )
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
 }
 
 if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
-                exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
+		if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
+				exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
 	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
 		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
 	switch ( $_POST['Value'] ) {
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
 
 $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) ;

Please login to merge, or discard this patch.

Braces +25 added lines, -15 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -5,36 +5,36 @@  discard block
 block discarded – undo
 $net = new \dautkom\ipv4\IPv4();
 
 $_ = $_POST['genere'];
-if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') )
+if (($tables["$_"]['field'] == 'email') AND ($_POST['Value'] != 'ALL'))
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_EMAIL)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
 
-if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
+if (($tables["$_"]['field'] == 'domain') AND ($_POST['Value'] != 'ALL'))
         if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid domain.</pre>');
 
-if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') )
+if (($tables["$_"]['field'] == 'ip') AND ($_POST['Value'] != 'ALL'))
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid IP address.</pre>');
 	
-if ( ($tables["$_"]['field']=='network') AND ($_POST['Value']!='ALL') ) {
-	$value = explode('/',$_POST['Value']);
+if (($tables["$_"]['field'] == 'network') AND ($_POST['Value'] != 'ALL')) {
+	$value = explode('/', $_POST['Value']);
 	if (count($value) != 2)
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask pair.</pre>');
 	if (!$net->address($value[0])->mask($value[1])->isValid(1))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask.</pre>');
 }
 
-if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
+if (($tables["$_"]['field'] == 'username') AND ($_POST['Value'] != 'ALL')) {
+        if (preg_match('/[^\x20-\x7f]/', $_POST['Value']))
                 exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
-	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
+	if (preg_match('/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']))
 		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
-	switch ( $_POST['Value'] ) {
+	switch ($_POST['Value']) {
 		case 'anonymous':
 		case 'anybody':
 		case 'anyone':
-		case ( preg_match( '/^anyone@/',$_POST['Value']) == TRUE ):
+		case (preg_match('/^anyone@/', $_POST['Value']) == TRUE):
 			exit('<pre>&lt;'.$_POST['Value'].'&gt; is not allowed.</pre>');
 	}
 }	
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
 
 $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) ;
-rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables);
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
+rlookup($mysqli, username(), $admins, $_POST['Value'], $_POST['genere'], $tables);
 $mysqli->close();
 closelog();
 ?>

Please login to merge, or discard this patch.

index.php 2 patches

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -14,10 +14,10 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 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>";
 	}
 

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

@@ -14,11 +14,14 @@
 block discarded – undo
 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">

Please login to merge, or discard this patch.

remove.php 3 patches

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -10,9 +10,9 @@
 block discarded – undo
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
 	syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-        die($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+					. $mysqli->connect_error);
+		die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,22 +1,22 @@
 block discarded – undo
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
-$type =  $tables["$typedesc"]['field'];
+$typedesc = $_POST['type'];
+$type = $tables["$typedesc"]['field'];
 $table = $tables["$typedesc"]['name'];
 
 openlog($tag, LOG_PID, $fac);
 $user = username();
 $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);
-        die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+        die($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
 
-if (remove ($mysqli,$user,$_POST['value'],$type,$table))
+if (remove($mysqli, $user, $_POST['value'], $type, $table))
  print 'OK '.$typedesc.' &lt;'.$_POST['value'].'&gt; permanently REMOVED!';
 else
  print 'Delete operation ERROR on '.$typedesc.' &lt;'.$_POST['value'].'&gt;; check log.';

Please login to merge, or discard this patch.

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -16,10 +16,11 @@
 block discarded – undo
 }
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 
-if (remove ($mysqli,$user,$_POST['value'],$type,$table))
+if (remove ($mysqli,$user,$_POST['value'],$type,$table)) {
  print 'OK '.$typedesc.' &lt;'.$_POST['value'].'&gt; permanently REMOVED!';
-else
+} else {
  print 'Delete operation ERROR on '.$typedesc.' &lt;'.$_POST['value'].'&gt;; check log.';
+}
 $mysqli->close();
 closelog();
 ?>

Please login to merge, or discard this patch.

list.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -12,12 +12,12 @@
 block discarded – undo
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
-        if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            die($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-        }
+		if ($mysqli->connect_error) {
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+		}
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 
 if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,26 +1,26 @@
 block discarded – undo
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $table = $tables["$typedesc"]['name'];
 
 openlog($tag, LOG_PID, $fac);
 if (empty($_POST['reason'])) die ("<p>Please, specify a reason!</p>");
-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
-	exit('<p>ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</p>');
+if (preg_match('/[^\x20-\x7f]/', $_POST['reason']))
+	exit('<p>ERROR: &lt;'.htmlentities($_POST['reason'], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</p>');
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
         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);
-            die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            die($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
         }
-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
 
-if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
+if (addtolist($mysqli, username(), $_POST['value'], $type, $table, $_POST['unit'], $_POST['quantity'], $_POST['reason']))
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; first time listed for '.$_POST['quantity'].$_POST['unit'].'.';
 else
  print 'List operation ERROR; check log.';

Please login to merge, or discard this patch.

Braces +8 added lines, -4 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

relist.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -2,23 +2,23 @@
 block discarded – undo
 require_once('config.php');
 require_once('function.php');
 $typedesc=$_POST['type'];
-        $type = $tables["$typedesc"]['field'];
-        $table = $tables["$typedesc"]['name'];
+		$type = $tables["$typedesc"]['field'];
+		$table = $tables["$typedesc"]['name'];
 ?>
 <td colspan="9" style="text-align: center">
 <?php
 openlog($tag, LOG_PID, $fac);
 if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
 if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
-        exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
+		exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 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);
+			. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 syslog(LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info) ;
 

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
         $type = $tables["$typedesc"]['field'];
         $table = $tables["$typedesc"]['name'];
 ?>
@@ -9,21 +9,21 @@  discard block
 block discarded – undo
 <?php
 openlog($tag, LOG_PID, $fac);
 if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
-        exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
+if (preg_match('/[^\x20-\x7f]/', $_POST['reason']))
+        exit('ERROR: &lt;'.htmlentities($_POST['reason'], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 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 connected to ' . $mysqli->host_info) ;
+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
 
-if (isFull($mysqli,$typedesc,$tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
-if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
+if (isFull($mysqli, $typedesc, $tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.'));
+if (relist($mysqli, username(), $_POST['value'], $type, $table, $_POST['unit'], $_POST['quantity'], $_POST['reason']))
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; relisted for '.$_POST['quantity'].$_POST['unit'];
 else
  print 'ERROR in relist; check log';

Please login to merge, or discard this patch.

Braces +11 added lines, -5 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

listForm.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@
 block discarded – undo
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+if (in_array($user, array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
 else $extopt = NULL;
 ?>
 <form style="margin:0; text-align: left;" name='ListButton<?php echo $type ?>' enctype="text/plain" method="post" target="_self" action="list.php"  onSubmit="xmlhttpPost('list.php', 'ListButton<?php echo $type ?>', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" />
 
 		List <?php  echo $typedesc.' &lt;'.$value.'&gt;'; ?> for <input name="type" type="hidden" value="<?php echo $typedesc; ?>" /><input name="value" type="hidden" class="input_text" value="<?php echo $value; ?>" />
-		<select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt;?></select>  Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form>
+		<select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt; ?></select>  Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form>

Please login to merge, or discard this patch.

Braces +5 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.