falon / RBL

contrib/ipImap/function.php

Doc Comments +23 added lines

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

Indentation +121 added lines, -121 removed lines

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

contrib/ipImap/report/calendar/calendar_functions.php

Doc Comments +3 added lines

@@ -1,4 +1,7 @@
 <?php

+/**
+ * @param string $str
+ */
 function filterInput($str, $type = "text"){

 	switch(strtolower($type)){

 		case "number":

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

Doc Comments +20 added lines

@@ -122,6 +122,11 @@ 
     }

 

 	//get the total day of each month in year

+
+    /**
+     * @param integer $month
+     * @param integer $year
+     */
     function total_days($month,$year){

     	$days = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);

 		if($month > 0 && $year > 0){

@@ -170,6 +175,12 @@ 
 	}

 

 	//set default selected date

+
+	/**
+	 * @param integer $day
+	 * @param integer $month
+	 * @param integer $year
+	 */
 	function setDate($day, $month, $year){

 		//get system timezone before set the date

 		$this->system_timezone = date_default_timezone_get();

@@ -516,6 +527,9 @@ 
 		return $str;

 	}

 

+	/**
+	 * @param string $suffix
+	 */
 	function eHidden($suffix, $value) {

 		if(trim($value) != ""){

 			if($suffix) $suffix = "_".$suffix;

@@ -849,6 +863,9 @@ 
 		return true;

 	}

 

+	/**
+	 * @return string
+	 */
 	function check_json_encode($obj){

 		//try customize to get it work, should replace with better solution in the future

 		if(is_array($obj)){

@@ -997,6 +1014,9 @@ 
 		}

 	}

 

+	/**
+	 * @param string $tz
+	 */
 	function setTimezone($tz){

 		$this->timezone = $tz;

 		@date_default_timezone_set($tz);

Indentation +7 added lines, -7 removed lines

@@ -117,17 +117,17 @@
 

 	//check for leapyear

 	function is_leapyear($year){

-    	return ($year % 4 == 0) ?

-    		!($year % 100 == 0 && $year % 400 <> 0)	: false;

-    }

+		return ($year % 4 == 0) ?

+			!($year % 100 == 0 && $year % 400 <> 0)	: false;

+	}

 

 	//get the total day of each month in year

-    function total_days($month,$year){

-    	$days = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);

+	function total_days($month,$year){

+		$days = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);

 		if($month > 0 && $year > 0){

-	    	return ($month == 2 && $this->is_leapYear($year)) ? 29 : $days[$month-1];

+			return ($month == 2 && $this->is_leapYear($year)) ? 29 : $days[$month-1];

 		}else return 31;

-    }

+	}

 

 	//Deprecate since v1.6

 	function getDayNum($day){

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

Doc Comments +14 added lines

@@ -54,6 +54,9 @@ 
 		}

 	}

 

+	/**
+	 * @return string
+	 */
 	function getDate($format = "Y-m-d", $cdate = ""){

 		if(!$this->compatible){

 			return tc_date_main::getDate($format, $cdate);

@@ -123,6 +126,9 @@ 
 		}

 	}

 

+	/**
+	 * @param string $timespan
+	 */
 	function addDate($format = "Y-m-d", $timespan, $cdate = ""){

 		if($this->compatible){

 			$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;

@@ -148,6 +154,10 @@ 
 

 	//check if date1 is before date2

 	//if date1 omitted use set date

+
+	/**
+	 * @param string|boolean $date2
+	 */
 	function dateBefore($date2, $date1 = "", $equal = true){

 		if(!$this->compatible){

 			return tc_date_main::dateBefore($date2, $date1, $equal);

@@ -162,6 +172,10 @@ 
 

 	//check if date1 is after date2

 	//if date1 omitted use set date

+
+	/**
+	 * @param string|boolean $date2
+	 */
 	function dateAfter($date2, $date1 = "", $equal = true){

 		if(!$this->compatible){

 			return tc_date_main::dateAfter($date2, $date1, $equal);

function.php

Doc Comments +8 added lines

@@ -204,6 +204,11 @@ 
 }
 
 
+/**
+ * @param integer $id
+ * @param string $what
+ * @param boolean $lock
+ */
 function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
 
 	switch ($what) {
@@ -404,6 +409,9 @@ 
 }
 
 
+/**
+ * @param string $reason
+ */
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
 
 /* Search and list value */

Indentation +137 added lines, -137 removed lines

@@ -4,8 +4,8 @@ 
 
 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;
 }
 
@@ -34,7 +34,7 @@ 
 
 	  case 'network':
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -47,10 +47,10 @@ 
                         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` ,
@@ -65,8 +65,8 @@ 
 	}
 
 	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;
@@ -76,9 +76,9 @@ 
 
 	$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),
@@ -86,9 +86,9 @@ 
 			`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),
@@ -97,7 +97,7 @@ 
                         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),
@@ -106,19 +106,19 @@ 
 			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) {
-        $result=FALSE;
+		$result=FALSE;
 
-        switch ($type) {
-          case 'ip':
+		switch ($type) {
+		  case 'ip':
 		$query = sprintf("DELETE FROM `$table` WHERE
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
@@ -134,18 +134,18 @@ 
 	}
 
 
-        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':
@@ -156,16 +156,16 @@ 
 		$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;
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
 		/* QUERY */
@@ -174,11 +174,11 @@ 
 		/* 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());
@@ -190,7 +190,7 @@ 
 	}
 	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;
 }
 
 
@@ -231,7 +231,7 @@ 
 		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;
@@ -248,28 +248,28 @@ 
 function searchentry ($myconn,$value,$tablelist) {
 /* Make a MYSQL query and return result */
 
-        $type = $tablelist['field'];
-        $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= 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
-                        break;
-                  default:
-                        $query= "select * from $table where $type = '$value'";
-                }
-        }
+		$type = $tablelist['field'];
+		$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= 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
+						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) {
@@ -285,10 +285,10 @@ 
 
 
 function isFull($myconn,$typedesc,$alltables) {
-        if (isset($alltables["$typedesc"]['limit'])) {
-                if ( countListed($myconn,$alltables["$typedesc"]['name']) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
-        }
+		if (isset($alltables["$typedesc"]['limit'])) {
+				if ( countListed($myconn,$alltables["$typedesc"]['name']) >= $alltables["$typedesc"]['limit'] ) 
+						return TRUE;
+		}
 	return FALSE;
 }
 
@@ -301,14 +301,14 @@ 
 	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 '<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;
-        		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';
@@ -327,9 +327,9 @@ 
 					$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 {
@@ -347,15 +347,15 @@ 
 
 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']);
@@ -364,36 +364,36 @@ 
 	$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! */
 	$params = NULL;
-        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) {
@@ -407,59 +407,59 @@ 
 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;
-        }
-
-        /* 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! */
+		$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 */
+
+
+		/* 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);
+		}
 }
 
 

result.php

Indentation +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
 
 if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
-        if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
+		if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid domain.</pre>');
 
 if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') )
@@ -26,8 +26,8 @@ 
 }
 
 if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
-                exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
+		if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
+				exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
 	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
 		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
 	switch ( $_POST['Value'] ) {
@@ -49,10 +49,10 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 
 syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;

remove.php

Indentation +3 added lines, -3 removed lines

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

list.php

Indentation +6 added lines, -6 removed lines

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

relist.php

Indentation +6 added lines, -6 removed lines

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