falon / RBL

contrib/ipImap/report/calendar/calendar_functions.php

Spacing +9 added lines, -9 removed lines

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

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

-	switch(strtolower($type)){

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

+	switch (strtolower($type)) {

 		case "number":

-			if(is_numeric($str))

+			if (is_numeric($str))

 				return array(true, $str);

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

 			break;

 		case "boolean":

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

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

 				return array(true, $str);

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

 			break;

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

 }

 

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

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

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

 

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

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

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

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

 		return $result_txt;

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

 }

 

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

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

 	$content = $txt;

 

 	//$content = unhtmlentities($content);

 	$content = htmlspecialchars_decode($content, ENT_QUOTES);

 

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

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

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

 	}

 

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

 	$content = stripslashes($content);

 

-	if(!$allow_tag){

+	if (!$allow_tag) {

 		$content = strip_tags($content);

 	}

 

contrib/ipImap/report/calendar/calendar_info.php

Spacing +12 added lines, -12 removed lines

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

 require_once("classes/tc_date.php");

 

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

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

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

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

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

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

 

 $tobj = new tc_calendar("");

 $version = $tobj->version;

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

 $tdate = new tc_date();

 

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

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

 

 $wan_enabled = 0;

 $new_version = 0;

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

-	if($check_version && $wan_enabled){

-		if(function_exists("file_get_contents")){

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

+	if ($check_version && $wan_enabled) {

+		if (function_exists("file_get_contents")) {

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

 		}

 	}

 }

-elseif(function_exists("file_get_contents")){

+elseif (function_exists("file_get_contents")) {

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

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

-	if($check_version && $wan_enabled){

-		if(function_exists("file_get_contents")){

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

+	if ($check_version && $wan_enabled) {

+		if (function_exists("file_get_contents")) {

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

 		}

 	}

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

 

 ?>

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

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

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

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

     <script>

contrib/ipImap/report/calendar/calendar_form.php

Spacing +155 added lines, -155 removed lines

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

 $timezone = getParameter("tmz");

 

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

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

 @date_default_timezone_set($timezone);

 

 $cdate = new tc_date();

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

 $sly = getParameter("selected_year");

 

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

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

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

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

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

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

 

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

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

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

 

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

-if(!$show_not_allow){

+if (!$show_not_allow) {

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

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

 }

 

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

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

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

-else{

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

+else {

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

 		$m = $slm;

-	}else{

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

+	}else {

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

 			//compare which one is more

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

-			if($year_allow2 >= $year_end){

+			if ($year_allow2>=$year_end) {

 				//use time_allow2

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

-			}else{

+			}else {

 				//use year_end

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

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

 			}

-		}elseif($ta2_set){

+		}elseif ($ta2_set) {

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

-		}elseif($year_end > 0){

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

-		}else{

+		}elseif ($year_end>0) {

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

+		}else {

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

 		}

 	}

 }

 

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

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

 

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

 

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

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

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

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

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

 

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

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

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

 else

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

 

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

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

 

 // ensure m-y fits date allow range

 if (!$show_not_allow) {

 	if ($ta1_set) {

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

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

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

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

 	}

 	if ($ta2_set) {

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

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

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

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

 	}

 }

 

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

 

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

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

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

 

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

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

-	if($time_allow1 != ""){

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

+	if ($time_allow1 != "") {

 		//get date of time allow1

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

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

 			//check valid if today is after date_allow1

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

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

 				//reset default calendar display

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

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

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

 

 //check year display in valid range

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

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

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

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

 

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

 

-if($m == 1){

+if ($m == 1) {

 	$previous_month = 12;

 	$previous_year = $y-1;

-}else{

+}else {

 	$previous_month = $m-1;

 	$previous_year = $y;

 }

 

-if($m == 12){

+if ($m == 12) {

 	$next_month = 1;

 	$next_year = $y+1;

-}else{

+}else {

 	$next_month = $m+1;

 	$next_year = $y;

 }

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

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

 

-if($firstdate == $startDate){

+if ($firstdate == $startDate) {

 	//skip last month

 	$startwrite = $total_lastmonth+1;

-}elseif($firstdate < $startDate){

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

-}else{

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

+}elseif ($firstdate<$startDate) {

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

+}else {

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

 }

 

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

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

 

 //write previous month

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

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

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

 	$dayinweek_counter++;

 

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

 

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

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

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

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

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

 }

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

 

 //check lastmonth is on allowed date

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

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

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

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

 		$show_previous = true;

 	}else $show_previous = false;

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

 

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

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

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

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

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

 }

 

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

 

 $select_days = array();

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

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

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

 

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

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

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

 		$select_days[] = $this_day;

 	}

 }

 

 //write current month

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

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

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

 

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

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

 

 	//check date allowed

-	if($ta1_set && $ta2_set){

+	if ($ta1_set && $ta2_set) {

 		//both date specified

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

-	}elseif($ta1_set){

+	}elseif ($ta1_set) {

 		//only date 1 specified

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

-	}elseif($ta2_set){

+	}elseif ($ta2_set) {

 		//only date 2 specified

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

-	}else{

+	}else {

 		//no date allow specified, assume show all

 		$dateLink = true;

 	}

 

-	if($dateLink){

+	if ($dateLink) {

 		//check for disable days

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

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

 			$dateLink = false;

 		}

 	}

 

 	//check specific date

-	if($dateLink){

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

+	if ($dateLink) {

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

 			//check if it is current date

 			$sp_found = false;

 

 			//check on yearly recursive

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

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

-					if($sp_time != ""){

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

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

-						if($sp_time_md == $this_md){

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

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

+					if ($sp_time != "") {

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

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

+						if ($sp_time_md == $this_md) {

 							$sp_found = true;

 							break;

 						}

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

 

 			//check on monthly recursive

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

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

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

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

-						if($sp_time_d == $day){

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

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

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

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

+						if ($sp_time_d == $day) {

 							$sp_found = true;

 							break;

 						}

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

 

 			//check on no recursive

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

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

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

 			}

 

-			switch($sp_type){

+			switch ($sp_type) {

 				case 0:

 				default:

 					//disabled specific and enabled others

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

 	}

 

-	if($date_pair_value){

+	if ($date_pair_value) {

 		//check date_pair1 & 2

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

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

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

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

 				$htmlClass[] = "select";

 		}

 

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

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

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

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

 				$htmlClass[] = "select";

 		}

 	}

 

 	$htmlClass[] = strtolower($day_txt);

 

-	if($dateLink){

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

+	if ($dateLink) {

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

 			$htmlClass[] = "select";

 		}

 

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

 

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

-	}else{

+	}else {

 		$htmlClass[] = "disabledate";

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

 

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

 

 		//check if selected date is a disabled date

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

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

 			//disabled

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

 		}

 	}

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

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

 		$row_count++;

 

 		$dayinweek_counter = 0;

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

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

 

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

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

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

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

 }

 

 //write next other month

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

-if($write_end_days > 0){

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

+if ($write_end_days>0) {

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

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

 

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

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

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

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

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

 	}

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

 

 //write fulfil row to 6 rows

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

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

 	$tmpday = $write_end_days+1;

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

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

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

 

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

 

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

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

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

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

 	}

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

 

 //check next month is on allowed date

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

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

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

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

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

 		$show_next = true;

 	}else $show_next = false;

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

 ?>

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

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

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

 <head>

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

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

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

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

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

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

 <?php } ?>

 <script type="text/javascript">

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

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

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

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

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

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

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

 

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

 //-->

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

 	<?php

 	//write auto submit script

-	if($auto_submit){

+	if ($auto_submit) {

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

-		if($form_name){

+		if ($form_name) {

 			//submit value by post form

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

-		}elseif($target_url){

+		}elseif ($target_url) {

 			//submit value by get method

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

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

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

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

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

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

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

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

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

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

 		<?php } ?>

 

 		<?php

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

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

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

 		}

 		?>

 

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

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

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

 			<tr>

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

 					<?php

 					$monthnames = $cobj->getMonthNames();

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

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

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

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

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

 					}

 					?>

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

 

 					//write year options

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

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

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

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

 					}

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

 				</tr>

 			</table>

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

-

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

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

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

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

-

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

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

-

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

-

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

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

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

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

-

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

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

-

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

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

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

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

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

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

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

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

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

+

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

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

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

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

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

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

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

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

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

+

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

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

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

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

+

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

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

+

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

+

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

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

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

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

+

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

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

+

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

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

 

 			<!-- focus var //-->

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

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

 

 			//write calendar day header

-			foreach($day_headers as $dh){

+			foreach ($day_headers as $dh) {

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

 			}

 			echo("</tr>");

 

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

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

 				echo("<tr>");

 

-				if ($show_weeks){

+				if ($show_weeks) {

 					asort($week_rows[$row]);

 

 					//get week number with highest member

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

 				}

 

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

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

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

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

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

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

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

 

-					if($this_link){

+					if ($this_link) {

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

-					}else{

+					}else {

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

 					}

 				}

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

 

 		<?php

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

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

 		?>

 		<div id="calendar-footer">

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

 				<?php

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

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

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

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

 				<?php

 				}else echo("&nbsp;");

 				?>

 			</div>

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

 				<?php

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

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

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

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

 				<?php

 				}else echo("&nbsp;");

 				?>

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

 				$footer_links = array();

 

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

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

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

 

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

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

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

 

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

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

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

 				}

 				?>

contrib/ipImap/getip.php

Spacing +16 added lines, -16 removed lines

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

contrib/expire.php

Spacing +4 added lines, -4 removed lines

@@ -15,15 +15,15 @@
 openlog($tag, LOG_PID, $fac);
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+            syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
-            die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            die($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
 
-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
 
-expire($mysqli,$user,$tables,$expireTime);
+expire($mysqli, $user, $tables, $expireTime);
 $mysqli->close();
 closelog();
 ?>

delist.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
         $type = $tables["$typedesc"]['field'];
         $table = $tables["$typedesc"]['name'];
 ?>
@@ -11,14 +11,14 @@ 
 $user = username();
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
         if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+            syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            exit ($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
-syslog(LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info) ;
+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
 
-if (changestatus($mysqli,username(),$_POST['value'],'0',$type,$table))
+if (changestatus($mysqli, username(), $_POST['value'], '0', $type, $table))
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; delisted.';
 else
  print 'ERROR in delist &lt;'.$_POST['value'].'&gt;; check log';

relistForm.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
-        $typedesc=$_POST["typedesc"];
+        $typedesc = $_POST["typedesc"];
         $type = $tables["$typedesc"]['field'];
         $table = $tables["$typedesc"]['name'];
 	$adm = unserialize($_POST["adm"]);
-	if (in_array($_POST["user"],array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+	if (in_array($_POST["user"], array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
 	else $extopt = NULL;
 ?>
 

lookup.php

Spacing +1 added lines, -1 removed lines

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

function.php

Spacing +104 added lines, -104 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 
-$version='1.9d';
+$version = '1.9d';
 
 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 addtolist ($myconn,$user,$value,$type,$table,$expUnit,$expQ,$myreason) {
+function addtolist($myconn, $user, $value, $type, $table, $expUnit, $expQ, $myreason) {
 // 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();
 
 	switch ($type) {
 	  case 'ip':
-		$query= sprintf("INSERT INTO `$table` (
+		$query = sprintf("INSERT INTO `$table` (
 			`$type` ,
 			`date` ,
 			`exp` ,
@@ -30,12 +30,12 @@ 
 		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':
-		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` ,
@@ -47,11 +47,11 @@ 
                 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` ,
@@ -62,60 +62,60 @@ 
                 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':
@@ -123,10 +123,10 @@ 
                         `$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
@@ -134,39 +134,39 @@ 
 	}
 
 
-        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 */
@@ -185,11 +185,11 @@ 
 			} 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;
 }
@@ -197,22 +197,22 @@ 
 
 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 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':
@@ -221,17 +221,17 @@ 
 }
 
 
-function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
+function consistentListing($myconn, $alltables, $typed, $value, &$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
 	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!";
@@ -239,7 +239,7 @@ 
 					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();
 	}
@@ -247,7 +247,7 @@ 
 	return TRUE;
 }
 
-function searchentry ($myconn,$value,$tablelist) {
+function searchentry($myconn, $value, $tablelist) {
 /* Make a MYSQL query and return result */
 
         $type = $tablelist['field'];
@@ -257,24 +257,24 @@ 
         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= 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
+                        list($sub['net'], $sub['mask']) = explode('/', $value);
+                        $query = 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
                         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);
@@ -285,37 +285,37 @@ 
 }
 
 
-function isFull($myconn,$typedesc,$alltables) {
+function isFull($myconn, $typedesc, $alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-                if ( countListed($myconn,$alltables["$typedesc"]['name']) >= $alltables["$typedesc"]['limit'] ) 
+                if (countListed($myconn, $alltables["$typedesc"]['name'])>=$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;
 
-	$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 '<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><th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
-			$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':
@@ -328,15 +328,15 @@ 
 					$element = $riga["$type"];
 				}
 
-                		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>';
 				
 		}
@@ -346,12 +346,12 @@ 
 }
 
 
-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'])) {
@@ -360,10 +360,10 @@ 
 	}
 
 	$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 */
 
@@ -373,62 +373,62 @@ 
         }
 
         $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;
@@ -443,7 +443,7 @@ 
                 /* 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;
@@ -452,13 +452,13 @@ 
                         /* 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);
         }
 }