Inspection of "Fixed StartPost action" - falon/RBL - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (69a36c)

by Marco

created 2017-04-28 12:06 UTC

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

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

Please login to merge, or discard this patch.

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

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

Please login to merge, or discard this patch.

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

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

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

Please login to merge, or discard this patch.

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

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
-function filterInput($str, $type = "text"){
-	switch(strtolower($type)){
+function filterInput($str, $type = "text") {
+	switch (strtolower($type)) {
 		case "number":
-			if(is_numeric($str))
+			if (is_numeric($str))
 				return array(true, $str);
 			else return array(false, "Invalid input - '$str', required number");
 			break;
 		case "boolean":
-			if($str == "" || $str == 0 || $str == 1 || is_bool($str))
+			if ($str == "" || $str == 0 || $str == 1 || is_bool($str))
 				return array(true, $str);
 			else return array(false, "Invalid input - '$str', required boolean");
 			break;
@@ -19,23 +19,23 @@  discard block
 block discarded – undo
 	}
 }
 
-function getParameter($name, $type='text', $default=""){
+function getParameter($name, $type = 'text', $default = "") {
 	$v = isset($_REQUEST[$name]) ? trim($_REQUEST[$name]) : $default;
 
 	$results = filterInput($v, $type);
 	$result_txt = isset($results[1]) ? $results[1] : "";
-	if(isset($results[0]) && $results[0] === true){
+	if (isset($results[0]) && $results[0] === true) {
 		return $result_txt;
 	}else exit("Error returned '$name' - ".$result_txt);
 }
 
-function getTranslatedTxt($txt, $allow_tag = false, $maps = array()){
+function getTranslatedTxt($txt, $allow_tag = false, $maps = array()) {
 	$content = $txt;
 
 	//$content = unhtmlentities($content);
 	$content = htmlspecialchars_decode($content, ENT_QUOTES);
 
-	foreach($maps as $map_key=>$map_value){
+	foreach ($maps as $map_key=>$map_value) {
 		$content = str_replace($map_key, $map_value, $content);
 	}
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 	$content = stripslashes($content);
 	$content = stripslashes($content);
 
-	if(!$allow_tag){
+	if (!$allow_tag) {
 		$content = strip_tags($content);
 	}
 

Please login to merge, or discard this patch.

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

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

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

Please login to merge, or discard this patch.

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

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 
 require_once('tc_date.php');
 
-class tc_calendar{
+class tc_calendar {
 	public $version = "3.75";
 	public $check_new_version = false;
 
@@ -98,12 +98,12 @@  discard block
 block discarded – undo
 	private $theme = "default";
 
 	//calendar constructor
-	function __construct($objname, $date_picker = false, $show_input = true, $timezone = ""){
+	function __construct($objname, $date_picker = false, $show_input = true, $timezone = "") {
 		$this->objname = $objname;
 		//$this->year_display_from_current = 50;
 		$this->date_picker = $date_picker;
 
-		if($timezone != "") $this->setTimezone($timezone);
+		if ($timezone != "") $this->setTimezone($timezone);
 
 		//set default year display from current year
 		$thisyear = date('Y');
@@ -116,36 +116,36 @@  discard block
 block discarded – undo
 	}
 
 	//check for leapyear
-	function is_leapyear($year){
+	function is_leapyear($year) {
     	return ($year % 4 == 0) ?
-    		!($year % 100 == 0 && $year % 400 <> 0)	: false;
+    		!($year % 100 == 0 && $year % 400 <> 0) : false;
     }
 
 	//get the total day of each month in year
-    function total_days($month,$year){
+    function total_days($month, $year) {
     	$days = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-		if($month > 0 && $year > 0){
+		if ($month>0 && $year>0) {
 	    	return ($month == 2 && $this->is_leapYear($year)) ? 29 : $days[$month-1];
 		}else return 31;
     }
 
 	//Deprecate since v1.6
-	function getDayNum($day){
+	function getDayNum($day) {
 		$headers = $this->getDayHeaders();
 		return isset($headers[$day]) ? $headers[$day] : 0;
 	}
 
 	//get the day headers start from sunday till saturday
-	function getDayHeaders(){
+	function getDayHeaders() {
 		$rtn_hdrs = array();
 		$hdrs = array("0"=>"Su", "1"=>"Mo", "2"=>"Tu", "3"=>"We", "4"=>"Th", "5"=>"Fr", "6"=>"Sa");
 
 		$startdate = $this->startDate;
 
-		for($i=0; $i<=6; $i++){
-			if($startdate >= sizeof($hdrs)) $startdate = 0;
+		for ($i = 0; $i<=6; $i++) {
+			if ($startdate>=sizeof($hdrs)) $startdate = 0;
 			//if(isset($hdrs[(string)$startdate]))
-				$rtn_hdrs[] = $hdrs[(string)$startdate];
+				$rtn_hdrs[] = $hdrs[(string) $startdate];
 
 			$startdate++;
 		}
@@ -153,11 +153,11 @@  discard block
 block discarded – undo
 		return $rtn_hdrs;
 	}
 
-	function setIcon($icon){
+	function setIcon($icon) {
 		$this->icon = $icon;
 	}
 
-	function setText($txt){
+	function setText($txt) {
 		$this->txt = $txt;
 	}
 
@@ -165,12 +165,12 @@  discard block
 block discarded – undo
 	//input the date format according to php date format
 	// for example: 'd F y' or 'Y-m-d'
 	//-----------------------------------------------------------
-	function setDateFormat($format){
+	function setDateFormat($format) {
 		$this->date_format = $format;
 	}
 
 	//set default selected date
-	function setDate($day, $month, $year){
+	function setDate($day, $month, $year) {
 		//get system timezone before set the date
 		$this->system_timezone = date_default_timezone_get();
 		$this->system_timezone_offset = date('Z');
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 		$this->year = $year;
 	}
 
-	function setDateYMD($date){
+	function setDateYMD($date) {
 		list($year, $month, $day) = explode("-", $date, 3);
 		$this->day = $day;
 		$this->month = $month;
@@ -193,52 +193,52 @@  discard block
 block discarded – undo
 	}
 
 	//specified location of the calendar_form.php
-	function setPath($path){
+	function setPath($path) {
 		$last_char = substr($path, strlen($path)-1, strlen($path));
-		if($last_char != "/") $path .= "/";
+		if ($last_char != "/") $path .= "/";
 		$this->path = $path;
 	}
 
-	function writeScript(){
+	function writeScript() {
 		$this->processScript();
 	}
 
-	function getScript(){
+	function getScript() {
 		return $this->processScript(true);
 	}
 
-	function processScript($buffer = false){
+	function processScript($buffer = false) {
 		$str = "";
 
 		//check valid default date
-		if(!$this->checkDefaultDateValid()){
+		if (!$this->checkDefaultDateValid()) {
 			//unset default date
 			$this->setDate(00, 00, 0000);
 		}
 
 		//check date set to the timezone
-		if($this->year>0 && $this->month>0 && $this->day>0){
+		if ($this->year>0 && $this->month>0 && $this->day>0) {
 			//date has been set
-			if($this->timezone != "" && $this->system_timezone != "" && $this->timezone != $this->system_timezone){
+			if ($this->timezone != "" && $this->system_timezone != "" && $this->timezone != $this->system_timezone) {
 				//echo("<br />TZ! ".$this->system_timezone);
 				//echo("<br />OFFSET: ".$this->system_timezone_offset.",".$this->timezone_offset);
 				//timezone has been set and different from system timezone
 				$a_date = $this->year."-".$this->month."-".$this->day." ".$this->system_timezone_h.":".$this->system_timezone_i.":".$this->system_timezone_s;
 				//echo(", date: $a_date");
 
-				if ((version_compare(PHP_VERSION, '5.3.0') <= 0 && checkdate($this->month, $this->day, $this->year)) || true) {
+				if ((version_compare(PHP_VERSION, '5.3.0')<=0 && checkdate($this->month, $this->day, $this->year)) || true) {
 					//get the timezone difference
 					$tz_sys_ms = $this->system_timezone_offset;
 					$tz_new_ms = $this->timezone_offset;
 
-					if($tz_sys_ms>=0 && $tz_new_ms<=0){
+					if ($tz_sys_ms>=0 && $tz_new_ms<=0) {
 						$timezone_diff = 0-($tz_sys_ms+abs($tz_new_ms));
-					}elseif($tz_sys_ms<=0 && $tz_new_ms>=0){
+					}elseif ($tz_sys_ms<=0 && $tz_new_ms>=0) {
 						$timezone_diff = abs($tz_sys_ms)+$tz_new_ms;
-					}else{
+					}else {
 						$timezone_diff = $tz_sys_ms-$tz_new_ms;
 					}
-					$timezone_diff_hr = $timezone_diff/3600;
+					$timezone_diff_hr = $timezone_diff / 3600;
 					//echo("<br />Diff: ".$timezone_diff_hr);
 
 					$a_time = strtotime($a_date);
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
 					$this->year = date("Y", $n_time);
 					$this->month = date("m", $n_time);
 					$this->day = date("d", $n_time);
-				}else{
+				}else {
 					$date = new DateTime($a_date, new DateTimeZone($this->system_timezone));
 					$date->setTimezone(new DateTimeZone($this->timezone));
 					$this->year = $date->format('Y');
@@ -269,21 +269,21 @@  discard block
 block discarded – undo
 		$str .= $this->writeHidden();
 
 		//check whether it is a date picker
-		if($this->date_picker){
+		if ($this->date_picker) {
 			$str .= "<div style=\"position: relative; z-index: ".$this->zindex."; display: inline-block; vertical-align: top;\" id=\"container_".$this->objname."\" onmouseover=\"javascript:focusCalendar('".$this->objname."');\" onmouseout=\"javascript:unFocusCalendar('".$this->objname."', ".$this->zindex.");\">";
 
-			if($this->show_input){
+			if ($this->show_input) {
 				$str .= $this->writeDay();
 				$str .= $this->writeMonth();
 				$str .= $this->writeYear();
-			}else{
+			}else {
 				$str .= " <a href=\"javascript:toggleCalendar('".$this->objname."', ".$this->auto_hide.", ".$this->auto_hide_time.");\" class=\"tclabel\">";
 				$str .= $this->writeDateContainer();
 				$str .= "</a>";
 			}
 
 			$str .= " <a href=\"javascript:toggleCalendar('".$this->objname."', ".$this->auto_hide.", ".$this->auto_hide_time.");\">";
-			if(is_file($this->icon)){
+			if (is_file($this->icon)) {
 				$str .= "<img src=\"".$this->icon."\" id=\"tcbtn_".$this->objname."\" name=\"tcbtn_".$this->objname."\" border=\"0\" align=\"absmiddle\" style=\"vertical-align:middle;\" alt=\"".$this->txt."\" title=\"".$this->txt."\" />";
 			}else $str .= $this->txt;
 			$str .= "</a>";
@@ -291,123 +291,123 @@  discard block
 block discarded – undo
 			$str .= $this->writeCalendarContainer();
 
 			$str .= "</div>";
-		}else{
+		}else {
 			$str .= $this->writeCalendarContainer();
 		}
 
-		if($buffer){
+		if ($buffer) {
 			return $str;
-		}else{
+		}else {
 			echo($str);
 		}
 	}
 
-	function writeCalendarContainer(){
+	function writeCalendarContainer() {
 		$params = array();
 		$params[] = "objname=".$this->objname;
 
 		$param = $this->day;
-		if($param != "") $params[] = "selected_day=".$param;
+		if ($param != "") $params[] = "selected_day=".$param;
 
 		$param = $this->month;
-		if($param != "") $params[] = "selected_month=".$param;
+		if ($param != "") $params[] = "selected_month=".$param;
 
 		$param = $this->year;
-		if($param != "") $params[] = "selected_year=".$param;
+		if ($param != "") $params[] = "selected_year=".$param;
 
 		$param = $this->year_start_input;
-		if($param != "") $params[] = "year_start=".$param;
+		if ($param != "") $params[] = "year_start=".$param;
 
 		$param = $this->year_end_input;
-		if($param != "") $params[] = "year_end=".$param;
+		if ($param != "") $params[] = "year_end=".$param;
 
 		$param = ($this->date_picker) ? 1 : 0;
-		if($param != "") $params[] = "dp=".$param;
+		if ($param != "") $params[] = "dp=".$param;
 
 		$param = $this->time_allow1;
-		if($param != "") $params[] = "da1=".$param;
+		if ($param != "") $params[] = "da1=".$param;
 
 		$param = $this->time_allow2;
-		if($param != "") $params[] = "da2=".$param;
+		if ($param != "") $params[] = "da2=".$param;
 
 		$param = $this->show_not_allow;
-		if($param != "") $params[] = "sna=".$param;
+		if ($param != "") $params[] = "sna=".$param;
 
 		$param = $this->auto_submit;
-		if($param != "") $params[] = "aut=".$param;
+		if ($param != "") $params[] = "aut=".$param;
 
 		$param = $this->form_container;
-		if($param != "") $params[] = "frm=".$param;
+		if ($param != "") $params[] = "frm=".$param;
 
 		$param = $this->target_url;
-		if($param != "") $params[] = "tar=".$param;
+		if ($param != "") $params[] = "tar=".$param;
 
 		$param = $this->show_input;
-		if($param != "") $params[] = "inp=".$param;
+		if ($param != "") $params[] = "inp=".$param;
 
 		$param = $this->date_format;
-		if($param != "") $params[] = "fmt=".$param;
+		if ($param != "") $params[] = "fmt=".$param;
 
 		$param = implode(",", $this->dsb_days);
-		if($param != "") $params[] = "dis=".$param;
+		if ($param != "") $params[] = "dis=".$param;
 
 		$param = $this->date_pair1;
-		if($param != "") $params[] = "pr1=".$param;
+		if ($param != "") $params[] = "pr1=".$param;
 
 		$param = $this->date_pair2;
-		if($param != "") $params[] = "pr2=".$param;
+		if ($param != "") $params[] = "pr2=".$param;
 
 		$param = $this->date_pair_value;
-		if($param != "") $params[] = "prv=".$param;
+		if ($param != "") $params[] = "prv=".$param;
 
 		$param = $this->path;
-		if($param != "") $params[] = "pth=".$param;
+		if ($param != "") $params[] = "pth=".$param;
 
 		$param = htmlspecialchars($this->check_json_encode($this->sp_dates), ENT_QUOTES);
-		if($param != "") $params[] = "spd=".$param;
+		if ($param != "") $params[] = "spd=".$param;
 
 		$param = $this->sp_type;
-		if($param != "") $params[] = "spt=".$param;
+		if ($param != "") $params[] = "spt=".$param;
 
 		$param = rawurlencode($this->tc_onchanged);
-		if($param != "") $params[] = "och=".$param;
+		if ($param != "") $params[] = "och=".$param;
 
 		$param = $this->startDate;
-		if($param != "") $params[] = "str=".$param;
+		if ($param != "") $params[] = "str=".$param;
 
 		$param = $this->rtl;
-		if($param != "") $params[] = "rtl=".$param;
+		if ($param != "") $params[] = "rtl=".$param;
 
 		$param = $this->show_week;
-		if($param != "") $params[] = "wks=".$param;
+		if ($param != "") $params[] = "wks=".$param;
 
 		$param = $this->interval;
-		if($param != "") $params[] = "int=".$param;
+		if ($param != "") $params[] = "int=".$param;
 
 		$param = $this->auto_hide;
-		if($param != "") $params[] = "hid=".$param;
+		if ($param != "") $params[] = "hid=".$param;
 
 		$param = $this->auto_hide_time;
-		if($param != "") $params[] = "hdt=".$param;
+		if ($param != "") $params[] = "hdt=".$param;
 
 		$param = $this->timezone;
-		if($param != "") $params[] = "tmz=".$param;
+		if ($param != "") $params[] = "tmz=".$param;
 
 		//$param = $this->system_timezone;
 		//if($param != "") $params[] = "stz=".$param;
 
 		$param = $this->theme;
-		if($param != "") $params[] = "thm=".$param;
+		if ($param != "") $params[] = "thm=".$param;
 
 		$paramStr = (sizeof($params)>0) ? "?".implode("&", $params) : "";
 
-		if($this->date_picker){
+		if ($this->date_picker) {
 			$div_display = "hidden";
 			$div_position = "absolute";
 
 			$line_height = $this->line_height;
 
-			if(is_file($this->icon)){
+			if (is_file($this->icon)) {
 				$img_attribs = getimagesize($this->icon);
 				$line_height = $img_attribs[1]+2;
 			}
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
 			$div_align = "";
 
 			//adjust alignment
-			switch($this->v_align){
+			switch ($this->v_align) {
 				case "top":
 					$div_align .= "bottom:".$line_height."px;";
 					break;
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
 					$div_align .= "top:".$line_height."px;";
 			}
 
-			switch($this->h_align){
+			switch ($this->h_align) {
 				case "left":
 					$div_align .= "left:0px;";
 					break;
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
 				default:
 					$div_align .= "right:0px;";
 			}
-		}else{
+		}else {
 			$div_display = "visible";
 			$div_position = "relative";
 			$div_align = "";
@@ -452,15 +452,15 @@  discard block
 block discarded – undo
 	}
 
 	//write the select box of days
-	function writeDay(){
+	function writeDay() {
 		$total_days = $this->total_days($this->month, $this->year);
 
 		$str = "";
 		$str .= "<select name=\"".$this->objname."_day\" id=\"".$this->objname."_day\" onChange=\"javascript:tc_setDay('".$this->objname."', this[this.selectedIndex].value);\" class=\"tcday\"".($this->rtl ? " dir=\"rtl\"" : "").">";
 		$str .= "<option value=\"00\"".($this->rtl ? " dir=\"rtl\"" : "").">Day</option>";
-		for($i=1; $i<=$total_days; $i++){
-			$selected = ((int)$this->day == $i) ? " selected='selected'" : "";
-			$str .= "<option value=\"".str_pad($i, 2 , "0", STR_PAD_LEFT)."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$i."</option>";
+		for ($i = 1; $i<=$total_days; $i++) {
+			$selected = ((int) $this->day == $i) ? " selected='selected'" : "";
+			$str .= "<option value=\"".str_pad($i, 2, "0", STR_PAD_LEFT)."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$i."</option>";
 		}
 		$str .= "</select> ";
 
@@ -468,14 +468,14 @@  discard block
 block discarded – undo
 	}
 
 	//write the select box of months
-	function writeMonth(){
+	function writeMonth() {
 		$str = "";
 		$str .= "<select name=\"".$this->objname."_month\" id=\"".$this->objname."_month\" onChange=\"javascript:tc_setMonth('".$this->objname."', this[this.selectedIndex].value);\" class=\"tcmonth\"".($this->rtl ? " dir=\"rtl\"" : "").">";
 		$str .= "<option value=\"00\"".($this->rtl ? " dir=\"rtl\"" : "").">Month</option>";
 
 		$monthnames = $this->getMonthNames();
-		for($i=1; $i<=sizeof($monthnames); $i++){
-			$selected = ((int)$this->month == $i) ? " selected='selected'" : "";
+		for ($i = 1; $i<=sizeof($monthnames); $i++) {
+			$selected = ((int) $this->month == $i) ? " selected='selected'" : "";
 			$str .= "<option value=\"".str_pad($i, 2, "0", STR_PAD_LEFT)."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$monthnames[$i-1]."</option>";
 		}
 		$str .= "</select> ";
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
 	}
 
 	//write the year textbox
-	function writeYear(){
+	function writeYear() {
 		$str = "";
 		//echo("<input type=\"textbox\" name=\"".$this->objname."_year\" id=\"".$this->objname."_year\" value=\"$this->year\" maxlength=4 size=5 onBlur=\"javascript:tc_setYear('".$this->objname."', this.value, '$this->path');\" onKeyPress=\"javascript:if(yearEnter(event)){ tc_setYear('".$this->objname."', this.value, '$this->path'); return false; }\"> ");
 		$str .= "<select name=\"".$this->objname."_year\" id=\"".$this->objname."_year\" onChange=\"javascript:tc_setYear('".$this->objname."', this[this.selectedIndex].value);\" class=\"tcyear\"".($this->rtl ? " dir=\"rtl\"" : "").">";
@@ -494,21 +494,21 @@  discard block
 block discarded – undo
 		$year_end = $this->year_end;
 
 		//check year to be selected in case of time_allow is set
-		if(!$this->show_not_allow && ($this->time_allow1 || $this->time_allow2)){
-			if($this->time_allow1 && $this->time_allow2){
+		if (!$this->show_not_allow && ($this->time_allow1 || $this->time_allow2)) {
+			if ($this->time_allow1 && $this->time_allow2) {
 				$year_start = $this->mydate->getDate("Y", $this->time_allow1);
 				$year_end = $this->mydate->getDate("Y", $this->time_allow2);
-			}elseif($this->time_allow1){
+			}elseif ($this->time_allow1) {
 				//only date 1 specified
 				$year_start = $this->mydate->getDate("Y", $this->time_allow1);
-			}elseif($this->time_allow2){
+			}elseif ($this->time_allow2) {
 				//only date 2 specified
 				$year_end = $this->mydate->getDate("Y", $this->time_allow2);
 			}
 		}
 
-		for($i=$year_end; $i>=$year_start; $i--){
-			$selected = ((int)$this->year == $i) ? " selected='selected'" : "";
+		for ($i = $year_end; $i>=$year_start; $i--) {
+			$selected = ((int) $this->year == $i) ? " selected='selected'" : "";
 			$str .= "<option value=\"".$i."\"".$selected.($this->rtl ? " dir=\"rtl\"" : "").">".$i."</option>";
 		}
 		$str .= "</select> ";
@@ -517,14 +517,14 @@  discard block
 block discarded – undo
 	}
 
 	function eHidden($suffix, $value) {
-		if(trim($value) != ""){
-			if($suffix) $suffix = "_".$suffix;
+		if (trim($value) != "") {
+			if ($suffix) $suffix = "_".$suffix;
 			return "<input type=\"hidden\" name=\"".$this->objname.$suffix."\" id=\"".$this->objname.$suffix."\" value=\"".$value."\" />";
 		}
 	}
 
 	//write hidden components
-	function writeHidden(){
+	function writeHidden() {
 		$str = "";
 
 		$str .= $this->eHidden('', $this->getDate());
@@ -574,8 +574,8 @@  discard block
 block discarded – undo
 	// Deprecated since version 2.9
 	// Auto sizing is applied
 	//---------------------------
-	function setWidth($width){
-		if($width) $this->width = $width;
+	function setWidth($width) {
+		if ($width) $this->width = $width;
 	}
 
 	//set height of calendar
@@ -583,27 +583,27 @@  discard block
 block discarded – undo
 	// Deprecated since version 2.9
 	// Auto sizing is applied
 	//---------------------------
-	function setHeight($height){
-		if($height) $this->height = $height;
+	function setHeight($height) {
+		if ($height) $this->height = $height;
 	}
 
-	function setYearInterval($start, $end){
+	function setYearInterval($start, $end) {
 		$this->year_start_input = $start;
 		$this->year_end_input = $end;
 
-		if(!$start) $start = $this->year_start;
-		if(!$end) $end = $this->year_end;
+		if (!$start) $start = $this->year_start;
+		if (!$end) $end = $this->year_end;
 
-		if($start < $end){
+		if ($start<$end) {
 			$this->year_start = $start;
 			$this->year_end = $end;
-		}else{
+		}else {
 			$this->year_start = $end;
 			$this->year_end = $start;
 		}
 	}
 
-	function getMonthNames(){
+	function getMonthNames() {
 		return array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");
 	}
 
@@ -611,24 +611,24 @@  discard block
 block discarded – undo
 	// Deprecated since version 3.61
 	// override by startDate()
 	//-------------------------------
-	function startMonday($flag){
+	function startMonday($flag) {
 		//$this->startMonday = $flag;
 
 		//change it so that it will not cause an error after version 3.61
-		if($flag) $this->startDate = 1;
+		if ($flag) $this->startDate = 1;
 	}
 
-	function startDate($num){
-		if(is_numeric($num) && $num >= 0 && $num <= 6)
+	function startDate($num) {
+		if (is_numeric($num) && $num>=0 && $num<=6)
 			$this->startDate = $num;
 	}
 
-	function dateAllow($from = "", $to = "", $show_not_allow = true){
+	function dateAllow($from = "", $to = "", $show_not_allow = true) {
 		$time_from = $this->mydate->validDate($from) ? $from : null;
 		$time_to = $this->mydate->validDate($to) ? $to : null;
 
 		// sanity check, ensure time_from earlier than time_to
-		if($time_from != null && $time_to != null && $this->mydate->dateAfter($time_to, $time_from, true)){
+		if ($time_from != null && $time_to != null && $this->mydate->dateAfter($time_to, $time_from, true)) {
 			$tmp = $time_from;
 			$time_from = $time_to;
 			$time_to = $tmp;
@@ -637,40 +637,40 @@  discard block
 block discarded – undo
 		if ($time_from != null) {
 			$this->time_allow1 = $time_from;
 			$y = $this->mydate->getDate('Y', $time_from);
-			if($this->year_start && $y > $this->year_start) $this->year_start = $y;
+			if ($this->year_start && $y>$this->year_start) $this->year_start = $y;
 
 			//setup year end from year start
-			if($time_to == null && !$this->year_end) $this->year_end = $this->year_start + $this->year_display_from_current;
+			if ($time_to == null && !$this->year_end) $this->year_end = $this->year_start+$this->year_display_from_current;
 		}
 
 		if ($time_to>0) {
 			$this->time_allow2 = $time_to;
 			$y = $this->mydate->getDate('Y', $time_to);
-			if($this->year_end && $y < $this->year_end) $this->year_end = $y;
+			if ($this->year_end && $y<$this->year_end) $this->year_end = $y;
 
 			//setup year start from year end
-			if($time_from == null && !$this->year_start) $this->year_start = $this->year_end - $this->year_display_from_current;
+			if ($time_from == null && !$this->year_start) $this->year_start = $this->year_end-$this->year_display_from_current;
 		}
 
 		$this->show_not_allow = $show_not_allow;
 	}
 
-	function autoSubmit($auto, $form_name, $target = ""){
+	function autoSubmit($auto, $form_name, $target = "") {
 		$this->auto_submit = $auto;
 		$this->form_container = $form_name;
 		$this->target_url = $target;
 	}
 
-	function getDate(){
+	function getDate() {
 		return str_pad($this->year, 4, "0", STR_PAD_LEFT)."-".str_pad($this->month, 2, "0", STR_PAD_LEFT)."-".str_pad($this->day, 2, "0", STR_PAD_LEFT);
 	}
 
-	function showInput($flag){
+	function showInput($flag) {
 		$this->show_input = $flag;
 	}
 
-	function writeDateContainer(){
-		if($this->day && $this->month && $this->year){
+	function writeDateContainer() {
+		if ($this->day && $this->month && $this->year) {
 			$dd = $this->mydate->getDate($this->date_format, $this->year."-".$this->month."-".$this->day);
 		}else $dd = "Select Date";
 
@@ -681,47 +681,47 @@  discard block
 block discarded – undo
 	// This function disable day column as specified value
 	// day values : Sun, Mon, Tue, Wed, Thu, Fri, Sat
 	//------------------------------------------------------
-	function disabledDay($day){
+	function disabledDay($day) {
 		$day = strtolower($day); //make it not case-sensitive
-		if(in_array($day, $this->dsb_days) === false)
+		if (in_array($day, $this->dsb_days) === false)
 			$this->dsb_days[] = $day;
 	}
 
-	function setAlignment($h_align, $v_align){
+	function setAlignment($h_align, $v_align) {
 		$this->h_align = $h_align;
 		$this->v_align = $v_align;
 	}
 
-	function setDatePair($calendar_name1, $calendar_name2, $pair_value = "0000-00-00 00:00:00"){
-		if($calendar_name1 != $this->objname){
+	function setDatePair($calendar_name1, $calendar_name2, $pair_value = "0000-00-00 00:00:00") {
+		if ($calendar_name1 != $this->objname) {
 			$this->date_pair1 = $calendar_name1;
-			if($pair_value != "0000-00-00 00:00:00")
+			if ($pair_value != "0000-00-00 00:00:00")
 				$this->date_pair_value = $pair_value;
-		}elseif($calendar_name2 != $this->objname){
+		}elseif ($calendar_name2 != $this->objname) {
 			$this->date_pair2 = $calendar_name2;
-			if($pair_value != "0000-00-00 00:00:00")
+			if ($pair_value != "0000-00-00 00:00:00")
 				$this->date_pair_value = $pair_value;
 		}
 	}
 
-	function setSpecificDate($dates, $type=0, $recursive=""){
-		if(is_array($dates)){
+	function setSpecificDate($dates, $type = 0, $recursive = "") {
+		if (is_array($dates)) {
 			$recursive = strtolower($recursive);
 
 			//change specific date to time
-			foreach($dates as $sp_date){
-				if($this->mydate->validDate($sp_date)){
-					switch($recursive){
+			foreach ($dates as $sp_date) {
+				if ($this->mydate->validDate($sp_date)) {
+					switch ($recursive) {
 						case "month": //add to monthly
-							if(!in_array($sp_date, $this->sp_dates[1]))
+							if (!in_array($sp_date, $this->sp_dates[1]))
 								$this->sp_dates[1][] = $sp_date;
 							break;
 						case "year": //add to yearly
-							if(!in_array($sp_date, $this->sp_dates[2]))
+							if (!in_array($sp_date, $this->sp_dates[2]))
 								$this->sp_dates[2][] = $sp_date;
 							break;
 						default: //add to no recursive
-							if(!in_array($sp_date, $this->sp_dates[0]))
+							if (!in_array($sp_date, $this->sp_dates[0]))
 								$this->sp_dates[0][] = $sp_date;
 					}
 				}
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
 	}
 	*/
 
-	function checkDefaultDateValid($reset = true){
+	function checkDefaultDateValid($reset = true) {
 		$date_str = $this->year."-".str_pad($this->month, 2, "0", STR_PAD_LEFT)."-".str_pad($this->day, 2, "0", STR_PAD_LEFT);
 		//$default_datetime = $this->mydate->getTimestamp($date_str);
 /*
@@ -776,72 +776,72 @@  discard block
 block discarded – undo
 		$end_interval = $this->year_end."-12-31";
 
 		//check if set date is before start_interval
-		if($this->mydate->dateBefore($start_interval, $date_str)){
+		if ($this->mydate->dateBefore($start_interval, $date_str)) {
 			return false;
 		}
 
 		//check if set date is after end_interval
-		if($this->mydate->dateAfter($end_interval, $date_str)){
+		if ($this->mydate->dateAfter($end_interval, $date_str)) {
 			return false;
 		}
 
 		//check with allow date
-		if($this->time_allow1 && $this->time_allow2){
-			if($this->mydate->dateBefore($this->time_allow1, $date_str, false) || $this->mydate->dateAfter($this->time_allow2, $date_str, false)){
+		if ($this->time_allow1 && $this->time_allow2) {
+			if ($this->mydate->dateBefore($this->time_allow1, $date_str, false) || $this->mydate->dateAfter($this->time_allow2, $date_str, false)) {
 				return false;
 			}
-		}elseif($this->time_allow1){
-			if($this->mydate->dateBefore($this->time_allow1, $date_str, false)) return false;
-		}elseif($this->time_allow2){
-			if($this->mydate->dateAfter($this->time_allow2, $date_str, false)) return false;
+		}elseif ($this->time_allow1) {
+			if ($this->mydate->dateBefore($this->time_allow1, $date_str, false)) return false;
+		}elseif ($this->time_allow2) {
+			if ($this->mydate->dateAfter($this->time_allow2, $date_str, false)) return false;
 		}
 
 		//check with specific date
-		if(is_array($this->sp_dates) && sizeof($this->sp_dates) > 0){
+		if (is_array($this->sp_dates) && sizeof($this->sp_dates)>0) {
 			//check if it is current date
 			$sp_found = false;
 
-			if(isset($this->sp_dates[2])){
-				foreach($this->sp_dates[2] as $sp_time){
+			if (isset($this->sp_dates[2])) {
+				foreach ($this->sp_dates[2] as $sp_time) {
 					$this_md = $this->mydate->getDate("md", $date_str);
 					$sp_time_md = $this->mydate->getDate("md", $sp_time);
-					if($sp_time_md == $this_md){
+					if ($sp_time_md == $this_md) {
 						$sp_found = true;
 						break;
 					}
 				}
 			}
 
-			if(isset($this->sp_dates[1]) && !$sp_found){
-				foreach($this->sp_dates[1] as $sp_time){
+			if (isset($this->sp_dates[1]) && !$sp_found) {
+				foreach ($this->sp_dates[1] as $sp_time) {
 					$sp_time_d = $this->mydate->getDate("d", $sp_time);
-					if($sp_time_d == $this->day){
+					if ($sp_time_d == $this->day) {
 						$sp_found = true;
 						break;
 					}
 				}
 			}
 
-			if(isset($this->sp_dates[0]) && !$sp_found){
+			if (isset($this->sp_dates[0]) && !$sp_found) {
 				$sp_found = in_array($date_str, $this->sp_dates[0]);
 			}
 
-			switch($this->sp_type){
+			switch ($this->sp_type) {
 				case 0:
 				default:
 					//disabled specific and enabled others
-					if($sp_found) return false;
+					if ($sp_found) return false;
 					break;
 				case 1:
 					//enabled specific and disabled others
-					if(!$sp_found) return false;
+					if (!$sp_found) return false;
 					break;
 			}
 		}
 
-		if(is_array($this->dsb_days) && sizeof($this->dsb_days) > 0){
+		if (is_array($this->dsb_days) && sizeof($this->dsb_days)>0) {
 			$day_txt = $this->mydate->getDate("D", $date_str);
-			if(in_array(strtolower($day_txt), $this->dsb_days) !== false){
+			if (in_array(strtolower($day_txt), $this->dsb_days) !== false) {
 				return false;
 			}
 		}
@@ -849,16 +849,16 @@  discard block
 block discarded – undo
 		return true;
 	}
 
-	function check_json_encode($obj){
+	function check_json_encode($obj) {
 		//try customize to get it work, should replace with better solution in the future
-		if(is_array($obj)){
-			if(function_exists("json_encode") && false){
+		if (is_array($obj)) {
+			if (function_exists("json_encode") && false) {
 				return json_encode($obj);
-			}else{
+			}else {
 				//only array is assumed for now
 				$return_arr = array();
-				foreach($obj as $arr){
-					if(is_array($arr) && sizeof($arr)>0)
+				foreach ($obj as $arr) {
+					if (is_array($arr) && sizeof($arr)>0)
 						$return_arr[] = "[\"".implode("\",\"", $arr)."\"]";
 					else $return_arr[] = "[]";
 				}
@@ -870,17 +870,17 @@  discard block
 block discarded – undo
 	function &check_json_decode($str){
 		//should replace with better solution in the future
 
-		if(function_exists("json_decode") && false){
+		if (function_exists("json_decode") && false) {
 			return json_decode($str);
-		}else{
+		}else {
 			//only array is assume for now
 			$str = stripslashes(rawurldecode($str));
 			$str = trim($str);
 
-			if($str && strlen($str) > 2){
+			if ($str && strlen($str)>2) {
 				$str = substr($str, 1, strlen($str)-2);
 
-				if($str && strlen($str) > 2){
+				if ($str && strlen($str)>2) {
 					$str = substr($str, 1, strlen($str)-2);
 
 					$return_arr = array();
@@ -888,15 +888,15 @@  discard block
 block discarded – undo
 					$offset = 0;
 
 					$arr = explode("],[", $str);
-					for($i=0; $i<sizeof($arr); $i++){
+					for ($i = 0; $i<sizeof($arr); $i++) {
 						$this_v = $arr[$i];
-						if($this_v == "")
+						if ($this_v == "")
 							$return_arr[] = array();
-						else{
+						else {
 							$this_arr = explode(",", $this_v);
 
-							for($j=0; $j<sizeof($this_arr); $j++){
-								if(substr($this_arr[$j], 0, 1)=="\"" && substr($this_arr[$j], strlen($this_arr[$j])-1, 1)=="\""){
+							for ($j = 0; $j<sizeof($this_arr); $j++) {
+								if (substr($this_arr[$j], 0, 1) == "\"" && substr($this_arr[$j], strlen($this_arr[$j])-1, 1) == "\"") {
 									$this_arr[$j] = substr($this_arr[$j], 1, strlen($this_arr[$j])-2);
 								}
 							}
@@ -910,17 +910,17 @@  discard block
 block discarded – undo
 		}
 	}
 
-	function setOnChange($value){
+	function setOnChange($value) {
 		$this->tc_onchanged = $value;
 	}
 
-	function showWeeks($flag){
+	function showWeeks($flag) {
 		$this->show_week = $flag;
 	}
 
-	function setAutoHide($auto, $time = ""){
+	function setAutoHide($auto, $time = "") {
 		$this->auto_hide = ($auto) ? 1 : 0;
-		if($time != "" && $time >= 0){
+		if ($time != "" && $time>=0) {
 			$this->auto_hide_time = $time;
 		}
 	}
@@ -928,66 +928,66 @@  discard block
 block discarded – undo
 	//*****************
 	// Validate the today date of calendar
 	//*****************
-	function validTodayDate(){
+	function validTodayDate() {
 		$today = $this->mydate->getDate();
 
 		//check if today is year 2038 and later
-		if(!$this->mydate->compatible && $this->mydate->getDate("Y") >= 2038){
+		if (!$this->mydate->compatible && $this->mydate->getDate("Y")>=2038) {
 			return false;
 		}
 
 		//check if today is in range of date allow
-		if($this->time_allow1 != ""){
+		if ($this->time_allow1 != "") {
 			//check valid if today is after date_allow1
-			if($this->mydate->validDate($this->time_allow1) && !$this->mydate->dateAfter($this->time_allow1, $today))
+			if ($this->mydate->validDate($this->time_allow1) && !$this->mydate->dateAfter($this->time_allow1, $today))
 				return false;
 		}
 
-		if($this->time_allow2 > 0){
+		if ($this->time_allow2>0) {
 			//check valid if today is before date_allow2
-			if($this->mydate->validDate($this->time_allow2) && !$this->mydate->dateBefore($this->time_allow2, $today))
+			if ($this->mydate->validDate($this->time_allow2) && !$this->mydate->dateBefore($this->time_allow2, $today))
 				return false;
 		}
 		return true;
 	}
 
 	//Tooltips
-	function setToolTips($dates, $tooltip="", $recursive=""){
+	function setToolTips($dates, $tooltip = "", $recursive = "") {
 
-		if(is_array($dates)){
+		if (is_array($dates)) {
 			$recursive = strtolower($recursive);
 
 			//change specific date to time
-			foreach($dates as $tt_date){
+			foreach ($dates as $tt_date) {
 				$tt_time = $tt_date;
 //				if($tt_time > 0){
-				switch($recursive){
+				switch ($recursive) {
 					case "year": //add to yearly
-						if(!in_array($tt_time, $this->tt_dates[2])){
+						if (!in_array($tt_time, $this->tt_dates[2])) {
 							$this->tt_dates[2][] = $tt_time;
 							$this->tt_tooltips[2][] = $tooltip;
 						}
-						else{
+						else {
 							$tt_key = array_search($tt_time, $this->tt_dates[2]);
 							$this->tt_tooltips[2][$tt_key] = $this->tt_tooltips[2][$tt_key]."\n".$tooltip;
 						}
 						break;
 					case "month": //add to monthly
-						if(!in_array($tt_time, $this->tt_dates[1])){
+						if (!in_array($tt_time, $this->tt_dates[1])) {
 							$this->tt_dates[1][] = $tt_time;
 							$this->tt_tooltips[1][] = $tooltip;
 						}
-						else{
+						else {
 							$tt_key = array_search($tt_time, $this->tt_dates[1]);
 							$this->tt_tooltips[1][$tt_key] = $this->tt_tooltips[1][$tt_key]."\n".$tooltip;
 						}
 						break;
 					default: //add to no recursive
-						if(!in_array($tt_time, $this->tt_dates[0])){
+						if (!in_array($tt_time, $this->tt_dates[0])) {
 							$this->tt_dates[0][] = $tt_time;
 							$this->tt_tooltips[0][] = $tooltip;
 						}
-						else{
+						else {
 							$tt_key = array_search($tt_time, $this->tt_dates[0]);
 							$this->tt_tooltips[0][$tt_key] = $this->tt_tooltips[0][$tt_key]."\n".$tooltip;
 						}
@@ -997,23 +997,23 @@  discard block
 block discarded – undo
 		}
 	}
 
-	function setTimezone($tz){
+	function setTimezone($tz) {
 		$this->timezone = $tz;
 		@date_default_timezone_set($tz);
 		$this->timezone_offset = date('Z');
 		//echo("new timezone: ".$this->timezone);
 	}
 
-	function setTheme($theme){
+	function setTheme($theme) {
 		$this->theme = $theme;
 	}
 
-	function getThemes(){
+	function getThemes() {
 		$themes = array();
 		$themesDirectory = dir('./css/');
-		while($thname = $themesDirectory->read())
+		while ($thname = $themesDirectory->read())
 		{
-			if(is_dir('./css/'.$thname) && file_exists('./css/'.$thname.'/calendar.css') && !preg_match("/^[\.]/", $thname))
+			if (is_dir('./css/'.$thname) && file_exists('./css/'.$thname.'/calendar.css') && !preg_match("/^[\.]/", $thname))
 			{
 				$themes[$thname] = "./css/".$thname."/calendar.css";
 			};
@@ -1023,7 +1023,7 @@  discard block
 block discarded – undo
 		return $themes;
 	}
 
-	function getThemePath($theme){
+	function getThemePath($theme) {
 		$all_themes = $this->getThemes();
 		return isset($all_themes[$theme]) ? $all_themes[$theme] : "";
 	}

Please login to merge, or discard this patch.

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

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

@@ -54,6 +54,9 @@  discard block
 block discarded – undo
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	function getDate($format = "Y-m-d", $cdate = ""){
 		if(!$this->compatible){
 			return tc_date_main::getDate($format, $cdate);
@@ -123,6 +126,9 @@  discard block
 block discarded – undo
 		}
 	}
 
+	/**
+	 * @param string $timespan
+	 */
 	function addDate($format = "Y-m-d", $timespan, $cdate = ""){
 		if($this->compatible){
 			$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
@@ -148,6 +154,10 @@  discard block
 block discarded – undo
 
 	//check if date1 is before date2
 	//if date1 omitted use set date
+
+	/**
+	 * @param string|boolean $date2
+	 */
 	function dateBefore($date2, $date1 = "", $equal = true){
 		if(!$this->compatible){
 			return tc_date_main::dateBefore($date2, $date1, $equal);
@@ -162,6 +172,10 @@  discard block
 block discarded – undo
 
 	//check if date1 is after date2
 	//if date1 omitted use set date
+
+	/**
+	 * @param string|boolean $date2
+	 */
 	function dateAfter($date2, $date1 = "", $equal = true){
 		if(!$this->compatible){
 			return tc_date_main::dateAfter($date2, $date1, $equal);

Please login to merge, or discard this patch.

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

@@ -7,88 +7,88 @@  discard block
 block discarded – undo
 
 require_once('tc_date_main.php');
 
-class tc_date extends tc_date_main{
+class tc_date extends tc_date_main {
 	var $compatible;
 
-	function tc_date(){
+	function tc_date() {
 		//check if we should use DateTime that comes with 5.3.0 and later
-		if (version_compare(PHP_VERSION, '5.3.0') <= 0) {
+		if (version_compare(PHP_VERSION, '5.3.0')<=0) {
 			$this->compatible = false;
 		}else $this->compatible = true;
 
-		if(!$this->compatible){
+		if (!$this->compatible) {
 			$this->tc_date_main();
-		}else{
+		}else {
 			$this->mydate = new DateTime('now');
 		}
 	}
 
-	function getDayOfWeek($cdate = ""){
-		if(!$this->compatible){
+	function getDayOfWeek($cdate = "") {
+		if (!$this->compatible) {
 			return tc_date_main::getDayOfWeek($cdate);
-		}else{
-			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){
+		}else {
+			if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {
 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
 				return $tmp_date->format('w');
 			}else return "";
 		}
 	}
 
-	function getWeekNumber($cdate = ""){
-		if(!$this->compatible){
+	function getWeekNumber($cdate = "") {
+		if (!$this->compatible) {
 			return tc_date_main::getWeekNumber($cdate);
-		}else{
-			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){
+		}else {
+			if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {
 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
 				return $tmp_date->format('W');
 			}else return "";
 		}
 	}
 
-	function setDate($sdate){
-		if(!$this->compatible){
+	function setDate($sdate) {
+		if (!$this->compatible) {
 			tc_date_main::setDate($sdate);
-		}else{
-			if(tc_date_main::validDate($sdate))
+		}else {
+			if (tc_date_main::validDate($sdate))
 				$this->mydate = new DateTime($sdate);
 		}
 	}
 
-	function getDate($format = "Y-m-d", $cdate = ""){
-		if(!$this->compatible){
+	function getDate($format = "Y-m-d", $cdate = "") {
+		if (!$this->compatible) {
 			return tc_date_main::getDate($format, $cdate);
-		}else{
-			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){
+		}else {
+			if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {
 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
 				return $tmp_date->format($format);
 			}else return "";
 		}
 	}
 
-	function setTimestamp($stime){
-		if(!$this->compatible){
+	function setTimestamp($stime) {
+		if (!$this->compatible) {
 			tc_date_main::setTimestamp($stime);
-		}else{
+		}else {
 			$this->mydate->setTimestamp($stime);
 		}
 	}
 
-	function getTimestamp($cdate = ""){
-		if(!$this->compatible){
+	function getTimestamp($cdate = "") {
+		if (!$this->compatible) {
 			return tc_date_main::getTimestamp($cdate);
-		}else{
-			if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){
+		}else {
+			if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {
 				$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
 				return $tmp_date->getTimestamp();
 			}else return 0;
 		}
 	}
 
-	function getDateFromTimestamp($stime, $format = 'Y-m-d'){
-		if($stime){
-			if(!$this->compatible){
+	function getDateFromTimestamp($stime, $format = 'Y-m-d') {
+		if ($stime) {
+			if (!$this->compatible) {
 				return tc_date_main::getDateFromTimestamp($stime, $format);
-			}else{
+			}else {
 				$tmp_date = new DateTime();
 				$tmp_date->setTimestamp($stime);
 				return $tmp_date->format($format);
@@ -96,35 +96,35 @@  discard block
 block discarded – undo
 		}else return "";
 	}
 
-	function addDay($format = "Y-m-d", $timespan, $cdate = ""){
-		if(!$this->compatible){
+	function addDay($format = "Y-m-d", $timespan, $cdate = "") {
+		if (!$this->compatible) {
 			return tc_date_main::addDay($format, $timespan, $cdate);
-		}else{
+		}else {
 			$timespan = "P".$timespan."D";
 			return $this->addDate($format, $timespan, $cdate);
 		}
 	}
 
-	function addMonth($format = "Y-m-d", $timespan, $cdate = ""){
-		if(!$this->compatible){
+	function addMonth($format = "Y-m-d", $timespan, $cdate = "") {
+		if (!$this->compatible) {
 			return tc_date_main::addMonth($format, $timespan, $cdate);
-		}else{
+		}else {
 			$timespan = "P".$timespan."M";
 			return $this->addDate($format, $timespan, $cdate);
 		}
 	}
 
-	function addYear($format = "Y-m-d", $timespan, $cdate = ""){
-		if(!$this->compatible){
+	function addYear($format = "Y-m-d", $timespan, $cdate = "") {
+		if (!$this->compatible) {
 			return tc_date_main::addYear($format, $timespan, $cdate);
-		}else{
+		}else {
 			$timespan = "P".$timespan."Y";
 			return $this->addDate($format, $timespan, $cdate);
 		}
 	}
 
-	function addDate($format = "Y-m-d", $timespan, $cdate = ""){
-		if($this->compatible){
+	function addDate($format = "Y-m-d", $timespan, $cdate = "") {
+		if ($this->compatible) {
 			$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
 			$tmp_date->add(new DateInterval($timespan));
 			return $tmp_date->format($format);
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
 
 	//return the number of day different between date1 and date2
 	//if date1 omitted use set date
-	function differentDate($date2, $date1 = ""){
-		if(!$this->compatible){
+	function differentDate($date2, $date1 = "") {
+		if (!$this->compatible) {
 			return tc_date_main::differentDate($date2, $date1);
-		}else{
+		}else {
 			$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');
 
 			$date1 = new DateTime($date1);
@@ -148,10 +148,10 @@  discard block
 block discarded – undo
 
 	//check if date1 is before date2
 	//if date1 omitted use set date
-	function dateBefore($date2, $date1 = "", $equal = true){
-		if(!$this->compatible){
+	function dateBefore($date2, $date1 = "", $equal = true) {
+		if (!$this->compatible) {
 			return tc_date_main::dateBefore($date2, $date1, $equal);
-		}else{
+		}else {
 			$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');
 
 			$date1 = new DateTime($date1);
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
 
 	//check if date1 is after date2
 	//if date1 omitted use set date
-	function dateAfter($date2, $date1 = "", $equal = true){
-		if(!$this->compatible){
+	function dateAfter($date2, $date1 = "", $equal = true) {
+		if (!$this->compatible) {
 			return tc_date_main::dateAfter($date2, $date1, $equal);
-		}else{
+		}else {
 			$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');
 
 			$date1 = new DateTime($date1);

Please login to merge, or discard this patch.

function.php 2 patches

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

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

Please login to merge, or discard this patch.

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

@@ -1,24 +1,24 @@  discard block
 block discarded – undo
 <?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;
+	$result = FALSE;
 
 	switch ($type) {
 	  case 'ip':
-		$query= sprintf("INSERT INTO `$table` (
+		$query = sprintf("INSERT INTO `$table` (
 			`$type` ,
 			`date` ,
 			`exp` ,
@@ -29,12 +29,12 @@  discard block
 block discarded – undo
 		VALUES (
 			INET_ATON( '%s' ) ,
 			CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-		)" ,$value,$expUnit,$expQ,$user,$myreason);
+		)", $value, $expUnit, $expQ, $user, $myreason);
 		break;
 
 	  case 'network':
-		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` ,
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
                 VALUES (
                         INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
+                )", $sub['net'], $sub['mask'], $expUnit, $expQ, $user, $myreason);
                 break;
 
 	  default:
-                $query= sprintf("INSERT INTO `$table` (
+                $query = sprintf("INSERT INTO `$table` (
                         `$type` ,
                         `date` ,
                         `exp` ,
@@ -61,61 +61,61 @@  discard block
 block discarded – undo
                 VALUES (
                         '%s' ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$value,$expUnit,$expQ,$user,$myreason);
+                )", $value, $expUnit, $expQ, $user, $myreason);
 	}
 
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
-	    $result=TRUE;
+	    $result = TRUE;
 	}
 	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
-function relist ($myconn,$user,$value,$type,$table,$expUnit,$expQ,$myreason) {
+function relist($myconn, $user, $value, $type, $table, $expUnit, $expQ, $myreason) {
 
-	$result=FALSE;
+	$result = FALSE;
 
         switch ($type) {
 	  case 'ip':
-                $query= sprintf("UPDATE `$table` SET
+                $query = sprintf("UPDATE `$table` SET
 			`active` = '1',
 			`user` = '%s',
 			`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
 			`nlist` = `nlist` + 1,
 			`reason` = '%s'
-			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
+			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $expUnit, $expQ, $myreason, $value);
 		break;
           case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("UPDATE `$table` SET
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+                $query = sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
                         `nlist` = `nlist` + 1,
                         `reason` = '%s'
-                        WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$sub['net'],$sub['mask']);
+                        WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1", $user, $expUnit, $expQ, $myreason, $sub['net'], $sub['mask']);
 		break;
 	  default:
-                $query= sprintf("UPDATE `$table` SET
+                $query = sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
                         `nlist` = `nlist` + 1,
                         `reason` = '%s'
-			WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
+			WHERE `$table`.`$type` = '%s' LIMIT 1", $user, $expUnit, $expQ, $myreason, $value);
 	}
 
         if ($myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
-		$result=TRUE;
+		$result = TRUE;
         }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
-function remove ($myconn,$user,$value,$type,$table) {
-        $result=FALSE;
+function remove($myconn, $user, $value, $type, $table) {
+        $result = FALSE;
 
         switch ($type) {
           case 'ip':
@@ -123,10 +123,10 @@  discard block
 block discarded – undo
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
 		$query = sprintf("DELETE FROM `$table` WHERE
 			`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s') LIMIT 1",
-			$sub['net'],$sub['mask']);
+			$sub['net'], $sub['mask']);
 		break;
 	  default:
 		$query = sprintf("DELETE FROM `$table` WHERE
@@ -134,38 +134,38 @@  discard block
 block discarded – undo
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
+        if ($return = $myconn->query($query) === TRUE) 
             syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 
         return $return;
 }
 
 
-function changestatus ($myconn,$user,$value,$status,$type,$table) {
+function changestatus($myconn, $user, $value, $status, $type, $table) {
 
 	switch ($type) {
           case 'ip':
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user, $sub['net'],$sub['mask']);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1", $user, $sub['net'], $sub['mask']);
 		break;
 	  default:
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1", $user, $value);
 	}
 
-        if ($return=$myconn->query($query) === TRUE) {
+        if ($return = $myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
         }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $return;	
 }
 
 
-function expire ($myconn,$user,$tables,$expireTime) {
-        $return=TRUE;
+function expire($myconn, $user, $tables, $expireTime) {
+        $return = TRUE;
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
 		/* QUERY */
@@ -184,11 +184,11 @@  discard block
 block discarded – undo
 			} while ($myconn->next_result());
 		}
 		else {
-			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
+			syslog(LOG_ERR, "Expire job - Error: ".$myconn->error);
 			$return = FALSE;
 		}
 	}
-	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
+	if (!($return)) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
 	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
         return $return;
 }
@@ -196,21 +196,21 @@  discard block
 block discarded – undo
 
 function isListed($row) {
 
-	$exp=new DateTime($row['exp']);
-	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
+	$exp = new DateTime($row['exp']);
+	$now = new DateTime('NOW');
+	if (($exp>$now) and ($row['active'])) return true;
 	else return false;
 
 }
 
 
-function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
+function ask($myconn, $id, $what, $alltables, $typedesc, $value, $lock, $user, $adm) {
 
 	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':
@@ -219,17 +219,17 @@  discard block
 block discarded – undo
 }
 
 
-function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
+function consistentListing($myconn, $alltables, $typed, $value, &$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
 	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!";
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
 					return FALSE;
 				}
 			}
-			if ( $entry->num_rows > 1 ) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!";}
+			if ($entry->num_rows>1) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!"; }
 		}
 		$entry->free();
 	}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
 	return TRUE;
 }
 
-function searchentry ($myconn,$value,$tablelist) {
+function searchentry($myconn, $value, $tablelist) {
 /* Make a MYSQL query and return result */
 
         $type = $tablelist['field'];
@@ -255,24 +255,24 @@  discard block
 block discarded – undo
         else {
                 switch ($type) {
                   case 'ip':
-                        $query= "select * from $table where $type =  INET_ATON('$value')";
+                        $query = "select * from $table where $type =  INET_ATON('$value')";
                         break;
                   case 'network':
-                        list($sub['net'],$sub['mask'])=explode('/',$value);
-                        $query= '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 */
 	$number = 0;
 	$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";
@@ -284,37 +284,37 @@  discard block
 block discarded – undo
 }
 
 
-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'];
 	$table = $tables["$typedesc"]['name'];
 
-	$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':
@@ -327,15 +327,15 @@  discard block
 block discarded – undo
 					$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>';
 				
 		}
@@ -345,12 +345,12 @@  discard block
 block discarded – undo
 }
 
 
-function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
+function sendEmailWarn($tplf, $from, $to, $sbj, $emailListed, $intervalToExpire, $detail) {
 	$now = time();
-        setlocale (LC_TIME, 'it_IT');
-        $date = date("r",$now);
-	$messageID = md5(uniqid($now,1)) . '@' . $_SERVER["HOSTNAME"];
-	$mua = 'PHP/' . phpversion();
+        setlocale(LC_TIME, 'it_IT');
+        $date = date("r", $now);
+	$messageID = md5(uniqid($now, 1)).'@'.$_SERVER["HOSTNAME"];
+	$mua = 'PHP/'.phpversion();
 
 	/* Parsing headers */
 	if (!file_exists($tplf['header'])) {
@@ -359,10 +359,10 @@  discard block
 block discarded – undo
 	}
 
 	$head_tmpl = file_get_contents($tplf['header']);
-	$arr_tpl_vars = array('{from}','{to}','{date}','{messageID}','{mua}');
-	$arr_tpl_data = array($from,$to,$date,$messageID,$mua);
+	$arr_tpl_vars = array('{from}', '{to}', '{date}', '{messageID}', '{mua}');
+	$arr_tpl_data = array($from, $to, $date, $messageID, $mua);
 	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
-	$headers = preg_replace( '/\r|\n/', "\r\n", $headers );
+	$headers = preg_replace('/\r|\n/', "\r\n", $headers);
 
         /* Parsing body */
 
@@ -372,63 +372,63 @@  discard block
 block discarded – undo
         }
 
         $body_tmpl = file_get_contents($tplf['body']);
-        $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
-        $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
+        $arr_tpl_vars = array('{emailListed}', '{expInterval}', '{reason}');
+        $arr_tpl_data = array($emailListed, $intervalToExpire, $detail);
         $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
-        $body = preg_replace( "/\r|\n/", "\r\n", $body );
-	$body = wordwrap ( $body, 75 , "\r\n" );	
+        $body = preg_replace("/\r|\n/", "\r\n", $body);
+	$body = wordwrap($body, 75, "\r\n");	
 
 	/* Send the mail! */
 	$params = NULL;
-        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 @@  discard block
 block discarded – undo
                 /* Relist value if already present */
                 case 1:
                         /* Entry already listed */
-                        if ( isListed($thisentry) ) {
+                        if (isListed($thisentry)) {
                                 syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
                                 $result->free();
                                 return FALSE;
@@ -452,13 +452,13 @@  discard block
 block discarded – undo
                         /* Entry delisted */
                         $result->free();
 			$quantity *= $thisentry['nlist'];
-                        return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+                        return relist($myconn, $loguser, $value, $type, $table, $unit, $quantity, $reason);
 
 
                 /* First time list value */
                 case 0:
                         $result->free();
-                        return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+                        return addtolist($myconn, $loguser, $value, $type, $table, $unit, $quantity, $reason);
         }
 }
 

Please login to merge, or discard this patch.

result.php 1 patch

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

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

Please login to merge, or discard this patch.

index.php 1 patch

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

@@ -14,10 +14,10 @@  discard block
 block discarded – undo
 require_once('function.php');
 
 
-if ( $require_auth ) if ( username() == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
+if ($require_auth) if (username() == 'unknown') exit ("<p>You MUST configure your server to use authentication.</p>");
 
 
-if ( $imapListActive )
+if ($imapListActive)
 	print ' <p style="text-align: right"><a href="/spamreport" target="_new">SPAM Learn Observer</a></p>';
 
 print <<<END
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
 END;
 
 
-$option=NULL;
+$option = NULL;
 $desc = array_keys($tables);
 foreach ($desc as $description) { 
-	$disabled = $tables["$description"]['active']==TRUE ? '' : ' disabled';  
+	$disabled = $tables["$description"]['active'] == TRUE ? '' : ' disabled';  
 	$option .= '<option value="'.$description."\"$disabled>$description</option>";
 	}
 

Please login to merge, or discard this patch.

remove.php 1 patch

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

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

Please login to merge, or discard this patch.

list.php 1 patch

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

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

Please login to merge, or discard this patch.

		@@ -204,6 +204,11 @@ discard block
		block discarded – undo
204	204	}
205	205
206	206
	207	+/**
	208	+ * @param integer $id
	209	+ * @param string $what
	210	+ * @param boolean $lock
	211	+ */
207	212	function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
208	213
209	214	switch ($what) {
		@@ -404,6 +409,9 @@ discard block
		block discarded – undo
404	409	}
405	410
406	411
	412	+/**
	413	+ * @param string $reason
	414	+ */
407	415	function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
408	416
409	417	/* Search and list value */

GitHub Access Token became invalid

Branch — master (69a36c)

Category

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
1	1	<?php
2		-function filterInput($str, $type = "text"){
3		- switch(strtolower($type)){
	2	+function filterInput($str, $type = "text") {
	3	+ switch (strtolower($type)) {
4	4	case "number":
5		- if(is_numeric($str))
	5	+ if (is_numeric($str))
6	6	return array(true, $str);
7	7	else return array(false, "Invalid input - '$str', required number");
8	8	break;
9	9	case "boolean":
10		- if($str == "" \|\| $str == 0 \|\| $str == 1 \|\| is_bool($str))
	10	+ if ($str == "" \|\| $str == 0 \|\| $str == 1 \|\| is_bool($str))
11	11	return array(true, $str);
12	12	else return array(false, "Invalid input - '$str', required boolean");
13	13	break;
		@@ -19,23 +19,23 @@ discard block
		block discarded – undo
19	19	}
20	20	}
21	21
22		-function getParameter($name, $type='text', $default=""){
	22	+function getParameter($name, $type = 'text', $default = "") {
23	23	$v = isset($_REQUEST[$name]) ? trim($_REQUEST[$name]) : $default;
24	24
25	25	$results = filterInput($v, $type);
26	26	$result_txt = isset($results[1]) ? $results[1] : "";
27		- if(isset($results[0]) && $results[0] === true){
	27	+ if (isset($results[0]) && $results[0] === true) {
28	28	return $result_txt;
29	29	}else exit("Error returned '$name' - ".$result_txt);
30	30	}
31	31
32		-function getTranslatedTxt($txt, $allow_tag = false, $maps = array()){
	32	+function getTranslatedTxt($txt, $allow_tag = false, $maps = array()) {
33	33	$content = $txt;
34	34
35	35	//$content = unhtmlentities($content);
36	36	$content = htmlspecialchars_decode($content, ENT_QUOTES);
37	37
38		- foreach($maps as $map_key=>$map_value){
	38	+ foreach ($maps as $map_key=>$map_value) {
39	39	$content = str_replace($map_key, $map_value, $content);
40	40	}
41	41
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	$content = stripslashes($content);
44	44	$content = stripslashes($content);
45	45
46		- if(!$allow_tag){
	46	+ if (!$allow_tag) {
47	47	$content = strip_tags($content);
48	48	}
49	49

		@@ -54,6 +54,9 @@ discard block
		block discarded – undo
54	54	}
55	55	}
56	56
	57	+ /**
	58	+ * @return string
	59	+ */
57	60	function getDate($format = "Y-m-d", $cdate = ""){
58	61	if(!$this->compatible){
59	62	return tc_date_main::getDate($format, $cdate);
		@@ -123,6 +126,9 @@ discard block
		block discarded – undo
123	126	}
124	127	}
125	128
	129	+ /**
	130	+ * @param string $timespan
	131	+ */
126	132	function addDate($format = "Y-m-d", $timespan, $cdate = ""){
127	133	if($this->compatible){
128	134	$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
		@@ -148,6 +154,10 @@ discard block
		block discarded – undo
148	154
149	155	//check if date1 is before date2
150	156	//if date1 omitted use set date
	157	+
	158	+ /**
	159	+ * @param string\|boolean $date2
	160	+ */
151	161	function dateBefore($date2, $date1 = "", $equal = true){
152	162	if(!$this->compatible){
153	163	return tc_date_main::dateBefore($date2, $date1, $equal);
		@@ -162,6 +172,10 @@ discard block
		block discarded – undo
162	172
163	173	//check if date1 is after date2
164	174	//if date1 omitted use set date
	175	+
	176	+ /**
	177	+ * @param string\|boolean $date2
	178	+ */
165	179	function dateAfter($date2, $date1 = "", $equal = true){
166	180	if(!$this->compatible){
167	181	return tc_date_main::dateAfter($date2, $date1, $equal);

		@@ -7,88 +7,88 @@ discard block
		block discarded – undo
7	7
8	8	require_once('tc_date_main.php');
9	9
10		-class tc_date extends tc_date_main{
	10	+class tc_date extends tc_date_main {
11	11	var $compatible;
12	12
13		- function tc_date(){
	13	+ function tc_date() {
14	14	//check if we should use DateTime that comes with 5.3.0 and later
15		- if (version_compare(PHP_VERSION, '5.3.0') <= 0) {
	15	+ if (version_compare(PHP_VERSION, '5.3.0')<=0) {
16	16	$this->compatible = false;
17	17	}else $this->compatible = true;
18	18
19		- if(!$this->compatible){
	19	+ if (!$this->compatible) {
20	20	$this->tc_date_main();
21		- }else{
	21	+ }else {
22	22	$this->mydate = new DateTime('now');
23	23	}
24	24	}
25	25
26		- function getDayOfWeek($cdate = ""){
27		- if(!$this->compatible){
	26	+ function getDayOfWeek($cdate = "") {
	27	+ if (!$this->compatible) {
28	28	return tc_date_main::getDayOfWeek($cdate);
29		- }else{
30		- if(($cdate != "" && $this->validDate($cdate)) \|\| $cdate == ""){
	29	+ }else {
	30	+ if (($cdate != "" && $this->validDate($cdate)) \|\| $cdate == "") {
31	31	$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
32	32	return $tmp_date->format('w');
33	33	}else return "";
34	34	}
35	35	}
36	36
37		- function getWeekNumber($cdate = ""){
38		- if(!$this->compatible){
	37	+ function getWeekNumber($cdate = "") {
	38	+ if (!$this->compatible) {
39	39	return tc_date_main::getWeekNumber($cdate);
40		- }else{
41		- if(($cdate != "" && $this->validDate($cdate)) \|\| $cdate == ""){
	40	+ }else {
	41	+ if (($cdate != "" && $this->validDate($cdate)) \|\| $cdate == "") {
42	42	$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
43	43	return $tmp_date->format('W');
44	44	}else return "";
45	45	}
46	46	}
47	47
48		- function setDate($sdate){
49		- if(!$this->compatible){
	48	+ function setDate($sdate) {
	49	+ if (!$this->compatible) {
50	50	tc_date_main::setDate($sdate);
51		- }else{
52		- if(tc_date_main::validDate($sdate))
	51	+ }else {
	52	+ if (tc_date_main::validDate($sdate))
53	53	$this->mydate = new DateTime($sdate);
54	54	}
55	55	}
56	56
57		- function getDate($format = "Y-m-d", $cdate = ""){
58		- if(!$this->compatible){
	57	+ function getDate($format = "Y-m-d", $cdate = "") {
	58	+ if (!$this->compatible) {
59	59	return tc_date_main::getDate($format, $cdate);
60		- }else{
61		- if(($cdate != "" && $this->validDate($cdate)) \|\| $cdate == ""){
	60	+ }else {
	61	+ if (($cdate != "" && $this->validDate($cdate)) \|\| $cdate == "") {
62	62	$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
63	63	return $tmp_date->format($format);
64	64	}else return "";
65	65	}
66	66	}
67	67
68		- function setTimestamp($stime){
69		- if(!$this->compatible){
	68	+ function setTimestamp($stime) {
	69	+ if (!$this->compatible) {
70	70	tc_date_main::setTimestamp($stime);
71		- }else{
	71	+ }else {
72	72	$this->mydate->setTimestamp($stime);
73	73	}
74	74	}
75	75
76		- function getTimestamp($cdate = ""){
77		- if(!$this->compatible){
	76	+ function getTimestamp($cdate = "") {
	77	+ if (!$this->compatible) {
78	78	return tc_date_main::getTimestamp($cdate);
79		- }else{
80		- if(($cdate != "" && $this->validDate($cdate)) \|\| $cdate == ""){
	79	+ }else {
	80	+ if (($cdate != "" && $this->validDate($cdate)) \|\| $cdate == "") {
81	81	$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
82	82	return $tmp_date->getTimestamp();
83	83	}else return 0;
84	84	}
85	85	}
86	86
87		- function getDateFromTimestamp($stime, $format = 'Y-m-d'){
88		- if($stime){
89		- if(!$this->compatible){
	87	+ function getDateFromTimestamp($stime, $format = 'Y-m-d') {
	88	+ if ($stime) {
	89	+ if (!$this->compatible) {
90	90	return tc_date_main::getDateFromTimestamp($stime, $format);
91		- }else{
	91	+ }else {
92	92	$tmp_date = new DateTime();
93	93	$tmp_date->setTimestamp($stime);
94	94	return $tmp_date->format($format);
		@@ -96,35 +96,35 @@ discard block
		block discarded – undo
96	96	}else return "";
97	97	}
98	98
99		- function addDay($format = "Y-m-d", $timespan, $cdate = ""){
100		- if(!$this->compatible){
	99	+ function addDay($format = "Y-m-d", $timespan, $cdate = "") {
	100	+ if (!$this->compatible) {
101	101	return tc_date_main::addDay($format, $timespan, $cdate);
102		- }else{
	102	+ }else {
103	103	$timespan = "P".$timespan."D";
104	104	return $this->addDate($format, $timespan, $cdate);
105	105	}
106	106	}
107	107
108		- function addMonth($format = "Y-m-d", $timespan, $cdate = ""){
109		- if(!$this->compatible){
	108	+ function addMonth($format = "Y-m-d", $timespan, $cdate = "") {
	109	+ if (!$this->compatible) {
110	110	return tc_date_main::addMonth($format, $timespan, $cdate);
111		- }else{
	111	+ }else {
112	112	$timespan = "P".$timespan."M";
113	113	return $this->addDate($format, $timespan, $cdate);
114	114	}
115	115	}
116	116
117		- function addYear($format = "Y-m-d", $timespan, $cdate = ""){
118		- if(!$this->compatible){
	117	+ function addYear($format = "Y-m-d", $timespan, $cdate = "") {
	118	+ if (!$this->compatible) {
119	119	return tc_date_main::addYear($format, $timespan, $cdate);
120		- }else{
	120	+ }else {
121	121	$timespan = "P".$timespan."Y";
122	122	return $this->addDate($format, $timespan, $cdate);
123	123	}
124	124	}
125	125
126		- function addDate($format = "Y-m-d", $timespan, $cdate = ""){
127		- if($this->compatible){
	126	+ function addDate($format = "Y-m-d", $timespan, $cdate = "") {
	127	+ if ($this->compatible) {
128	128	$tmp_date = ($cdate != "") ? new DateTime($cdate) : $this->mydate;
129	129	$tmp_date->add(new DateInterval($timespan));
130	130	return $tmp_date->format($format);
		@@ -133,10 +133,10 @@ discard block
		block discarded – undo
133	133
134	134	//return the number of day different between date1 and date2
135	135	//if date1 omitted use set date
136		- function differentDate($date2, $date1 = ""){
137		- if(!$this->compatible){
	136	+ function differentDate($date2, $date1 = "") {
	137	+ if (!$this->compatible) {
138	138	return tc_date_main::differentDate($date2, $date1);
139		- }else{
	139	+ }else {
140	140	$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');
141	141
142	142	$date1 = new DateTime($date1);
		@@ -148,10 +148,10 @@ discard block
		block discarded – undo
148	148
149	149	//check if date1 is before date2
150	150	//if date1 omitted use set date
151		- function dateBefore($date2, $date1 = "", $equal = true){
152		- if(!$this->compatible){
	151	+ function dateBefore($date2, $date1 = "", $equal = true) {
	152	+ if (!$this->compatible) {
153	153	return tc_date_main::dateBefore($date2, $date1, $equal);
154		- }else{
	154	+ }else {
155	155	$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');
156	156
157	157	$date1 = new DateTime($date1);
		@@ -162,10 +162,10 @@ discard block
		block discarded – undo
162	162
163	163	//check if date1 is after date2
164	164	//if date1 omitted use set date
165		- function dateAfter($date2, $date1 = "", $equal = true){
166		- if(!$this->compatible){
	165	+ function dateAfter($date2, $date1 = "", $equal = true) {
	166	+ if (!$this->compatible) {
167	167	return tc_date_main::dateAfter($date2, $date1, $equal);
168		- }else{
	168	+ }else {
169	169	$date1 = ($date1 != "") ? $date1 : $this->getDate('Y-m-d');
170	170
171	171	$date1 = new DateTime($date1);

		@@ -5,36 +5,36 @@ discard block
		block discarded – undo
5	5	$net = new \dautkom\ipv4\IPv4();
6	6
7	7	$_ = $_POST['genere'];
8		-if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') )
	8	+if (($tables["$_"]['field'] == 'email') AND ($_POST['Value'] != 'ALL'))
9	9	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_EMAIL)))
10	10	exit ('<pre><'.$_POST['Value'].'> is NOT a valid email address.</pre>');
11	11
12		-if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
	12	+if (($tables["$_"]['field'] == 'domain') AND ($_POST['Value'] != 'ALL'))
13	13	if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
14	14	exit ('<pre><'.$_POST['Value'].'> is NOT a valid domain.</pre>');
15	15
16		-if ( ($tables["$_"]['field']=='ip') AND ($_POST['Value']!='ALL') )
	16	+if (($tables["$_"]['field'] == 'ip') AND ($_POST['Value'] != 'ALL'))
17	17	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)))
18	18	exit ('<pre><'.$_POST['Value'].'> is NOT a valid IP address.</pre>');
19	19
20		-if ( ($tables["$_"]['field']=='network') AND ($_POST['Value']!='ALL') ) {
21		- $value = explode('/',$_POST['Value']);
	20	+if (($tables["$_"]['field'] == 'network') AND ($_POST['Value'] != 'ALL')) {
	21	+ $value = explode('/', $_POST['Value']);
22	22	if (count($value) != 2)
23	23	exit ('<pre><'.$_POST['Value'].'> is NOT a valid Network/Netmask pair.</pre>');
24	24	if (!$net->address($value[0])->mask($value[1])->isValid(1))
25	25	exit ('<pre><'.$_POST['Value'].'> is NOT a valid Network/Netmask.</pre>');
26	26	}
27	27
28		-if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
29		- if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
	28	+if (($tables["$_"]['field'] == 'username') AND ($_POST['Value'] != 'ALL')) {
	29	+ if (preg_match('/[^\x20-\x7f]/', $_POST['Value']))
30	30	exit('<pre><'.$_POST['Value'].'> contains NON ASCII chars.</pre>');
31		- if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
	31	+ if (preg_match('/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']))
32	32	exit('<pre><'.$_POST['Value'].'> contains invalid ASCII chars.</pre>');
33		- switch ( $_POST['Value'] ) {
	33	+ switch ($_POST['Value']) {
34	34	case 'anonymous':
35	35	case 'anybody':
36	36	case 'anyone':
37		- case ( preg_match( '/^anyone@/',$_POST['Value']) == TRUE ) :
	37	+ case (preg_match('/^anyone@/', $_POST['Value']) == TRUE) :
38	38	exit('<pre><'.$_POST['Value'].'> is not allowed.</pre>');
39	39	}
40	40	}
		@@ -49,14 +49,14 @@ discard block
		block discarded – undo
49	49
50	50	$mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
51	51	if ($mysqli->connect_error) {
52		- syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
	52	+ syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
53	53	. $mysqli->connect_error);
54		- exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
	54	+ exit ($user.': Connect Error ('.$mysqli->connect_errno.') '
55	55	. $mysqli->connect_error);
56	56	}
57	57
58		-syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
59		-rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables);
	58	+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
	59	+rlookup($mysqli, username(), $admins, $_POST['Value'], $_POST['genere'], $tables);
60	60	$mysqli->close();
61	61	closelog();
62	62	?>

		@@ -14,10 +14,10 @@ discard block
		block discarded – undo
14	14	require_once('function.php');
15	15
16	16
17		-if ( $require_auth ) if ( username() == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
	17	+if ($require_auth) if (username() == 'unknown') exit ("<p>You MUST configure your server to use authentication.</p>");
18	18
19	19
20		-if ( $imapListActive )
	20	+if ($imapListActive)
21	21	print ' <p style="text-align: right"><a href="/spamreport" target="_new">SPAM Learn Observer</a></p>';
22	22
23	23	print <<<END
		@@ -26,10 +26,10 @@ discard block
		block discarded – undo
26	26	END;
27	27
28	28
29		-$option=NULL;
	29	+$option = NULL;
30	30	$desc = array_keys($tables);
31	31	foreach ($desc as $description) {
32		- $disabled = $tables["$description"]['active']==TRUE ? '' : ' disabled';
	32	+ $disabled = $tables["$description"]['active'] == TRUE ? '' : ' disabled';
33	33	$option .= '<option value="'.$description."\"$disabled>$description</option>";
34	34	}
35	35

		@@ -1,22 +1,22 @@
		block discarded – undo
1	1	<?php
2	2	require_once('config.php');
3	3	require_once('function.php');
4		-$typedesc=$_POST['type'];
5		-$type = $tables["$typedesc"]['field'];
	4	+$typedesc = $_POST['type'];
	5	+$type = $tables["$typedesc"]['field'];
6	6	$table = $tables["$typedesc"]['name'];
7	7
8	8	openlog($tag, LOG_PID, $fac);
9	9	$user = username();
10	10	$mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
11	11	if ($mysqli->connect_error) {
12		- syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
	12	+ syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
13	13	. $mysqli->connect_error);
14		- die($user.': Connect Error (' . $mysqli->connect_errno . ') '
	14	+ die($user.': Connect Error ('.$mysqli->connect_errno.') '
15	15	. $mysqli->connect_error);
16	16	}
17		-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
	17	+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
18	18
19		-if (remove ($_POST['value'],$type,$table))
	19	+if (remove($_POST['value'], $type, $table))
20	20	print 'OK '.$typedesc.' <'.$_POST['value'].'> permanently REMOVED!';
21	21	else
22	22	print 'Delete operation ERROR on '.$typedesc.' <'.$_POST['value'].'>; check log.';

		@@ -1,26 +1,26 @@
		block discarded – undo
1	1	<?php
2	2	require_once('config.php');
3	3	require_once('function.php');
4		-$typedesc=$_POST['type'];
	4	+$typedesc = $_POST['type'];
5	5	$type = $tables["$typedesc"]['field'];
6	6	$table = $tables["$typedesc"]['name'];
7	7
8	8	openlog($tag, LOG_PID, $fac);
9	9	if (empty($_POST['reason'])) die ("<p>Please, specify a reason!</p>");
10		-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
11		- exit('<p>ERROR: <'.htmlentities($_POST['reason'],ENT_COMPAT \| ENT_HTML401, 'ISO-8859-1').'> contains NON ASCII chars.</p>');
	10	+if (preg_match('/[^\x20-\x7f]/', $_POST['reason']))
	11	+ exit('<p>ERROR: <'.htmlentities($_POST['reason'], ENT_COMPAT \| ENT_HTML401, 'ISO-8859-1').'> contains NON ASCII chars.</p>');
12	12	$user = username();
13	13
14	14	$mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
15	15	if ($mysqli->connect_error) {
16		- syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
	16	+ syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
17	17	. $mysqli->connect_error);
18		- die($user.': Connect Error (' . $mysqli->connect_errno . ') '
	18	+ die($user.': Connect Error ('.$mysqli->connect_errno.') '
19	19	. $mysqli->connect_error);
20	20	}
21		-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
	21	+syslog(LOG_INFO, $user.': Successfully connected to '.$mysqli->host_info);
22	22
23		-if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
	23	+if (addtolist($mysqli, username(), $_POST['value'], $type, $table, $_POST['unit'], $_POST['quantity'], $_POST['reason']))
24	24	print 'OK '.$_POST["type"].' <'.$_POST['value'].'> first time listed for '.$_POST['quantity'].$_POST['unit'].'.';
25	25	else
26	26	print 'List operation ERROR; check log.';

falon / RBL

GitHub Access Token became invalid

Branch — master (69a36c)

Category

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

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

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

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

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

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

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

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

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

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

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

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

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

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