falon / RBL

contrib/ipImap/report/calendar/calendar_functions.php

Doc Comments +3 added lines

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

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

 	switch(strtolower($type)){

 		case "number":

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

Doc Comments +20 added lines

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

 

 	//get the total day of each month in year

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

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

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

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

 

 	//set default selected date

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

 		//get system timezone before set the date

 		$this->system_timezone = date_default_timezone_get();

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

 	}

 

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

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

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

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

 	}

 

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

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

 		if(is_array($obj)){

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

 	}

 

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

 		$this->timezone = $tz;

 		@date_default_timezone_set($tz);

Indentation +7 added lines, -7 removed lines

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

 	//check for leapyear

 	function is_leapyear($year){

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

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

-    }

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

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

+	}

 

 	//get the total day of each month in year

-    function total_days($month,$year){

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

+	function total_days($month,$year){

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

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

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

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

 		}else return 31;

-    }

+	}

 

 	//Deprecate since v1.6

 	function getDayNum($day){

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

Doc Comments +14 added lines

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

 	}

 

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

 		if(!$this->compatible){

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

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

 	}

 

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

 		if($this->compatible){

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

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

 	//check if date1 is before date2

 	//if date1 omitted use set date

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

 		if(!$this->compatible){

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

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

 	//check if date1 is after date2

 	//if date1 omitted use set date

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

 		if(!$this->compatible){

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

result.php

Indentation +7 added lines, -7 removed lines

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

remove.php

Indentation +3 added lines, -3 removed lines

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

list.php

Indentation +6 added lines, -6 removed lines

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

relist.php

Indentation +6 added lines, -6 removed lines

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

contrib/splunk/listFromSplunk.php

Indentation +34 added lines, -34 removed lines

@@ -48,8 +48,8 @@ 
 
 /* check you select a blocklist */
 if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
-        exit (254);
+		syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+		exit (254);
 }
 
 
@@ -69,33 +69,33 @@ 
 $tolist = array();
 
 if ( !file_exists($splfile) ) {
-        syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
-        exit (254);
+		syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
+		exit (254);
 }
 
 if (($handle = gzopen($splfile, 'r')) !== FALSE) {
-        $row = -1;
-        while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
-                $row++;
-                if ($row == 0) continue; /* Skip heading line */
-                $thisVal = $data[1];
-                unset($data[1]);
-                $data = array_values($data);
-                if ( !in_array($thisVal,array_keys($tolist))  )
-                        $tolist["$thisVal"] = $data;
-                else if ($data[3]>$tolist[$thisVal][3])
-                        $tolist["$thisVal"] = $data;
-        }
-        fclose($handle);
+		$row = -1;
+		while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
+				$row++;
+				if ($row == 0) continue; /* Skip heading line */
+				$thisVal = $data[1];
+				unset($data[1]);
+				$data = array_values($data);
+				if ( !in_array($thisVal,array_keys($tolist))  )
+						$tolist["$thisVal"] = $data;
+				else if ($data[3]>$tolist[$thisVal][3])
+						$tolist["$thisVal"] = $data;
+		}
+		fclose($handle);
 }
 
 /* Make MYSQL connection */
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-        syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-        . $mysqli->connect_error);
-        exit (254);
+		syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+		. $mysqli->connect_error);
+		exit (254);
 
 }
 
@@ -103,28 +103,28 @@ 
 
 foreach ( array_keys($tolist) as $value) {
 	$reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
-                        /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+		if ( $tolist["$value"][3] >= $threshold ) {
+				if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
+						syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+						/* Send a email to domain admin if you list an email */
+						if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
 				/* Sometime uid are in the form of <user>@<domain> ... */
 				if ( strpos($value, '@') !== FALSE ) {
-                                	$domain = array_pop(explode('@',$value,2));
+									$domain = array_pop(explode('@',$value,2));
 					if ( strpos($domain, '@') === FALSE ) {
-                                		$recip = emailToNotify($domainNotify_file,$domain);
-                                		$subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
+										$recip = emailToNotify($domainNotify_file,$domain);
+										$subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
 								$tables["$typedesc"]['field'], $value);
-                                		if (!empty($recip))
-                                        		if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
+										if (!empty($recip))
+												if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
 								$subject,$value,"$quantity $unit",$reason) )
-                                                		syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
+														syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
 					}
 					else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
 				}
-                        }
-                }
-        }
+						}
+				}
+		}
 	else {
 		$reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
 		syslog (LOG_INFO, "$user: ".$reason);

contrib/rbldns/exportdns.php

Indentation +23 added lines, -23 removed lines

@@ -2,7 +2,7 @@ 
 <?php
 
 if (PHP_SAPI != "cli")
-    exit;
+	exit;
 
 $home = '/var/www/html/RBL';
 require_once($home.'/config.php');
@@ -20,30 +20,30 @@ 
 
 $opts = getopt('f:t:');
 if ( isset($opts['f']) ) {
-        $filetemplate = $opts['f'];
+		$filetemplate = $opts['f'];
 } else {
 	print "\nNo option for '-f' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( isset($opts['t']) ) {
-        $tablename = $opts['t'];
+		$tablename = $opts['t'];
 } else {
 	print "\nNo option for '-t' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( ($typedescN = array_search( $tablename, array_column($tables, 'name'))) === FALSE ) {
-        print "\nDB <$tablename> doesn't exist!\n";
-        syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
-        exit ( usage() );
+		print "\nDB <$tablename> doesn't exist!\n";
+		syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
+		exit ( usage() );
 }
 $typedesc = array_keys($tables)[$typedescN];
 
 if (! file_exists($filetemplate) ) {
-        print "\nFile <$filetemplate> doesn't exists!\n";
+		print "\nFile <$filetemplate> doesn't exists!\n";
 	syslog (LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if (! in_array( $typedesc, array_keys($tables) ) ) {
@@ -53,7 +53,7 @@ 
 
 if (! $tables["$typedesc"]['active'] ) {
 	print "\nList <$typedesc> is not active. Please provide an active list name.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 
@@ -73,10 +73,10 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 
 syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
@@ -87,14 +87,14 @@ 
 	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 		if (isListed($riga)) {
 			switch ( $tables["$typedesc"]['field'] ) {
-                                  case 'ip':
-                                        $element[] = long2ip($riga['ip']);
-                                        break;
-                                  case 'network':
-                                        $element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
-                                        break;
-                                  default:
-                                        $element[] = $riga["$type"];
+								  case 'ip':
+										$element[] = long2ip($riga['ip']);
+										break;
+								  case 'network':
+										$element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
+										break;
+								  default:
+										$element[] = $riga["$type"];
 			}
 		}
 	}