falon / RBL

contrib/ipImap/report/calendar/calendar_form.php

Spacing +155 added lines, -155 removed lines

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

 $timezone = getParameter("tmz");

 

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

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

 @date_default_timezone_set($timezone);

 

 $cdate = new tc_date();

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

 $sly = getParameter("selected_year");

 

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

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

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

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

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

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

 

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

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

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

 

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

-if(!$show_not_allow){

+if (!$show_not_allow) {

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

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

 }

 

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

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

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

-else{

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

+else {

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

 		$m = $slm;

-	}else{

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

+	}else {

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

 			//compare which one is more

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

-			if($year_allow2 >= $year_end){

+			if ($year_allow2>=$year_end) {

 				//use time_allow2

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

-			}else{

+			}else {

 				//use year_end

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

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

 			}

-		}elseif($ta2_set){

+		}elseif ($ta2_set) {

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

-		}elseif($year_end > 0){

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

-		}else{

+		}elseif ($year_end>0) {

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

+		}else {

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

 		}

 	}

 }

 

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

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

 

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

 

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

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

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

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

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

 

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

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

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

 else

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

 

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

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

 

 // ensure m-y fits date allow range

 if (!$show_not_allow) {

 	if ($ta1_set) {

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

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

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

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

 	}

 	if ($ta2_set) {

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

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

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

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

 	}

 }

 

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

 

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

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

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

 

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

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

-	if($time_allow1 != ""){

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

+	if ($time_allow1 != "") {

 		//get date of time allow1

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

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

 			//check valid if today is after date_allow1

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

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

 				//reset default calendar display

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

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

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

 

 //check year display in valid range

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

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

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

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

 

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

 

-if($m == 1){

+if ($m == 1) {

 	$previous_month = 12;

 	$previous_year = $y-1;

-}else{

+}else {

 	$previous_month = $m-1;

 	$previous_year = $y;

 }

 

-if($m == 12){

+if ($m == 12) {

 	$next_month = 1;

 	$next_year = $y+1;

-}else{

+}else {

 	$next_month = $m+1;

 	$next_year = $y;

 }

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

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

 

-if($firstdate == $startDate){

+if ($firstdate == $startDate) {

 	//skip last month

 	$startwrite = $total_lastmonth+1;

-}elseif($firstdate < $startDate){

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

-}else{

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

+}elseif ($firstdate<$startDate) {

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

+}else {

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

 }

 

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

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

 

 //write previous month

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

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

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

 	$dayinweek_counter++;

 

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

 

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

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

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

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

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

 }

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

 

 //check lastmonth is on allowed date

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

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

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

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

 		$show_previous = true;

 	}else $show_previous = false;

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

 

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

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

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

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

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

 }

 

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

 

 $select_days = array();

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

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

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

 

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

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

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

 		$select_days[] = $this_day;

 	}

 }

 

 //write current month

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

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

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

 

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

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

 

 	//check date allowed

-	if($ta1_set && $ta2_set){

+	if ($ta1_set && $ta2_set) {

 		//both date specified

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

-	}elseif($ta1_set){

+	}elseif ($ta1_set) {

 		//only date 1 specified

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

-	}elseif($ta2_set){

+	}elseif ($ta2_set) {

 		//only date 2 specified

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

-	}else{

+	}else {

 		//no date allow specified, assume show all

 		$dateLink = true;

 	}

 

-	if($dateLink){

+	if ($dateLink) {

 		//check for disable days

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

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

 			$dateLink = false;

 		}

 	}

 

 	//check specific date

-	if($dateLink){

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

+	if ($dateLink) {

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

 			//check if it is current date

 			$sp_found = false;

 

 			//check on yearly recursive

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

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

-					if($sp_time != ""){

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

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

-						if($sp_time_md == $this_md){

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

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

+					if ($sp_time != "") {

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

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

+						if ($sp_time_md == $this_md) {

 							$sp_found = true;

 							break;

 						}

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

 

 			//check on monthly recursive

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

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

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

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

-						if($sp_time_d == $day){

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

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

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

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

+						if ($sp_time_d == $day) {

 							$sp_found = true;

 							break;

 						}

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

 

 			//check on no recursive

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

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

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

 			}

 

-			switch($sp_type){

+			switch ($sp_type) {

 				case 0:

 				default:

 					//disabled specific and enabled others

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

 	}

 

-	if($date_pair_value){

+	if ($date_pair_value) {

 		//check date_pair1 & 2

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

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

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

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

 				$htmlClass[] = "select";

 		}

 

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

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

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

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

 				$htmlClass[] = "select";

 		}

 	}

 

 	$htmlClass[] = strtolower($day_txt);

 

-	if($dateLink){

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

+	if ($dateLink) {

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

 			$htmlClass[] = "select";

 		}

 

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

 

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

-	}else{

+	}else {

 		$htmlClass[] = "disabledate";

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

 

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

 

 		//check if selected date is a disabled date

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

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

 			//disabled

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

 		}

 	}

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

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

 		$row_count++;

 

 		$dayinweek_counter = 0;

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

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

 

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

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

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

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

 }

 

 //write next other month

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

-if($write_end_days > 0){

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

+if ($write_end_days>0) {

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

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

 

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

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

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

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

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

 	}

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

 

 //write fulfil row to 6 rows

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

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

 	$tmpday = $write_end_days+1;

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

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

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

 

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

 

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

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

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

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

 	}

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

 

 //check next month is on allowed date

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

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

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

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

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

 		$show_next = true;

 	}else $show_next = false;

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

 ?>

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

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

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

 <head>

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

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

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

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

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

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

 <?php } ?>

 <script type="text/javascript">

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

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

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

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

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

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

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

 

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

 //-->

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

 	<?php

 	//write auto submit script

-	if($auto_submit){

+	if ($auto_submit) {

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

-		if($form_name){

+		if ($form_name) {

 			//submit value by post form

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

-		}elseif($target_url){

+		}elseif ($target_url) {

 			//submit value by get method

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

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

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

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

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

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

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

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

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

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

 		<?php } ?>

 

 		<?php

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

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

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

 		}

 		?>

 

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

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

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

 			<tr>

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

 					<?php

 					$monthnames = $cobj->getMonthNames();

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

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

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

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

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

 					}

 					?>

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

 

 					//write year options

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

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

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

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

 					}

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

 				</tr>

 			</table>

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

-

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

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

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

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

-

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

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

-

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

-

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

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

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

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

-

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

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

-

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

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

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

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

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

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

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

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

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

+

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

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

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

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

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

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

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

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

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

+

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

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

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

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

+

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

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

+

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

+

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

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

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

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

+

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

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

+

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

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

 

 			<!-- focus var //-->

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

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

 

 			//write calendar day header

-			foreach($day_headers as $dh){

+			foreach ($day_headers as $dh) {

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

 			}

 			echo("</tr>");

 

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

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

 				echo("<tr>");

 

-				if ($show_weeks){

+				if ($show_weeks) {

 					asort($week_rows[$row]);

 

 					//get week number with highest member

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

 				}

 

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

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

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

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

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

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

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

 

-					if($this_link){

+					if ($this_link) {

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

-					}else{

+					}else {

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

 					}

 				}

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

 

 		<?php

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

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

 		?>

 		<div id="calendar-footer">

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

 				<?php

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

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

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

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

 				<?php

 				}else echo("&nbsp;");

 				?>

 			</div>

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

 				<?php

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

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

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

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

 				<?php

 				}else echo("&nbsp;");

 				?>

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

 				$footer_links = array();

 

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

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

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

 

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

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

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

 

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

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

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

 				}

 				?>

Braces +136 added lines, -67 removed lines

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

 $timezone = getParameter("tmz");

 

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

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

 

 $cdate = new tc_date();

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

 $sly = getParameter("selected_year");

 

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

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

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

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

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

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

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

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

 if(!$show_not_allow){

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

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

-}

-

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

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

-else{

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

+

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

 	if($slm != "00"){

 		$m = $slm;

-	}else{

+	} else{

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

 			//compare which one is more

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

 			if($year_allow2 >= $year_end){

 				//use time_allow2

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

-			}else{

+			} else{

 				//use year_end

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

 			}

-		}elseif($ta2_set){

+		} elseif($ta2_set){

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

-		}elseif($year_end > 0){

+		} elseif($year_end > 0){

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

-		}else{

+		} else{

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

 		}

 	}

 }

 

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

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

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

 

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

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

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

-

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

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

-else

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

-

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

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

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

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

 // ensure m-y fits date allow range

 if (!$show_not_allow) {

 	if ($ta1_set) {

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

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

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

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

 	if ($ta2_set) {

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

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

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

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

 }

 

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

 

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

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

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

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

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

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

 

 //check year display in valid range

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

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

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

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

 

 if($m == 1){

 	$previous_month = 12;

 	$previous_year = $y-1;

-}else{

+} else{

 	$previous_month = $m-1;

 	$previous_year = $y;

 }

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

 	$next_month = 1;

 	$next_year = $y+1;

-}else{

+} else{

 	$next_month = $m+1;

 	$next_year = $y;

 }

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

 	//skip last month

 	$startwrite = $total_lastmonth+1;

-}elseif($firstdate < $startDate){

+} elseif($firstdate < $startDate){

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

-}else{

+} else{

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

 }

 

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

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

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

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

-}

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

 

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

 

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

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

 		$show_previous = true;

-	}else $show_previous = false;

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

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

 

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

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

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

-}

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

 

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

 

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

 		//both date specified

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

-	}elseif($ta1_set){

+	} elseif($ta1_set){

 		//only date 1 specified

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

-	}elseif($ta2_set){

+	} elseif($ta2_set){

 		//only date 2 specified

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

-	}else{

+	} else{

 		//no date allow specified, assume show all

 		$dateLink = true;

 	}

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

 		//check date_pair1 & 2

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

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

-				$htmlClass[] = "select";

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

 

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

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

-				$htmlClass[] = "select";

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

 	}

 

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

 

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

-	}else{

+	} else{

 		$htmlClass[] = "disabledate";

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

 

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

 

 		$dayinweek_counter = 0;

-	}else $dayinweek_counter++;

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

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

 

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

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

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

-}

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

 

 //write next other month

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

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

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

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

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

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

 	 $row_count++;

 }

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

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

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

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

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

 	$write_end_days += 6;

 }

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

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

 		$show_next = true;

-	}else $show_next = false;

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

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

 ?>

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

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

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

 <head>

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

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

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

 			//submit value by post form

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

-		}elseif($target_url){

+		} elseif($target_url){

 			//submit value by get method

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

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

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

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

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

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

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

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

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

 		<?php } ?>

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

 			echo("<tr>");

 

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

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

 			//write calendar day header

 			foreach($day_headers as $dh){

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

 					if($this_link){

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

-					}else{

+					} else{

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

 					}

 				}

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

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

 				<?php

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

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

 			</div>

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

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

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

 				<?php

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

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

 			</div>

 			<div class="links">

 				<?php

 				$footer_links = array();

 

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

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

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

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

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

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

 				if(sizeof($footer_links)>0){

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

contrib/ipImap/getip.php

Indentation +8 added lines, -8 removed lines

@@ -5,10 +5,10 @@ 
 include_once($path.'config.php');
 require_once($path.'function.php');
 if ( !isset($version) ) {
-        openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
-        closelog();
-        exit(255);
+		openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
+		syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
+		closelog();
+		exit(255);
 }
 include_once(dirname(__FILE__) . '/function.php');
 $conf = parse_ini_file($confImap_file);
@@ -35,12 +35,12 @@ 
 
 	/* check you select a right list */
 	if ( !$tables[$conf['list']['spam']]['bl'] ) {
-       		syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
-	       	exit (254);
+	   		syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
+		   	exit (254);
 	}
 	if ( $tables[$conf['list']['ham']]['bl'] ) {
-        	syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
-	        exit (254);
+			syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
+			exit (254);
 	}
 
 	/* Make MYSQL connection Array */

Spacing +16 added lines, -16 removed lines

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

Braces +1 added lines, -3 removed lines

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

contrib/expire.php

Indentation +4 added lines, -4 removed lines

@@ -15,10 +15,10 @@
 openlog($tag, LOG_PID, $fac);
 $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);
+			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 );

Spacing +4 added lines, -4 removed lines

@@ -15,15 +15,15 @@
 openlog($tag, LOG_PID, $fac);
 $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);
 
-expire($mysqli,$user,$tables,$expireTime);
+expire($mysqli, $user, $tables, $expireTime);
 $mysqli->close();
 closelog();
 ?>

lookup.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 <h1> DNSBL Lookup</h1> 
 <?php
 
-$_POST['Value'] = str_replace('_','.',array_keys($_GET)[0]);
+$_POST['Value'] = str_replace('_', '.', array_keys($_GET)[0]);
 $_POST['genere'] = 'Spam IP';
 require_once('result.php');
 ?>

contrib/ipImap/function.php

Doc Comments +23 added lines

@@ -1,4 +1,7 @@ 
 <?php
+/**
+ * @param string $header
+ */
 function getIP($header,$mxserver,$msa) {
 /* Get submission server's IP from header's mail */
 /* Each line must end with /r/n			 */
@@ -28,11 +31,24 @@ 
 	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
 }
 
+/**
+ * @param string|false $ip
+ * @param string $hostname
+ * @param string $dateC
+ * @param string|null $msgid
+ * @param string|false $dateL
+ */
 function updateReport ($ip,$uid,$ipcount,$uidcount,$hostname,$dateC,$msgid,$dateL) {
 
 	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n",$dateL,$dateC,$uid,$ip,$uidcount,$ipcount,$hostname,htmlentities($msgid) );
 }
 
+/**
+ * @param string $dateC
+ * @param string|null $msgid
+ * @param false|string $dateL
+ * @param string $text
+ */
 function updatebadReport ( $uid,$dateC,$msgid,$dateL,$text ) {
 	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n",$dateL,$dateC,$uid,htmlentities($msgid),$text );
 }
@@ -84,6 +100,9 @@ 
 }
 
 
+/**
+ * @param null|mysqli $myconn
+ */
 function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
 	$nips = $ipvet['count'];
 
@@ -154,6 +173,10 @@ 
 }
 
 
+/**
+ * @param string $message_id
+ * @param string $date
+ */
 function splunksearch ($service,$message_id,$date) {
 
 	// Run a blocking search

Indentation +125 added lines, -125 removed lines

@@ -12,14 +12,14 @@ 
 #			print "Examine ".$received[0][$i]."\n";
 			if ( preg_match($msa,$received['host'][$i]) )
 				$dateR = $received['date'][$i];
-        		foreach ($mxserver as $mx) {
-        			if (!$ip)
+				foreach ($mxserver as $mx) {
+					if (!$ip)
 					if ($mx == $received['host'][$i]) {
 						$host = $received['host'][$i];
 						$ip = $received['ip'][$i];
-                    			}
-                	}
-        	}
+								}
+					}
+			}
 	}
 	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
 		$dateC['date'] = 'Not found';
@@ -39,15 +39,15 @@ 
 
 
 function summaryBadReport ($uidvet) {
-        $nuid = $uidvet['count'];
-        if ( empty($uidvet) ) return NULL;
-        $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
+		$nuid = $uidvet['count'];
+		if ( empty($uidvet) ) return NULL;
+		$return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
 
-        /* Remove count index */
-        $uids = array_keys($uidvet['uid']);
+		/* Remove count index */
+		$uids = array_keys($uidvet['uid']);
 	$totlearn = 0;
 
-        foreach ( $uids as $uid ) {
+		foreach ( $uids as $uid ) {
 		$totlearn += $uidvet['uid']["$uid"]['count'];; 
 		$return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']);
 	}
@@ -60,26 +60,26 @@ 
 
 function array_msort($array, $cols)
 {
-    $colarr = array();
-    foreach ($cols as $col => $order) {
-        $colarr[$col] = array();
-        foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
-    }
-    $eval = 'array_multisort(';
-    foreach ($cols as $col => $order) {
-        $eval .= '$colarr[\''.$col.'\'],'.$order.',';
-    }
-    $eval = substr($eval,0,-1).');';
-    eval($eval);
-    $ret = array();
-    foreach ($colarr as $col => $arr) {
-        foreach ($arr as $k => $v) {
-            $k = substr($k,1);
-            if (!isset($ret[$k])) $ret[$k] = $array[$k];
-            if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
-        }
-    }
-    return $ret;
+	$colarr = array();
+	foreach ($cols as $col => $order) {
+		$colarr[$col] = array();
+		foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
+	}
+	$eval = 'array_multisort(';
+	foreach ($cols as $col => $order) {
+		$eval .= '$colarr[\''.$col.'\'],'.$order.',';
+	}
+	$eval = substr($eval,0,-1).');';
+	eval($eval);
+	$ret = array();
+	foreach ($colarr as $col => $arr) {
+		foreach ($arr as $k => $v) {
+			$k = substr($k,1);
+			if (!isset($ret[$k])) $ret[$k] = $array[$k];
+			if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
+		}
+	}
+	return $ret;
 
 }
 
@@ -94,8 +94,8 @@ 
 
 	foreach ( $ips as $ip ) {
 		if ( $ip == 'count' ) continue;
-                $nlearn = $ipvet['ip']["$ip"]['count'];
-                unset($ipvet['ip']["$ip"]['count']);
+				$nlearn = $ipvet['ip']["$ip"]['count'];
+				unset($ipvet['ip']["$ip"]['count']);
 		$quantity = $cf['quantity']["$category"]; /* In searchAndList this value is passed by reference and modified */
 		$nuid = count($ipvet['ip']["$ip"]);
 		if ( !$cf['onlyReport'] ) {
@@ -123,9 +123,9 @@ 
 		$return .='<tr><td rowspan="'.$nuid.'">'.$ip.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>',$ipvet['ip']["$ip"][0],$nlearn,$nowlist["$listed"]['name']);
 		$rowuid=NULL;
-                for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+				for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
 		array_shift($ipvet['ip']["$ip"]);
-                $return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
+				$return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
 
 	}
 	$return .= sprintf ('<tr><th title="unique ips">%u</th><th title="unique uids">%u</th><th>%u</th></table>',$ipvet['ip']['count'],$ipvet['uid']['count'],$nips);
@@ -135,20 +135,20 @@ 
 	/* Not used for listing purpose, but useful to you! */
 	$return .= '<h3>Statistics by UID</h3><table><tr><th>UID</th><th>IP learned</th><th>Learned times</th></tr>'."\n";
 	$uids = array_keys($ipvet['uid']);
-        foreach ( $uids as $uid ) {
+		foreach ( $uids as $uid ) {
 		if ( $uid == 'count' ) continue;	
-	        $nlearn = $ipvet['uid']["$uid"]['count'];
-	        unset ( $ipvet['uid']["$uid"]['count'] );
+			$nlearn = $ipvet['uid']["$uid"]['count'];
+			unset ( $ipvet['uid']["$uid"]['count'] );
 		$nip = count($ipvet['uid']["$uid"]);
 		$return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$ipvet['uid']["$uid"][0],$nlearn);
-                $rowuid=NULL;
-                for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
-                array_shift($ipvet['uid']["$uid"]);
-                $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
+				$rowuid=NULL;
+				for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+				array_shift($ipvet['uid']["$uid"]);
+				$return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
 
-        }
-        $return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>',$ipvet['uid']['count'],$ipvet['ip']['count'],$nips);	
+		}
+		$return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>',$ipvet['uid']['count'],$ipvet['ip']['count'],$nips);	
 
 
 	return $return;
@@ -176,50 +176,50 @@ 
 	*/
 
 	// A one shot search
-        $searchParams = array(
-                'earliest_time' => date("c",strtotime ($date)-120),
-                'latest_time' => date("c",strtotime ($date)+60)
-        );
+		$searchParams = array(
+				'earliest_time' => date("c",strtotime ($date)-120),
+				'latest_time' => date("c",strtotime ($date)+60)
+		);
 
-        // Run a oneshot search that returns the job's results
-        $resultsStream = $service->oneshotSearch($searchQueryBlocking, $searchParams);
-        $resultSearch = new Splunk_ResultsReader($resultsStream);
+		// Run a oneshot search that returns the job's results
+		$resultsStream = $service->oneshotSearch($searchQueryBlocking, $searchParams);
+		$resultSearch = new Splunk_ResultsReader($resultsStream);
 
 	// Use the built-in XML parser to display the job results
 	foreach ($resultSearch as $result)
 	  {
-	    if ($result instanceof Splunk_ResultsFieldOrder)
-	    {
-	      // More than one field attribute returned by search
-	      // You must redefine the search
-	      if ( count($result->getFieldNames()) > 1 ) return FALSE;
-	    }
-	    else if ($result instanceof Splunk_ResultsMessage)
-	    {
-	      // I don't want messages in my search
-	      return FALSE;
-	    }
-	    else if (is_array($result))
-	    {
-	      // Process a row
-	      foreach ($result as $key => $valueOrValues)
-	        {
-	         if (is_array($valueOrValues))
-	          {
-	            return FALSE;
-	          }
-	         else
-	          {
-	            return $valueOrValues;
-	            #print "  {$key} => {$value}\r\n";
-	          }
-	        }
-	    }
-	    else
-	    {
-	      #print "Unknow result type";
-	      return FALSE;
-	    }
+		if ($result instanceof Splunk_ResultsFieldOrder)
+		{
+		  // More than one field attribute returned by search
+		  // You must redefine the search
+		  if ( count($result->getFieldNames()) > 1 ) return FALSE;
+		}
+		else if ($result instanceof Splunk_ResultsMessage)
+		{
+		  // I don't want messages in my search
+		  return FALSE;
+		}
+		else if (is_array($result))
+		{
+		  // Process a row
+		  foreach ($result as $key => $valueOrValues)
+			{
+			 if (is_array($valueOrValues))
+			  {
+				return FALSE;
+			  }
+			 else
+			  {
+				return $valueOrValues;
+				#print "  {$key} => {$value}\r\n";
+			  }
+			}
+		}
+		else
+		{
+		  #print "Unknow result type";
+		  return FALSE;
+		}
 	  }
 }
 
@@ -228,26 +228,26 @@ 
 	$file = dirname(__FILE__) . '/' . $cf['reportFile']["$type"];
 	$fileb= dirname(__FILE__) . '/' . $cf['badreportFile']["$type"];
 	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$cf['folder']["$type"], $cf['account'],$cf['authpassword'], OP_READONLY)
-        	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
+			or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
 	if ( !$m_mail ) exit(254);
 		
 
 	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
 	//get all messages
 	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) );
-        $dateN  = date ( "d-M-Y", strToTime ( "now" ) );
-        $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
+		$dateN  = date ( "d-M-Y", strToTime ( "now" ) );
+		$m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
 
 
 	// Order results starting from newest message
 	if ( empty($m_search) ) {
 		syslog (LOG_INFO,$cf['user'].": No mail found in $type folder. No reports written for $type.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+			if ( $ierr = imap_errors() )
+					foreach ( $ierr as $thiserr )
+							syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
+			if ( $ierr = imap_alerts() )
+					foreach ( $ierr as $thiserr )
+							syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
 		imap_close( $m_mail );
 		if ( file_exists( $file ) ) unlink ($file);
 		if ( file_exists( $fileb ) ) unlink ($fileb);
@@ -280,16 +280,16 @@ 
 	$uidbad['count'] = 0;
 	$uidbad['uid'] = array();
 
-        // loop for each message
+		// loop for each message
 	foreach ($m_search as $onem) {
 
-	        //get imap header info for obj thang
-	        //$headers = imap_headerinfo($m_mail, $onem);
-	        //$head = imap_fetchheader($m_mail, $headers->Msgno);
+			//get imap header info for obj thang
+			//$headers = imap_headerinfo($m_mail, $onem);
+			//$head = imap_fetchheader($m_mail, $headers->Msgno);
 		$head = imap_fetchheader($m_mail, $onem );
-	        //$obj = imap_rfc822_parse_headers( $head);
+			//$obj = imap_rfc822_parse_headers( $head);
 
-	        list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx'],$cf['msalearn'] );
+			list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx'],$cf['msalearn'] );
 		if (empty($mid)) {
 			$uid='NA';
 			syslog (LOG_ERR, $cf['user'].": Error retrieving data for empty Message-ID.");
@@ -304,11 +304,11 @@ 
 				}
 		}
 
-	        /* Update count of each ip */
-	        if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
+			/* Update count of each ip */
+			if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
 			$ipuid['count']++;					//number of right messages
 
-	                if (in_array($uid,array_keys($ipuid['uid']))) {
+					if (in_array($uid,array_keys($ipuid['uid']))) {
 				$ipuid['uid']["$uid"]['count']++;		//number of learn by this uid
 				if (!in_array($ip,$ipuid['uid']["$uid"])) 
 					$ipuid['uid']["$uid"][]=$ip;		//ips learned by this uid
@@ -319,29 +319,29 @@ 
 				$ipuid['uid']['count']++;                	//number of unique uids
 			}
 
-                        if (in_array($ip,array_keys($ipuid['ip']))) {
-                                $ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
+						if (in_array($ip,array_keys($ipuid['ip']))) {
+								$ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
 				if (!in_array($uid,$ipuid['ip']["$ip"]))
 					$ipuid['ip']["$ip"][]=$uid;		//uids that learned this ip
 			}
-                        else {
-                                $ipuid['ip']["$ip"]['count'] = 1;
+						else {
+								$ipuid['ip']["$ip"]['count'] = 1;
 				$ipuid['ip']["$ip"][]=$uid;
 				$ipuid['ip']['count']++;			//number of unique ips
-                        }
+						}
 
-	        	/* Update HTML report */
-	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
+				/* Update HTML report */
+				fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
 		}
-	        else {	/* Bad learn */
+			else {	/* Bad learn */
 			
-                        if (in_array($uid,array_keys($uidbad['uid']))) 
-                                $uidbad['uid']["$uid"]['count']++;               //number of bad learn by this uid
-                        else {
-                                $uidbad['uid']["$uid"]['count'] = 1;
+						if (in_array($uid,array_keys($uidbad['uid']))) 
+								$uidbad['uid']["$uid"]['count']++;               //number of bad learn by this uid
+						else {
+								$uidbad['uid']["$uid"]['count'] = 1;
 				$uidbad['uid']["$uid"][]=$uid;
-                                $uidbad['count']++;                       //numeber of unique bad uids
-                        }
+								$uidbad['count']++;                       //numeber of unique bad uids
+						}
 			/* The reason of bad report */
 			if ($host === FALSE) $reason = 'This mail was not received by recognized MX host';
 			if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn';
@@ -363,17 +363,17 @@ 
 	fwrite($fp, '</table>');
 	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['thresholdip']["$type"].' times from at least '.$cf['thresholduid']["$type"].' different valid uids.</h5>' );
 
-        /* Make MYSQL connection */
+		/* Make MYSQL connection */
 	if ( $cf['onlyReport'] )
 		$mysqli = NULL;
 	else {
-        	$mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
-        	if ($mysqli->connect_error) {
-                	syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
-                	. $mysqli->connect_error);
-                	exit (254);
-        	}
-        	syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
+			$mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
+			if ($mysqli->connect_error) {
+					syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+					exit (254);
+			}
+			syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
 	}
 	/***********************/
 
@@ -393,8 +393,8 @@ 
 		foreach ( $ierr as $thiserr )
 			syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
 	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
-                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+				foreach ( $ierr as $thiserr )
+						syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
 	imap_close($m_mail);
 }
 ?>

Spacing +132 added lines, -132 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-function getIP($header,$mxserver,$msa) {
+function getIP($header, $mxserver, $msa) {
 /* Get submission server's IP from header's mail */
 /* Each line must end with /r/n			 */
 /* IP is the first one written by your mxserver	 */
@@ -7,10 +7,10 @@ 
 	$ip = FALSE;
 	$host = FALSE;
 	$dateR = FALSE;
-	if ( preg_match_all('/^Received:\sfrom(?:.|\r\n\s)*?[\[\(]\s*(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\]\)](?:.|\r\n\s)+\s+by(?:\s|\r\n\s+)(?P<host>\S+).*(?:\s|\r\n\s\s)+.*;\s+(?P<date>.*)/m',$header,$received) ) {
-		for ($i = count($received[0])-1;$i>=0;$i--) {
+	if (preg_match_all('/^Received:\sfrom(?:.|\r\n\s)*?[\[\(]\s*(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\]\)](?:.|\r\n\s)+\s+by(?:\s|\r\n\s+)(?P<host>\S+).*(?:\s|\r\n\s\s)+.*;\s+(?P<date>.*)/m', $header, $received)) {
+		for ($i = count($received[0])-1; $i>=0; $i--) {
 #			print "Examine ".$received[0][$i]."\n";
-			if ( preg_match($msa,$received['host'][$i]) )
+			if (preg_match($msa, $received['host'][$i]))
 				$dateR = $received['date'][$i];
         		foreach ($mxserver as $mx) {
         			if (!$ip)
@@ -21,38 +21,38 @@ 
                 	}
         	}
 	}
-	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
+	if (preg_match('/\r\nDate:\s(?P<date>.*)\r\n/', $header, $dateC) != 1)
 		$dateC['date'] = 'Not found';
-	if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1)
+	if (preg_match('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/', $header, $mid) != 1)
 		$mid['mid'] = NULL;
-	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
+	return array($ip, $host, $dateR, $dateC['date'], $mid['mid']);
 }
 
-function updateReport ($ip,$uid,$ipcount,$uidcount,$hostname,$dateC,$msgid,$dateL) {
+function updateReport($ip, $uid, $ipcount, $uidcount, $hostname, $dateC, $msgid, $dateL) {
 
-	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n",$dateL,$dateC,$uid,$ip,$uidcount,$ipcount,$hostname,htmlentities($msgid) );
+	return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n", $dateL, $dateC, $uid, $ip, $uidcount, $ipcount, $hostname, htmlentities($msgid));
 }
 
-function updatebadReport ( $uid,$dateC,$msgid,$dateL,$text ) {
-	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n",$dateL,$dateC,$uid,htmlentities($msgid),$text );
+function updatebadReport($uid, $dateC, $msgid, $dateL, $text) {
+	return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n", $dateL, $dateC, $uid, htmlentities($msgid), $text);
 }
 
 
-function summaryBadReport ($uidvet) {
+function summaryBadReport($uidvet) {
         $nuid = $uidvet['count'];
-        if ( empty($uidvet) ) return NULL;
+        if (empty($uidvet)) return NULL;
         $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
 
         /* Remove count index */
         $uids = array_keys($uidvet['uid']);
 	$totlearn = 0;
 
-        foreach ( $uids as $uid ) {
-		$totlearn += $uidvet['uid']["$uid"]['count'];; 
-		$return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']);
+        foreach ($uids as $uid) {
+		$totlearn += $uidvet['uid']["$uid"]['count']; ; 
+		$return .= sprintf('<tr><td>%s</td><td>%u</td></tr>', $uid, $uidvet['uid']["$uid"]['count']);
 	}
-	$return .= sprintf ('<tr><th>%s</th><th>%u</th></tr></table>','TOT',$totlearn);
-	$return .= sprintf ('<p>%s : %u</p>','Unique UID',$nuid);
+	$return .= sprintf('<tr><th>%s</th><th>%u</th></tr></table>', 'TOT', $totlearn);
+	$return .= sprintf('<p>%s : %u</p>', 'Unique UID', $nuid);
 
 	return $return;
 }
@@ -69,12 +69,12 @@ 
     foreach ($cols as $col => $order) {
         $eval .= '$colarr[\''.$col.'\'],'.$order.',';
     }
-    $eval = substr($eval,0,-1).');';
+    $eval = substr($eval, 0, -1).');';
     eval($eval);
     $ret = array();
     foreach ($colarr as $col => $arr) {
         foreach ($arr as $k => $v) {
-            $k = substr($k,1);
+            $k = substr($k, 1);
             if (!isset($ret[$k])) $ret[$k] = $array[$k];
             if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
         }
@@ -84,29 +84,29 @@ 
 }
 
 
-function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
+function summaryReportAndList($cf, $myconn, $tables, $category, $ipvet) {
 	$nips = $ipvet['count'];
 
-	if ( empty($ipvet) ) return NULL;
+	if (empty($ipvet)) return NULL;
 	$return = '<h3>Statistics by IP</h3><table><tr><th>IP</th><th>Learned by</th><th>Learned times</th><th title="This field doesn\'t say if this ip is currently listed, but it says if this IP has listed now!">Listed Now</th></tr>'."\n";
 	
 	$ips = array_keys($ipvet['ip']);
 
-	foreach ( $ips as $ip ) {
-		if ( $ip == 'count' ) continue;
+	foreach ($ips as $ip) {
+		if ($ip == 'count') continue;
                 $nlearn = $ipvet['ip']["$ip"]['count'];
                 unset($ipvet['ip']["$ip"]['count']);
 		$quantity = $cf['quantity']["$category"]; /* In searchAndList this value is passed by reference and modified */
 		$nuid = count($ipvet['ip']["$ip"]);
-		if ( !$cf['onlyReport'] ) {
-			if ( ($nlearn >= $cf['thresholdip']["$category"])&&($nuid >= $cf['thresholduid']["$category"]) ) {
+		if (!$cf['onlyReport']) {
+			if (($nlearn>=$cf['thresholdip']["$category"]) && ($nuid>=$cf['thresholduid']["$category"])) {
 				$reason = "The IP <$ip> has been listed because was marked $nlearn times as $category by $nuid different accounts during last ".$cf['oldestday'].' days.';
-				$listed = searchAndList ($myconn,$cf['user'],$tables,$cf['list']["$category"],$ip,$cf['unit']["$category"],$quantity,$reason);
+				$listed = searchAndList($myconn, $cf['user'], $tables, $cf['list']["$category"], $ip, $cf['unit']["$category"], $quantity, $reason);
 			}
 			else $listed = FALSE;
 		}
 		else $listed = FALSE;
-		$nowlist = array( TRUE =>  array(
+		$nowlist = array(TRUE =>  array(
 					'style' => 'id=\'ipfound\'',
 					'name'  => 'YES',
 				  ),
@@ -120,45 +120,45 @@ 
 				  )
 		);
 		
-		$return .='<tr><td rowspan="'.$nuid.'">'.$ip.'</td>';
-		$return .= sprintf ('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>',$ipvet['ip']["$ip"][0],$nlearn,$nowlist["$listed"]['name']);
-		$rowuid=NULL;
-                for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+		$return .= '<tr><td rowspan="'.$nuid.'">'.$ip.'</td>';
+		$return .= sprintf('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>', $ipvet['ip']["$ip"][0], $nlearn, $nowlist["$listed"]['name']);
+		$rowuid = NULL;
+                for ($j = 1; $j<$nuid; $j++) $rowuid .= '<tr><td>%s</td></tr>';
 		array_shift($ipvet['ip']["$ip"]);
-                $return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
+                $return .= vsprintf($rowuid, $ipvet['ip']["$ip"]);
 
 	}
-	$return .= sprintf ('<tr><th title="unique ips">%u</th><th title="unique uids">%u</th><th>%u</th></table>',$ipvet['ip']['count'],$ipvet['uid']['count'],$nips);
+	$return .= sprintf('<tr><th title="unique ips">%u</th><th title="unique uids">%u</th><th>%u</th></table>', $ipvet['ip']['count'], $ipvet['uid']['count'], $nips);
 
 
 	/* Statistics by UID */
 	/* Not used for listing purpose, but useful to you! */
 	$return .= '<h3>Statistics by UID</h3><table><tr><th>UID</th><th>IP learned</th><th>Learned times</th></tr>'."\n";
 	$uids = array_keys($ipvet['uid']);
-        foreach ( $uids as $uid ) {
-		if ( $uid == 'count' ) continue;	
+        foreach ($uids as $uid) {
+		if ($uid == 'count') continue;	
 	        $nlearn = $ipvet['uid']["$uid"]['count'];
-	        unset ( $ipvet['uid']["$uid"]['count'] );
+	        unset ($ipvet['uid']["$uid"]['count']);
 		$nip = count($ipvet['uid']["$uid"]);
-		$return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
-		$return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$ipvet['uid']["$uid"][0],$nlearn);
-                $rowuid=NULL;
-                for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+		$return .= '<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
+		$return .= sprintf('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>', $ipvet['uid']["$uid"][0], $nlearn);
+                $rowuid = NULL;
+                for ($j = 1; $j<$nip; $j++) $rowuid .= '<tr><td>%s</td></tr>';
                 array_shift($ipvet['uid']["$uid"]);
-                $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
+                $return .= vsprintf($rowuid, $ipvet['uid']["$uid"]);
 
         }
-        $return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>',$ipvet['uid']['count'],$ipvet['ip']['count'],$nips);	
+        $return .= sprintf('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>', $ipvet['uid']['count'], $ipvet['ip']['count'], $nips);	
 
 
 	return $return;
 }
 
 
-function splunksearch ($service,$message_id,$date) {
+function splunksearch($service, $message_id, $date) {
 
 	// Run a blocking search
-	$searchQueryBlocking = 'search (message_id="'. addslashes( $message_id ) .
+	$searchQueryBlocking = 'search (message_id="'.addslashes($message_id).
 				'" OR sasl_username) | transaction message_id queue_id maxspan=3m maxpause=2m | search sasl_username message_id=* | table sasl_username';
 
 	/* Doesn't work on Splunk 6.6 for HTTP exceptions
@@ -177,8 +177,8 @@ 
 
 	// A one shot search
         $searchParams = array(
-                'earliest_time' => date("c",strtotime ($date)-120),
-                'latest_time' => date("c",strtotime ($date)+60)
+                'earliest_time' => date("c", strtotime($date)-120),
+                'latest_time' => date("c", strtotime($date)+60)
         );
 
         // Run a oneshot search that returns the job's results
@@ -192,7 +192,7 @@ 
 	    {
 	      // More than one field attribute returned by search
 	      // You must redefine the search
-	      if ( count($result->getFieldNames()) > 1 ) return FALSE;
+	      if (count($result->getFieldNames())>1) return FALSE;
 	    }
 	    else if ($result instanceof Splunk_ResultsMessage)
 	    {
@@ -224,51 +224,51 @@ 
 }
 
 
-function imapReport ($cf,$myconnArray,$splunkconn,$tables,$type) {
-	$file = dirname(__FILE__) . '/' . $cf['reportFile']["$type"];
-	$fileb= dirname(__FILE__) . '/' . $cf['badreportFile']["$type"];
-	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$cf['folder']["$type"], $cf['account'],$cf['authpassword'], OP_READONLY)
-        	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-	if ( !$m_mail ) exit(254);
+function imapReport($cf, $myconnArray, $splunkconn, $tables, $type) {
+	$file = dirname(__FILE__).'/'.$cf['reportFile']["$type"];
+	$fileb = dirname(__FILE__).'/'.$cf['badreportFile']["$type"];
+	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$cf['folder']["$type"], $cf['account'], $cf['authpassword'], OP_READONLY)
+        	or syslog(LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: '.imap_last_error());
+	if (!$m_mail) exit(254);
 		
 
-	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
+	syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
 	//get all messages
-	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) );
-        $dateN  = date ( "d-M-Y", strToTime ( "now" ) );
-        $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
+	$dateTh = date("d-M-Y", strToTime('-'.$cf['oldestday'].' days'));
+        $dateN = date("d-M-Y", strToTime("now"));
+        $m_search = imap_search($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"");
 
 
 	// Order results starting from newest message
-	if ( empty($m_search) ) {
-		syslog (LOG_INFO,$cf['user'].": No mail found in $type folder. No reports written for $type.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
-		imap_close( $m_mail );
-		if ( file_exists( $file ) ) unlink ($file);
-		if ( file_exists( $fileb ) ) unlink ($fileb);
+	if (empty($m_search)) {
+		syslog(LOG_INFO, $cf['user'].": No mail found in $type folder. No reports written for $type.");
+	        if ($ierr = imap_errors())
+	                foreach ($ierr as $thiserr)
+	                        syslog(LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
+	        if ($ierr = imap_alerts())
+	                foreach ($ierr as $thiserr)
+	                        syslog(LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+		imap_close($m_mail);
+		if (file_exists($file)) unlink($file);
+		if (file_exists($fileb)) unlink($fileb);
 		return FALSE;
 	}
-	$nmes = count ($m_search);
-	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in $type folder.");
+	$nmes = count($m_search);
+	syslog(LOG_INFO, $cf['user'].": Found $nmes mail in $type folder.");
 	if ($nmes>0) rsort($m_search);
 
 	// Create report file
 
 	$fp = fopen($file, 'w');
-	$fpb= fopen($fileb, 'w');
-	$lastup = "Last Update: " . date ("d F Y H:i", time());
-	fwrite( $fp, file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
-	fwrite( $fp,"<h1> Report of IP sending $type</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
-	if ($cf['onlyReport']) fwrite( $fp,'<p>None of the below IP has been listed because listing is not active in configuration.</p>');
-	fwrite( $fp,'<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>IP</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned IP appears in different mails">#IP</th><th nowrap>Received by</th><th>Message-Id</th></tr>' );
-	fwrite( $fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
-	fwrite( $fpb,"<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
-	fwrite( $fpb,'<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>' );
+	$fpb = fopen($fileb, 'w');
+	$lastup = "Last Update: ".date("d F Y H:i", time());
+	fwrite($fp, file_get_contents(dirname(__FILE__).'/'.$cf['reportTemplateHeader']));
+	fwrite($fp, "<h1> Report of IP sending $type</h1><h5>$lastup</h5><h2>Detailed Report</h2>");
+	if ($cf['onlyReport']) fwrite($fp, '<p>None of the below IP has been listed because listing is not active in configuration.</p>');
+	fwrite($fp, '<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>IP</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned IP appears in different mails">#IP</th><th nowrap>Received by</th><th>Message-Id</th></tr>');
+	fwrite($fpb, file_get_contents(dirname(__FILE__).'/'.$cf['reportTemplateHeader']));
+	fwrite($fpb, "<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>");
+	fwrite($fpb, '<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>');
 
 	$ipuid = array();
 	$ipuid['count'] = 0;
@@ -286,69 +286,69 @@ 
 	        //get imap header info for obj thang
 	        //$headers = imap_headerinfo($m_mail, $onem);
 	        //$head = imap_fetchheader($m_mail, $headers->Msgno);
-		$head = imap_fetchheader($m_mail, $onem );
+		$head = imap_fetchheader($m_mail, $onem);
 	        //$obj = imap_rfc822_parse_headers( $head);
 
-	        list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx'],$cf['msalearn'] );
+	        list ($ip, $host, $dateReceived, $dateClient, $mid) = getIP($head, $cf['mx'], $cf['msalearn']);
 		if (empty($mid)) {
-			$uid='NA';
-			syslog (LOG_ERR, $cf['user'].": Error retrieving data for empty Message-ID.");
-		} else {
+			$uid = 'NA';
+			syslog(LOG_ERR, $cf['user'].": Error retrieving data for empty Message-ID.");
+		}else {
 			if ($dateReceived === FALSE) {
-				$uid='unauthenticated';
-				syslog (LOG_ERR, $cf['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA");
-			} else  
-				if ( !($uid = splunksearch ($splunkconn, trim($mid,'<>'), $dateReceived)) ) {
-					syslog (LOG_ERR, $cf['user'].": Error retrieving uid from Splunk log for $mid.");
-					$uid='unknown';
+				$uid = 'unauthenticated';
+				syslog(LOG_ERR, $cf['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA");
+			}else  
+				if (!($uid = splunksearch($splunkconn, trim($mid, '<>'), $dateReceived))) {
+					syslog(LOG_ERR, $cf['user'].": Error retrieving uid from Splunk log for $mid.");
+					$uid = 'unknown';
 				}
 		}
 
 	        /* Update count of each ip */
-	        if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
-			$ipuid['count']++;					//number of right messages
+	        if ($host and ($uid != 'NA') and ($uid != 'unauthenticated') and ($uid != 'unknown')) { /* IP is received by MX servers  and learned by valid uid */
+			$ipuid['count']++; //number of right messages
 
-	                if (in_array($uid,array_keys($ipuid['uid']))) {
-				$ipuid['uid']["$uid"]['count']++;		//number of learn by this uid
-				if (!in_array($ip,$ipuid['uid']["$uid"])) 
-					$ipuid['uid']["$uid"][]=$ip;		//ips learned by this uid
+	                if (in_array($uid, array_keys($ipuid['uid']))) {
+				$ipuid['uid']["$uid"]['count']++; //number of learn by this uid
+				if (!in_array($ip, $ipuid['uid']["$uid"])) 
+					$ipuid['uid']["$uid"][] = $ip; //ips learned by this uid
 			}
 			else {
 				$ipuid['uid']["$uid"]['count'] = 1;
-				$ipuid['uid']["$uid"][]=$ip;
-				$ipuid['uid']['count']++;                	//number of unique uids
+				$ipuid['uid']["$uid"][] = $ip;
+				$ipuid['uid']['count']++; //number of unique uids
 			}
 
-                        if (in_array($ip,array_keys($ipuid['ip']))) {
-                                $ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
-				if (!in_array($uid,$ipuid['ip']["$ip"]))
-					$ipuid['ip']["$ip"][]=$uid;		//uids that learned this ip
+                        if (in_array($ip, array_keys($ipuid['ip']))) {
+                                $ipuid['ip']["$ip"]['count']++; //number of time this ip appears in different messages
+				if (!in_array($uid, $ipuid['ip']["$ip"]))
+					$ipuid['ip']["$ip"][] = $uid; //uids that learned this ip
 			}
                         else {
                                 $ipuid['ip']["$ip"]['count'] = 1;
-				$ipuid['ip']["$ip"][]=$uid;
-				$ipuid['ip']['count']++;			//number of unique ips
+				$ipuid['ip']["$ip"][] = $uid;
+				$ipuid['ip']['count']++; //number of unique ips
                         }
 
 	        	/* Update HTML report */
-	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
+	        	fwrite($fp, updateReport($ip, $uid, $ipuid['ip']["$ip"]['count'], $ipuid['uid']["$uid"]['count'], $host, $dateClient, $mid, $dateReceived));
 		}
 	        else {	/* Bad learn */
 			
-                        if (in_array($uid,array_keys($uidbad['uid']))) 
-                                $uidbad['uid']["$uid"]['count']++;               //number of bad learn by this uid
+                        if (in_array($uid, array_keys($uidbad['uid']))) 
+                                $uidbad['uid']["$uid"]['count']++; //number of bad learn by this uid
                         else {
                                 $uidbad['uid']["$uid"]['count'] = 1;
-				$uidbad['uid']["$uid"][]=$uid;
-                                $uidbad['count']++;                       //numeber of unique bad uids
+				$uidbad['uid']["$uid"][] = $uid;
+                                $uidbad['count']++; //numeber of unique bad uids
                         }
 			/* The reason of bad report */
 			if ($host === FALSE) $reason = 'This mail was not received by recognized MX host';
 			if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn';
-			if ($uid=='unknown') $reason = 'The uid of this mail was not found in splunk log';
+			if ($uid == 'unknown') $reason = 'The uid of this mail was not found in splunk log';
 			if (!isset($reason)) $reason = '?';
 				
-			fwrite( $fpb,updatebadReport ( $uid,$dateClient,$mid,$dateReceived,$reason ) );
+			fwrite($fpb, updatebadReport($uid, $dateClient, $mid, $dateReceived, $reason));
 		}
 	}
 
@@ -356,45 +356,45 @@ 
 	//close report file and mailbox
 
 	/* Summary Report */
-	$ipuid['ip'] = array_msort( $ipuid['ip'], array('count'=>SORT_DESC) );
-	$ipuid['uid'] = array_msort( $ipuid['uid'], array('count'=>SORT_DESC) );
-	$uidbad['uid'] = array_msort( $uidbad['uid'], array('count'=>SORT_DESC) );
+	$ipuid['ip'] = array_msort($ipuid['ip'], array('count'=>SORT_DESC));
+	$ipuid['uid'] = array_msort($ipuid['uid'], array('count'=>SORT_DESC));
+	$uidbad['uid'] = array_msort($uidbad['uid'], array('count'=>SORT_DESC));
 	
 	fwrite($fp, '</table>');
-	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['thresholdip']["$type"].' times from at least '.$cf['thresholduid']["$type"].' different valid uids.</h5>' );
+	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['thresholdip']["$type"].' times from at least '.$cf['thresholduid']["$type"].' different valid uids.</h5>');
 
         /* Make MYSQL connection */
-	if ( $cf['onlyReport'] )
+	if ($cf['onlyReport'])
 		$mysqli = NULL;
 	else {
         	$mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
         	if ($mysqli->connect_error) {
-                	syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
+                	syslog(LOG_EMERG, $cf['user'].': Connect Error ('.$mysqli->connect_errno.') '
                 	. $mysqli->connect_error);
                 	exit (254);
         	}
-        	syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
+        	syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to '.$mysqli->host_info);
 	}
 	/***********************/
 
-	fwrite($fp, summaryReportAndList ($cf,$mysqli,$tables,$type,$ipuid) );
-	if ( !$cf['onlyReport'] )
+	fwrite($fp, summaryReportAndList($cf, $mysqli, $tables, $type, $ipuid));
+	if (!$cf['onlyReport'])
 		$mysqli->close();
-	fwrite($fp,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateFooter']));
+	fwrite($fp, file_get_contents(dirname(__FILE__).'/'.$cf['reportTemplateFooter']));
 	fclose($fp);
 
 	fwrite($fpb, '</table>');
-	fwrite( $fpb,summaryBadReport( $uidbad ) );
-	fwrite($fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateFooter']));
+	fwrite($fpb, summaryBadReport($uidbad));
+	fwrite($fpb, file_get_contents(dirname(__FILE__).'/'.$cf['reportTemplateFooter']));
 	fclose($fpb);
-	syslog (LOG_INFO,$cf['user'].': Report files written. Listing job for '.$type.' terminated.');
-
-	if ( $ierr = imap_errors() )
-		foreach ( $ierr as $thiserr )
-			syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
-                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	syslog(LOG_INFO, $cf['user'].': Report files written. Listing job for '.$type.' terminated.');
+
+	if ($ierr = imap_errors())
+		foreach ($ierr as $thiserr)
+			syslog(LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
+	if ($ierr = imap_alerts())
+                foreach ($ierr as $thiserr)
+                        syslog(LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
 	imap_close($m_mail);
 }
 ?>

Braces +107 added lines, -61 removed lines

@@ -10,21 +10,25 @@ 
 	if ( preg_match_all('/^Received:\sfrom(?:.|\r\n\s)*?[\[\(]\s*(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\]\)](?:.|\r\n\s)+\s+by(?:\s|\r\n\s+)(?P<host>\S+).*(?:\s|\r\n\s\s)+.*;\s+(?P<date>.*)/m',$header,$received) ) {
 		for ($i = count($received[0])-1;$i>=0;$i--) {
 #			print "Examine ".$received[0][$i]."\n";
-			if ( preg_match($msa,$received['host'][$i]) )
-				$dateR = $received['date'][$i];
+			if ( preg_match($msa,$received['host'][$i]) ) {
+							$dateR = $received['date'][$i];
+			}
         		foreach ($mxserver as $mx) {
-        			if (!$ip)
-					if ($mx == $received['host'][$i]) {
+        			if (!$ip) {
+        								if ($mx == $received['host'][$i]) {
 						$host = $received['host'][$i];
+        			}
 						$ip = $received['ip'][$i];
                     			}
                 	}
         	}
 	}
-	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
-		$dateC['date'] = 'Not found';
-	if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1)
-		$mid['mid'] = NULL;
+	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1) {
+			$dateC['date'] = 'Not found';
+	}
+	if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1) {
+			$mid['mid'] = NULL;
+	}
 	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
 }
 
@@ -40,7 +44,9 @@ 
 
 function summaryBadReport ($uidvet) {
         $nuid = $uidvet['count'];
-        if ( empty($uidvet) ) return NULL;
+        if ( empty($uidvet) ) {
+        	return NULL;
+        }
         $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
 
         /* Remove count index */
@@ -75,8 +81,12 @@ 
     foreach ($colarr as $col => $arr) {
         foreach ($arr as $k => $v) {
             $k = substr($k,1);
-            if (!isset($ret[$k])) $ret[$k] = $array[$k];
-            if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
+            if (!isset($ret[$k])) {
+            	$ret[$k] = $array[$k];
+            }
+            if (isset ($array[$k][$col])) {
+            	$ret[$k][$col] = $array[$k][$col];
+            }
         }
     }
     return $ret;
@@ -87,13 +97,17 @@ 
 function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
 	$nips = $ipvet['count'];
 
-	if ( empty($ipvet) ) return NULL;
+	if ( empty($ipvet) ) {
+		return NULL;
+	}
 	$return = '<h3>Statistics by IP</h3><table><tr><th>IP</th><th>Learned by</th><th>Learned times</th><th title="This field doesn\'t say if this ip is currently listed, but it says if this IP has listed now!">Listed Now</th></tr>'."\n";
 	
 	$ips = array_keys($ipvet['ip']);
 
 	foreach ( $ips as $ip ) {
-		if ( $ip == 'count' ) continue;
+		if ( $ip == 'count' ) {
+			continue;
+		}
                 $nlearn = $ipvet['ip']["$ip"]['count'];
                 unset($ipvet['ip']["$ip"]['count']);
 		$quantity = $cf['quantity']["$category"]; /* In searchAndList this value is passed by reference and modified */
@@ -102,10 +116,12 @@ 
 			if ( ($nlearn >= $cf['thresholdip']["$category"])&&($nuid >= $cf['thresholduid']["$category"]) ) {
 				$reason = "The IP <$ip> has been listed because was marked $nlearn times as $category by $nuid different accounts during last ".$cf['oldestday'].' days.';
 				$listed = searchAndList ($myconn,$cf['user'],$tables,$cf['list']["$category"],$ip,$cf['unit']["$category"],$quantity,$reason);
+			} else {
+				$listed = FALSE;
 			}
-			else $listed = FALSE;
+		} else {
+			$listed = FALSE;
 		}
-		else $listed = FALSE;
 		$nowlist = array( TRUE =>  array(
 					'style' => 'id=\'ipfound\'',
 					'name'  => 'YES',
@@ -123,7 +139,9 @@ 
 		$return .='<tr><td rowspan="'.$nuid.'">'.$ip.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>',$ipvet['ip']["$ip"][0],$nlearn,$nowlist["$listed"]['name']);
 		$rowuid=NULL;
-                for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+                for ($j=1;$j<$nuid;$j++) {
+                	$rowuid .= '<tr><td>%s</td></tr>';
+                }
 		array_shift($ipvet['ip']["$ip"]);
                 $return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
 
@@ -136,14 +154,18 @@ 
 	$return .= '<h3>Statistics by UID</h3><table><tr><th>UID</th><th>IP learned</th><th>Learned times</th></tr>'."\n";
 	$uids = array_keys($ipvet['uid']);
         foreach ( $uids as $uid ) {
-		if ( $uid == 'count' ) continue;	
+		if ( $uid == 'count' ) {
+			continue;
+		}
 	        $nlearn = $ipvet['uid']["$uid"]['count'];
 	        unset ( $ipvet['uid']["$uid"]['count'] );
 		$nip = count($ipvet['uid']["$uid"]);
 		$return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$ipvet['uid']["$uid"][0],$nlearn);
                 $rowuid=NULL;
-                for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+                for ($j=1;$j<$nip;$j++) {
+                	$rowuid .= '<tr><td>%s</td></tr>';
+                }
                 array_shift($ipvet['uid']["$uid"]);
                 $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
 
@@ -192,14 +214,14 @@ 
 	    {
 	      // More than one field attribute returned by search
 	      // You must redefine the search
-	      if ( count($result->getFieldNames()) > 1 ) return FALSE;
-	    }
-	    else if ($result instanceof Splunk_ResultsMessage)
+	      if ( count($result->getFieldNames()) > 1 ) {
+	      	return FALSE;
+	      }
+	    } else if ($result instanceof Splunk_ResultsMessage)
 	    {
 	      // I don't want messages in my search
 	      return FALSE;
-	    }
-	    else if (is_array($result))
+	    } else if (is_array($result))
 	    {
 	      // Process a row
 	      foreach ($result as $key => $valueOrValues)
@@ -207,15 +229,13 @@ 
 	         if (is_array($valueOrValues))
 	          {
 	            return FALSE;
-	          }
-	         else
+	          } else
 	          {
 	            return $valueOrValues;
 	            #print "  {$key} => {$value}\r\n";
 	          }
 	        }
-	    }
-	    else
+	    } else
 	    {
 	      #print "Unknow result type";
 	      return FALSE;
@@ -229,7 +249,9 @@ 
 	$fileb= dirname(__FILE__) . '/' . $cf['badreportFile']["$type"];
 	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$cf['folder']["$type"], $cf['account'],$cf['authpassword'], OP_READONLY)
         	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-	if ( !$m_mail ) exit(254);
+	if ( !$m_mail ) {
+		exit(254);
+	}
 		
 
 	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
@@ -242,20 +264,28 @@ 
 	// Order results starting from newest message
 	if ( empty($m_search) ) {
 		syslog (LOG_INFO,$cf['user'].": No mail found in $type folder. No reports written for $type.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
+	        if ( $ierr = imap_errors() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
+	        }
+	        if ( $ierr = imap_alerts() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	        }
 		imap_close( $m_mail );
-		if ( file_exists( $file ) ) unlink ($file);
-		if ( file_exists( $fileb ) ) unlink ($fileb);
+		if ( file_exists( $file ) ) {
+			unlink ($file);
+		}
+		if ( file_exists( $fileb ) ) {
+			unlink ($fileb);
+		}
 		return FALSE;
 	}
 	$nmes = count ($m_search);
 	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in $type folder.");
-	if ($nmes>0) rsort($m_search);
+	if ($nmes>0) {
+		rsort($m_search);
+	}
 
 	// Create report file
 
@@ -264,7 +294,9 @@ 
 	$lastup = "Last Update: " . date ("d F Y H:i", time());
 	fwrite( $fp, file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
 	fwrite( $fp,"<h1> Report of IP sending $type</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
-	if ($cf['onlyReport']) fwrite( $fp,'<p>None of the below IP has been listed because listing is not active in configuration.</p>');
+	if ($cf['onlyReport']) {
+		fwrite( $fp,'<p>None of the below IP has been listed because listing is not active in configuration.</p>');
+	}
 	fwrite( $fp,'<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>IP</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned IP appears in different mails">#IP</th><th nowrap>Received by</th><th>Message-Id</th></tr>' );
 	fwrite( $fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
 	fwrite( $fpb,"<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
@@ -310,10 +342,11 @@ 
 
 	                if (in_array($uid,array_keys($ipuid['uid']))) {
 				$ipuid['uid']["$uid"]['count']++;		//number of learn by this uid
-				if (!in_array($ip,$ipuid['uid']["$uid"])) 
-					$ipuid['uid']["$uid"][]=$ip;		//ips learned by this uid
-			}
-			else {
+				if (!in_array($ip,$ipuid['uid']["$uid"])) {
+									$ipuid['uid']["$uid"][]=$ip;
+				}
+				//ips learned by this uid
+			} else {
 				$ipuid['uid']["$uid"]['count'] = 1;
 				$ipuid['uid']["$uid"][]=$ip;
 				$ipuid['uid']['count']++;                	//number of unique uids
@@ -321,10 +354,11 @@ 
 
                         if (in_array($ip,array_keys($ipuid['ip']))) {
                                 $ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
-				if (!in_array($uid,$ipuid['ip']["$ip"]))
-					$ipuid['ip']["$ip"][]=$uid;		//uids that learned this ip
-			}
-                        else {
+				if (!in_array($uid,$ipuid['ip']["$ip"])) {
+									$ipuid['ip']["$ip"][]=$uid;
+				}
+				//uids that learned this ip
+			} else {
                                 $ipuid['ip']["$ip"]['count'] = 1;
 				$ipuid['ip']["$ip"][]=$uid;
 				$ipuid['ip']['count']++;			//number of unique ips
@@ -332,21 +366,30 @@ 
 
 	        	/* Update HTML report */
 	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
-		}
-	        else {	/* Bad learn */
+		} else {	/* Bad learn */
 			
-                        if (in_array($uid,array_keys($uidbad['uid']))) 
-                                $uidbad['uid']["$uid"]['count']++;               //number of bad learn by this uid
+                        if (in_array($uid,array_keys($uidbad['uid']))) {
+                                                        $uidbad['uid']["$uid"]['count']++;
+                        }
+                        //number of bad learn by this uid
                         else {
                                 $uidbad['uid']["$uid"]['count'] = 1;
 				$uidbad['uid']["$uid"][]=$uid;
                                 $uidbad['count']++;                       //numeber of unique bad uids
                         }
 			/* The reason of bad report */
-			if ($host === FALSE) $reason = 'This mail was not received by recognized MX host';
-			if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn';
-			if ($uid=='unknown') $reason = 'The uid of this mail was not found in splunk log';
-			if (!isset($reason)) $reason = '?';
+			if ($host === FALSE) {
+				$reason = 'This mail was not received by recognized MX host';
+			}
+			if ($dateReceived === FALSE) {
+				$reason = 'This mail was not submitted to recognized MSA for learn';
+			}
+			if ($uid=='unknown') {
+				$reason = 'The uid of this mail was not found in splunk log';
+			}
+			if (!isset($reason)) {
+				$reason = '?';
+			}
 				
 			fwrite( $fpb,updatebadReport ( $uid,$dateClient,$mid,$dateReceived,$reason ) );
 		}
@@ -364,9 +407,9 @@ 
 	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['thresholdip']["$type"].' times from at least '.$cf['thresholduid']["$type"].' different valid uids.</h5>' );
 
         /* Make MYSQL connection */
-	if ( $cf['onlyReport'] )
-		$mysqli = NULL;
-	else {
+	if ( $cf['onlyReport'] ) {
+			$mysqli = NULL;
+	} else {
         	$mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
         	if ($mysqli->connect_error) {
                 	syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
@@ -378,8 +421,9 @@ 
 	/***********************/
 
 	fwrite($fp, summaryReportAndList ($cf,$mysqli,$tables,$type,$ipuid) );
-	if ( !$cf['onlyReport'] )
-		$mysqli->close();
+	if ( !$cf['onlyReport'] ) {
+			$mysqli->close();
+	}
 	fwrite($fp,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateFooter']));
 	fclose($fp);
 
@@ -389,12 +433,14 @@ 
 	fclose($fpb);
 	syslog (LOG_INFO,$cf['user'].': Report files written. Listing job for '.$type.' terminated.');
 
-	if ( $ierr = imap_errors() )
-		foreach ( $ierr as $thiserr )
+	if ( $ierr = imap_errors() ) {
+			foreach ( $ierr as $thiserr )
 			syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
+	}
+	if ( $ierr = imap_alerts() ) {
+	                foreach ( $ierr as $thiserr )
                         syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	}
 	imap_close($m_mail);
 }
 ?>

changeMilter.php

Indentation +3 added lines, -3 removed lines

@@ -44,8 +44,8 @@ 
 	}
 	if (! empty($old) ) {
 		foreach ($old as $item) {
-        		if (! in_array($item, $new) ) {
-                		$values["$item"] = 'del';
+				if (! in_array($item, $new) ) {
+						$values["$item"] = 'del';
 				$logs[] = "<$item>: ". $values["$item"];
 			}
 		}
@@ -63,7 +63,7 @@ 
 	
 	/* Store new values */
 	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-        	exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
 
 	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
 		print 'OK milter setting changed.';

Spacing +18 added lines, -18 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $col = milterTable($type);
-if ( $col === FALSE )
+if ($col === FALSE)
 	exit ("<p>Error in you config at field <b>$type</b>.</p>");
 ?>
 <td colspan="10" style="text-align: center">
@@ -18,54 +18,54 @@ 
 	$new = $_POST['newvalues'];
 else
 	$new = array();
-if (! empty($_POST['oldvalues']))
+if (!empty($_POST['oldvalues']))
 	$old = explode(',', $_POST['oldvalues']);
 else
-	$old=array();
-$values=array();
-$logs=array();
+	$old = array();
+$values = array();
+$logs = array();
 
 print '<pre>';
 /* Check need to disable all milters, removing unnecessary setting */
-if ( in_array('DISABLE ALL', $new) )
+if (in_array('DISABLE ALL', $new))
 	$new = array('DISABLE ALL');
 
 /* Compare the values determining what to do */
 if (count(array_diff(array_merge($new, $old), array_intersect($new, $old))) !== 0) {
 	/* New and old are different (we assume we don't have duplicate values) */
-	if (! empty($new) ) {
+	if (!empty($new)) {
 		foreach ($new as $item) {
-			if ( in_array($item, $old) )
+			if (in_array($item, $old))
 				$values["$item"] = 'keep';
 			else
 				$values["$item"] = 'add';
-			$logs[] = "<$item>: ". $values["$item"];
+			$logs[] = "<$item>: ".$values["$item"];
 		}
 	}
-	if (! empty($old) ) {
+	if (!empty($old)) {
 		foreach ($old as $item) {
-        		if (! in_array($item, $new) ) {
+        		if (!in_array($item, $new)) {
                 		$values["$item"] = 'del';
-				$logs[] = "<$item>: ". $values["$item"];
+				$logs[] = "<$item>: ".$values["$item"];
 			}
 		}
 	}
 }
 
 /* Logging */
-if ( empty($values) ) 
+if (empty($values)) 
 	print 'No values to change.';
 else {
-	$msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.',$user,$typedesc,$type, $_POST['object']);
+	$msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.', $user, $typedesc, $type, $_POST['object']);
 	syslog(LOG_INFO, $msg);
 	foreach ($logs as $log)
 		syslog(LOG_INFO, "$user: milter $log");
 	
 	/* Store new values */
-	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-        	exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+	if (($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE)
+        	exit ($user.': Connect Error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
 
-	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
+	if (changeMilter($mysqli, $user, $values, $col, $_POST['miltId']))
 		print 'OK milter setting changed.';
 	else
 		print 'ERROR updating milter setting; check your syslog. No changes made.';

Braces +28 added lines, -20 removed lines

@@ -4,8 +4,9 @@ 
 $typedesc=$_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $col = milterTable($type);
-if ( $col === FALSE )
+if ( $col === FALSE ) {
 	exit ("<p>Error in you config at field <b>$type</b>.</p>");
+}
 ?>
 <td colspan="10" style="text-align: center">
 
@@ -14,31 +15,35 @@ 
 $user = $_POST['user'];
 
 /* Compare old values with new ones */
-if (isset($_POST['newvalues']))
+if (isset($_POST['newvalues'])) {
 	$new = $_POST['newvalues'];
-else
+} else {
 	$new = array();
-if (! empty($_POST['oldvalues']))
+}
+if (! empty($_POST['oldvalues'])) {
 	$old = explode(',', $_POST['oldvalues']);
-else
+} else {
 	$old=array();
+}
 $values=array();
 $logs=array();
 
 print '<pre>';
 /* Check need to disable all milters, removing unnecessary setting */
-if ( in_array('DISABLE ALL', $new) )
+if ( in_array('DISABLE ALL', $new) ) {
 	$new = array('DISABLE ALL');
+}
 
 /* Compare the values determining what to do */
 if (count(array_diff(array_merge($new, $old), array_intersect($new, $old))) !== 0) {
 	/* New and old are different (we assume we don't have duplicate values) */
 	if (! empty($new) ) {
 		foreach ($new as $item) {
-			if ( in_array($item, $old) )
-				$values["$item"] = 'keep';
-			else
-				$values["$item"] = 'add';
+			if ( in_array($item, $old) ) {
+							$values["$item"] = 'keep';
+			} else {
+							$values["$item"] = 'add';
+			}
 			$logs[] = "<$item>: ". $values["$item"];
 		}
 	}
@@ -53,22 +58,25 @@ 
 }
 
 /* Logging */
-if ( empty($values) ) 
+if ( empty($values) ) {
 	print 'No values to change.';
-else {
+} else {
 	$msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.',$user,$typedesc,$type, $_POST['object']);
 	syslog(LOG_INFO, $msg);
-	foreach ($logs as $log)
-		syslog(LOG_INFO, "$user: milter $log");
+	foreach ($logs as $log) {
+			syslog(LOG_INFO, "$user: milter $log");
+	}
 	
 	/* Store new values */
-	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-        	exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
+	        	exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+	}
 
-	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
-		print 'OK milter setting changed.';
-	else
-		print 'ERROR updating milter setting; check your syslog. No changes made.';
+	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId'])) {
+			print 'OK milter setting changed.';
+	} else {
+			print 'ERROR updating milter setting; check your syslog. No changes made.';
+	}
 
 	$mysqli->close();
 }

listForm.php

Spacing +6 added lines, -6 removed lines

@@ -1,18 +1,18 @@
 <?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;
 
-if ( $tables["$typedesc"]['milter'] ) {
-	if ( checkMilterConf($tables["$typedesc"]) ) 
+if ($tables["$typedesc"]['milter']) {
+	if (checkMilterConf($tables["$typedesc"])) 
 		print '<p>This is a milter table. Please, first add your item as usual. Then you will be able to customize the milter settings.</p>';
 	else {
 		$err = "Error in config about <$typedesc>. Check at your config.php.";
-		syslog (LOG_EMERG, $err);
-		printf ('<p>%s</p>', htmlspecialchars($err) );
+		syslog(LOG_EMERG, $err);
+		printf('<p>%s</p>', htmlspecialchars($err));
 	}	
 }	
 ?>
 <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>

Braces +8 added lines, -5 removed lines

@@ -1,11 +1,14 @@
 <?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;
+}
 
 if ( $tables["$typedesc"]['milter'] ) {
-	if ( checkMilterConf($tables["$typedesc"]) ) 
-		print '<p>This is a milter table. Please, first add your item as usual. Then you will be able to customize the milter settings.</p>';
-	else {
+	if ( checkMilterConf($tables["$typedesc"]) ) {
+			print '<p>This is a milter table. Please, first add your item as usual. Then you will be able to customize the milter settings.</p>';
+	} else {
 		$err = "Error in config about <$typedesc>. Check at your config.php.";
 		syslog (LOG_EMERG, $err);
 		printf ('<p>%s</p>', htmlspecialchars($err) );

relist.php

Indentation +2 added lines, -2 removed lines

@@ -11,11 +11,11 @@
 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();
 
 if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-                exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+				exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
 
 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']))

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $table = ($tables["$typedesc"]['milter']) ? milterTable($type) : $tables["$typedesc"]['name'];
 $cl = ($tables["$typedesc"]['milter']) ? 10 : 9;
@@ -10,15 +10,15 @@ 
 <?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();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-                exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+if (($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE)
+                exit ($user.': Connect Error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
 
-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';

Braces +13 added lines, -6 removed lines

@@ -9,19 +9,26 @@
 <td colspan="<?php echo $cl; ?>" 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();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
                 exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+}
 
-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>';

result.php

Indentation +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 		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') )
@@ -27,8 +27,8 @@ 
 }
 
 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'] ) {

Spacing +13 added lines, -13 removed lines

@@ -5,20 +5,20 @@ 
 $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))
@@ -26,16 +26,16 @@ 
 	$_POST['Value'] = $value[0].'/'.$net->mask($value[1])->convertTo('dec');
 }
 
-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>');
 	}
 }	
@@ -51,10 +51,10 @@ 
 openlog($tag, LOG_PID, $fac);
 $user = username();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE )
-	exit ('Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+if (($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE)
+	exit ('Connect Error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
 	
-rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables);
+rlookup($mysqli, username(), $admins, $_POST['Value'], $_POST['genere'], $tables);
 $mysqli->close();
 closelog();
 ?>

Braces +28 added lines, -16 removed lines

@@ -5,32 +5,39 @@ 
 $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>');
+	}
 	$_POST['Value'] = $value[0].'/'.$net->mask($value[1])->convertTo('dec');
 }
 
 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':
@@ -41,18 +48,23 @@ 
 }	
 
 if (empty($_GET)) {
-	if ($tables["$_"]['milter']) print "<p><i>$_</i> is a miltermap of ".$tables["$_"]['field'].'.</p>';
-	else {
-		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["$_"]['milter']) {
+		print "<p><i>$_</i> is a miltermap of ".$tables["$_"]['field'].'.</p>';
+	} else {
+		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();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE ) {
 	exit ('Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+}
 	
 rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables);
 $mysqli->close();