Inspection of "added composer" - falon/RBL - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 9659fc...cb82fe )

by Marco

created 2017-10-19 09:44 UTC

Status

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

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

Please login to merge, or discard this patch.

Braces +136 added lines, -67 removed lines patch added patch discarded remove patch

@@ -13,7 +13,9 @@  discard block
 block discarded – undo
 //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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 
 //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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 if($m == 12){
 	$next_month = 1;
 	$next_year = $y+1;
-}else{
+} else{
 	$next_month = $m+1;
 	$next_year = $y;
 }
@@ -196,9 +227,9 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 
 		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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 <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 @@  discard block
 block discarded – undo
 
 			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 @@  discard block
 block discarded – undo
 
 					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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 				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));

Please login to merge, or discard this patch.

contrib/ipImap/getip.php 3 patches

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

@@ -5,10 +5,10 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 
 	/* 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 */

Please login to merge, or discard this patch.

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

@@ -1,16 +1,16 @@  discard block
 block discarded – undo
 #!/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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 
 
 /* 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();
 ?>

Please login to merge, or discard this patch.

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

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

Please login to merge, or discard this patch.

contrib/expire.php 2 patches

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

@@ -15,10 +15,10 @@
 block discarded – undo
 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 );

Please login to merge, or discard this patch.

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

@@ -15,15 +15,15 @@
 block discarded – undo
 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();
 ?>

Please login to merge, or discard this patch.

lookup.php 1 patch

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

@@ -11,7 +11,7 @@
 block discarded – undo
 <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');
 ?>

Please login to merge, or discard this patch.

contrib/ipImap/function.php 4 patches

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

@@ -1,4 +1,7 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 }
 
 
+/**
+ * @param null|mysqli $myconn
+ */
 function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
 	$nips = $ipvet['count'];
 
@@ -154,6 +173,10 @@  discard block
 block discarded – undo
 }
 
 
+/**
+ * @param string $message_id
+ * @param string $date
+ */
 function splunksearch ($service,$message_id,$date) {
 
 	// Run a blocking search

Please login to merge, or discard this patch.

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

@@ -12,14 +12,14 @@  discard block
 block discarded – undo
 #			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 @@  discard block
 block discarded – undo
 
 
 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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	/* 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 @@  discard block
 block discarded – undo
 	*/
 
 	// 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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 				}
 		}
 
-	        /* 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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		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);
 }
 ?>

Please login to merge, or discard this patch.

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

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
                 	}
         	}
 	}
-	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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
 }
 
 
-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 @@  discard block
 block discarded – undo
 				  )
 		);
 		
-		$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 @@  discard block
 block discarded – undo
 
 	// 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 @@  discard block
 block discarded – undo
 	    {
 	      // 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 @@  discard block
 block discarded – undo
 }
 
 
-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 @@  discard block
 block discarded – undo
 	        //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 @@  discard block
 block discarded – undo
 	//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);
 }
 ?>

Please login to merge, or discard this patch.

Braces +107 added lines, -61 removed lines patch added patch discarded remove patch

@@ -10,21 +10,25 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 	    {
 	      // 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 @@  discard block
 block discarded – undo
 	         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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 
 	                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 @@  discard block
 block discarded – undo
 
                         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 @@  discard block
 block discarded – undo
 
 	        	/* 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	/***********************/
 
 	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 @@  discard block
 block discarded – undo
 	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);
 }
 ?>

Please login to merge, or discard this patch.

function.php 4 patches

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

@@ -226,6 +226,9 @@  discard block
 block discarded – undo
 }
 
 
+/**
+ * @param integer $id
+ */
 function askMilter($myconn,$id,$obj,$typedesc,$miltId,$value,$user,$adm)  {
 	$milts = readMiltName($myconn,$user);
 	$size = count($milts);
@@ -256,6 +259,11 @@  discard block
 block discarded – undo
 }
 
 
+/**
+ * @param integer $id
+ * @param string $what
+ * @param boolean $lock
+ */
 function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
 
 	$whynot=NULL;
@@ -514,6 +522,9 @@  discard block
 block discarded – undo
 }
 
 
+/**
+ * @param string $reason
+ */
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
 
 /* Search and list value */
@@ -580,6 +591,9 @@  discard block
 block discarded – undo
 	return array_map('long2ip', range( ip2long($range[0]), ip2long($range[1]) ) );
 }
 
+/**
+ * @param string $netA
+ */
 function isIn($netA, $netB) {
 /* TRUE if an IP of $netA is contained in netB */
 	list($addressA,$maskA) = explode('/', $netA);

Please login to merge, or discard this patch.

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

@@ -4,18 +4,18 @@  discard block
 block discarded – undo
 
 function username() {
 	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
-        	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+			else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
+					else $user='unknown';
 	return $user;
 }
 
 
 function myConnect($host, $user, $pass, $db, $port, $tablelist, $typedesc, $loguser) {
-        $db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
+		$db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
 	$mysqli = new mysqli($host, $user, $pass, $db, $port);
-        if ($mysqli->connect_error) {
-           	syslog (LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> (' . $mysqli->connect_errno . ') '
-                    		. $mysqli->connect_error);
+		if ($mysqli->connect_error) {
+		   	syslog (LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> (' . $mysqli->connect_errno . ') '
+							. $mysqli->connect_error);
 		return FALSE;
 	}
 	syslog(LOG_INFO, $loguser.': Successfully MySQL connected at DB <'.$db.'> to ' . $mysqli->host_info) ;
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 			}
 		}
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
                         INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
                 )" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
-                break;
+				break;
 
 	  default:
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
                         `date` ,
                         `exp` ,
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
 	}
 
 	if ($myconn->query($query) === TRUE) {
-	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
-	    $result=TRUE;
+		syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
+		$result=TRUE;
 	}
 	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
 
 	$result=FALSE;
 
-        switch ($type) {
+		switch ($type) {
 	  case 'ip':
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
 			`active` = '1',
 			`user` = '%s',
 			`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
 			`reason` = '%s'
 			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
 		break;
-          case 'network':
+		  case 'network':
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
                         WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$sub['net'],$sub['mask']);
 		break;
 	  default:
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
@@ -128,18 +128,18 @@  discard block
 block discarded – undo
 			WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
 	}
 
-        if ($myconn->query($query) === TRUE) {
-            syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
+		if ($myconn->query($query) === TRUE) {
+			syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
 		$result=TRUE;
-        }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
+		}
+		else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
 	return $result;
 }
 
 function remove ($myconn,$user,$value,$type,$table) {
 
-        switch ($type) {
-          case 'ip':
+		switch ($type) {
+		  case 'ip':
 		$query = sprintf("DELETE FROM `$table` WHERE
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
@@ -155,18 +155,18 @@  discard block
 block discarded – undo
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
-            syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+		if ($return=$myconn->query($query) === TRUE) 
+			syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
+		else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 
-        return $return;
+		return $return;
 }
 
 
 function changestatus ($myconn,$user,$value,$status,$type,$table) {
 
 	switch ($type) {
-          case 'ip':
+		  case 'ip':
 		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
 		break;
 	  case 'network':
@@ -177,16 +177,16 @@  discard block
 block discarded – undo
 		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
 	}
 
-        if ($return=$myconn->query($query) === TRUE) {
-            syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
-        }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+		if ($return=$myconn->query($query) === TRUE) {
+			syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
+		}
+		else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 	return $return;	
 }
 
 
 function expire ($myconn,$user,$tables,$expireTime) {
-        $return=TRUE;
+		$return=TRUE;
 	$log=array();
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
@@ -196,11 +196,11 @@  discard block
 block discarded – undo
 		/* END OF QUERY */
 		$log[0] = 'expired for';
 		$log[1] = 'disabled for';
-        	if ($myconn->multi_query($query)) {
+			if ($myconn->multi_query($query)) {
 			$j = 0;
 			do {
-		    		$numdel = $myconn->affected_rows;
-	            		syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
+					$numdel = $myconn->affected_rows;
+						syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
 				$j++;
 
 			} while ($myconn->next_result());
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
 	}
 	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
 	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
-        return $return;
+		return $return;
 }
 
 
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
 		if ( $entry->num_rows ) {
 			if ( $entry->num_rows == 1 ) {
 				$riga = $entry->fetch_array(MYSQLI_ASSOC);
-                        	if (isListed($riga)) {
+							if (isListed($riga)) {
 					$warn = "<$value> is already present in <$listdep> list!";
 					$entry->free();
 					return FALSE;
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
 function searchentry ($myconn,$value,$tablelist) {
 /* Make a MYSQL query and return result */
 
-        $type = $tablelist['field'];
+		$type = $tablelist['field'];
 	
 	if ( $tablelist['milter'] ) {
 		$table = milterTable($type);
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
 				case 'ip':
 					$query = sprintf('SELECT * FROM (
 							SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id)' .
-                                                		'WHERE `ip` =  INET_ATON(\'%s\')
+														'WHERE `ip` =  INET_ATON(\'%s\')
 							 ) AS val WHERE val.ip IS NOT null', $table, $table, $value);
 					break;
 				default:
@@ -337,33 +337,33 @@  discard block
 block discarded – undo
 	}
 
 	else {
-	        $table = $tablelist['name'];
-	        if ($value == 'ALL') $query = 'select * from '.$table;
-	        else {
-	                switch ($type) {
-	                  case 'ip':
-	                        $query= "select * from $table where $type =  INET_ATON('$value')";
-	                        break;
-	                  case 'network':
-	                        list($sub['net'],$sub['mask'])=explode('/',$value);
-	                        $query= sprintf('select * from `%s`
+			$table = $tablelist['name'];
+			if ($value == 'ALL') $query = 'select * from '.$table;
+			else {
+					switch ($type) {
+					  case 'ip':
+							$query= "select * from $table where $type =  INET_ATON('$value')";
+							break;
+					  case 'network':
+							list($sub['net'],$sub['mask'])=explode('/',$value);
+							$query= sprintf('select * from `%s`
 						WHERE (
 							inet_aton(\'%s\') >= network AND
 							( inet_aton(\'%s\') | ( inet_aton(\'%s\') ^ (power(2,32)-1) ) )
 								<= network | ( netmask ^ (power(2,32)-1) )
 						)', $table, $sub['net'], $sub['net'], $sub['mask']);
 ;
-	                        break;
-	                  default:
-	                        $query= "select * from $table where $type = '$value'";
-	                }
-	        }
+							break;
+					  default:
+							$query= "select * from $table where $type = '$value'";
+					}
+			}
 	}
 
 	$result = $myconn->query($query);
 	if($result === false)
 		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
-        return $result;
+		return $result;
 }
 
 function countListed ($myconn,$table) {
@@ -378,14 +378,14 @@  discard block
 block discarded – undo
 
 
 function isFull($myconn,$typedesc,$alltables) {
-        if (isset($alltables["$typedesc"]['limit'])) {
+		if (isset($alltables["$typedesc"]['limit'])) {
 		if ( $alltables["$typedesc"]['milter'] )
 			$tab = 'net';
 		else
 			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
-        }
+				if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
+						return TRUE;
+		}
 	return FALSE;
 }
 
@@ -405,14 +405,14 @@  discard block
 block discarded – undo
 	if ($result) {
 		printf("<pre>Your request for $type &lt;$value&gt; returned %d items.\n</pre>", $result->num_rows);
 
-        /* Check for limit in number of listed items */
+		/* Check for limit in number of listed items */
 	$full = isFull($myconn,$typedesc,$tables);
 	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
 
 		if ($result->num_rows) {
 			print $tabhtm;
 			$i=0;
-        		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
+				while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
 					if ($tables["$typedesc"]['bl']) $listed='Listed';
 					else $listed='WhiteListed';
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
 					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
 				$i++;
-        		}
+				}
 			print '</tbody></table>';
 		}
 		else {
@@ -458,15 +458,15 @@  discard block
 block discarded – undo
         
 function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
 	$now = time();
-        setlocale (LC_TIME, 'it_IT');
-        $date = date("r",$now);
+		setlocale (LC_TIME, 'it_IT');
+		$date = date("r",$now);
 	$messageID = md5(uniqid($now,1)) . '@' . $_SERVER["HOSTNAME"];
 	$mua = 'PHP/' . phpversion();
 
 	/* Parsing headers */
 	if (!file_exists($tplf['header'])) {
-    		syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
-    		exit;
+			syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
+			exit;
 	}
 
 	$head_tmpl = file_get_contents($tplf['header']);
@@ -475,35 +475,35 @@  discard block
 block discarded – undo
 	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
 	$headers = preg_replace( '/\r|\n/', "\r\n", $headers );
 
-        /* Parsing body */
+		/* Parsing body */
 
-        if (!file_exists($tplf['body'])) {
-                syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
-                exit;
-        }
+		if (!file_exists($tplf['body'])) {
+				syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
+				exit;
+		}
 
-        $body_tmpl = file_get_contents($tplf['body']);
-        $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
-        $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
-        $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
-        $body = preg_replace( "/\r|\n/", "\r\n", $body );
+		$body_tmpl = file_get_contents($tplf['body']);
+		$arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
+		$arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
+		$body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
+		$body = preg_replace( "/\r|\n/", "\r\n", $body );
 	$body = wordwrap ( $body, 75 , "\r\n" );	
 
 	/* Send the mail! */
-        if ( strlen(ini_get("safe_mode"))< 1) {
-                $old_mailfrom = ini_get("sendmail_from");
-                ini_set("sendmail_from", $from);
-                $params = sprintf("-oi -f %s", '<>');
-                if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
-                else $flag=TRUE;
-                if (isset($old_mailfrom))
-                        ini_set("sendmail_from", $old_mailfrom);
-        }
-        else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
-        }
-        return $flag;
+		if ( strlen(ini_get("safe_mode"))< 1) {
+				$old_mailfrom = ini_get("sendmail_from");
+				ini_set("sendmail_from", $from);
+				$params = sprintf("-oi -f %s", '<>');
+				if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
+				else $flag=TRUE;
+				if (isset($old_mailfrom))
+						ini_set("sendmail_from", $old_mailfrom);
+		}
+		else {
+				if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
+				else $flag=TRUE;
+		}
+		return $flag;
 }
 
 function emailToNotify($notify_file,$dom) {
@@ -517,59 +517,59 @@  discard block
 block discarded – undo
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
 
 /* Search and list value */
-        $type = $tables["$typedesc"]['field'];
-        $table = $tables["$typedesc"]['name'];
-        $result = searchentry ($myconn,$value,$tables["$typedesc"]);
-
-        /* Manage abnormal conditions */
-        /* Value already present in db more than once. This is absurd. Panic! */
-        if ($result->num_rows > 1) {
-                syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
-                $result->free();
-                return FALSE;
-        }
+		$type = $tables["$typedesc"]['field'];
+		$table = $tables["$typedesc"]['name'];
+		$result = searchentry ($myconn,$value,$tables["$typedesc"]);
+
+		/* Manage abnormal conditions */
+		/* Value already present in db more than once. This is absurd. Panic! */
+		if ($result->num_rows > 1) {
+				syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
+				$result->free();
+				return FALSE;
+		}
 
-        /* Value already present in db or not present: to list anyway */
-        if ($result->num_rows >= 0) {
-                /* First, check for limit in number of listed items */
-                if (isFull($myconn,$typedesc,$tables)) {
-                        syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
-                        $result->free();
-                        return FALSE;
-                }
-                /* Second, check if the (re)list would be consistent now */
-                if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
-                        syslog(LOG_ERR, $loguser.': '.$whynot);
-                        $result->free();
-                        return FALSE;
-                }
-        }
-        /* End of abnormal conditions */
+		/* Value already present in db or not present: to list anyway */
+		if ($result->num_rows >= 0) {
+				/* First, check for limit in number of listed items */
+				if (isFull($myconn,$typedesc,$tables)) {
+						syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
+						$result->free();
+						return FALSE;
+				}
+				/* Second, check if the (re)list would be consistent now */
+				if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
+						syslog(LOG_ERR, $loguser.': '.$whynot);
+						$result->free();
+						return FALSE;
+				}
+		}
+		/* End of abnormal conditions */
 
 
-        /* Finally, here I can list the value! */
+		/* Finally, here I can list the value! */
 	$thisentry = $result->fetch_array(MYSQLI_ASSOC);
-        switch ($result->num_rows) {
-                /* Relist value if already present */
-                case 1:
-                        /* Entry already listed */
-                        if ( isListed($thisentry) ) {
-                                syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
-                                $result->free();
-                                return FALSE;
-                        }
-
-                        /* Entry delisted */
-                        $result->free();
+		switch ($result->num_rows) {
+				/* Relist value if already present */
+				case 1:
+						/* Entry already listed */
+						if ( isListed($thisentry) ) {
+								syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
+								$result->free();
+								return FALSE;
+						}
+
+						/* Entry delisted */
+						$result->free();
 			$quantity *= $thisentry['nlist'];
-                        return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+						return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
 
 
-                /* First time list value */
-                case 0:
-                        $result->free();
-                        return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
-        }
+				/* First time list value */
+				case 0:
+						$result->free();
+						return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+		}
 }
 
 
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
 		return FALSE;
 	}
 	$result = searchentry ($myconn,'ALL',$tabletype);
-        if ($result->num_rows) {
+		if ($result->num_rows) {
 		while ($row = $result->fetch_array(MYSQLI_ASSOC)) {
 			$thisNet = long2ip($row['network']).'/'.long2ip($row['netmask']);
 			if ( isIn($thisNet, $net) ) {
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
 /* For miltermap */
 function checkMilterConf($table) {
 	if (isset($table['milter'])) {
-        	if ($table['milter'] ===  TRUE) {
+			if ($table['milter'] ===  TRUE) {
 			switch ( $table['field'] ) {
 				case 'network':
 				case 'ip':
@@ -645,15 +645,15 @@  discard block
 block discarded – undo
 
 function milterTable($t) {
 	/* Return the milter object table for type t  or FALSE on error */
-        switch ($t) {
-                case 'network':
-                        return 'net';
-                case 'ip':
-                        return 'ips';
-                default:
+		switch ($t) {
+				case 'network':
+						return 'net';
+				case 'ip':
+						return 'ips';
+				default:
 			syslog(LOG_EMERG, "ALERT: type <$t> not allowed in configuration. ");
-                        return FALSE;
-        }
+						return FALSE;
+		}
 }
 
 
@@ -661,9 +661,9 @@  discard block
 block discarded – undo
 	$milters=array();
 	$query = 'SELECT `name` FROM `config`';
 
-        $result = $myconn->query($query);
-        if($result === false) {
-                syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
+		$result = $myconn->query($query);
+		if($result === false) {
+				syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
 		return FALSE;
 	}
 	if ($result->num_rows) {

Please login to merge, or discard this patch.

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

@@ -5,36 +5,36 @@  discard block
 block discarded – undo
 function username() {
 	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
         	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+                	else $user = 'unknown';
 	return $user;
 }
 
 
 function myConnect($host, $user, $pass, $db, $port, $tablelist, $typedesc, $loguser) {
-        $db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
+        $db = ($tablelist["$typedesc"]['milter']) ? $tablelist["$typedesc"]['name'] : $db;
 	$mysqli = new mysqli($host, $user, $pass, $db, $port);
         if ($mysqli->connect_error) {
-           	syslog (LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> (' . $mysqli->connect_errno . ') '
+           	syslog(LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> ('.$mysqli->connect_errno.') '
                     		. $mysqli->connect_error);
 		return FALSE;
 	}
-	syslog(LOG_INFO, $loguser.': Successfully MySQL connected at DB <'.$db.'> to ' . $mysqli->host_info) ;
+	syslog(LOG_INFO, $loguser.': Successfully MySQL connected at DB <'.$db.'> to '.$mysqli->host_info);
 	return $mysqli;
 }
 
-function addtolist ($myconn,$user,$value,$tabledesc,$expUnit,$expQ,$myreason,&$err) {
+function addtolist($myconn, $user, $value, $tabledesc, $expUnit, $expQ, $myreason, &$err) {
 // See MySQL manual for $expQ and $expUnit at
 // https://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html#function_timestampadd
 
-	$result=FALSE;
-	$sub=array();
+	$result = FALSE;
+	$sub = array();
 	$type = $tabledesc['field'];
 	$milt = $tabledesc['milter'];
 	$table = ($milt) ? milterTable($type) : $tabledesc['name'];
 
 	switch ($type) {
 	  case 'ip':
-		$query= sprintf("INSERT INTO `$table` (
+		$query = sprintf("INSERT INTO `$table` (
 			`$type` ,
 			`date` ,
 			`exp` ,
@@ -45,18 +45,18 @@  discard block
 block discarded – undo
 		VALUES (
 			INET_ATON( '%s' ) ,
 			CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-		)" ,$value,$expUnit,$expQ,$user,$myreason);
+		)", $value, $expUnit, $expQ, $user, $myreason);
 		break;
 
 	  case 'network':
 		if (!$milt) {
-			if ( netOverlap($myconn, $tabledesc, $value, $overlappedNet, $user) ) {
+			if (netOverlap($myconn, $tabledesc, $value, $overlappedNet, $user)) {
 				$err = "<$value> overlaps the existing network <$overlappedNet>";
 				return FALSE;
 			}
 		}
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+                $query = sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
                 VALUES (
                         INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
+                )", $sub['net'], $sub['mask'], $expUnit, $expQ, $user, $myreason);
                 break;
 
 	  default:
-                $query= sprintf("INSERT INTO `$table` (
+                $query = sprintf("INSERT INTO `$table` (
                         `$type` ,
                         `date` ,
                         `exp` ,
@@ -83,60 +83,60 @@  discard block
 block discarded – undo
                 VALUES (
                         '%s' ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$value,$expUnit,$expQ,$user,$myreason);
+                )", $value, $expUnit, $expQ, $user, $myreason);
 	}
 
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
-	    $result=TRUE;
+	    $result = TRUE;
 	}
 	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
-function relist ($myconn,$user,$value,$type,$table,$expUnit,$expQ,$myreason) {
+function relist($myconn, $user, $value, $type, $table, $expUnit, $expQ, $myreason) {
 
-	$result=FALSE;
+	$result = FALSE;
 
         switch ($type) {
 	  case 'ip':
-                $query= sprintf("UPDATE `$table` SET
+                $query = sprintf("UPDATE `$table` SET
 			`active` = '1',
 			`user` = '%s',
 			`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
 			`nlist` = `nlist` + 1,
 			`reason` = '%s'
-			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
+			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $expUnit, $expQ, $myreason, $value);
 		break;
           case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("UPDATE `$table` SET
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+                $query = sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
                         `nlist` = `nlist` + 1,
                         `reason` = '%s'
-                        WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$sub['net'],$sub['mask']);
+                        WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1", $user, $expUnit, $expQ, $myreason, $sub['net'], $sub['mask']);
 		break;
 	  default:
-                $query= sprintf("UPDATE `$table` SET
+                $query = sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
                         `nlist` = `nlist` + 1,
                         `reason` = '%s'
-			WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
+			WHERE `$table`.`$type` = '%s' LIMIT 1", $user, $expUnit, $expQ, $myreason, $value);
 	}
 
         if ($myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
-		$result=TRUE;
+		$result = TRUE;
         }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
-function remove ($myconn,$user,$value,$type,$table) {
+function remove($myconn, $user, $value, $type, $table) {
 
         switch ($type) {
           case 'ip':
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
 		$query = sprintf("DELETE FROM `$table` WHERE
 			`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s') LIMIT 1",
-			$sub['net'],$sub['mask']);
+			$sub['net'], $sub['mask']);
 		break;
 	  default:
 		$query = sprintf("DELETE FROM `$table` WHERE
@@ -155,39 +155,39 @@  discard block
 block discarded – undo
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
+        if ($return = $myconn->query($query) === TRUE) 
             syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 
         return $return;
 }
 
 
-function changestatus ($myconn,$user,$value,$status,$type,$table) {
+function changestatus($myconn, $user, $value, $status, $type, $table) {
 
 	switch ($type) {
           case 'ip':
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user, $sub['net'],$sub['mask']);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1", $user, $sub['net'], $sub['mask']);
 		break;
 	  default:
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1", $user, $value);
 	}
 
-        if ($return=$myconn->query($query) === TRUE) {
+        if ($return = $myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
         }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $return;	
 }
 
 
-function expire ($myconn,$user,$tables,$expireTime) {
-        $return=TRUE;
-	$log=array();
+function expire($myconn, $user, $tables, $expireTime) {
+        $return = TRUE;
+	$log = array();
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
 		/* QUERY */
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
 			} while ($myconn->next_result());
 		}
 		else {
-			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
+			syslog(LOG_ERR, "Expire job - Error: ".$myconn->error);
 			$return = FALSE;
 		}
 	}
-	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
+	if (!($return)) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
 	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
         return $return;
 }
@@ -218,18 +218,18 @@  discard block
 block discarded – undo
 
 function isListed($row) {
 
-	$exp=new DateTime($row['exp']);
-	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
+	$exp = new DateTime($row['exp']);
+	$now = new DateTime('NOW');
+	if (($exp>$now) and ($row['active'])) return true;
 	else return false;
 
 }
 
 
-function askMilter($myconn,$id,$obj,$typedesc,$miltId,$value,$user,$adm)  {
-	$milts = readMiltName($myconn,$user);
+function askMilter($myconn, $id, $obj, $typedesc, $miltId, $value, $user, $adm) {
+	$milts = readMiltName($myconn, $user);
 	$size = count($milts);
-	if (in_array($user,array_keys($adm))) {
+	if (in_array($user, array_keys($adm))) {
 		$button = <<<END
 		<form style="margin:0; display:inline;" name="Milter$id" enctype="text/plain" method="post" target="_self" action="changeMilter.php" onSubmit="xmlhttpPost('changeMilter.php', 'Milter$id', 'id$id', '<img src=\'/include/pleasewait.gif\'>'); return false;" />
 		<input name="object" type="hidden" value="$obj" /><input name="oldvalues" type="hidden" value="$value" />
@@ -239,12 +239,12 @@  discard block
 block discarded – undo
 		<div class="noscroll">
 		<select class="input_text" name="newvalues[]" multiple size="$size">
 END;
-		$activeMilts = explode(',',$value);
-		foreach ( $milts as $milter ) {
-			if ( in_array($milter, $activeMilts) )
-				$selected= 'selected';
+		$activeMilts = explode(',', $value);
+		foreach ($milts as $milter) {
+			if (in_array($milter, $activeMilts))
+				$selected = 'selected';
 			else
-				$selected= NULL;
+				$selected = NULL;
 			$button .= sprintf('<option value="%s" %s>%s</option>', $milter, $selected, $milter);
 		}	
 		$button .= '</select></div><input class="button" name="Change" type="submit" value="Change" /></form>';
@@ -256,14 +256,14 @@  discard block
 block discarded – undo
 }
 
 
-function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
+function ask($myconn, $id, $what, $alltables, $typedesc, $value, $lock, $user, $adm) {
 
-	$whynot=NULL;
+	$whynot = NULL;
 	switch ($what) {
 		case 'Ok':
 			if ($lock) return NULL;
-			if (in_array($user,array_keys($adm)))
-				if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			if (in_array($user, array_keys($adm)))
+				if (consistentListing($myconn, $alltables, $typedesc, $value, $whynot)) return require('relistButton.php');
 			return htmlspecialchars($whynot);
 		case 'Listed':
 		case 'WhiteListed':
@@ -272,18 +272,18 @@  discard block
 block discarded – undo
 }
 
 
-function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
+function consistentListing($myconn, $alltables, $typed, $value, &$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
-	if (! isset($alltables["$typed"]['depend']) ) return TRUE;
+	if (!isset($alltables["$typed"]['depend'])) return TRUE;
 	foreach ($alltables["$typed"]['depend'] as $listdep) {
-		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
+		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field']) {
 			$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
 			return FALSE;
 		}
-		$entry = searchentry($myconn,$value,$alltables["$listdep"]);
-		if ( $entry->num_rows ) {
-			if ( $entry->num_rows == 1 ) {
+		$entry = searchentry($myconn, $value, $alltables["$listdep"]);
+		if ($entry->num_rows) {
+			if ($entry->num_rows == 1) {
 				$riga = $entry->fetch_array(MYSQLI_ASSOC);
                         	if (isListed($riga)) {
 					$warn = "<$value> is already present in <$listdep> list!";
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
 					return FALSE;
 				}
 			}
-			if ( $entry->num_rows > 1 ) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!";}
+			if ($entry->num_rows>1) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!"; }
 		}
 		$entry->free();
 	}
@@ -299,20 +299,20 @@  discard block
 block discarded – undo
 	return TRUE;
 }
 
-function searchentry ($myconn,$value,$tablelist) {
+function searchentry($myconn, $value, $tablelist) {
 /* Make a MYSQL query and return result */
 
         $type = $tablelist['field'];
 	
-	if ( $tablelist['milter'] ) {
+	if ($tablelist['milter']) {
 		$table = milterTable($type);
 		if ($value == 'ALL')
 			$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
-				$table,$table);
+				$table, $table);
 		else {
 			switch ($type) {
 				case 'network':
-					list($sub['net'],$sub['mask'])=explode('/',$value);
+					list($sub['net'], $sub['mask']) = explode('/', $value);
 					$query = sprintf('SELECT * FROM (
 							SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id)
 				 				WHERE (
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
 							 ) AS val WHERE val.ip IS NOT null', $table, $table, $value);
 					break;
 				default:
-					syslog(LOG_EMERG, 'ALERT: The type <'.$type.'> is not allowed for milter lists.' );
+					syslog(LOG_EMERG, 'ALERT: The type <'.$type.'> is not allowed for milter lists.');
 					return FALSE;
 			}
 		}
@@ -342,11 +342,11 @@  discard block
 block discarded – undo
 	        else {
 	                switch ($type) {
 	                  case 'ip':
-	                        $query= "select * from $table where $type =  INET_ATON('$value')";
+	                        $query = "select * from $table where $type =  INET_ATON('$value')";
 	                        break;
 	                  case 'network':
-	                        list($sub['net'],$sub['mask'])=explode('/',$value);
-	                        $query= sprintf('select * from `%s`
+	                        list($sub['net'], $sub['mask']) = explode('/', $value);
+	                        $query = sprintf('select * from `%s`
 						WHERE (
 							inet_aton(\'%s\') >= network AND
 							( inet_aton(\'%s\') | ( inet_aton(\'%s\') ^ (power(2,32)-1) ) )
@@ -355,18 +355,18 @@  discard block
 block discarded – undo
 ;
 	                        break;
 	                  default:
-	                        $query= "select * from $table where $type = '$value'";
+	                        $query = "select * from $table where $type = '$value'";
 	                }
 	        }
 	}
 
 	$result = $myconn->query($query);
-	if($result === false)
+	if ($result === false)
 		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
         return $result;
 }
 
-function countListed ($myconn,$table) {
+function countListed($myconn, $table) {
 /* Return number of current listed items into a rbl table */
 	$query = "SELECT COUNT(*) as `count` FROM `$table` WHERE (`active`=1 AND TIMESTAMPDIFF(MICROSECOND,NOW(),`exp`)>0) GROUP BY `active` ORDER BY `count` DESC LIMIT 1";
 	$row = $myconn->query($query);
@@ -377,48 +377,48 @@  discard block
 block discarded – undo
 }
 
 
-function isFull($myconn,$typedesc,$alltables) {
+function isFull($myconn, $typedesc, $alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-		if ( $alltables["$typedesc"]['milter'] )
+		if ($alltables["$typedesc"]['milter'])
 			$tab = 'net';
 		else
 			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
+                if (countListed($myconn, $tab)>=$alltables["$typedesc"]['limit']) 
                         return TRUE;
         }
 	return FALSE;
 }
 
-function rlookup ($myconn,$user,$adm,$value,$typedesc,$tables) {
+function rlookup($myconn, $user, $adm, $value, $typedesc, $tables) {
 
 	$type = $tables["$typedesc"]['field'];
-	$whynot=NULL;
+	$whynot = NULL;
 
 	$tabhtm = <<<END
 	<table><thead><tr><th>$type</th><th title="The date this object has been listed for the first time">DateAdd</th><th>DateMod</th><th>Exp</th><th>Status</th><th title="Number of times this object has been listed">#List</th>
 END;
-	if ( $tables["$typedesc"]['milter'] )
+	if ($tables["$typedesc"]['milter'])
 		$tabhtm .= '<th title="Milter active for this object">Milters</th>';
 	$tabhtm .= '<th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
 
-	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
+	$result = searchentry($myconn, $value, $tables["$typedesc"]);
 	if ($result) {
 		printf("<pre>Your request for $type &lt;$value&gt; returned %d items.\n</pre>", $result->num_rows);
 
         /* Check for limit in number of listed items */
-	$full = isFull($myconn,$typedesc,$tables);
+	$full = isFull($myconn, $typedesc, $tables);
 	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
 
 		if ($result->num_rows) {
 			print $tabhtm;
-			$i=0;
+			$i = 0;
         		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
-					if ($tables["$typedesc"]['bl']) $listed='Listed';
-					else $listed='WhiteListed';
+					if ($tables["$typedesc"]['bl']) $listed = 'Listed';
+					else $listed = 'WhiteListed';
 				}	
 				else
-					$listed='Ok';
+					$listed = 'Ok';
 
 				switch ($type) {
 				  case 'ip':
@@ -431,20 +431,20 @@  discard block
 block discarded – undo
 					$element = $riga["$type"];
 				}
 
-				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) )
-					printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
-					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn,$i,$element,$typedesc,$riga['idmilt'],$riga['miltnames'],$user,$adm), $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
+				if ($tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]))
+					printf("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn, $i, $element, $typedesc, $riga['idmilt'], $riga['miltnames'], $user, $adm), $riga['user'], htmlspecialchars($riga['reason']), ask($myconn, $i, $listed, $tables, $typedesc, $element, $full, $user, $adm));
 				else
-					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
-					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
+					 printf("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'], htmlspecialchars($riga['reason']), ask($myconn, $i, $listed, $tables, $typedesc, $element, $full, $user, $adm));
 				$i++;
         		}
 			print '</tbody></table>';
 		}
 		else {
 			print "<pre>$type &lt;$value&gt; is not listed!\n</pre>";
-			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') )
-				if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
+			if (in_array($user, array_keys($adm)) AND ($value != 'ALL'))
+				if ((!$full) AND (consistentListing($myconn, $tables, $typedesc, $value, $whynot))) require_once('listForm.php');
 									else print '<p>'.htmlspecialchars($whynot).'</p>';
 				
 		}
@@ -456,12 +456,12 @@  discard block
 block discarded – undo
 
 
         
-function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
+function sendEmailWarn($tplf, $from, $to, $sbj, $emailListed, $intervalToExpire, $detail) {
 	$now = time();
-        setlocale (LC_TIME, 'it_IT');
-        $date = date("r",$now);
-	$messageID = md5(uniqid($now,1)) . '@' . $_SERVER["HOSTNAME"];
-	$mua = 'PHP/' . phpversion();
+        setlocale(LC_TIME, 'it_IT');
+        $date = date("r", $now);
+	$messageID = md5(uniqid($now, 1)).'@'.$_SERVER["HOSTNAME"];
+	$mua = 'PHP/'.phpversion();
 
 	/* Parsing headers */
 	if (!file_exists($tplf['header'])) {
@@ -470,10 +470,10 @@  discard block
 block discarded – undo
 	}
 
 	$head_tmpl = file_get_contents($tplf['header']);
-	$arr_tpl_vars = array('{from}','{to}','{date}','{messageID}','{mua}');
-	$arr_tpl_data = array($from,$to,$date,$messageID,$mua);
+	$arr_tpl_vars = array('{from}', '{to}', '{date}', '{messageID}', '{mua}');
+	$arr_tpl_data = array($from, $to, $date, $messageID, $mua);
 	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
-	$headers = preg_replace( '/\r|\n/', "\r\n", $headers );
+	$headers = preg_replace('/\r|\n/', "\r\n", $headers);
 
         /* Parsing body */
 
@@ -483,62 +483,62 @@  discard block
 block discarded – undo
         }
 
         $body_tmpl = file_get_contents($tplf['body']);
-        $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
-        $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
+        $arr_tpl_vars = array('{emailListed}', '{expInterval}', '{reason}');
+        $arr_tpl_data = array($emailListed, $intervalToExpire, $detail);
         $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
-        $body = preg_replace( "/\r|\n/", "\r\n", $body );
-	$body = wordwrap ( $body, 75 , "\r\n" );	
+        $body = preg_replace("/\r|\n/", "\r\n", $body);
+	$body = wordwrap($body, 75, "\r\n");	
 
 	/* Send the mail! */
-        if ( strlen(ini_get("safe_mode"))< 1) {
+        if (strlen(ini_get("safe_mode"))<1) {
                 $old_mailfrom = ini_get("sendmail_from");
                 ini_set("sendmail_from", $from);
                 $params = sprintf("-oi -f %s", '<>');
-                if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
-                else $flag=TRUE;
+                if (!(mail($to, $sbj, $body, $headers, $params))) $flag = FALSE;
+                else $flag = TRUE;
                 if (isset($old_mailfrom))
                         ini_set("sendmail_from", $old_mailfrom);
         }
         else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
+                if (!(mail($to, $sbj, $body, $headers))) $flag = FALSE;
+                else $flag = TRUE;
         }
         return $flag;
 }
 
-function emailToNotify($notify_file,$dom) {
+function emailToNotify($notify_file, $dom) {
 	$ini_array = parse_ini_file($notify_file);
-	if (in_array($dom,array_keys($ini_array)))
+	if (in_array($dom, array_keys($ini_array)))
 		return $ini_array["$dom"];
 	else return FALSE;
 }
 
 
-function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
+function searchAndList($myconn, $loguser, $tables, $typedesc, $value, $unit, &$quantity, $reason) {
 
 /* Search and list value */
         $type = $tables["$typedesc"]['field'];
         $table = $tables["$typedesc"]['name'];
-        $result = searchentry ($myconn,$value,$tables["$typedesc"]);
+        $result = searchentry($myconn, $value, $tables["$typedesc"]);
 
         /* Manage abnormal conditions */
         /* Value already present in db more than once. This is absurd. Panic! */
-        if ($result->num_rows > 1) {
-                syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
+        if ($result->num_rows>1) {
+                syslog(LOG_EMERG, "$loguser: PANIC! Select for $type '$value' returned ".$result->num_rows." items instead of one. Abnormal. Contact a sysadmin or a developer.");
                 $result->free();
                 return FALSE;
         }
 
         /* Value already present in db or not present: to list anyway */
-        if ($result->num_rows >= 0) {
+        if ($result->num_rows>=0) {
                 /* First, check for limit in number of listed items */
-                if (isFull($myconn,$typedesc,$tables)) {
-                        syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
+                if (isFull($myconn, $typedesc, $tables)) {
+                        syslog(LOG_EMERG, "$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
                         $result->free();
                         return FALSE;
                 }
                 /* Second, check if the (re)list would be consistent now */
-                if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
+                if (!consistentListing($myconn, $tables, $typedesc, $value, $whynot)) {
                         syslog(LOG_ERR, $loguser.': '.$whynot);
                         $result->free();
                         return FALSE;
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
                 /* Relist value if already present */
                 case 1:
                         /* Entry already listed */
-                        if ( isListed($thisentry) ) {
+                        if (isListed($thisentry)) {
                                 syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
                                 $result->free();
                                 return FALSE;
@@ -562,34 +562,34 @@  discard block
 block discarded – undo
                         /* Entry delisted */
                         $result->free();
 			$quantity *= $thisentry['nlist'];
-                        return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+                        return relist($myconn, $loguser, $value, $type, $table, $unit, $quantity, $reason);
 
 
                 /* First time list value */
                 case 0:
                         $result->free();
-                        return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+                        return addtolist($myconn, $loguser, $value, $type, $table, $unit, $quantity, $reason);
         }
 }
 
 
 /*************** Functions to check if two net overlap each other ********************/
 
-function ipRange ($range) {
+function ipRange($range) {
 /* List IP in range */
-	return array_map('long2ip', range( ip2long($range[0]), ip2long($range[1]) ) );
+	return array_map('long2ip', range(ip2long($range[0]), ip2long($range[1])));
 }
 
 function isIn($netA, $netB) {
 /* TRUE if an IP of $netA is contained in netB */
-	list($addressA,$maskA) = explode('/', $netA);
-	list($addressB,$maskB) = explode('/', $netB);
+	list($addressA, $maskA) = explode('/', $netA);
+	list($addressB, $maskB) = explode('/', $netB);
 	require_once 'vendor/autoload.php';
 	$net = new \dautkom\ipv4\IPv4();
 	$range = $net->address($addressA)->mask($maskA)->getRange();
 	$ips = ipRange($range);
-	foreach ( $ips as $ip )
-		if ( $net->address($addressB)->mask($maskB)->has($ip) )
+	foreach ($ips as $ip)
+		if ($net->address($addressB)->mask($maskB)->has($ip))
 			return TRUE;
 	return FALSE;
 }
@@ -601,11 +601,11 @@  discard block
 block discarded – undo
 		syslog(LOG_ERR, $loguser.': '.$tabletype['name'].' is not a network list.');
 		return FALSE;
 	}
-	$result = searchentry ($myconn,'ALL',$tabletype);
+	$result = searchentry($myconn, 'ALL', $tabletype);
         if ($result->num_rows) {
 		while ($row = $result->fetch_array(MYSQLI_ASSOC)) {
 			$thisNet = long2ip($row['network']).'/'.long2ip($row['netmask']);
-			if ( isIn($thisNet, $net) ) {
+			if (isIn($thisNet, $net)) {
 				$result->free();
 				syslog(LOG_INFO, "$loguser: the net <$net> overlaps the existing network <$thisNet>.");
 				return TRUE;
@@ -622,8 +622,8 @@  discard block
 block discarded – undo
 /* For miltermap */
 function checkMilterConf($table) {
 	if (isset($table['milter'])) {
-        	if ($table['milter'] ===  TRUE) {
-			switch ( $table['field'] ) {
+        	if ($table['milter'] === TRUE) {
+			switch ($table['field']) {
 				case 'network':
 				case 'ip':
 					return TRUE;
@@ -657,12 +657,12 @@  discard block
 block discarded – undo
 }
 
 
-function readMiltName($myconn,$loguser) {
-	$milters=array();
+function readMiltName($myconn, $loguser) {
+	$milters = array();
 	$query = 'SELECT `name` FROM `config`';
 
         $result = $myconn->query($query);
-        if($result === false) {
+        if ($result === false) {
                 syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
 		return FALSE;
 	}
@@ -674,27 +674,27 @@  discard block
 block discarded – undo
 	return $milters;
 }
 
-function changeMilter ($myconn,$loguser,$miltVal,$table,$miltID) {
+function changeMilter($myconn, $loguser, $miltVal, $table, $miltID) {
 	$query = array();
-	foreach ( $miltVal as $value => $action ) {
-		switch ( $action ) {
+	foreach ($miltVal as $value => $action) {
+		switch ($action) {
 			case 'keep':
 				break;
 			case 'add':
-				$query[] = sprintf( "INSERT INTO `milt` (
+				$query[] = sprintf("INSERT INTO `milt` (
                 		        	`id` ,
                         			`name` 
                 			)
                 			VALUES (
                         			%d ,
 						'%s'
-					)",$miltID,$value);
+					)",$miltID, $value);
 				break;
 			case 'del':
 				$query[] = "DELETE FROM  `milt` WHERE (`id` = '$miltID' AND `name` = '$value')";
 		}
 	}
-	if ( count($query) ) /* This "if" is redundant, because if I call this I already checked there is a change */
+	if (count($query)) /* This "if" is redundant, because if I call this I already checked there is a change */
 		/* I update datemod because the user couldn't change */
 		$query[] = sprintf('UPDATE `%s` SET
 						`user`=\'%s\',
@@ -706,18 +706,18 @@  discard block
 block discarded – undo
 	$myconn->autocommit(FALSE);
 	$myconn->begin_transaction(MYSQLI_TRANS_START_READ_ONLY);
 	$ok = TRUE;
-	foreach ( $query as $q ) {
+	foreach ($query as $q) {
 		if ($myconn->query($q) !== TRUE) {
 			$ok = FALSE;
 			syslog(LOG_ERR, "$loguser: Error: ".$myconn->error);
 		}
 	}
-	if ( $ok ) {
-		if ( $myconn->commit() )
+	if ($ok) {
+		if ($myconn->commit())
 			syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
 		else {
 			syslog(LOG_ERR, "$loguser: Milter setting NOT changed for an unpredictable COMMIT error.");
-			if ( $myconn->rollback() )
+			if ($myconn->rollback())
 				syslog(LOG_INFO, "$loguser: rollback succeeded.");
 			else
 				syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");

Please login to merge, or discard this patch.

Braces +128 added lines, -84 removed lines patch added patch discarded remove patch

@@ -3,9 +3,13 @@  discard block
 block discarded – undo
 ini_set('error_log', 'syslog');
 
 function username() {
-	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
-        	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+	if (isset ($_SERVER['REMOTE_USER'])) {
+		$user = $_SERVER['REMOTE_USER'];
+	} else if (isset ($_SERVER['USER'])) {
+        		$user = $_SERVER['USER'];
+        	} else {
+                		$user='unknown';
+                	}
 	return $user;
 }
 
@@ -89,8 +93,9 @@  discard block
 block discarded – undo
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
 	    $result=TRUE;
+	} else {
+		syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	}
-	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
@@ -131,8 +136,9 @@  discard block
 block discarded – undo
         if ($myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
 		$result=TRUE;
+        } else {
+        	syslog (LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
 	return $result;
 }
 
@@ -155,9 +161,11 @@  discard block
 block discarded – undo
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
-            syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        if ($return=$myconn->query($query) === TRUE) {
+                    syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        }
 
         return $return;
 }
@@ -179,8 +187,9 @@  discard block
 block discarded – undo
 
         if ($return=$myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 	return $return;	
 }
 
@@ -204,14 +213,16 @@  discard block
 block discarded – undo
 				$j++;
 
 			} while ($myconn->next_result());
-		}
-		else {
+		} else {
 			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
 			$return = FALSE;
 		}
 	}
-	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
-	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	if ( !($return) ) {
+		syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
+	} else {
+		syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	}
         return $return;
 }
 
@@ -220,8 +231,11 @@  discard block
 block discarded – undo
 
 	$exp=new DateTime($row['exp']);
 	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
-	else return false;
+	if (($exp > $now) and ($row['active'])) {
+		return true;
+	} else {
+		return false;
+	}
 
 }
 
@@ -241,10 +255,11 @@  discard block
 block discarded – undo
 END;
 		$activeMilts = explode(',',$value);
 		foreach ( $milts as $milter ) {
-			if ( in_array($milter, $activeMilts) )
-				$selected= 'selected';
-			else
-				$selected= NULL;
+			if ( in_array($milter, $activeMilts) ) {
+							$selected= 'selected';
+			} else {
+							$selected= NULL;
+			}
 			$button .= sprintf('<option value="%s" %s>%s</option>', $milter, $selected, $milter);
 		}	
 		$button .= '</select></div><input class="button" name="Change" type="submit" value="Change" /></form>';
@@ -261,9 +276,12 @@  discard block
 block discarded – undo
 	$whynot=NULL;
 	switch ($what) {
 		case 'Ok':
-			if ($lock) return NULL;
-			if (in_array($user,array_keys($adm)))
-				if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			if ($lock) {
+				return NULL;
+			}
+			if (in_array($user,array_keys($adm))) {
+							if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			}
 			return htmlspecialchars($whynot);
 		case 'Listed':
 		case 'WhiteListed':
@@ -275,7 +293,9 @@  discard block
 block discarded – undo
 function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
-	if (! isset($alltables["$typed"]['depend']) ) return TRUE;
+	if (! isset($alltables["$typed"]['depend']) ) {
+		return TRUE;
+	}
 	foreach ($alltables["$typed"]['depend'] as $listdep) {
 		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
 			$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
@@ -306,10 +326,10 @@  discard block
 block discarded – undo
 	
 	if ( $tablelist['milter'] ) {
 		$table = milterTable($type);
-		if ($value == 'ALL')
-			$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
+		if ($value == 'ALL') {
+					$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
 				$table,$table);
-		else {
+		} else {
 			switch ($type) {
 				case 'network':
 					list($sub['net'],$sub['mask'])=explode('/',$value);
@@ -334,12 +354,11 @@  discard block
 block discarded – undo
 					return FALSE;
 			}
 		}
-	}
-
-	else {
+	} else {
 	        $table = $tablelist['name'];
-	        if ($value == 'ALL') $query = 'select * from '.$table;
-	        else {
+	        if ($value == 'ALL') {
+	        	$query = 'select * from '.$table;
+	        } else {
 	                switch ($type) {
 	                  case 'ip':
 	                        $query= "select * from $table where $type =  INET_ATON('$value')";
@@ -361,8 +380,9 @@  discard block
 block discarded – undo
 	}
 
 	$result = $myconn->query($query);
-	if($result === false)
-		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	if($result === false) {
+			syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	}
         return $result;
 }
 
@@ -379,12 +399,14 @@  discard block
 block discarded – undo
 
 function isFull($myconn,$typedesc,$alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-		if ( $alltables["$typedesc"]['milter'] )
-			$tab = 'net';
-		else
-			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
+		if ( $alltables["$typedesc"]['milter'] ) {
+					$tab = 'net';
+		} else {
+					$tab = $alltables["$typedesc"]['name'];
+		}
+                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) {
+                                        return TRUE;
+                }
         }
 	return FALSE;
 }
@@ -397,8 +419,9 @@  discard block
 block discarded – undo
 	$tabhtm = <<<END
 	<table><thead><tr><th>$type</th><th title="The date this object has been listed for the first time">DateAdd</th><th>DateMod</th><th>Exp</th><th>Status</th><th title="Number of times this object has been listed">#List</th>
 END;
-	if ( $tables["$typedesc"]['milter'] )
-		$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	if ( $tables["$typedesc"]['milter'] ) {
+			$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	}
 	$tabhtm .= '<th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
 
 	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
@@ -407,18 +430,23 @@  discard block
 block discarded – undo
 
         /* Check for limit in number of listed items */
 	$full = isFull($myconn,$typedesc,$tables);
-	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	if ($full) {
+		print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	}
 
 		if ($result->num_rows) {
 			print $tabhtm;
 			$i=0;
         		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
-					if ($tables["$typedesc"]['bl']) $listed='Listed';
-					else $listed='WhiteListed';
-				}	
-				else
-					$listed='Ok';
+					if ($tables["$typedesc"]['bl']) {
+						$listed='Listed';
+					} else {
+						$listed='WhiteListed';
+					}
+				} else {
+									$listed='Ok';
+				}
 
 				switch ($type) {
 				  case 'ip':
@@ -431,27 +459,30 @@  discard block
 block discarded – undo
 					$element = $riga["$type"];
 				}
 
-				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) )
-					printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) ) {
+									printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn,$i,$element,$typedesc,$riga['idmilt'],$riga['miltnames'],$user,$adm), $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
-				else
-					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				} else {
+									 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
+				}
 				$i++;
         		}
 			print '</tbody></table>';
-		}
-		else {
+		} else {
 			print "<pre>$type &lt;$value&gt; is not listed!\n</pre>";
-			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') )
-				if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
-									else print '<p>'.htmlspecialchars($whynot).'</p>';
+			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') ) {
+							if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
+			} else {
+										print '<p>'.htmlspecialchars($whynot).'</p>';
+									}
 				
 		}
 		$result->free();
+	} else {
+		print '<pre>Query error or something wrong in DB schema'."\n</pre>";
+	}
 	}
-	else print '<pre>Query error or something wrong in DB schema'."\n</pre>";
-}
 
 
 
@@ -494,24 +525,32 @@  discard block
 block discarded – undo
                 $old_mailfrom = ini_get("sendmail_from");
                 ini_set("sendmail_from", $from);
                 $params = sprintf("-oi -f %s", '<>');
-                if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
-                else $flag=TRUE;
-                if (isset($old_mailfrom))
-                        ini_set("sendmail_from", $old_mailfrom);
-        }
-        else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
+                if (!(mail($to,$sbj, $body,$headers,$params))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
+                if (isset($old_mailfrom)) {
+                                        ini_set("sendmail_from", $old_mailfrom);
+                }
+        } else {
+                if (!(mail($to,$sbj, $body,$headers))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
         }
         return $flag;
 }
 
 function emailToNotify($notify_file,$dom) {
 	$ini_array = parse_ini_file($notify_file);
-	if (in_array($dom,array_keys($ini_array)))
-		return $ini_array["$dom"];
-	else return FALSE;
-}
+	if (in_array($dom,array_keys($ini_array))) {
+			return $ini_array["$dom"];
+	} else {
+		return FALSE;
+	}
+	}
 
 
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
@@ -588,9 +627,10 @@  discard block
 block discarded – undo
 	$net = new \dautkom\ipv4\IPv4();
 	$range = $net->address($addressA)->mask($maskA)->getRange();
 	$ips = ipRange($range);
-	foreach ( $ips as $ip )
-		if ( $net->address($addressB)->mask($maskB)->has($ip) )
+	foreach ( $ips as $ip ) {
+			if ( $net->address($addressB)->mask($maskB)->has($ip) )
 			return TRUE;
+	}
 	return FALSE;
 }
 
@@ -667,8 +707,9 @@  discard block
 block discarded – undo
 		return FALSE;
 	}
 	if ($result->num_rows) {
-		while ($milt = $result->fetch_array(MYSQLI_ASSOC))
-			$milters[] = $milt['name'];
+		while ($milt = $result->fetch_array(MYSQLI_ASSOC)) {
+					$milters[] = $milt['name'];
+		}
 	}
 	$result->free();
 	return $milters;
@@ -694,12 +735,14 @@  discard block
 block discarded – undo
 				$query[] = "DELETE FROM  `milt` WHERE (`id` = '$miltID' AND `name` = '$value')";
 		}
 	}
-	if ( count($query) ) /* This "if" is redundant, because if I call this I already checked there is a change */
+	if ( count($query) ) {
+		/* This "if" is redundant, because if I call this I already checked there is a change */
 		/* I update datemod because the user couldn't change */
 		$query[] = sprintf('UPDATE `%s` SET
 						`user`=\'%s\',
 						`datemod`= CURRENT_TIMESTAMP
 					 WHERE `idmilt`=%d', $table, $loguser, $miltID);
+	}
 
 
 	/* Start a safe transaction: it commits only if all queries happen */
@@ -713,19 +756,20 @@  discard block
 block discarded – undo
 		}
 	}
 	if ( $ok ) {
-		if ( $myconn->commit() )
-			syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
-		else {
+		if ( $myconn->commit() ) {
+					syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
+		} else {
 			syslog(LOG_ERR, "$loguser: Milter setting NOT changed for an unpredictable COMMIT error.");
-			if ( $myconn->rollback() )
-				syslog(LOG_INFO, "$loguser: rollback succeeded.");
-			else
-				syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			if ( $myconn->rollback() ) {
+							syslog(LOG_INFO, "$loguser: rollback succeeded.");
+			} else {
+							syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			}
 			$ok = FALSE;
 		}
+	} else {
+			syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	}
-	else
-		syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	return $ok;
 		
 }

Please login to merge, or discard this patch.

changeMilter.php 3 patches

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

@@ -44,8 +44,8 @@  discard block
 block discarded – undo
 	}
 	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 @@  discard block
 block discarded – undo
 	
 	/* 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.';

Please login to merge, or discard this patch.

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

@@ -1,10 +1,10 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	$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.';

Please login to merge, or discard this patch.

Braces +28 added lines, -20 removed lines patch added patch discarded remove patch

@@ -4,8 +4,9 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 }
 
 /* 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();
 }

Please login to merge, or discard this patch.

listForm.php 2 patches

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

@@ -1,18 +1,18 @@
 block discarded – undo
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+if (in_array($user, array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
 else $extopt = NULL;
 
-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>

Please login to merge, or discard this patch.

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

@@ -1,11 +1,14 @@
 block discarded – undo
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
-else $extopt = NULL;
+if (in_array($user,array_keys(array_filter($adm)))) {
+	$extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+} else {
+	$extopt = NULL;
+}
 
 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) );

Please login to merge, or discard this patch.

relist.php 3 patches

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

@@ -11,11 +11,11 @@
 block discarded – undo
 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']))

Please login to merge, or discard this patch.

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

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $table = ($tables["$typedesc"]['milter']) ? milterTable($type) : $tables["$typedesc"]['name'];
 $cl = ($tables["$typedesc"]['milter']) ? 10 : 9;
@@ -10,15 +10,15 @@  discard block
 block discarded – undo
 <?php
 openlog($tag, LOG_PID, $fac);
 if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
-        exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
+if (preg_match('/[^\x20-\x7f]/', $_POST['reason']))
+        exit('ERROR: &lt;'.htmlentities($_POST['reason'], ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
 $user = username();
 
-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';

Please login to merge, or discard this patch.

Braces +13 added lines, -6 removed lines patch added patch discarded remove patch

@@ -9,19 +9,26 @@
 block discarded – undo
 <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>';

Please login to merge, or discard this patch.

GitHub Access Token became invalid

Push — master ( 9659fc...cb82fe )

Status

Category

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

Braces +136 added lines, -67 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

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

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

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

Braces +107 added lines, -61 removed lines patch added patch discarded remove patch

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

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

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

Braces +128 added lines, -84 removed lines patch added patch discarded remove patch

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

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

Braces +28 added lines, -20 removed lines patch added patch discarded remove patch

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

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

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

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

Braces +13 added lines, -6 removed lines patch added patch discarded remove patch

		@@ -13,7 +13,9 @@ discard block
		block discarded – undo
13	13	//timezone var, need to setup before any other tasks
14	14	$timezone = getParameter("tmz");
15	15
16		-if(!$timezone) $timezone = date_default_timezone_get();
	16	+if(!$timezone) {
	17	+ $timezone = date_default_timezone_get();
	18	+}
17	19	@date_default_timezone_set($timezone);
18	20
19	21	$cdate = new tc_date();
		@@ -23,9 +25,15 @@ discard block
		block discarded – undo
23	25	$slm = getParameter("selected_month");
24	26	$sly = getParameter("selected_year");
25	27
26		-if(!is_numeric($sld)) $sld = "00";
27		-if(!is_numeric($slm)) $slm = "00";
28		-if(!is_numeric($sly)) $sly = "0000";
	28	+if(!is_numeric($sld)) {
	29	+ $sld = "00";
	30	+}
	31	+if(!is_numeric($slm)) {
	32	+ $slm = "00";
	33	+}
	34	+if(!is_numeric($sly)) {
	35	+ $sly = "0000";
	36	+}
29	37
30	38	$year_start = getParameter("year_start", "number", 0);
31	39	$year_end = getParameter("year_end", "number", 0);
		@@ -74,62 +82,79 @@ discard block
		block discarded – undo
74	82
75	83	//check year to be select in case of date_allow is set
76	84	if(!$show_not_allow){
77		- if ($ta1_set && $cdate->validDate($time_allow1)) $year_start = $cdate->getDate('Y', $time_allow1);
78		- if ($ta2_set && $cdate->validDate($time_allow2)) $year_end = $cdate->getDate('Y', $time_allow2);
79		-}
80		-
81		-if(isset($_REQUEST["m"]))
82		- $m = getParameter("m", "number");
83		-else{
	85	+ if ($ta1_set && $cdate->validDate($time_allow1)) {
	86	+ $year_start = $cdate->getDate('Y', $time_allow1);
	87	+ }
	88	+ if ($ta2_set && $cdate->validDate($time_allow2)) {
	89	+ $year_end = $cdate->getDate('Y', $time_allow2);
	90	+ }
	91	+ }
	92	+
	93	+if(isset($_REQUEST["m"])) {
	94	+ $m = getParameter("m", "number");
	95	+} else{
84	96	if($slm != "00"){
85	97	$m = $slm;
86		- }else{
	98	+ } else{
87	99	if($ta2_set && $year_end > 0){
88	100	//compare which one is more
89	101	$year_allow2 = $cdate->getDate('Y', $time_allow2);
90	102	if($year_allow2 >= $year_end){
91	103	//use time_allow2
92	104	$m = ($cdate->dateBefore($time_allow2)) ? $cdate->getDate("m") : $cdate->getDate('m', $time_allow2);
93		- }else{
	105	+ } else{
94	106	//use year_end
95	107	$m = ($year_end > $cdate->getDate("Y")) ? $cdate->getDate("m") : 12;
96	108	}
97		- }elseif($ta2_set){
	109	+ } elseif($ta2_set){
98	110	$m = ($cdate->dateBefore($time_allow2)) ? $cdate->getDate("m") : $cdate->getDate('m', $time_allow2);
99		- }elseif($year_end > 0){
	111	+ } elseif($year_end > 0){
100	112	$m = ($year_end > $cdate->getDate("Y")) ? $cdate->getDate("m") : 12; //date('m')
101		- }else{
	113	+ } else{
102	114	$m = $cdate->getDate("m");
103	115	}
104	116	}
105	117	}
106	118
107		-if($m < 1 && $m > 12) $m = $cdate->getDate("m");
	119	+if($m < 1 && $m > 12) {
	120	+ $m = $cdate->getDate("m");
	121	+}
108	122
109	123	$m = str_pad($m, 2, "0", STR_PAD_LEFT);
110	124
111	125	$cyr = ($sly != "0000") ? true : false;
112		-if($cyr && $sly && $sly < $year_start) $sly = $year_start;
113		-if($cyr && $sly && $sly > $year_end) $sly = $year_end;
114		-
115		-if(isset($_REQUEST["y"]))
116		- $y = getParameter("y", "number");
117		-else
118		- $y = ($cyr) ? $sly : $cdate->getDate("Y");
119		-
120		-if($y <= 0) $y = $cdate->getDate("Y");
	126	+if($cyr && $sly && $sly < $year_start) {
	127	+ $sly = $year_start;
	128	+}
	129	+if($cyr && $sly && $sly > $year_end) {
	130	+ $sly = $year_end;
	131	+}
	132	+
	133	+if(isset($_REQUEST["y"])) {
	134	+ $y = getParameter("y", "number");
	135	+} else {
	136	+ $y = ($cyr) ? $sly : $cdate->getDate("Y");
	137	+}
	138	+
	139	+if($y <= 0) {
	140	+ $y = $cdate->getDate("Y");
	141	+}
121	142
122	143	// ensure m-y fits date allow range
123	144	if (!$show_not_allow) {
124	145	if ($ta1_set) {
125	146	$m1 = $cdate->getDate('m', $time_allow1);
126	147	$y1 = $cdate->getDate('Y', $time_allow1);
127		- if ($y == $y1 && (int)$m < (int)$m1) $m = $m1;
	148	+ if ($y == $y1 && (int)$m < (int)$m1) {
	149	+ $m = $m1;
	150	+ }
128	151	}
129	152	if ($ta2_set) {
130	153	$m2 = $cdate->getDate('m', $time_allow2);
131	154	$y2 = $cdate->getDate('Y', $time_allow2);
132		- if ($y == $y2 && (int)$m > (int)$m2) $m = $m2;
	155	+ if ($y == $y2 && (int)$m > (int)$m2) {
	156	+ $m = $m2;
	157	+ }
133	158	}
134	159	}
135	160
		@@ -147,7 +172,9 @@ discard block
		block discarded – undo
147	172	$cobj->setTimezone($timezone); //set for further usage, nothing for now
148	173
149	174	$theme_path = ($theme != "") ? $cobj->getThemePath($theme) : "";
150		-if(!is_file($theme_path)) $theme_path = "";
	175	+if(!is_file($theme_path)) {
	176	+ $theme_path = "";
	177	+}
151	178
152	179	//check and show default calendar month and year on valid range of date_allow
153	180	if(!isset($_REQUEST["m"])){
		@@ -168,15 +195,19 @@ discard block
		block discarded – undo
168	195	$year_end = $cobj->year_end;
169	196
170	197	//check year display in valid range
171		-if($y >= $year_end) $y = $year_end;
172		-if($y <= $year_start) $y = $year_start;
	198	+if($y >= $year_end) {
	199	+ $y = $year_end;
	200	+}
	201	+if($y <= $year_start) {
	202	+ $y = $year_start;
	203	+}
173	204
174	205	$total_thismonth = $cobj->total_days($m, $y);
175	206
176	207	if($m == 1){
177	208	$previous_month = 12;
178	209	$previous_year = $y-1;
179		-}else{
	210	+} else{
180	211	$previous_month = $m-1;
181	212	$previous_year = $y;
182	213	}
		@@ -184,7 +215,7 @@ discard block
		block discarded – undo
184	215	if($m == 12){
185	216	$next_month = 1;
186	217	$next_year = $y+1;
187		-}else{
	218	+} else{
188	219	$next_month = $m+1;
189	220	$next_year = $y;
190	221	}
		@@ -196,9 +227,9 @@ discard block
		block discarded – undo
196	227	if($firstdate == $startDate){
197	228	//skip last month
198	229	$startwrite = $total_lastmonth+1;
199		-}elseif($firstdate < $startDate){
	230	+} elseif($firstdate < $startDate){
200	231	$startwrite = $total_lastmonth - (6-($startDate-$firstdate));
201		-}else{
	232	+} else{
202	233	$startwrite = $total_lastmonth - ($firstdate - $startDate - 1);
203	234	}
204	235
		@@ -222,8 +253,10 @@ discard block
		block discarded – undo
222	253	$wknum = $cdate->getWeekNumber($prev_d);
223	254	if(!isset($week_rows[$row_count][$wknum])){
224	255	$week_rows[$row_count][$wknum] = 1;
225		- }else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
226		-}
	256	+ } else {
	257	+ $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
	258	+ }
	259	+ }
227	260
228	261	$pvMonthTime = $previous_year."-".$previous_month."-".$total_lastmonth;
229	262
		@@ -231,13 +264,20 @@ discard block
		block discarded – undo
231	264	if($ta1_set && !$show_not_allow){
232	265	if($cdate->dateBefore($pvMonthTime, $time_allow1)){
233	266	$show_previous = true;
234		- }else $show_previous = false;
235		-}else $show_previous = true; //always show when not set
	267	+ } else {
	268	+ $show_previous = false;
	269	+ }
	270	+ } else {
	271	+ $show_previous = true;
	272	+}
	273	+//always show when not set
236	274
237	275	$date_num = $cdate->getDayOfWeek(($previous_year."-".$previous_month."-".$total_lastmonth));
238	276	if(($startDate == 0 && $date_num == 6) \|\| ($startDate > 0 && $date_num == $startDate-1) && $startwrite<$total_lastmonth){
239		- if(isset($calendar_rows[0])) $row_count++;
240		-}
	277	+ if(isset($calendar_rows[0])) {
	278	+ $row_count++;
	279	+ }
	280	+ }
241	281
242	282	$dp_time = ($date_pair_value) ? $date_pair_value : "";
243	283
		@@ -270,13 +310,13 @@ discard block
		block discarded – undo
270	310	if($ta1_set && $ta2_set){
271	311	//both date specified
272	312	$dateLink = ($cdate->dateBefore($date_str, $time_allow1) && $cdate->dateAfter($date_str, $time_allow2)) ? true : false;
273		- }elseif($ta1_set){
	313	+ } elseif($ta1_set){
274	314	//only date 1 specified
275	315	$dateLink = $cdate->dateBefore($date_str, $time_allow1) ? true : false;
276		- }elseif($ta2_set){
	316	+ } elseif($ta2_set){
277	317	//only date 2 specified
278	318	$dateLink = $cdate->dateAfter($date_str, $time_allow2) ? true : false;
279		- }else{
	319	+ } else{
280	320	//no date allow specified, assume show all
281	321	$dateLink = true;
282	322	}
		@@ -343,13 +383,15 @@ discard block
		block discarded – undo
343	383	if($date_pair_value){
344	384	//check date_pair1 & 2
345	385	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
346		- if(!in_array("select", $htmlClass))
347		- $htmlClass[] = "select";
	386	+ if(!in_array("select", $htmlClass)) {
	387	+ $htmlClass[] = "select";
	388	+ }
348	389	}
349	390
350	391	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
351		- if(!in_array("select", $htmlClass))
352		- $htmlClass[] = "select";
	392	+ if(!in_array("select", $htmlClass)) {
	393	+ $htmlClass[] = "select";
	394	+ }
353	395	}
354	396	}
355	397
		@@ -364,7 +406,7 @@ discard block
		block discarded – undo
364	406	$class = implode(" ", $htmlClass);
365	407
366	408	$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));
367		- }else{
	409	+ } else{
368	410	$htmlClass[] = "disabledate";
369	411	$class = implode(" ", $htmlClass);
370	412
		@@ -381,14 +423,18 @@ discard block
		block discarded – undo
381	423	$row_count++;
382	424
383	425	$dayinweek_counter = 0;
384		- }else $dayinweek_counter++;
	426	+ } else {
	427	+ $dayinweek_counter++;
	428	+ }
385	429
386	430	$wknum = $cdate->getWeekNumber(($y."-".$m."-".$day));
387	431
388	432	if(!isset($week_rows[$row_count][$wknum])){
389	433	$week_rows[$row_count][$wknum] = 1;
390		- }else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
391		-}
	434	+ } else {
	435	+ $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
	436	+ }
	437	+ }
392	438
393	439	//write next other month
394	440	$write_end_days = (6-$dayinweek_counter)+1;
		@@ -399,7 +445,9 @@ discard block
		block discarded – undo
399	445	$wknum = $cdate->getWeekNumber($cdate->addMonth("Y-m-d", 1, ($y."-".$m."-".$day))); //date('W', mktime(0,0,0, $m+1, $day, $y));
400	446	if(!isset($week_rows[$row_count][$wknum])){
401	447	$week_rows[$row_count][$wknum] = 1;
402		- }else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
	448	+ } else {
	449	+ $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
	450	+ }
403	451	}
404	452	$row_count++;
405	453	}
		@@ -414,7 +462,9 @@ discard block
		block discarded – undo
414	462
415	463	if(!isset($week_rows[$row_count][$wknum])){
416	464	$week_rows[$row_count][$wknum] = 1;
417		- }else $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
	465	+ } else {
	466	+ $week_rows[$row_count][$wknum] = $week_rows[$row_count][$wknum]+1;
	467	+ }
418	468	}
419	469	$write_end_days += 6;
420	470	}
		@@ -424,11 +474,19 @@ discard block
		block discarded – undo
424	474	$nxMonthTime = $next_year."-".$next_month."-1";
425	475	if($cdate->dateAfter($nxMonthTime, $time_allow2)){
426	476	$show_next = true;
427		- }else $show_next = false;
428		-}else $show_next = true; //always show when not set
	477	+ } else {
	478	+ $show_next = false;
	479	+ }
	480	+ } else {
	481	+ $show_next = true;
	482	+}
	483	+//always show when not set
429	484	?>
430	485	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
431		-<html xmlns="http://www.w3.org/1999/xhtml"<?php if($rtl) echo(" dir=\"rtl\""); ?>>
	486	+<html xmlns="http://www.w3.org/1999/xhtml"<?php if($rtl) {
	487	+ echo(" dir=\"rtl\"");
	488	+}
	489	+?>>
432	490	<head>
433	491	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
434	492	<title>TriConsole.com - PHP Calendar Date Picker</title>
		@@ -459,7 +517,7 @@ discard block
		block discarded – undo
459	517	if($form_name){
460	518	//submit value by post form
461	519	echo("window.parent.document.".$form_name.".submit();\n");
462		- }elseif($target_url){
	520	+ } elseif($target_url){
463	521	//submit value by get method
464	522	echo("var date_selected = yvalue + \"-\" + mvalue + \"-\" + dvalue;\n");
465	523	echo("window.parent.location.href='".$target_url."?".$objname."='+date_selected;\n");
		@@ -474,7 +532,10 @@ discard block
		block discarded – undo
474	532	<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
475	533	<span id="calendar-page" class="font">
476	534	<div id="calendar-header" align="center">
477		- <?php if($show_calendar_info) include("calendar_info.php"); ?>
	535	+ <?php if($show_calendar_info) {
	536	+ include("calendar_info.php");
	537	+}
	538	+?>
478	539	<?php if($dp && !$auto_hide){ ?>
479	540	<div style="float: right;" class="closeme"><a href="javascript:closeMe();"><img src="images/close.gif" border="0" alt="Close" title="Close" /></a></div>
480	541	<?php } ?>
		@@ -561,7 +622,9 @@ discard block
		block discarded – undo
561	622
562	623	echo("<tr>");
563	624
564		- if ($show_weeks) echo("<td align=\"center\" class=\"header wk-hdr\"><div>".$cobj->week_hdr."</div></td>");
	625	+ if ($show_weeks) {
	626	+ echo("<td align=\"center\" class=\"header wk-hdr\"><div>".$cobj->week_hdr."</div></td>");
	627	+ }
565	628
566	629	//write calendar day header
567	630	foreach($day_headers as $dh){
		@@ -591,7 +654,7 @@ discard block
		block discarded – undo
591	654
592	655	if($this_link){
593	656	echo("<td".$id_str." align=\"center\" class=\"".$this_class."\"><div><a href=\"".$this_link."\">".$this_day."</a></div></td>");
594		- }else{
	657	+ } else{
595	658	echo("<td".$id_str." align=\"center\" class=\"".$this_class."\"><div>".$this_day."</div></td>");
596	659	}
597	660	}
		@@ -610,7 +673,9 @@ discard block
		block discarded – undo
610	673	if($previous_year >= $year_start && $show_previous){
611	674	?><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>
612	675	<?php
613		- }else echo(" ");
	676	+ } else {
	677	+ echo(" ");
	678	+ }
614	679	?>
615	680	</div>
616	681	<div style="float: <?php echo($rtl ? "left" : "right"); ?>;" class="btn">
		@@ -618,18 +683,22 @@ discard block
		block discarded – undo
618	683	if($next_year <= $year_end && $show_next){
619	684	?><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>
620	685	<?php
621		- }else echo(" ");
	686	+ } else {
	687	+ echo(" ");
	688	+ }
622	689	?>
623	690	</div>
624	691	<div class="links">
625	692	<?php
626	693	$footer_links = array();
627	694
628		- if($cobj->validTodayDate() && ($m != $cdate->getDate('m') \|\| $y != $cdate->getDate('Y')))
629		- $footer_links[] = "<a href=\"javascript:today();\" class=\"txt\" alt=\"Today\" title=\"Today\">Today</a>";
	695	+ if($cobj->validTodayDate() && ($m != $cdate->getDate('m') \|\| $y != $cdate->getDate('Y'))) {
	696	+ $footer_links[] = "<a href=\"javascript:today();\" class=\"txt\" alt=\"Today\" title=\"Today\">Today</a>";
	697	+ }
630	698
631		- if($sld>0 && $slm>0 && $sly>0)
632		- $footer_links[] = "<a href=\"javascript:unsetValue();\" class=\"txt\" alt=\"Unset\" title=\"Unset\">Unset</a>";
	699	+ if($sld>0 && $slm>0 && $sly>0) {
	700	+ $footer_links[] = "<a href=\"javascript:unsetValue();\" class=\"txt\" alt=\"Unset\" title=\"Unset\">Unset</a>";
	701	+ }
633	702
634	703	if(sizeof($footer_links)>0){
635	704	echo(implode(" \| ", $footer_links));

		@@ -5,10 +5,10 @@ discard block
		block discarded – undo
5	5	include_once($path.'config.php');
6	6	require_once($path.'function.php');
7	7	if ( !isset($version) ) {
8		- openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
9		- syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
10		- closelog();
11		- exit(255);
	8	+ openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
	9	+ syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
	10	+ closelog();
	11	+ exit(255);
12	12	}
13	13	include_once(dirname(__FILE__) . '/function.php');
14	14	$conf = parse_ini_file($confImap_file);
		@@ -35,12 +35,12 @@ discard block
		block discarded – undo
35	35
36	36	/* check you select a right list */
37	37	if ( !$tables[$conf['list']['spam']]['bl'] ) {
38		- 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.');
39		- exit (254);
	38	+ 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.');
	39	+ exit (254);
40	40	}
41	41	if ( $tables[$conf['list']['ham']]['bl'] ) {
42		- 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.');
43		- exit (254);
	42	+ 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.');
	43	+ exit (254);
44	44	}
45	45
46	46	/* Make MYSQL connection Array */

		@@ -1,16 +1,16 @@ discard block
		block discarded – undo
1	1	#!/usr/bin/php
2	2	<?php
3	3	/* Config */
4		-$path='/web/RBL/';
	4	+$path = '/web/RBL/';
5	5	include_once($path.'config.php');
6	6	require_once($path.'function.php');
7		-if ( !isset($version) ) {
	7	+if (!isset($version)) {
8	8	openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
9		- syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
	9	+ syslog(LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
10	10	closelog();
11	11	exit(255);
12	12	}
13		-include_once(dirname(__FILE__) . '/function.php');
	13	+include_once(dirname(__FILE__).'/function.php');
14	14	$conf = parse_ini_file($confImap_file);
15	15
16	16
		@@ -19,8 +19,8 @@ discard block
		block discarded – undo
19	19	openlog($tag, LOG_PID, $fac);
20	20
21	21
22		-if ( !$imapListActive ) {
23		- syslog (LOG_INFO, $conf['user'].': This plugin isn\'t active.');
	22	+if (!$imapListActive) {
	23	+ syslog(LOG_INFO, $conf['user'].': This plugin isn\'t active.');
24	24	closelog();
25	25	exit(255);
26	26	}
		@@ -31,20 +31,20 @@ discard block
		block discarded – undo
31	31	$arr_tpl_data = array(date("Y-m-d", time()));
32	32
33	33
34		-if ( !$conf['onlyReport'] ) {
	34	+if (!$conf['onlyReport']) {
35	35
36	36	/* check you select a right list */
37		- if ( !$tables[$conf['list']['spam']]['bl'] ) {
	37	+ if (!$tables[$conf['list']['spam']]['bl']) {
38	38	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.');
39	39	exit (254);
40	40	}
41		- if ( $tables[$conf['list']['ham']]['bl'] ) {
	41	+ if ($tables[$conf['list']['ham']]['bl']) {
42	42	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.');
43	43	exit (254);
44	44	}
45	45
46	46	/* Make MYSQL connection Array */
47		- $mysqlconf= array(
	47	+ $mysqlconf = array(
48	48	'dbhost' => $dbhost,
49	49	'userdb' => $userdb,
50	50	'pwd' => $pwd,
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55
56	56	else {
57	57	$mysqlconf = NULL;
58		- syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.') ;
	58	+ syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.');
59	59	}
60	60
61	61
		@@ -67,16 +67,16 @@ discard block
		block discarded – undo
67	67
68	68
69	69	/* The hard work has hidden in imapReport */
70		-$learnfromArray = array('ham','spam');
71		-foreach ( $learnfromArray as $learnfrom ) {
	70	+$learnfromArray = array('ham', 'spam');
	71	+foreach ($learnfromArray as $learnfrom) {
72	72	$conf['reportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['reportFile']["$learnfrom"]);
73	73	$conf['badreportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['badreportFile']["$learnfrom"]);
74		- imapReport ($conf,$mysqlconf,$splservice,$tables,$learnfrom);
	74	+ imapReport($conf, $mysqlconf, $splservice, $tables, $learnfrom);
75	75	}
76	76
77		-if ( !$conf['onlyReport'] ) {
	77	+if (!$conf['onlyReport']) {
78	78	/* Close connection */
79		- syslog (LOG_INFO, $conf['user'].': Successfully end of session.');
	79	+ syslog(LOG_INFO, $conf['user'].': Successfully end of session.');
80	80	}
81	81	closelog();
82	82	?>

		@@ -51,9 +51,7 @@
		block discarded – undo
51	51	'db' => $db,
52	52	'dbport' => $dbport
53	53	);
54		-}
55		-
56		-else {
	54	+} else {
57	55	$mysqlconf = NULL;
58	56	syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.') ;
59	57	}

		@@ -15,10 +15,10 @@
		block discarded – undo
15	15	openlog($tag, LOG_PID, $fac);
16	16	$mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
17	17	if ($mysqli->connect_error) {
18		- syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
19		- . $mysqli->connect_error);
20		- die($user.': Connect Error (' . $mysqli->connect_errno . ') '
21		- . $mysqli->connect_error);
	18	+ syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
	19	+ . $mysqli->connect_error);
	20	+ die($user.': Connect Error (' . $mysqli->connect_errno . ') '
	21	+ . $mysqli->connect_error);
22	22	}
23	23
24	24	syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );

		@@ -15,15 +15,15 @@
		block discarded – undo
15	15	openlog($tag, LOG_PID, $fac);
16	16	$mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
17	17	if ($mysqli->connect_error) {
18		- syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
	18	+ syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
19	19	. $mysqli->connect_error);
20		- die($user.': Connect Error (' . $mysqli->connect_errno . ') '
	20	+ die($user.': Connect Error ('.$mysqli->connect_errno.') '
21	21	. $mysqli->connect_error);
22	22	}
23	23
24		-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
	24	+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
25	25
26		-expire($mysqli,$user,$tables,$expireTime);
	26	+expire($mysqli, $user, $tables, $expireTime);
27	27	$mysqli->close();
28	28	closelog();
29	29	?>

		@@ -11,7 +11,7 @@
		block discarded – undo
11	11	<h1> DNSBL Lookup</h1>
12	12	<?php
13	13
14		-$_POST['Value'] = str_replace('_','.',array_keys($_GET)[0]);
	14	+$_POST['Value'] = str_replace('_', '.', array_keys($_GET)[0]);
15	15	$_POST['genere'] = 'Spam IP';
16	16	require_once('result.php');
17	17	?>

		@@ -1,4 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
	2	+/**
	3	+ * @param string $header
	4	+ */
2	5	function getIP($header,$mxserver,$msa) {
3	6	/* Get submission server's IP from header's mail */
4	7	/* Each line must end with /r/n */
		@@ -28,11 +31,24 @@ discard block
		block discarded – undo
28	31	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
29	32	}
30	33
	34	+/**
	35	+ * @param string\|false $ip
	36	+ * @param string $hostname
	37	+ * @param string $dateC
	38	+ * @param string\|null $msgid
	39	+ * @param string\|false $dateL
	40	+ */
31	41	function updateReport ($ip,$uid,$ipcount,$uidcount,$hostname,$dateC,$msgid,$dateL) {
32	42
33	43	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) );
34	44	}
35	45
	46	+/**
	47	+ * @param string $dateC
	48	+ * @param string\|null $msgid
	49	+ * @param false\|string $dateL
	50	+ * @param string $text
	51	+ */
36	52	function updatebadReport ( $uid,$dateC,$msgid,$dateL,$text ) {
37	53	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 );
38	54	}
		@@ -84,6 +100,9 @@ discard block
		block discarded – undo
84	100	}
85	101
86	102
	103	+/**
	104	+ * @param null\|mysqli $myconn
	105	+ */
87	106	function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
88	107	$nips = $ipvet['count'];
89	108
		@@ -154,6 +173,10 @@ discard block
		block discarded – undo
154	173	}
155	174
156	175
	176	+/**
	177	+ * @param string $message_id
	178	+ * @param string $date
	179	+ */
157	180	function splunksearch ($service,$message_id,$date) {
158	181
159	182	// Run a blocking search

		@@ -12,14 +12,14 @@ discard block
		block discarded – undo
12	12	# print "Examine ".$received[0][$i]."\n";
13	13	if ( preg_match($msa,$received['host'][$i]) )
14	14	$dateR = $received['date'][$i];
15		- foreach ($mxserver as $mx) {
16		- if (!$ip)
	15	+ foreach ($mxserver as $mx) {
	16	+ if (!$ip)
17	17	if ($mx == $received['host'][$i]) {
18	18	$host = $received['host'][$i];
19	19	$ip = $received['ip'][$i];
20		- }
21		- }
22		- }
	20	+ }
	21	+ }
	22	+ }
23	23	}
24	24	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
25	25	$dateC['date'] = 'Not found';
		@@ -39,15 +39,15 @@ discard block
		block discarded – undo
39	39
40	40
41	41	function summaryBadReport ($uidvet) {
42		- $nuid = $uidvet['count'];
43		- if ( empty($uidvet) ) return NULL;
44		- $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
	42	+ $nuid = $uidvet['count'];
	43	+ if ( empty($uidvet) ) return NULL;
	44	+ $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
45	45
46		- /* Remove count index */
47		- $uids = array_keys($uidvet['uid']);
	46	+ /* Remove count index */
	47	+ $uids = array_keys($uidvet['uid']);
48	48	$totlearn = 0;
49	49
50		- foreach ( $uids as $uid ) {
	50	+ foreach ( $uids as $uid ) {
51	51	$totlearn += $uidvet['uid']["$uid"]['count'];;
52	52	$return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']);
53	53	}
		@@ -60,26 +60,26 @@ discard block
		block discarded – undo
60	60
61	61	function array_msort($array, $cols)
62	62	{
63		- $colarr = array();
64		- foreach ($cols as $col => $order) {
65		- $colarr[$col] = array();
66		- foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
67		- }
68		- $eval = 'array_multisort(';
69		- foreach ($cols as $col => $order) {
70		- $eval .= '$colarr[\''.$col.'\'],'.$order.',';
71		- }
72		- $eval = substr($eval,0,-1).');';
73		- eval($eval);
74		- $ret = array();
75		- foreach ($colarr as $col => $arr) {
76		- foreach ($arr as $k => $v) {
77		- $k = substr($k,1);
78		- if (!isset($ret[$k])) $ret[$k] = $array[$k];
79		- if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
80		- }
81		- }
82		- return $ret;
	63	+ $colarr = array();
	64	+ foreach ($cols as $col => $order) {
	65	+ $colarr[$col] = array();
	66	+ foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
	67	+ }
	68	+ $eval = 'array_multisort(';
	69	+ foreach ($cols as $col => $order) {
	70	+ $eval .= '$colarr[\''.$col.'\'],'.$order.',';
	71	+ }
	72	+ $eval = substr($eval,0,-1).');';
	73	+ eval($eval);
	74	+ $ret = array();
	75	+ foreach ($colarr as $col => $arr) {
	76	+ foreach ($arr as $k => $v) {
	77	+ $k = substr($k,1);
	78	+ if (!isset($ret[$k])) $ret[$k] = $array[$k];
	79	+ if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
	80	+ }
	81	+ }
	82	+ return $ret;
83	83
84	84	}
85	85
		@@ -94,8 +94,8 @@ discard block
		block discarded – undo
94	94
95	95	foreach ( $ips as $ip ) {
96	96	if ( $ip == 'count' ) continue;
97		- $nlearn = $ipvet['ip']["$ip"]['count'];
98		- unset($ipvet['ip']["$ip"]['count']);
	97	+ $nlearn = $ipvet['ip']["$ip"]['count'];
	98	+ unset($ipvet['ip']["$ip"]['count']);
99	99	$quantity = $cf['quantity']["$category"]; /* In searchAndList this value is passed by reference and modified */
100	100	$nuid = count($ipvet['ip']["$ip"]);
101	101	if ( !$cf['onlyReport'] ) {
		@@ -123,9 +123,9 @@ discard block
		block discarded – undo
123	123	$return .='<tr><td rowspan="'.$nuid.'">'.$ip.'</td>';
124	124	$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']);
125	125	$rowuid=NULL;
126		- for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
	126	+ for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
127	127	array_shift($ipvet['ip']["$ip"]);
128		- $return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
	128	+ $return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
129	129
130	130	}
131	131	$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 @@ discard block
		block discarded – undo
135	135	/* Not used for listing purpose, but useful to you! */
136	136	$return .= '<h3>Statistics by UID</h3><table><tr><th>UID</th><th>IP learned</th><th>Learned times</th></tr>'."\n";
137	137	$uids = array_keys($ipvet['uid']);
138		- foreach ( $uids as $uid ) {
	138	+ foreach ( $uids as $uid ) {
139	139	if ( $uid == 'count' ) continue;
140		- $nlearn = $ipvet['uid']["$uid"]['count'];
141		- unset ( $ipvet['uid']["$uid"]['count'] );
	140	+ $nlearn = $ipvet['uid']["$uid"]['count'];
	141	+ unset ( $ipvet['uid']["$uid"]['count'] );
142	142	$nip = count($ipvet['uid']["$uid"]);
143	143	$return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
144	144	$return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$ipvet['uid']["$uid"][0],$nlearn);
145		- $rowuid=NULL;
146		- for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
147		- array_shift($ipvet['uid']["$uid"]);
148		- $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
	145	+ $rowuid=NULL;
	146	+ for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
	147	+ array_shift($ipvet['uid']["$uid"]);
	148	+ $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
149	149
150		- }
151		- $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);
	150	+ }
	151	+ $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);
152	152
153	153
154	154	return $return;
		@@ -176,50 +176,50 @@ discard block
		block discarded – undo
176	176	*/
177	177
178	178	// A one shot search
179		- $searchParams = array(
180		- 'earliest_time' => date("c",strtotime ($date)-120),
181		- 'latest_time' => date("c",strtotime ($date)+60)
182		- );
	179	+ $searchParams = array(
	180	+ 'earliest_time' => date("c",strtotime ($date)-120),
	181	+ 'latest_time' => date("c",strtotime ($date)+60)
	182	+ );
183	183
184		- // Run a oneshot search that returns the job's results
185		- $resultsStream = $service->oneshotSearch($searchQueryBlocking, $searchParams);
186		- $resultSearch = new Splunk_ResultsReader($resultsStream);
	184	+ // Run a oneshot search that returns the job's results
	185	+ $resultsStream = $service->oneshotSearch($searchQueryBlocking, $searchParams);
	186	+ $resultSearch = new Splunk_ResultsReader($resultsStream);
187	187
188	188	// Use the built-in XML parser to display the job results
189	189	foreach ($resultSearch as $result)
190	190	{
191		- if ($result instanceof Splunk_ResultsFieldOrder)
192		- {
193		- // More than one field attribute returned by search
194		- // You must redefine the search
195		- if ( count($result->getFieldNames()) > 1 ) return FALSE;
196		- }
197		- else if ($result instanceof Splunk_ResultsMessage)
198		- {
199		- // I don't want messages in my search
200		- return FALSE;
201		- }
202		- else if (is_array($result))
203		- {
204		- // Process a row
205		- foreach ($result as $key => $valueOrValues)
206		- {
207		- if (is_array($valueOrValues))
208		- {
209		- return FALSE;
210		- }
211		- else
212		- {
213		- return $valueOrValues;
214		- #print " {$key} => {$value}\r\n";
215		- }
216		- }
217		- }
218		- else
219		- {
220		- #print "Unknow result type";
221		- return FALSE;
222		- }
	191	+ if ($result instanceof Splunk_ResultsFieldOrder)
	192	+ {
	193	+ // More than one field attribute returned by search
	194	+ // You must redefine the search
	195	+ if ( count($result->getFieldNames()) > 1 ) return FALSE;
	196	+ }
	197	+ else if ($result instanceof Splunk_ResultsMessage)
	198	+ {
	199	+ // I don't want messages in my search
	200	+ return FALSE;
	201	+ }
	202	+ else if (is_array($result))
	203	+ {
	204	+ // Process a row
	205	+ foreach ($result as $key => $valueOrValues)
	206	+ {
	207	+ if (is_array($valueOrValues))
	208	+ {
	209	+ return FALSE;
	210	+ }
	211	+ else
	212	+ {
	213	+ return $valueOrValues;
	214	+ #print " {$key} => {$value}\r\n";
	215	+ }
	216	+ }
	217	+ }
	218	+ else
	219	+ {
	220	+ #print "Unknow result type";
	221	+ return FALSE;
	222	+ }
223	223	}
224	224	}
225	225
		@@ -228,26 +228,26 @@ discard block
		block discarded – undo
228	228	$file = dirname(__FILE__) . '/' . $cf['reportFile']["$type"];
229	229	$fileb= dirname(__FILE__) . '/' . $cf['badreportFile']["$type"];
230	230	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$cf['folder']["$type"], $cf['account'],$cf['authpassword'], OP_READONLY)
231		- or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
	231	+ or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
232	232	if ( !$m_mail ) exit(254);
233	233
234	234
235	235	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
236	236	//get all messages
237	237	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) );
238		- $dateN = date ( "d-M-Y", strToTime ( "now" ) );
239		- $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
	238	+ $dateN = date ( "d-M-Y", strToTime ( "now" ) );
	239	+ $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
240	240
241	241
242	242	// Order results starting from newest message
243	243	if ( empty($m_search) ) {
244	244	syslog (LOG_INFO,$cf['user'].": No mail found in $type folder. No reports written for $type.");
245		- if ( $ierr = imap_errors() )
246		- foreach ( $ierr as $thiserr )
247		- syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
248		- if ( $ierr = imap_alerts() )
249		- foreach ( $ierr as $thiserr )
250		- syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
	245	+ if ( $ierr = imap_errors() )
	246	+ foreach ( $ierr as $thiserr )
	247	+ syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
	248	+ if ( $ierr = imap_alerts() )
	249	+ foreach ( $ierr as $thiserr )
	250	+ syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
251	251	imap_close( $m_mail );
252	252	if ( file_exists( $file ) ) unlink ($file);
253	253	if ( file_exists( $fileb ) ) unlink ($fileb);
		@@ -280,16 +280,16 @@ discard block
		block discarded – undo
280	280	$uidbad['count'] = 0;
281	281	$uidbad['uid'] = array();
282	282
283		- // loop for each message
	283	+ // loop for each message
284	284	foreach ($m_search as $onem) {
285	285
286		- //get imap header info for obj thang
287		- //$headers = imap_headerinfo($m_mail, $onem);
288		- //$head = imap_fetchheader($m_mail, $headers->Msgno);
	286	+ //get imap header info for obj thang
	287	+ //$headers = imap_headerinfo($m_mail, $onem);
	288	+ //$head = imap_fetchheader($m_mail, $headers->Msgno);
289	289	$head = imap_fetchheader($m_mail, $onem );
290		- //$obj = imap_rfc822_parse_headers( $head);
	290	+ //$obj = imap_rfc822_parse_headers( $head);
291	291
292		- list ($ip,$host,$dateReceived,$dateClient,$mid) = getIP( $head,$cf['mx'],$cf['msalearn'] );
	292	+ list ($ip,$host,$dateReceived,$dateClient,$mid) = getIP( $head,$cf['mx'],$cf['msalearn'] );
293	293	if (empty($mid)) {
294	294	$uid='NA';
295	295	syslog (LOG_ERR, $cf['user'].": Error retrieving data for empty Message-ID.");
		@@ -304,11 +304,11 @@ discard block
		block discarded – undo
304	304	}
305	305	}
306	306
307		- /* Update count of each ip */
308		- if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers and learned by valid uid */
	307	+ /* Update count of each ip */
	308	+ if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers and learned by valid uid */
309	309	$ipuid['count']++; //number of right messages
310	310
311		- if (in_array($uid,array_keys($ipuid['uid']))) {
	311	+ if (in_array($uid,array_keys($ipuid['uid']))) {
312	312	$ipuid['uid']["$uid"]['count']++; //number of learn by this uid
313	313	if (!in_array($ip,$ipuid['uid']["$uid"]))
314	314	$ipuid['uid']["$uid"][]=$ip; //ips learned by this uid
		@@ -319,29 +319,29 @@ discard block
		block discarded – undo
319	319	$ipuid['uid']['count']++; //number of unique uids
320	320	}
321	321
322		- if (in_array($ip,array_keys($ipuid['ip']))) {
323		- $ipuid['ip']["$ip"]['count']++; //number of time this ip appears in different messages
	322	+ if (in_array($ip,array_keys($ipuid['ip']))) {
	323	+ $ipuid['ip']["$ip"]['count']++; //number of time this ip appears in different messages
324	324	if (!in_array($uid,$ipuid['ip']["$ip"]))
325	325	$ipuid['ip']["$ip"][]=$uid; //uids that learned this ip
326	326	}
327		- else {
328		- $ipuid['ip']["$ip"]['count'] = 1;
	327	+ else {
	328	+ $ipuid['ip']["$ip"]['count'] = 1;
329	329	$ipuid['ip']["$ip"][]=$uid;
330	330	$ipuid['ip']['count']++; //number of unique ips
331		- }
	331	+ }
332	332
333		- /* Update HTML report */
334		- fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
	333	+ /* Update HTML report */
	334	+ fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
335	335	}
336		- else { /* Bad learn */
	336	+ else { /* Bad learn */
337	337
338		- if (in_array($uid,array_keys($uidbad['uid'])))
339		- $uidbad['uid']["$uid"]['count']++; //number of bad learn by this uid
340		- else {
341		- $uidbad['uid']["$uid"]['count'] = 1;
	338	+ if (in_array($uid,array_keys($uidbad['uid'])))
	339	+ $uidbad['uid']["$uid"]['count']++; //number of bad learn by this uid
	340	+ else {
	341	+ $uidbad['uid']["$uid"]['count'] = 1;
342	342	$uidbad['uid']["$uid"][]=$uid;
343		- $uidbad['count']++; //numeber of unique bad uids
344		- }
	343	+ $uidbad['count']++; //numeber of unique bad uids
	344	+ }
345	345	/* The reason of bad report */
346	346	if ($host === FALSE) $reason = 'This mail was not received by recognized MX host';
347	347	if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn';
		@@ -363,17 +363,17 @@ discard block
		block discarded – undo
363	363	fwrite($fp, '</table>');
364	364	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>' );
365	365
366		- /* Make MYSQL connection */
	366	+ /* Make MYSQL connection */
367	367	if ( $cf['onlyReport'] )
368	368	$mysqli = NULL;
369	369	else {
370		- $mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
371		- if ($mysqli->connect_error) {
372		- syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
373		- . $mysqli->connect_error);
374		- exit (254);
375		- }
376		- syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
	370	+ $mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
	371	+ if ($mysqli->connect_error) {
	372	+ syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
	373	+ . $mysqli->connect_error);
	374	+ exit (254);
	375	+ }
	376	+ syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
377	377	}
378	378	/***********************/
379	379
		@@ -393,8 +393,8 @@ discard block
		block discarded – undo
393	393	foreach ( $ierr as $thiserr )
394	394	syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
395	395	if ( $ierr = imap_alerts() )
396		- foreach ( $ierr as $thiserr )
397		- syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
	396	+ foreach ( $ierr as $thiserr )
	397	+ syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
398	398	imap_close($m_mail);
399	399	}
400	400	?>

		@@ -10,21 +10,25 @@ discard block
		block discarded – undo
10	10	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) ) {
11	11	for ($i = count($received[0])-1;$i>=0;$i--) {
12	12	# print "Examine ".$received[0][$i]."\n";
13		- if ( preg_match($msa,$received['host'][$i]) )
14		- $dateR = $received['date'][$i];
	13	+ if ( preg_match($msa,$received['host'][$i]) ) {
	14	+ $dateR = $received['date'][$i];
	15	+ }
15	16	foreach ($mxserver as $mx) {
16		- if (!$ip)
17		- if ($mx == $received['host'][$i]) {
	17	+ if (!$ip) {
	18	+ if ($mx == $received['host'][$i]) {
18	19	$host = $received['host'][$i];
	20	+ }
19	21	$ip = $received['ip'][$i];
20	22	}
21	23	}
22	24	}
23	25	}
24		- if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
25		- $dateC['date'] = 'Not found';
26		- if ( preg_match ('/\r\nMessage\-I(?:D\|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1)
27		- $mid['mid'] = NULL;
	26	+ if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1) {
	27	+ $dateC['date'] = 'Not found';
	28	+ }
	29	+ if ( preg_match ('/\r\nMessage\-I(?:D\|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1) {
	30	+ $mid['mid'] = NULL;
	31	+ }
28	32	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
29	33	}
30	34
		@@ -40,7 +44,9 @@ discard block
		block discarded – undo
40	44
41	45	function summaryBadReport ($uidvet) {
42	46	$nuid = $uidvet['count'];
43		- if ( empty($uidvet) ) return NULL;
	47	+ if ( empty($uidvet) ) {
	48	+ return NULL;
	49	+ }
44	50	$return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
45	51
46	52	/* Remove count index */
		@@ -75,8 +81,12 @@ discard block
		block discarded – undo
75	81	foreach ($colarr as $col => $arr) {
76	82	foreach ($arr as $k => $v) {
77	83	$k = substr($k,1);
78		- if (!isset($ret[$k])) $ret[$k] = $array[$k];
79		- if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
	84	+ if (!isset($ret[$k])) {
	85	+ $ret[$k] = $array[$k];
	86	+ }
	87	+ if (isset ($array[$k][$col])) {
	88	+ $ret[$k][$col] = $array[$k][$col];
	89	+ }
80	90	}
81	91	}
82	92	return $ret;
		@@ -87,13 +97,17 @@ discard block
		block discarded – undo
87	97	function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
88	98	$nips = $ipvet['count'];
89	99
90		- if ( empty($ipvet) ) return NULL;
	100	+ if ( empty($ipvet) ) {
	101	+ return NULL;
	102	+ }
91	103	$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";
92	104
93	105	$ips = array_keys($ipvet['ip']);
94	106
95	107	foreach ( $ips as $ip ) {
96		- if ( $ip == 'count' ) continue;
	108	+ if ( $ip == 'count' ) {
	109	+ continue;
	110	+ }
97	111	$nlearn = $ipvet['ip']["$ip"]['count'];
98	112	unset($ipvet['ip']["$ip"]['count']);
99	113	$quantity = $cf['quantity']["$category"]; /* In searchAndList this value is passed by reference and modified */
		@@ -102,10 +116,12 @@ discard block
		block discarded – undo
102	116	if ( ($nlearn >= $cf['thresholdip']["$category"])&&($nuid >= $cf['thresholduid']["$category"]) ) {
103	117	$reason = "The IP <$ip> has been listed because was marked $nlearn times as $category by $nuid different accounts during last ".$cf['oldestday'].' days.';
104	118	$listed = searchAndList ($myconn,$cf['user'],$tables,$cf['list']["$category"],$ip,$cf['unit']["$category"],$quantity,$reason);
	119	+ } else {
	120	+ $listed = FALSE;
105	121	}
106		- else $listed = FALSE;
	122	+ } else {
	123	+ $listed = FALSE;
107	124	}
108		- else $listed = FALSE;
109	125	$nowlist = array( TRUE => array(
110	126	'style' => 'id=\'ipfound\'',
111	127	'name' => 'YES',
		@@ -123,7 +139,9 @@ discard block
		block discarded – undo
123	139	$return .='<tr><td rowspan="'.$nuid.'">'.$ip.'</td>';
124	140	$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']);
125	141	$rowuid=NULL;
126		- for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
	142	+ for ($j=1;$j<$nuid;$j++) {
	143	+ $rowuid .= '<tr><td>%s</td></tr>';
	144	+ }
127	145	array_shift($ipvet['ip']["$ip"]);
128	146	$return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
129	147
		@@ -136,14 +154,18 @@ discard block
		block discarded – undo
136	154	$return .= '<h3>Statistics by UID</h3><table><tr><th>UID</th><th>IP learned</th><th>Learned times</th></tr>'."\n";
137	155	$uids = array_keys($ipvet['uid']);
138	156	foreach ( $uids as $uid ) {
139		- if ( $uid == 'count' ) continue;
	157	+ if ( $uid == 'count' ) {
	158	+ continue;
	159	+ }
140	160	$nlearn = $ipvet['uid']["$uid"]['count'];
141	161	unset ( $ipvet['uid']["$uid"]['count'] );
142	162	$nip = count($ipvet['uid']["$uid"]);
143	163	$return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
144	164	$return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$ipvet['uid']["$uid"][0],$nlearn);
145	165	$rowuid=NULL;
146		- for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
	166	+ for ($j=1;$j<$nip;$j++) {
	167	+ $rowuid .= '<tr><td>%s</td></tr>';
	168	+ }
147	169	array_shift($ipvet['uid']["$uid"]);
148	170	$return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
149	171
		@@ -192,14 +214,14 @@ discard block
		block discarded – undo
192	214	{
193	215	// More than one field attribute returned by search
194	216	// You must redefine the search
195		- if ( count($result->getFieldNames()) > 1 ) return FALSE;
196		- }
197		- else if ($result instanceof Splunk_ResultsMessage)
	217	+ if ( count($result->getFieldNames()) > 1 ) {
	218	+ return FALSE;
	219	+ }
	220	+ } else if ($result instanceof Splunk_ResultsMessage)
198	221	{
199	222	// I don't want messages in my search
200	223	return FALSE;
201		- }
202		- else if (is_array($result))
	224	+ } else if (is_array($result))
203	225	{
204	226	// Process a row
205	227	foreach ($result as $key => $valueOrValues)
		@@ -207,15 +229,13 @@ discard block
		block discarded – undo
207	229	if (is_array($valueOrValues))
208	230	{
209	231	return FALSE;
210		- }
211		- else
	232	+ } else
212	233	{
213	234	return $valueOrValues;
214	235	#print " {$key} => {$value}\r\n";
215	236	}
216	237	}
217		- }
218		- else
	238	+ } else
219	239	{
220	240	#print "Unknow result type";
221	241	return FALSE;
		@@ -229,7 +249,9 @@ discard block
		block discarded – undo
229	249	$fileb= dirname(__FILE__) . '/' . $cf['badreportFile']["$type"];
230	250	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$cf['folder']["$type"], $cf['account'],$cf['authpassword'], OP_READONLY)
231	251	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
232		- if ( !$m_mail ) exit(254);
	252	+ if ( !$m_mail ) {
	253	+ exit(254);
	254	+ }
233	255
234	256
235	257	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
		@@ -242,20 +264,28 @@ discard block
		block discarded – undo
242	264	// Order results starting from newest message
243	265	if ( empty($m_search) ) {
244	266	syslog (LOG_INFO,$cf['user'].": No mail found in $type folder. No reports written for $type.");
245		- if ( $ierr = imap_errors() )
246		- foreach ( $ierr as $thiserr )
	267	+ if ( $ierr = imap_errors() ) {
	268	+ foreach ( $ierr as $thiserr )
247	269	syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
248		- if ( $ierr = imap_alerts() )
249		- foreach ( $ierr as $thiserr )
	270	+ }
	271	+ if ( $ierr = imap_alerts() ) {
	272	+ foreach ( $ierr as $thiserr )
250	273	syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
	274	+ }
251	275	imap_close( $m_mail );
252		- if ( file_exists( $file ) ) unlink ($file);
253		- if ( file_exists( $fileb ) ) unlink ($fileb);
	276	+ if ( file_exists( $file ) ) {
	277	+ unlink ($file);
	278	+ }
	279	+ if ( file_exists( $fileb ) ) {
	280	+ unlink ($fileb);
	281	+ }
254	282	return FALSE;
255	283	}
256	284	$nmes = count ($m_search);
257	285	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in $type folder.");
258		- if ($nmes>0) rsort($m_search);
	286	+ if ($nmes>0) {
	287	+ rsort($m_search);
	288	+ }
259	289
260	290	// Create report file
261	291
		@@ -264,7 +294,9 @@ discard block
		block discarded – undo
264	294	$lastup = "Last Update: " . date ("d F Y H:i", time());
265	295	fwrite( $fp, file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
266	296	fwrite( $fp,"<h1> Report of IP sending $type</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
267		- if ($cf['onlyReport']) fwrite( $fp,'<p>None of the below IP has been listed because listing is not active in configuration.</p>');
	297	+ if ($cf['onlyReport']) {
	298	+ fwrite( $fp,'<p>None of the below IP has been listed because listing is not active in configuration.</p>');
	299	+ }
268	300	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>' );
269	301	fwrite( $fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
270	302	fwrite( $fpb,"<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
		@@ -310,10 +342,11 @@ discard block
		block discarded – undo
310	342
311	343	if (in_array($uid,array_keys($ipuid['uid']))) {
312	344	$ipuid['uid']["$uid"]['count']++; //number of learn by this uid
313		- if (!in_array($ip,$ipuid['uid']["$uid"]))
314		- $ipuid['uid']["$uid"][]=$ip; //ips learned by this uid
315		- }
316		- else {
	345	+ if (!in_array($ip,$ipuid['uid']["$uid"])) {
	346	+ $ipuid['uid']["$uid"][]=$ip;
	347	+ }
	348	+ //ips learned by this uid
	349	+ } else {
317	350	$ipuid['uid']["$uid"]['count'] = 1;
318	351	$ipuid['uid']["$uid"][]=$ip;
319	352	$ipuid['uid']['count']++; //number of unique uids
		@@ -321,10 +354,11 @@ discard block
		block discarded – undo
321	354
322	355	if (in_array($ip,array_keys($ipuid['ip']))) {
323	356	$ipuid['ip']["$ip"]['count']++; //number of time this ip appears in different messages
324		- if (!in_array($uid,$ipuid['ip']["$ip"]))
325		- $ipuid['ip']["$ip"][]=$uid; //uids that learned this ip
326		- }
327		- else {
	357	+ if (!in_array($uid,$ipuid['ip']["$ip"])) {
	358	+ $ipuid['ip']["$ip"][]=$uid;
	359	+ }
	360	+ //uids that learned this ip
	361	+ } else {
328	362	$ipuid['ip']["$ip"]['count'] = 1;
329	363	$ipuid['ip']["$ip"][]=$uid;
330	364	$ipuid['ip']['count']++; //number of unique ips
		@@ -332,21 +366,30 @@ discard block
		block discarded – undo
332	366
333	367	/* Update HTML report */
334	368	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
335		- }
336		- else { /* Bad learn */
	369	+ } else { /* Bad learn */
337	370
338		- if (in_array($uid,array_keys($uidbad['uid'])))
339		- $uidbad['uid']["$uid"]['count']++; //number of bad learn by this uid
	371	+ if (in_array($uid,array_keys($uidbad['uid']))) {
	372	+ $uidbad['uid']["$uid"]['count']++;
	373	+ }
	374	+ //number of bad learn by this uid
340	375	else {
341	376	$uidbad['uid']["$uid"]['count'] = 1;
342	377	$uidbad['uid']["$uid"][]=$uid;
343	378	$uidbad['count']++; //numeber of unique bad uids
344	379	}
345	380	/* The reason of bad report */
346		- if ($host === FALSE) $reason = 'This mail was not received by recognized MX host';
347		- if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn';
348		- if ($uid=='unknown') $reason = 'The uid of this mail was not found in splunk log';
349		- if (!isset($reason)) $reason = '?';
	381	+ if ($host === FALSE) {
	382	+ $reason = 'This mail was not received by recognized MX host';
	383	+ }
	384	+ if ($dateReceived === FALSE) {
	385	+ $reason = 'This mail was not submitted to recognized MSA for learn';
	386	+ }
	387	+ if ($uid=='unknown') {
	388	+ $reason = 'The uid of this mail was not found in splunk log';
	389	+ }
	390	+ if (!isset($reason)) {
	391	+ $reason = '?';
	392	+ }
350	393
351	394	fwrite( $fpb,updatebadReport ( $uid,$dateClient,$mid,$dateReceived,$reason ) );
352	395	}
		@@ -364,9 +407,9 @@ discard block
		block discarded – undo
364	407	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>' );
365	408
366	409	/* Make MYSQL connection */
367		- if ( $cf['onlyReport'] )
368		- $mysqli = NULL;
369		- else {
	410	+ if ( $cf['onlyReport'] ) {
	411	+ $mysqli = NULL;
	412	+ } else {
370	413	$mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
371	414	if ($mysqli->connect_error) {
372	415	syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
		@@ -378,8 +421,9 @@ discard block
		block discarded – undo
378	421	/***********************/
379	422
380	423	fwrite($fp, summaryReportAndList ($cf,$mysqli,$tables,$type,$ipuid) );
381		- if ( !$cf['onlyReport'] )
382		- $mysqli->close();
	424	+ if ( !$cf['onlyReport'] ) {
	425	+ $mysqli->close();
	426	+ }
383	427	fwrite($fp,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateFooter']));
384	428	fclose($fp);
385	429
		@@ -389,12 +433,14 @@ discard block
		block discarded – undo
389	433	fclose($fpb);
390	434	syslog (LOG_INFO,$cf['user'].': Report files written. Listing job for '.$type.' terminated.');
391	435
392		- if ( $ierr = imap_errors() )
393		- foreach ( $ierr as $thiserr )
	436	+ if ( $ierr = imap_errors() ) {
	437	+ foreach ( $ierr as $thiserr )
394	438	syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
395		- if ( $ierr = imap_alerts() )
396		- foreach ( $ierr as $thiserr )
	439	+ }
	440	+ if ( $ierr = imap_alerts() ) {
	441	+ foreach ( $ierr as $thiserr )
397	442	syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
	443	+ }
398	444	imap_close($m_mail);
399	445	}
400	446	?>

		@@ -226,6 +226,9 @@ discard block
		block discarded – undo
226	226	}
227	227
228	228
	229	+/**
	230	+ * @param integer $id
	231	+ */
229	232	function askMilter($myconn,$id,$obj,$typedesc,$miltId,$value,$user,$adm) {
230	233	$milts = readMiltName($myconn,$user);
231	234	$size = count($milts);
		@@ -256,6 +259,11 @@ discard block
		block discarded – undo
256	259	}
257	260
258	261
	262	+/**
	263	+ * @param integer $id
	264	+ * @param string $what
	265	+ * @param boolean $lock
	266	+ */
259	267	function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
260	268
261	269	$whynot=NULL;
		@@ -514,6 +522,9 @@ discard block
		block discarded – undo
514	522	}
515	523
516	524
	525	+/**
	526	+ * @param string $reason
	527	+ */
517	528	function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
518	529
519	530	/* Search and list value */
		@@ -580,6 +591,9 @@ discard block
		block discarded – undo
580	591	return array_map('long2ip', range( ip2long($range[0]), ip2long($range[1]) ) );
581	592	}
582	593
	594	+/**
	595	+ * @param string $netA
	596	+ */
583	597	function isIn($netA, $netB) {
584	598	/* TRUE if an IP of $netA is contained in netB */
585	599	list($addressA,$maskA) = explode('/', $netA);

		@@ -4,18 +4,18 @@ discard block
		block discarded – undo
4	4
5	5	function username() {
6	6	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
7		- else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
8		- else $user='unknown';
	7	+ else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
	8	+ else $user='unknown';
9	9	return $user;
10	10	}
11	11
12	12
13	13	function myConnect($host, $user, $pass, $db, $port, $tablelist, $typedesc, $loguser) {
14		- $db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
	14	+ $db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
15	15	$mysqli = new mysqli($host, $user, $pass, $db, $port);
16		- if ($mysqli->connect_error) {
17		- syslog (LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> (' . $mysqli->connect_errno . ') '
18		- . $mysqli->connect_error);
	16	+ if ($mysqli->connect_error) {
	17	+ syslog (LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> (' . $mysqli->connect_errno . ') '
	18	+ . $mysqli->connect_error);
19	19	return FALSE;
20	20	}
21	21	syslog(LOG_INFO, $loguser.': Successfully MySQL connected at DB <'.$db.'> to ' . $mysqli->host_info) ;
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	}
57	57	}
58	58	list($sub['net'],$sub['mask'])=explode('/',$value);
59		- $query= sprintf("INSERT INTO `$table` (
	59	+ $query= sprintf("INSERT INTO `$table` (
60	60	`$type` ,
61	61	`netmask`,
62	62	`date` ,
		@@ -69,10 +69,10 @@ discard block
		block discarded – undo
69	69	INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
70	70	CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
71	71	)" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
72		- break;
	72	+ break;
73	73
74	74	default:
75		- $query= sprintf("INSERT INTO `$table` (
	75	+ $query= sprintf("INSERT INTO `$table` (
76	76	`$type` ,
77	77	`date` ,
78	78	`exp` ,
		@@ -87,8 +87,8 @@ discard block
		block discarded – undo
87	87	}
88	88
89	89	if ($myconn->query($query) === TRUE) {
90		- syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
91		- $result=TRUE;
	90	+ syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
	91	+ $result=TRUE;
92	92	}
93	93	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
94	94	return $result;
		@@ -98,9 +98,9 @@ discard block
		block discarded – undo
98	98
99	99	$result=FALSE;
100	100
101		- switch ($type) {
	101	+ switch ($type) {
102	102	case 'ip':
103		- $query= sprintf("UPDATE `$table` SET
	103	+ $query= sprintf("UPDATE `$table` SET
104	104	`active` = '1',
105	105	`user` = '%s',
106	106	`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
		@@ -108,9 +108,9 @@ discard block
		block discarded – undo
108	108	`reason` = '%s'
109	109	WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
110	110	break;
111		- case 'network':
	111	+ case 'network':
112	112	list($sub['net'],$sub['mask'])=explode('/',$value);
113		- $query= sprintf("UPDATE `$table` SET
	113	+ $query= sprintf("UPDATE `$table` SET
114	114	`active` = '1',
115	115	`user` = '%s',
116	116	`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$sub['net'],$sub['mask']);
120	120	break;
121	121	default:
122		- $query= sprintf("UPDATE `$table` SET
	122	+ $query= sprintf("UPDATE `$table` SET
123	123	`active` = '1',
124	124	`user` = '%s',
125	125	`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
		@@ -128,18 +128,18 @@ discard block
		block discarded – undo
128	128	WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
129	129	}
130	130
131		- if ($myconn->query($query) === TRUE) {
132		- syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
	131	+ if ($myconn->query($query) === TRUE) {
	132	+ syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
133	133	$result=TRUE;
134		- }
135		- else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
	134	+ }
	135	+ else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
136	136	return $result;
137	137	}
138	138
139	139	function remove ($myconn,$user,$value,$type,$table) {
140	140
141		- switch ($type) {
142		- case 'ip':
	141	+ switch ($type) {
	142	+ case 'ip':
143	143	$query = sprintf("DELETE FROM `$table` WHERE
144	144	`$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
145	145	break;
		@@ -155,18 +155,18 @@ discard block
		block discarded – undo
155	155	}
156	156
157	157
158		- if ($return=$myconn->query($query) === TRUE)
159		- syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
160		- else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
	158	+ if ($return=$myconn->query($query) === TRUE)
	159	+ syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
	160	+ else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
161	161
162		- return $return;
	162	+ return $return;
163	163	}
164	164
165	165
166	166	function changestatus ($myconn,$user,$value,$status,$type,$table) {
167	167
168	168	switch ($type) {
169		- case 'ip':
	169	+ case 'ip':
170	170	$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
171	171	break;
172	172	case 'network':
		@@ -177,16 +177,16 @@ discard block
		block discarded – undo
177	177	$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
178	178	}
179	179
180		- if ($return=$myconn->query($query) === TRUE) {
181		- syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
182		- }
183		- else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
	180	+ if ($return=$myconn->query($query) === TRUE) {
	181	+ syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
	182	+ }
	183	+ else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
184	184	return $return;
185	185	}
186	186
187	187
188	188	function expire ($myconn,$user,$tables,$expireTime) {
189		- $return=TRUE;
	189	+ $return=TRUE;
190	190	$log=array();
191	191	$desc = array_keys($tables);
192	192	foreach ($desc as $tdesc) {
		@@ -196,11 +196,11 @@ discard block
		block discarded – undo
196	196	/* END OF QUERY */
197	197	$log[0] = 'expired for';
198	198	$log[1] = 'disabled for';
199		- if ($myconn->multi_query($query)) {
	199	+ if ($myconn->multi_query($query)) {
200	200	$j = 0;
201	201	do {
202		- $numdel = $myconn->affected_rows;
203		- syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
	202	+ $numdel = $myconn->affected_rows;
	203	+ syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
204	204	$j++;
205	205
206	206	} while ($myconn->next_result());
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	}
213	213	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
214	214	else syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
215		- return $return;
	215	+ return $return;
216	216	}
217	217
218	218
		@@ -285,7 +285,7 @@ discard block
		block discarded – undo
285	285	if ( $entry->num_rows ) {
286	286	if ( $entry->num_rows == 1 ) {
287	287	$riga = $entry->fetch_array(MYSQLI_ASSOC);
288		- if (isListed($riga)) {
	288	+ if (isListed($riga)) {
289	289	$warn = "<$value> is already present in <$listdep> list!";
290	290	$entry->free();
291	291	return FALSE;
		@@ -302,7 +302,7 @@ discard block
		block discarded – undo
302	302	function searchentry ($myconn,$value,$tablelist) {
303	303	/* Make a MYSQL query and return result */
304	304
305		- $type = $tablelist['field'];
	305	+ $type = $tablelist['field'];
306	306
307	307	if ( $tablelist['milter'] ) {
308	308	$table = milterTable($type);
		@@ -326,7 +326,7 @@ discard block
		block discarded – undo
326	326	case 'ip':
327	327	$query = sprintf('SELECT * FROM (
328	328	SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id)' .
329		- 'WHERE `ip` = INET_ATON(\'%s\')
	329	+ 'WHERE `ip` = INET_ATON(\'%s\')
330	330	) AS val WHERE val.ip IS NOT null', $table, $table, $value);
331	331	break;
332	332	default:
		@@ -337,33 +337,33 @@ discard block
		block discarded – undo
337	337	}
338	338
339	339	else {
340		- $table = $tablelist['name'];
341		- if ($value == 'ALL') $query = 'select * from '.$table;
342		- else {
343		- switch ($type) {
344		- case 'ip':
345		- $query= "select * from $table where $type = INET_ATON('$value')";
346		- break;
347		- case 'network':
348		- list($sub['net'],$sub['mask'])=explode('/',$value);
349		- $query= sprintf('select * from `%s`
	340	+ $table = $tablelist['name'];
	341	+ if ($value == 'ALL') $query = 'select * from '.$table;
	342	+ else {
	343	+ switch ($type) {
	344	+ case 'ip':
	345	+ $query= "select * from $table where $type = INET_ATON('$value')";
	346	+ break;
	347	+ case 'network':
	348	+ list($sub['net'],$sub['mask'])=explode('/',$value);
	349	+ $query= sprintf('select * from `%s`
350	350	WHERE (
351	351	inet_aton(\'%s\') >= network AND
352	352	( inet_aton(\'%s\') \| ( inet_aton(\'%s\') ^ (power(2,32)-1) ) )
353	353	<= network \| ( netmask ^ (power(2,32)-1) )
354	354	)', $table, $sub['net'], $sub['net'], $sub['mask']);
355	355	;
356		- break;
357		- default:
358		- $query= "select * from $table where $type = '$value'";
359		- }
360		- }
	356	+ break;
	357	+ default:
	358	+ $query= "select * from $table where $type = '$value'";
	359	+ }
	360	+ }
361	361	}
362	362
363	363	$result = $myconn->query($query);
364	364	if($result === false)
365	365	syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
366		- return $result;
	366	+ return $result;
367	367	}
368	368
369	369	function countListed ($myconn,$table) {
		@@ -378,14 +378,14 @@ discard block
		block discarded – undo
378	378
379	379
380	380	function isFull($myconn,$typedesc,$alltables) {
381		- if (isset($alltables["$typedesc"]['limit'])) {
	381	+ if (isset($alltables["$typedesc"]['limit'])) {
382	382	if ( $alltables["$typedesc"]['milter'] )
383	383	$tab = 'net';
384	384	else
385	385	$tab = $alltables["$typedesc"]['name'];
386		- if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] )
387		- return TRUE;
388		- }
	386	+ if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] )
	387	+ return TRUE;
	388	+ }
389	389	return FALSE;
390	390	}
391	391
		@@ -405,14 +405,14 @@ discard block
		block discarded – undo
405	405	if ($result) {
406	406	printf("<pre>Your request for $type <$value> returned %d items.\n</pre>", $result->num_rows);
407	407
408		- /* Check for limit in number of listed items */
	408	+ /* Check for limit in number of listed items */
409	409	$full = isFull($myconn,$typedesc,$tables);
410	410	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
411	411
412	412	if ($result->num_rows) {
413	413	print $tabhtm;
414	414	$i=0;
415		- while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
	415	+ while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
416	416	if (isListed($riga)) {
417	417	if ($tables["$typedesc"]['bl']) $listed='Listed';
418	418	else $listed='WhiteListed';
		@@ -438,7 +438,7 @@ discard block
		block discarded – undo
438	438	printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
439	439	$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
440	440	$i++;
441		- }
	441	+ }
442	442	print '</tbody></table>';
443	443	}
444	444	else {
		@@ -458,15 +458,15 @@ discard block
		block discarded – undo
458	458
459	459	function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
460	460	$now = time();
461		- setlocale (LC_TIME, 'it_IT');
462		- $date = date("r",$now);
	461	+ setlocale (LC_TIME, 'it_IT');
	462	+ $date = date("r",$now);
463	463	$messageID = md5(uniqid($now,1)) . '@' . $_SERVER["HOSTNAME"];
464	464	$mua = 'PHP/' . phpversion();
465	465
466	466	/* Parsing headers */
467	467	if (!file_exists($tplf['header'])) {
468		- syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
469		- exit;
	468	+ syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
	469	+ exit;
470	470	}
471	471
472	472	$head_tmpl = file_get_contents($tplf['header']);
		@@ -475,35 +475,35 @@ discard block
		block discarded – undo
475	475	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
476	476	$headers = preg_replace( '/\r\|\n/', "\r\n", $headers );
477	477
478		- /* Parsing body */
	478	+ /* Parsing body */
479	479
480		- if (!file_exists($tplf['body'])) {
481		- syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
482		- exit;
483		- }
	480	+ if (!file_exists($tplf['body'])) {
	481	+ syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
	482	+ exit;
	483	+ }
484	484
485		- $body_tmpl = file_get_contents($tplf['body']);
486		- $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
487		- $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
488		- $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
489		- $body = preg_replace( "/\r\|\n/", "\r\n", $body );
	485	+ $body_tmpl = file_get_contents($tplf['body']);
	486	+ $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
	487	+ $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
	488	+ $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
	489	+ $body = preg_replace( "/\r\|\n/", "\r\n", $body );
490	490	$body = wordwrap ( $body, 75 , "\r\n" );
491	491
492	492	/* Send the mail! */
493		- if ( strlen(ini_get("safe_mode"))< 1) {
494		- $old_mailfrom = ini_get("sendmail_from");
495		- ini_set("sendmail_from", $from);
496		- $params = sprintf("-oi -f %s", '<>');
497		- if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
498		- else $flag=TRUE;
499		- if (isset($old_mailfrom))
500		- ini_set("sendmail_from", $old_mailfrom);
501		- }
502		- else {
503		- if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
504		- else $flag=TRUE;
505		- }
506		- return $flag;
	493	+ if ( strlen(ini_get("safe_mode"))< 1) {
	494	+ $old_mailfrom = ini_get("sendmail_from");
	495	+ ini_set("sendmail_from", $from);
	496	+ $params = sprintf("-oi -f %s", '<>');
	497	+ if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
	498	+ else $flag=TRUE;
	499	+ if (isset($old_mailfrom))
	500	+ ini_set("sendmail_from", $old_mailfrom);
	501	+ }
	502	+ else {
	503	+ if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
	504	+ else $flag=TRUE;
	505	+ }
	506	+ return $flag;
507	507	}
508	508
509	509	function emailToNotify($notify_file,$dom) {
		@@ -517,59 +517,59 @@ discard block
		block discarded – undo
517	517	function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
518	518
519	519	/* Search and list value */
520		- $type = $tables["$typedesc"]['field'];
521		- $table = $tables["$typedesc"]['name'];
522		- $result = searchentry ($myconn,$value,$tables["$typedesc"]);
523		-
524		- /* Manage abnormal conditions */
525		- /* Value already present in db more than once. This is absurd. Panic! */
526		- if ($result->num_rows > 1) {
527		- syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
528		- $result->free();
529		- return FALSE;
530		- }
	520	+ $type = $tables["$typedesc"]['field'];
	521	+ $table = $tables["$typedesc"]['name'];
	522	+ $result = searchentry ($myconn,$value,$tables["$typedesc"]);
	523	+
	524	+ /* Manage abnormal conditions */
	525	+ /* Value already present in db more than once. This is absurd. Panic! */
	526	+ if ($result->num_rows > 1) {
	527	+ syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
	528	+ $result->free();
	529	+ return FALSE;
	530	+ }
531	531
532		- /* Value already present in db or not present: to list anyway */
533		- if ($result->num_rows >= 0) {
534		- /* First, check for limit in number of listed items */
535		- if (isFull($myconn,$typedesc,$tables)) {
536		- syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
537		- $result->free();
538		- return FALSE;
539		- }
540		- /* Second, check if the (re)list would be consistent now */
541		- if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
542		- syslog(LOG_ERR, $loguser.': '.$whynot);
543		- $result->free();
544		- return FALSE;
545		- }
546		- }
547		- /* End of abnormal conditions */
	532	+ /* Value already present in db or not present: to list anyway */
	533	+ if ($result->num_rows >= 0) {
	534	+ /* First, check for limit in number of listed items */
	535	+ if (isFull($myconn,$typedesc,$tables)) {
	536	+ syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
	537	+ $result->free();
	538	+ return FALSE;
	539	+ }
	540	+ /* Second, check if the (re)list would be consistent now */
	541	+ if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
	542	+ syslog(LOG_ERR, $loguser.': '.$whynot);
	543	+ $result->free();
	544	+ return FALSE;
	545	+ }
	546	+ }
	547	+ /* End of abnormal conditions */
548	548
549	549
550		- /* Finally, here I can list the value! */
	550	+ /* Finally, here I can list the value! */
551	551	$thisentry = $result->fetch_array(MYSQLI_ASSOC);
552		- switch ($result->num_rows) {
553		- /* Relist value if already present */
554		- case 1:
555		- /* Entry already listed */
556		- if ( isListed($thisentry) ) {
557		- syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
558		- $result->free();
559		- return FALSE;
560		- }
561		-
562		- /* Entry delisted */
563		- $result->free();
	552	+ switch ($result->num_rows) {
	553	+ /* Relist value if already present */
	554	+ case 1:
	555	+ /* Entry already listed */
	556	+ if ( isListed($thisentry) ) {
	557	+ syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
	558	+ $result->free();
	559	+ return FALSE;
	560	+ }
	561	+
	562	+ /* Entry delisted */
	563	+ $result->free();
564	564	$quantity *= $thisentry['nlist'];
565		- return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
	565	+ return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
566	566
567	567
568		- /* First time list value */
569		- case 0:
570		- $result->free();
571		- return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
572		- }
	568	+ /* First time list value */
	569	+ case 0:
	570	+ $result->free();
	571	+ return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
	572	+ }
573	573	}
574	574
575	575
		@@ -602,7 +602,7 @@ discard block
		block discarded – undo
602	602	return FALSE;
603	603	}
604	604	$result = searchentry ($myconn,'ALL',$tabletype);
605		- if ($result->num_rows) {
	605	+ if ($result->num_rows) {
606	606	while ($row = $result->fetch_array(MYSQLI_ASSOC)) {
607	607	$thisNet = long2ip($row['network']).'/'.long2ip($row['netmask']);
608	608	if ( isIn($thisNet, $net) ) {
		@@ -622,7 +622,7 @@ discard block
		block discarded – undo
622	622	/* For miltermap */
623	623	function checkMilterConf($table) {
624	624	if (isset($table['milter'])) {
625		- if ($table['milter'] === TRUE) {
	625	+ if ($table['milter'] === TRUE) {
626	626	switch ( $table['field'] ) {
627	627	case 'network':
628	628	case 'ip':
		@@ -645,15 +645,15 @@ discard block
		block discarded – undo
645	645
646	646	function milterTable($t) {
647	647	/* Return the milter object table for type t or FALSE on error */
648		- switch ($t) {
649		- case 'network':
650		- return 'net';
651		- case 'ip':
652		- return 'ips';
653		- default:
	648	+ switch ($t) {
	649	+ case 'network':
	650	+ return 'net';
	651	+ case 'ip':
	652	+ return 'ips';
	653	+ default:
654	654	syslog(LOG_EMERG, "ALERT: type <$t> not allowed in configuration. ");
655		- return FALSE;
656		- }
	655	+ return FALSE;
	656	+ }
657	657	}
658	658
659	659
		@@ -661,9 +661,9 @@ discard block
		block discarded – undo
661	661	$milters=array();
662	662	$query = 'SELECT `name` FROM `config`';
663	663
664		- $result = $myconn->query($query);
665		- if($result === false) {
666		- syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
	664	+ $result = $myconn->query($query);
	665	+ if($result === false) {
	666	+ syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
667	667	return FALSE;
668	668	}
669	669	if ($result->num_rows) {

		@@ -3,9 +3,13 @@ discard block
		block discarded – undo
3	3	ini_set('error_log', 'syslog');
4	4
5	5	function username() {
6		- if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
7		- else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
8		- else $user='unknown';
	6	+ if (isset ($_SERVER['REMOTE_USER'])) {
	7	+ $user = $_SERVER['REMOTE_USER'];
	8	+ } else if (isset ($_SERVER['USER'])) {
	9	+ $user = $_SERVER['USER'];
	10	+ } else {
	11	+ $user='unknown';
	12	+ }
9	13	return $user;
10	14	}
11	15
		@@ -89,8 +93,9 @@ discard block
		block discarded – undo
89	93	if ($myconn->query($query) === TRUE) {
90	94	syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
91	95	$result=TRUE;
	96	+ } else {
	97	+ syslog(LOG_ERR, "$user: Error: ".$myconn->error);
92	98	}
93		- else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
94	99	return $result;
95	100	}
96	101
		@@ -131,8 +136,9 @@ discard block
		block discarded – undo
131	136	if ($myconn->query($query) === TRUE) {
132	137	syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
133	138	$result=TRUE;
	139	+ } else {
	140	+ syslog (LOG_ERR, "$user: Error: ". $myconn->error);
134	141	}
135		- else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
136	142	return $result;
137	143	}
138	144
		@@ -155,9 +161,11 @@ discard block
		block discarded – undo
155	161	}
156	162
157	163
158		- if ($return=$myconn->query($query) === TRUE)
159		- syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
160		- else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
	164	+ if ($return=$myconn->query($query) === TRUE) {
	165	+ syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
	166	+ } else {
	167	+ syslog(LOG_ERR, "$user: Error: ". $myconn->error);
	168	+ }
161	169
162	170	return $return;
163	171	}
		@@ -179,8 +187,9 @@ discard block
		block discarded – undo
179	187
180	188	if ($return=$myconn->query($query) === TRUE) {
181	189	syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
	190	+ } else {
	191	+ syslog(LOG_ERR, "$user: Error: ". $myconn->error);
182	192	}
183		- else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
184	193	return $return;
185	194	}
186	195
		@@ -204,14 +213,16 @@ discard block
		block discarded – undo
204	213	$j++;
205	214
206	215	} while ($myconn->next_result());
207		- }
208		- else {
	216	+ } else {
209	217	syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
210	218	$return = FALSE;
211	219	}
212	220	}
213		- if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
214		- else syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
	221	+ if ( !($return) ) {
	222	+ syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
	223	+ } else {
	224	+ syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
	225	+ }
215	226	return $return;
216	227	}
217	228
		@@ -220,8 +231,11 @@ discard block
		block discarded – undo
220	231
221	232	$exp=new DateTime($row['exp']);
222	233	$now=new DateTime('NOW');
223		- if (($exp > $now) and ($row['active'])) return true;
224		- else return false;
	234	+ if (($exp > $now) and ($row['active'])) {
	235	+ return true;
	236	+ } else {
	237	+ return false;
	238	+ }
225	239
226	240	}
227	241
		@@ -241,10 +255,11 @@ discard block
		block discarded – undo
241	255	END;
242	256	$activeMilts = explode(',',$value);
243	257	foreach ( $milts as $milter ) {
244		- if ( in_array($milter, $activeMilts) )
245		- $selected= 'selected';
246		- else
247		- $selected= NULL;
	258	+ if ( in_array($milter, $activeMilts) ) {
	259	+ $selected= 'selected';
	260	+ } else {
	261	+ $selected= NULL;
	262	+ }
248	263	$button .= sprintf('<option value="%s" %s>%s</option>', $milter, $selected, $milter);
249	264	}
250	265	$button .= '</select></div><input class="button" name="Change" type="submit" value="Change" /></form>';
		@@ -261,9 +276,12 @@ discard block
		block discarded – undo
261	276	$whynot=NULL;
262	277	switch ($what) {
263	278	case 'Ok':
264		- if ($lock) return NULL;
265		- if (in_array($user,array_keys($adm)))
266		- if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
	279	+ if ($lock) {
	280	+ return NULL;
	281	+ }
	282	+ if (in_array($user,array_keys($adm))) {
	283	+ if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
	284	+ }
267	285	return htmlspecialchars($whynot);
268	286	case 'Listed':
269	287	case 'WhiteListed':
		@@ -275,7 +293,9 @@ discard block
		block discarded – undo
275	293	function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
276	294	/* Check if there are no pending mislisting */
277	295	$warn = NULL;
278		- if (! isset($alltables["$typed"]['depend']) ) return TRUE;
	296	+ if (! isset($alltables["$typed"]['depend']) ) {
	297	+ return TRUE;
	298	+ }
279	299	foreach ($alltables["$typed"]['depend'] as $listdep) {
280	300	if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
281	301	$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
		@@ -306,10 +326,10 @@ discard block
		block discarded – undo
306	326
307	327	if ( $tablelist['milter'] ) {
308	328	$table = milterTable($type);
309		- if ($value == 'ALL')
310		- $query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
	329	+ if ($value == 'ALL') {
	330	+ $query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
311	331	$table,$table);
312		- else {
	332	+ } else {
313	333	switch ($type) {
314	334	case 'network':
315	335	list($sub['net'],$sub['mask'])=explode('/',$value);
		@@ -334,12 +354,11 @@ discard block
		block discarded – undo
334	354	return FALSE;
335	355	}
336	356	}
337		- }
338		-
339		- else {
	357	+ } else {
340	358	$table = $tablelist['name'];
341		- if ($value == 'ALL') $query = 'select * from '.$table;
342		- else {
	359	+ if ($value == 'ALL') {
	360	+ $query = 'select * from '.$table;
	361	+ } else {
343	362	switch ($type) {
344	363	case 'ip':
345	364	$query= "select * from $table where $type = INET_ATON('$value')";
		@@ -361,8 +380,9 @@ discard block
		block discarded – undo
361	380	}
362	381
363	382	$result = $myconn->query($query);
364		- if($result === false)
365		- syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
	383	+ if($result === false) {
	384	+ syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
	385	+ }
366	386	return $result;
367	387	}
368	388
		@@ -379,12 +399,14 @@ discard block
		block discarded – undo
379	399
380	400	function isFull($myconn,$typedesc,$alltables) {
381	401	if (isset($alltables["$typedesc"]['limit'])) {
382		- if ( $alltables["$typedesc"]['milter'] )
383		- $tab = 'net';
384		- else
385		- $tab = $alltables["$typedesc"]['name'];
386		- if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] )
387		- return TRUE;
	402	+ if ( $alltables["$typedesc"]['milter'] ) {
	403	+ $tab = 'net';
	404	+ } else {
	405	+ $tab = $alltables["$typedesc"]['name'];
	406	+ }
	407	+ if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) {
	408	+ return TRUE;
	409	+ }
388	410	}
389	411	return FALSE;
390	412	}
		@@ -397,8 +419,9 @@ discard block
		block discarded – undo
397	419	$tabhtm = <<<END
398	420	<table><thead><tr><th>$type</th><th title="The date this object has been listed for the first time">DateAdd</th><th>DateMod</th><th>Exp</th><th>Status</th><th title="Number of times this object has been listed">#List</th>
399	421	END;
400		- if ( $tables["$typedesc"]['milter'] )
401		- $tabhtm .= '<th title="Milter active for this object">Milters</th>';
	422	+ if ( $tables["$typedesc"]['milter'] ) {
	423	+ $tabhtm .= '<th title="Milter active for this object">Milters</th>';
	424	+ }
402	425	$tabhtm .= '<th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
403	426
404	427	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
		@@ -407,18 +430,23 @@ discard block
		block discarded – undo
407	430
408	431	/* Check for limit in number of listed items */
409	432	$full = isFull($myconn,$typedesc,$tables);
410		- if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
	433	+ if ($full) {
	434	+ print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
	435	+ }
411	436
412	437	if ($result->num_rows) {
413	438	print $tabhtm;
414	439	$i=0;
415	440	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
416	441	if (isListed($riga)) {
417		- if ($tables["$typedesc"]['bl']) $listed='Listed';
418		- else $listed='WhiteListed';
419		- }
420		- else
421		- $listed='Ok';
	442	+ if ($tables["$typedesc"]['bl']) {
	443	+ $listed='Listed';
	444	+ } else {
	445	+ $listed='WhiteListed';
	446	+ }
	447	+ } else {
	448	+ $listed='Ok';
	449	+ }
422	450
423	451	switch ($type) {
424	452	case 'ip':
		@@ -431,27 +459,30 @@ discard block
		block discarded – undo
431	459	$element = $riga["$type"];
432	460	}
433	461
434		- if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) )
435		- printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
	462	+ if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) ) {
	463	+ printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
436	464	$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn,$i,$element,$typedesc,$riga['idmilt'],$riga['miltnames'],$user,$adm), $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
437		- else
438		- printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
	465	+ } else {
	466	+ printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
439	467	$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
	468	+ }
440	469	$i++;
441	470	}
442	471	print '</tbody></table>';
443		- }
444		- else {
	472	+ } else {
445	473	print "<pre>$type <$value> is not listed!\n</pre>";
446		- if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') )
447		- if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
448		- else print '<p>'.htmlspecialchars($whynot).'</p>';
	474	+ if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') ) {
	475	+ if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
	476	+ } else {
	477	+ print '<p>'.htmlspecialchars($whynot).'</p>';
	478	+ }
449	479
450	480	}
451	481	$result->free();
	482	+ } else {
	483	+ print '<pre>Query error or something wrong in DB schema'."\n</pre>";
	484	+ }
452	485	}
453		- else print '<pre>Query error or something wrong in DB schema'."\n</pre>";
454		-}
455	486
456	487
457	488
		@@ -494,24 +525,32 @@ discard block
		block discarded – undo
494	525	$old_mailfrom = ini_get("sendmail_from");
495	526	ini_set("sendmail_from", $from);
496	527	$params = sprintf("-oi -f %s", '<>');
497		- if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
498		- else $flag=TRUE;
499		- if (isset($old_mailfrom))
500		- ini_set("sendmail_from", $old_mailfrom);
501		- }
502		- else {
503		- if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
504		- else $flag=TRUE;
	528	+ if (!(mail($to,$sbj, $body,$headers,$params))) {
	529	+ $flag=FALSE;
	530	+ } else {
	531	+ $flag=TRUE;
	532	+ }
	533	+ if (isset($old_mailfrom)) {
	534	+ ini_set("sendmail_from", $old_mailfrom);
	535	+ }
	536	+ } else {
	537	+ if (!(mail($to,$sbj, $body,$headers))) {
	538	+ $flag=FALSE;
	539	+ } else {
	540	+ $flag=TRUE;
	541	+ }
505	542	}
506	543	return $flag;
507	544	}
508	545
509	546	function emailToNotify($notify_file,$dom) {
510	547	$ini_array = parse_ini_file($notify_file);
511		- if (in_array($dom,array_keys($ini_array)))
512		- return $ini_array["$dom"];
513		- else return FALSE;
514		-}
	548	+ if (in_array($dom,array_keys($ini_array))) {
	549	+ return $ini_array["$dom"];
	550	+ } else {
	551	+ return FALSE;
	552	+ }
	553	+ }
515	554
516	555
517	556	function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
		@@ -588,9 +627,10 @@ discard block
		block discarded – undo
588	627	$net = new \dautkom\ipv4\IPv4();
589	628	$range = $net->address($addressA)->mask($maskA)->getRange();
590	629	$ips = ipRange($range);
591		- foreach ( $ips as $ip )
592		- if ( $net->address($addressB)->mask($maskB)->has($ip) )
	630	+ foreach ( $ips as $ip ) {
	631	+ if ( $net->address($addressB)->mask($maskB)->has($ip) )
593	632	return TRUE;
	633	+ }
594	634	return FALSE;
595	635	}
596	636
		@@ -667,8 +707,9 @@ discard block
		block discarded – undo
667	707	return FALSE;
668	708	}
669	709	if ($result->num_rows) {
670		- while ($milt = $result->fetch_array(MYSQLI_ASSOC))
671		- $milters[] = $milt['name'];
	710	+ while ($milt = $result->fetch_array(MYSQLI_ASSOC)) {
	711	+ $milters[] = $milt['name'];
	712	+ }
672	713	}
673	714	$result->free();
674	715	return $milters;
		@@ -694,12 +735,14 @@ discard block
		block discarded – undo
694	735	$query[] = "DELETE FROM `milt` WHERE (`id` = '$miltID' AND `name` = '$value')";
695	736	}
696	737	}
697		- if ( count($query) ) /* This "if" is redundant, because if I call this I already checked there is a change */
	738	+ if ( count($query) ) {
	739	+ /* This "if" is redundant, because if I call this I already checked there is a change */
698	740	/* I update datemod because the user couldn't change */
699	741	$query[] = sprintf('UPDATE `%s` SET
700	742	`user`=\'%s\',
701	743	`datemod`= CURRENT_TIMESTAMP
702	744	WHERE `idmilt`=%d', $table, $loguser, $miltID);
	745	+ }
703	746
704	747
705	748	/* Start a safe transaction: it commits only if all queries happen */
		@@ -713,19 +756,20 @@ discard block
		block discarded – undo
713	756	}
714	757	}
715	758	if ( $ok ) {
716		- if ( $myconn->commit() )
717		- syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
718		- else {
	759	+ if ( $myconn->commit() ) {
	760	+ syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
	761	+ } else {
719	762	syslog(LOG_ERR, "$loguser: Milter setting NOT changed for an unpredictable COMMIT error.");
720		- if ( $myconn->rollback() )
721		- syslog(LOG_INFO, "$loguser: rollback succeeded.");
722		- else
723		- syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
	763	+ if ( $myconn->rollback() ) {
	764	+ syslog(LOG_INFO, "$loguser: rollback succeeded.");
	765	+ } else {
	766	+ syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
	767	+ }
724	768	$ok = FALSE;
725	769	}
	770	+ } else {
	771	+ syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
726	772	}
727		- else
728		- syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
729	773	return $ok;
730	774
731	775	}

		@@ -44,8 +44,8 @@ discard block
		block discarded – undo
44	44	}
45	45	if (! empty($old) ) {
46	46	foreach ($old as $item) {
47		- if (! in_array($item, $new) ) {
48		- $values["$item"] = 'del';
	47	+ if (! in_array($item, $new) ) {
	48	+ $values["$item"] = 'del';
49	49	$logs[] = "<$item>: ". $values["$item"];
50	50	}
51	51	}
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63
64	64	/* Store new values */
65	65	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
66		- exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
	66	+ exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
67	67
68	68	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
69	69	print 'OK milter setting changed.';

		@@ -1,10 +1,10 @@ discard block
		block discarded – undo
1	1	<?php
2	2	require_once('config.php');
3	3	require_once('function.php');
4		-$typedesc=$_POST['type'];
	4	+$typedesc = $_POST['type'];
5	5	$type = $tables["$typedesc"]['field'];
6	6	$col = milterTable($type);
7		-if ( $col === FALSE )
	7	+if ($col === FALSE)
8	8	exit ("<p>Error in you config at field <b>$type</b>.</p>");
9	9	?>
10	10	<td colspan="10" style="text-align: center">
		@@ -18,54 +18,54 @@ discard block
		block discarded – undo
18	18	$new = $_POST['newvalues'];
19	19	else
20	20	$new = array();
21		-if (! empty($_POST['oldvalues']))
	21	+if (!empty($_POST['oldvalues']))
22	22	$old = explode(',', $_POST['oldvalues']);
23	23	else
24		- $old=array();
25		-$values=array();
26		-$logs=array();
	24	+ $old = array();
	25	+$values = array();
	26	+$logs = array();
27	27
28	28	print '<pre>';
29	29	/* Check need to disable all milters, removing unnecessary setting */
30		-if ( in_array('DISABLE ALL', $new) )
	30	+if (in_array('DISABLE ALL', $new))
31	31	$new = array('DISABLE ALL');
32	32
33	33	/* Compare the values determining what to do */
34	34	if (count(array_diff(array_merge($new, $old), array_intersect($new, $old))) !== 0) {
35	35	/* New and old are different (we assume we don't have duplicate values) */
36		- if (! empty($new) ) {
	36	+ if (!empty($new)) {
37	37	foreach ($new as $item) {
38		- if ( in_array($item, $old) )
	38	+ if (in_array($item, $old))
39	39	$values["$item"] = 'keep';
40	40	else
41	41	$values["$item"] = 'add';
42		- $logs[] = "<$item>: ". $values["$item"];
	42	+ $logs[] = "<$item>: ".$values["$item"];
43	43	}
44	44	}
45		- if (! empty($old) ) {
	45	+ if (!empty($old)) {
46	46	foreach ($old as $item) {
47		- if (! in_array($item, $new) ) {
	47	+ if (!in_array($item, $new)) {
48	48	$values["$item"] = 'del';
49		- $logs[] = "<$item>: ". $values["$item"];
	49	+ $logs[] = "<$item>: ".$values["$item"];
50	50	}
51	51	}
52	52	}
53	53	}
54	54
55	55	/* Logging */
56		-if ( empty($values) )
	56	+if (empty($values))
57	57	print 'No values to change.';
58	58	else {
59		- $msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.',$user,$typedesc,$type, $_POST['object']);
	59	+ $msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.', $user, $typedesc, $type, $_POST['object']);
60	60	syslog(LOG_INFO, $msg);
61	61	foreach ($logs as $log)
62	62	syslog(LOG_INFO, "$user: milter $log");
63	63
64	64	/* Store new values */
65		- if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
66		- exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
	65	+ if (($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE)
	66	+ exit ($user.': Connect Error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
67	67
68		- if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
	68	+ if (changeMilter($mysqli, $user, $values, $col, $_POST['miltId']))
69	69	print 'OK milter setting changed.';
70	70	else
71	71	print 'ERROR updating milter setting; check your syslog. No changes made.';

		@@ -4,8 +4,9 @@ discard block
		block discarded – undo
4	4	$typedesc=$_POST['type'];
5	5	$type = $tables["$typedesc"]['field'];
6	6	$col = milterTable($type);
7		-if ( $col === FALSE )
	7	+if ( $col === FALSE ) {
8	8	exit ("<p>Error in you config at field <b>$type</b>.</p>");
	9	+}
9	10	?>
10	11	<td colspan="10" style="text-align: center">
11	12
		@@ -14,31 +15,35 @@ discard block
		block discarded – undo
14	15	$user = $_POST['user'];
15	16
16	17	/* Compare old values with new ones */
17		-if (isset($_POST['newvalues']))
	18	+if (isset($_POST['newvalues'])) {
18	19	$new = $_POST['newvalues'];
19		-else
	20	+} else {
20	21	$new = array();
21		-if (! empty($_POST['oldvalues']))
	22	+}
	23	+if (! empty($_POST['oldvalues'])) {
22	24	$old = explode(',', $_POST['oldvalues']);
23		-else
	25	+} else {
24	26	$old=array();
	27	+}
25	28	$values=array();
26	29	$logs=array();
27	30
28	31	print '<pre>';
29	32	/* Check need to disable all milters, removing unnecessary setting */
30		-if ( in_array('DISABLE ALL', $new) )
	33	+if ( in_array('DISABLE ALL', $new) ) {
31	34	$new = array('DISABLE ALL');
	35	+}
32	36
33	37	/* Compare the values determining what to do */
34	38	if (count(array_diff(array_merge($new, $old), array_intersect($new, $old))) !== 0) {
35	39	/* New and old are different (we assume we don't have duplicate values) */
36	40	if (! empty($new) ) {
37	41	foreach ($new as $item) {
38		- if ( in_array($item, $old) )
39		- $values["$item"] = 'keep';
40		- else
41		- $values["$item"] = 'add';
	42	+ if ( in_array($item, $old) ) {
	43	+ $values["$item"] = 'keep';
	44	+ } else {
	45	+ $values["$item"] = 'add';
	46	+ }
42	47	$logs[] = "<$item>: ". $values["$item"];
43	48	}
44	49	}
		@@ -53,22 +58,25 @@ discard block
		block discarded – undo
53	58	}
54	59
55	60	/* Logging */
56		-if ( empty($values) )
	61	+if ( empty($values) ) {
57	62	print 'No values to change.';
58		-else {
	63	+} else {
59	64	$msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.',$user,$typedesc,$type, $_POST['object']);
60	65	syslog(LOG_INFO, $msg);
61		- foreach ($logs as $log)
62		- syslog(LOG_INFO, "$user: milter $log");
	66	+ foreach ($logs as $log) {
	67	+ syslog(LOG_INFO, "$user: milter $log");
	68	+ }
63	69
64	70	/* Store new values */
65		- if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
66		- exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
	71	+ if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
	72	+ exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
	73	+ }
67	74
68		- if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
69		- print 'OK milter setting changed.';
70		- else
71		- print 'ERROR updating milter setting; check your syslog. No changes made.';
	75	+ if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId'])) {
	76	+ print 'OK milter setting changed.';
	77	+ } else {
	78	+ print 'ERROR updating milter setting; check your syslog. No changes made.';
	79	+ }
72	80
73	81	$mysqli->close();
74	82	}

		@@ -1,18 +1,18 @@
		block discarded – undo
1	1	<?php
2		-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
	2	+if (in_array($user, array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
3	3	else $extopt = NULL;
4	4
5		-if ( $tables["$typedesc"]['milter'] ) {
6		- if ( checkMilterConf($tables["$typedesc"]) )
	5	+if ($tables["$typedesc"]['milter']) {
	6	+ if (checkMilterConf($tables["$typedesc"]))
7	7	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>';
8	8	else {
9	9	$err = "Error in config about <$typedesc>. Check at your config.php.";
10		- syslog (LOG_EMERG, $err);
11		- printf ('<p>%s</p>', htmlspecialchars($err) );
	10	+ syslog(LOG_EMERG, $err);
	11	+ printf('<p>%s</p>', htmlspecialchars($err));
12	12	}
13	13	}
14	14	?>
15	15	<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;" />
16	16
17	17	List <?php echo $typedesc.' <'.$value.'>'; ?> for <input name="type" type="hidden" value="<?php echo $typedesc; ?>" /><input name="value" type="hidden" class="input_text" value="<?php echo $value; ?>" />
18		- <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>
	18	+ <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>

		@@ -1,11 +1,14 @@
		block discarded – undo
1	1	<?php
2		-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
3		-else $extopt = NULL;
	2	+if (in_array($user,array_keys(array_filter($adm)))) {
	3	+ $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
	4	+} else {
	5	+ $extopt = NULL;
	6	+}
4	7
5	8	if ( $tables["$typedesc"]['milter'] ) {
6		- if ( checkMilterConf($tables["$typedesc"]) )
7		- 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>';
8		- else {
	9	+ if ( checkMilterConf($tables["$typedesc"]) ) {
	10	+ 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>';
	11	+ } else {
9	12	$err = "Error in config about <$typedesc>. Check at your config.php.";
10	13	syslog (LOG_EMERG, $err);
11	14	printf ('<p>%s</p>', htmlspecialchars($err) );

		@@ -11,11 +11,11 @@
		block discarded – undo
11	11	openlog($tag, LOG_PID, $fac);
12	12	if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
13	13	if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
14		- exit('ERROR: <'.htmlentities($_POST['reason'],ENT_COMPAT \| ENT_HTML401, 'ISO-8859-1').'> contains NON ASCII chars.</td>');
	14	+ exit('ERROR: <'.htmlentities($_POST['reason'],ENT_COMPAT \| ENT_HTML401, 'ISO-8859-1').'> contains NON ASCII chars.</td>');
15	15	$user = username();
16	16
17	17	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
18		- exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
	18	+ exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
19	19
20	20	if (isFull($mysqli,$typedesc,$tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
21	21	if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2	require_once('config.php');
3	3	require_once('function.php');
4		-$typedesc=$_POST['type'];
	4	+$typedesc = $_POST['type'];
5	5	$type = $tables["$typedesc"]['field'];
6	6	$table = ($tables["$typedesc"]['milter']) ? milterTable($type) : $tables["$typedesc"]['name'];
7	7	$cl = ($tables["$typedesc"]['milter']) ? 10 : 9;
		@@ -10,15 +10,15 @@ discard block
		block discarded – undo
10	10	<?php
11	11	openlog($tag, LOG_PID, $fac);
12	12	if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
13		-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
14		- exit('ERROR: <'.htmlentities($_POST['reason'],ENT_COMPAT \| ENT_HTML401, 'ISO-8859-1').'> contains NON ASCII chars.</td>');
	13	+if (preg_match('/[^\x20-\x7f]/', $_POST['reason']))
	14	+ exit('ERROR: <'.htmlentities($_POST['reason'], ENT_COMPAT \| ENT_HTML401, 'ISO-8859-1').'> contains NON ASCII chars.</td>');
15	15	$user = username();
16	16
17		-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
18		- exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
	17	+if (($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE)
	18	+ exit ($user.': Connect Error ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
19	19
20		-if (isFull($mysqli,$typedesc,$tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
21		-if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
	20	+if (isFull($mysqli, $typedesc, $tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.'));
	21	+if (relist($mysqli, username(), $_POST['value'], $type, $table, $_POST['unit'], $_POST['quantity'], $_POST['reason']))
22	22	print 'OK '.$_POST["type"].' <'.$_POST['value'].'> relisted for '.$_POST['quantity'].$_POST['unit'];
23	23	else
24	24	print 'ERROR in relist; check log';

falon / RBL

GitHub Access Token became invalid

Push — master ( 9659fc...cb82fe )

Status

Category

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

Braces +136 added lines, -67 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

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

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

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

Braces +107 added lines, -61 removed lines patch added patch discarded remove patch

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

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

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

Braces +128 added lines, -84 removed lines patch added patch discarded remove patch

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

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

Braces +28 added lines, -20 removed lines patch added patch discarded remove patch

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

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

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

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

Braces +13 added lines, -6 removed lines patch added patch discarded remove patch

		@@ -9,19 +9,26 @@
		block discarded – undo
9	9	<td colspan="<?php echo $cl; ?>" style="text-align: center">
10	10	<?php
11	11	openlog($tag, LOG_PID, $fac);
12		-if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
13		-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
	12	+if (empty($_POST['reason'])) {
	13	+ die ("Specify a reason, please!</td>");
	14	+}
	15	+if (preg_match( '/[^\x20-\x7f]/', $_POST['reason'])) {
14	16	exit('ERROR: <'.htmlentities($_POST['reason'],ENT_COMPAT \| ENT_HTML401, 'ISO-8859-1').'> contains NON ASCII chars.</td>');
	17	+}
15	18	$user = username();
16	19
17		-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
	20	+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
18	21	exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
	22	+}
19	23
20		-if (isFull($mysqli,$typedesc,$tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
21		-if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
	24	+if (isFull($mysqli,$typedesc,$tables)) {
	25	+ die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
	26	+}
	27	+if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason'])) {
22	28	print 'OK '.$_POST["type"].' <'.$_POST['value'].'> relisted for '.$_POST['quantity'].$_POST['unit'];
23		-else
	29	+} else {
24	30	print 'ERROR in relist; check log';
	31	+}
25	32	$mysqli->close();
26	33	closelog();
27	34	print '</td>';