falon / RBL

listForm.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+if (in_array($user, array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
 else $extopt = NULL;
 ?>
 <form style="margin:0; text-align: left;" name='ListButton<?php echo $type ?>' enctype="text/plain" method="post" target="_self" action="list.php"  onSubmit="xmlhttpPost('list.php', 'ListButton<?php echo $type ?>', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" />
 
 		List <?php  echo $typedesc.' &lt;'.$value.'&gt;'; ?> for <input name="type" type="hidden" value="<?php echo $typedesc; ?>" /><input name="value" type="hidden" class="input_text" value="<?php echo $value; ?>" />
-		<select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt;?></select>  Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form>
+		<select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt; ?></select>  Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form>

Braces +5 added lines, -2 removed lines

@@ -1,6 +1,9 @@
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
-else $extopt = NULL;
+if (in_array($user,array_keys(array_filter($adm)))) {
+	$extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+} else {
+	$extopt = NULL;
+}
 ?>
 <form style="margin:0; text-align: left;" name='ListButton<?php echo $type ?>' enctype="text/plain" method="post" target="_self" action="list.php"  onSubmit="xmlhttpPost('list.php', 'ListButton<?php echo $type ?>', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" />
 

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);

Spacing +31 added lines, -31 removed lines

@@ -10,33 +10,33 @@ 
 #
 */
 
-$shortopts = "c:";  // Required value
+$shortopts = "c:"; // Required value
 $options = getopt($shortopts);
-if ( !isset($options['c']) ) exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
-if ( !file_exists(dirname(__FILE__) . '/' . $options['c']) ) exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
+if (!isset($options['c'])) exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
+if (!file_exists(dirname(__FILE__).'/'.$options['c'])) exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
 
 /************** Start of conf ************************/
 require_once('config.php');
 
  /* Syslog */
-$tag            .= 'SplunkLister';
+$tag .= 'SplunkLister';
 
-$conf = parse_ini_file( dirname(__FILE__) . '/' . $options['c'] );
+$conf = parse_ini_file(dirname(__FILE__).'/'.$options['c']);
 
  /* Splunk inherited parameters */
-$threshold = $conf['threshold'];         /* Threshold value on trigger condition; the same which engage the alert */
-$splfile = $argv[10];    		/* Full path of result Splunk file, see at
+$threshold = $conf['threshold']; /* Threshold value on trigger condition; the same which engage the alert */
+$splfile = $argv[10]; /* Full path of result Splunk file, see at
                            		   http://docs.splunk.com/Documentation/Splunk/6.2.2/Alert/Configuringscriptedalerts
                            		   It is 8+2 because of -c <conf> */
  /* Blacklist name */
-$typedesc  = $conf['typedesc'];
+$typedesc = $conf['typedesc'];
 
  /* How long to list's parameters */
-$unit = $conf['unit'];          /* MySQL language ;) */
+$unit = $conf['unit']; /* MySQL language ;) */
 $quantity = $conf['quantity'];
 
  /* Syslog */
-$tag            .= $conf['tag'];
+$tag .= $conf['tag'];
 
 /************** End of conf *************************/
 
@@ -47,8 +47,8 @@ 
 $user = 'Splunk';
 
 /* 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.");
+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);
 }
 
@@ -68,8 +68,8 @@ 
 
 $tolist = array();
 
-if ( !file_exists($splfile) ) {
-        syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
+if (!file_exists($splfile)) {
+        syslog(LOG_ERR, "$user: File <$splfile> not found! Exit.");
         exit (254);
 }
 
@@ -81,7 +81,7 @@ 
                 $thisVal = $data[1];
                 unset($data[1]);
                 $data = array_values($data);
-                if ( !in_array($thisVal,array_keys($tolist))  )
+                if (!in_array($thisVal, array_keys($tolist)))
                         $tolist["$thisVal"] = $data;
                 else if ($data[3]>$tolist[$thisVal][3])
                         $tolist["$thisVal"] = $data;
@@ -93,46 +93,46 @@ 
 
 $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 (254);
 
 }
 
-syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
 
-foreach ( array_keys($tolist) as $value) {
+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);
+        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 (($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));
-					if ( strpos($domain, '@') === FALSE ) {
-                                		$recip = emailToNotify($domainNotify_file,$domain);
+				if (strpos($value, '@') !== FALSE) {
+                                	$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',
 								$tables["$typedesc"]['field'], $value);
                                 		if (!empty($recip))
-                                        		if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
-								$subject,$value,"$quantity $unit",$reason) )
+                                        		if (sendEmailWarn($tplfile, 'postmaster@csi.it', $recip,
+								$subject, $value, "$quantity $unit", $reason))
                                                 		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 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);
+		syslog(LOG_INFO, "$user: ".$reason);
 	}
 }
 
 /* Close connection */
-syslog (LOG_INFO, "$user: ".'Successfully end of session.');
+syslog(LOG_INFO, "$user: ".'Successfully end of session.');
 $mysqli->close();
 closelog();
 

Braces +21 added lines, -12 removed lines

@@ -12,8 +12,12 @@ 
 
 $shortopts = "c:";  // Required value
 $options = getopt($shortopts);
-if ( !isset($options['c']) ) exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
-if ( !file_exists(dirname(__FILE__) . '/' . $options['c']) ) exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
+if ( !isset($options['c']) ) {
+	exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
+}
+if ( !file_exists(dirname(__FILE__) . '/' . $options['c']) ) {
+	exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
+}
 
 /************** Start of conf ************************/
 require_once('config.php');
@@ -77,14 +81,18 @@ 
         $row = -1;
         while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
                 $row++;
-                if ($row == 0) continue; /* Skip heading line */
+                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;
+                if ( !in_array($thisVal,array_keys($tolist))  ) {
+                                        $tolist["$thisVal"] = $data;
+                } else if ($data[3]>$tolist[$thisVal][3]) {
+                                        $tolist["$thisVal"] = $data;
+                }
         }
         fclose($handle);
 }
@@ -115,17 +123,18 @@ 
                                 		$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.");
+                                		}
+					} else {
+						syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
 					}
-					else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
 				}
                         }
                 }
-        }
-	else {
+        } 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"];
 			}
 		}
 	}

Spacing +26 added lines, -26 removed lines

@@ -19,74 +19,74 @@ 
 $user = username();
 
 $opts = getopt('f:t:');
-if ( isset($opts['f']) ) {
+if (isset($opts['f'])) {
         $filetemplate = $opts['f'];
-} else {
+}else {
 	print "\nNo option for '-f' given.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
-if ( isset($opts['t']) ) {
+if (isset($opts['t'])) {
         $tablename = $opts['t'];
-} else {
+}else {
 	print "\nNo option for '-t' given.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
-if ( ($typedescN = array_search( $tablename, array_column($tables, 'name'))) === FALSE ) {
+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() );
+        syslog(LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
+        exit (usage());
 }
 $typedesc = array_keys($tables)[$typedescN];
 
-if (! file_exists($filetemplate) ) {
+if (!file_exists($filetemplate)) {
         print "\nFile <$filetemplate> doesn't exists!\n";
-	syslog (LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
-        exit ( usage() );
+	syslog(LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
+        exit (usage());
 }
 
-if (! in_array( $typedesc, array_keys($tables) ) ) {
+if (!in_array($typedesc, array_keys($tables))) {
 	print "\nUnknown list <$typedesc>. Please provide an existent list name.\n";
-	exit ( usage() );
+	exit (usage());
 }
 
-if (! $tables["$typedesc"]['active'] ) {
+if (!$tables["$typedesc"]['active']) {
 	print "\nList <$typedesc> is not active. Please provide an active list name.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
 
 
-$now=new DateTime('NOW');
+$now = new DateTime('NOW');
 $timeunix = $now->format('U');
 $dateRFC822 = $now->format('r');
 $year = $now->format('Y');
-$rbltype= ($tables["$typedesc"]['bl']) ? 'Blocklist' : 'Whitelist';
+$rbltype = ($tables["$typedesc"]['bl']) ? 'Blocklist' : 'Whitelist';
 
 
 $tmpl = file_get_contents($filetemplate);
-$arr_tpl_vars = array('{rblname}','{rbltype}','{date822}','{year}','{unixtimestamp}','{rblname64}','{hostname}');
-$arr_tpl_data = array($typedesc,$rbltype,$dateRFC822,$year,$timeunix,base64_encode($typedesc),gethostname());
+$arr_tpl_vars = array('{rblname}', '{rbltype}', '{date822}', '{year}', '{unixtimestamp}', '{rblname64}', '{hostname}');
+$arr_tpl_data = array($typedesc, $rbltype, $dateRFC822, $year, $timeunix, base64_encode($typedesc), gethostname());
 $headerList = str_replace($arr_tpl_vars, $arr_tpl_data, $tmpl);
 
 
 $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) ;
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
 
-$result = searchentry ($mysqli,'ALL',$tables["$typedesc"]);
+$result = searchentry($mysqli, 'ALL', $tables["$typedesc"]);
 if ($result->num_rows) {
 	$element = array();
 	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 		if (isListed($riga)) {
-			switch ( $tables["$typedesc"]['field'] ) {
+			switch ($tables["$typedesc"]['field']) {
                                   case 'ip':
                                         $element[] = long2ip($riga['ip']);
                                         break;
@@ -104,6 +104,6 @@ 
 $mysqli->close();
 
 /* Print to file */
-file_put_contents( $tables["$typedesc"]['name'], $headerList . implode("\n",$element) );
+file_put_contents($tables["$typedesc"]['name'], $headerList.implode("\n", $element));
 closelog();
 ?>

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 #!/usr/bin/php
 <?php
 
-if (PHP_SAPI != "cli")
+if (PHP_SAPI != "cli") {
     exit;
+}
 
 $home = '/var/www/html/RBL';
 require_once($home.'/config.php');

contrib/ipImap/report/result.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 print '<p>List of available Reports for '.date('l, d M Y', strtotime($theDate)).'</p><ul>';
 foreach($dir as $file)
 {
-        if ( basename($file) != basename(__FILE__) ) {
+		if ( basename($file) != basename(__FILE__) ) {
 		$modalDiv = 'openModal'.basename($file);
 		echo '<li><a href="#'.$modalDiv.'">'.str_replace("-$theDate.html",'',basename($file)).'</a></li>';
 #                echo '<li><pre><a href="'.basename($file).'" title="'.str_replace("-$theDate.html",'',basename($file))." of $theDate".'" onClick="Modalbox.show(this.href, {title: this.title, height: 600}); return false;">'.str_replace("-$theDate.html",'',basename($file)).'</a></pre></li>';

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@
 
 
 print '<p>List of available Reports for '.date('l, d M Y', strtotime($theDate)).'</p><ul>';
-foreach($dir as $file)
+foreach ($dir as $file)
 {
-        if ( basename($file) != basename(__FILE__) ) {
+        if (basename($file) != basename(__FILE__)) {
 		$modalDiv = 'openModal'.basename($file);
-		echo '<li><a href="#'.$modalDiv.'">'.str_replace("-$theDate.html",'',basename($file)).'</a></li>';
+		echo '<li><a href="#'.$modalDiv.'">'.str_replace("-$theDate.html", '', basename($file)).'</a></li>';
 #                echo '<li><pre><a href="'.basename($file).'" title="'.str_replace("-$theDate.html",'',basename($file))." of $theDate".'" onClick="Modalbox.show(this.href, {title: this.title, height: 600}); return false;">'.str_replace("-$theDate.html",'',basename($file)).'</a></pre></li>';
 		print <<<MODAL
 <div id="$modalDiv" class="overlay">

contrib/ipImap/report/index.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 <?php
 $reports = array();
 foreach (glob("*.{htm,html}", GLOB_BRACE) as $filename) {
-    $reports[$filename] = filemtime($filename);
+	$reports[$filename] = filemtime($filename);
 }
 arsort($reports);
 $newest = array_shift($reports);

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
 /* Write Calendar */
 	  $myCalendar = new tc_calendar("calSpam");
 	  $myCalendar->setIcon("calendar/images/iconCalendar.gif");
-	  $myCalendar->setDate(date('d',$newest), date('m',$newest), date('Y',$newest));
+	  $myCalendar->setDate(date('d', $newest), date('m', $newest), date('Y', $newest));
 	  $myCalendar->setPath("calendar/");
-	  $myCalendar->setYearInterval(date('Y',$oldest), date('Y', $newest));
+	  $myCalendar->setYearInterval(date('Y', $oldest), date('Y', $newest));
 	  $myCalendar->dateAllow(date('Y-m-d', $oldest), date('Y-m-d', $newest));
 	  $myCalendar->setDateFormat('j F Y');
 	  $myCalendar->startDate(1);

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

Spacing +33 added lines, -33 removed lines

@@ -5,81 +5,81 @@ 
 // written by TJ @triconsole

 //*************************************

 

-class tc_date_main{

+class tc_date_main {

 	var $mydate;

 

-	function tc_date_main(){

+	function tc_date_main() {

 		$this->mydate = strtotime(date('Y-m-d'));

 	}

 

-	function getDayOfWeek($cdate = ""){

-		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

+	function getDayOfWeek($cdate = "") {

+		if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {

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

 			return date('w', $tmp_date);

 		}

 	}

 

-	function getWeekNumber($cdate = ""){

-		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

+	function getWeekNumber($cdate = "") {

+		if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {

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

 			return date('W', $tmp_date);

 		}

 	}

 

-	function setDate($sdate){

-		if($this->validDate($sdate))

+	function setDate($sdate) {

+		if ($this->validDate($sdate))

 			$this->mydate = strtotime($sdate);

 	}

 

-	function getDate($format = "Y-m-d", $cdate = ""){

-		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

+	function getDate($format = "Y-m-d", $cdate = "") {

+		if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {

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

 			return date($format, $tmp_date);

 		}else return "";

 	}

 

-	function setTimestamp($stime){

+	function setTimestamp($stime) {

 		$this->mydate = $stime;

 	}

 

-	function getTimestamp($cdate = ""){

-		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

+	function getTimestamp($cdate = "") {

+		if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {

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

 			return $tmp_date;

 		}else return 0;

 	}

 

-	function getDateFromTimestamp($stime, $format = "Y-m-d"){

-		if($stime && $stime > 0){

+	function getDateFromTimestamp($stime, $format = "Y-m-d") {

+		if ($stime && $stime>0) {

 			return date($format, $stime);

 		}else return "0000-00-00";

 	}

 

-	function addDay($format = "Y-m-d", $timespan, $cdate = ""){

-		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

+	function addDay($format = "Y-m-d", $timespan, $cdate = "") {

+		if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {

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

-			return date($format, mktime(0,0,0,date('m', $tmp_date),(date('d', $tmp_date)+$timespan),date('Y', $tmp_date)));

+			return date($format, mktime(0, 0, 0, date('m', $tmp_date), (date('d', $tmp_date)+$timespan), date('Y', $tmp_date)));

 		}else return "0000-00-00";

 	}

 

-	function addMonth($format = "Y-m-d", $timespan, $cdate = ""){

-		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

+	function addMonth($format = "Y-m-d", $timespan, $cdate = "") {

+		if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {

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

-			return date($format, mktime(0,0,0,(date('m', $tmp_date)+$timespan),date('d', $tmp_date),date('Y', $tmp_date)));

+			return date($format, mktime(0, 0, 0, (date('m', $tmp_date)+$timespan), date('d', $tmp_date), date('Y', $tmp_date)));

 		}else return "0000-00-00";

 	}

 

-	function addYear($format = "Y-m-d", $timespan, $cdate = ""){

-		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

+	function addYear($format = "Y-m-d", $timespan, $cdate = "") {

+		if (($cdate != "" && $this->validDate($cdate)) || $cdate == "") {

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

-			return date($format, mktime(0,0,0,date('m', $tmp_date),date('d', $tmp_date),(date('Y', $tmp_date)+$timespan)));

+			return date($format, mktime(0, 0, 0, date('m', $tmp_date), date('d', $tmp_date), (date('Y', $tmp_date)+$timespan)));

 		}else return "0000-00-00";

 	}

 

 	//return the number of day different between date1 and date2

 	//if date1 omitted use set date

-	function differentDate($date2, $date1 = ""){

-		if($this->validDate($date2)){

+	function differentDate($date2, $date1 = "") {

+		if ($this->validDate($date2)) {

 			$date1 = ($date1 != "") ? strtotime($date1) : $this->mydate;

 

 			$date_diff = $date1-strtotime($date2);

@@ -89,8 +89,8 @@ 
 

 	//check if date1 is before date2

 	//if date1 omitted use set date

-	function dateBefore($date2, $date1 = "", $equal = true){

-		if($this->validDate($date2)){

+	function dateBefore($date2, $date1 = "", $equal = true) {

+		if ($this->validDate($date2)) {

 			$date1 = ($date1 != "") ? strtotime($date1) : $this->mydate;

 			$date2 = strtotime($date2);

 			return ($equal) ? $date1<=$date2 : $date1<$date2;

@@ -99,19 +99,19 @@ 
 

 	//check if date1 is after date2

 	//if date1 omitted use set date

-	function dateAfter($date2, $date1 = "", $equal = true){

-		if($this->validDate($date2)){

+	function dateAfter($date2, $date1 = "", $equal = true) {

+		if ($this->validDate($date2)) {

 			$date1 = ($date1 != "") ? strtotime($date1) : $this->mydate;

 			$date2 = strtotime($date2);

 			return ($equal) ? $date1>=$date2 : $date1>$date2;

 		}else return false;

 	}

 

-	function validDate($date_str){

-		if($date_str != ""){

+	function validDate($date_str) {

+		if ($date_str != "") {

 			$date_arr = explode("-", $date_str, 3);

 

-			if((isset($date_arr[0]) && is_numeric($date_arr[0])) && (isset($date_arr[1]) && is_numeric($date_arr[1])) && (isset($date_arr[2]) && is_numeric($date_arr[2]))){

+			if ((isset($date_arr[0]) && is_numeric($date_arr[0])) && (isset($date_arr[1]) && is_numeric($date_arr[1])) && (isset($date_arr[2]) && is_numeric($date_arr[2]))) {

 				return (checkdate($date_arr[1], $date_arr[2], $date_arr[0])) ? true : false;

 			}else return false;

 		}else return false;

Braces +36 added lines, -13 removed lines

@@ -27,15 +27,18 @@ 
 	}

 

 	function setDate($sdate){

-		if($this->validDate($sdate))

-			$this->mydate = strtotime($sdate);

+		if($this->validDate($sdate)) {
+					$this->mydate = strtotime($sdate);
+		}
 	}

 

 	function getDate($format = "Y-m-d", $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

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

 			return date($format, $tmp_date);

-		}else return "";

+		} else {
+			return "";
+		}
 	}

 

 	function setTimestamp($stime){

@@ -46,34 +49,44 @@ 
 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

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

 			return $tmp_date;

-		}else return 0;

+		} else {
+			return 0;
+		}
 	}

 

 	function getDateFromTimestamp($stime, $format = "Y-m-d"){

 		if($stime && $stime > 0){

 			return date($format, $stime);

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	function addDay($format = "Y-m-d", $timespan, $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

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

 			return date($format, mktime(0,0,0,date('m', $tmp_date),(date('d', $tmp_date)+$timespan),date('Y', $tmp_date)));

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	function addMonth($format = "Y-m-d", $timespan, $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

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

 			return date($format, mktime(0,0,0,(date('m', $tmp_date)+$timespan),date('d', $tmp_date),date('Y', $tmp_date)));

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	function addYear($format = "Y-m-d", $timespan, $cdate = ""){

 		if(($cdate != "" && $this->validDate($cdate)) || $cdate == ""){

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

 			return date($format, mktime(0,0,0,date('m', $tmp_date),date('d', $tmp_date),(date('Y', $tmp_date)+$timespan)));

-		}else return "0000-00-00";

+		} else {
+			return "0000-00-00";
+		}
 	}

 

 	//return the number of day different between date1 and date2

@@ -84,7 +97,9 @@ 
 

 			$date_diff = $date1-strtotime($date2);

 			return abs($date_diff);

-		}else return false;

+		} else {
+			return false;
+		}
 	}

 

 	//check if date1 is before date2

@@ -94,7 +109,9 @@ 
 			$date1 = ($date1 != "") ? strtotime($date1) : $this->mydate;

 			$date2 = strtotime($date2);

 			return ($equal) ? $date1<=$date2 : $date1<$date2;

-		}else return false;

+		} else {
+			return false;
+		}
 	}

 

 	//check if date1 is after date2

@@ -104,7 +121,9 @@ 
 			$date1 = ($date1 != "") ? strtotime($date1) : $this->mydate;

 			$date2 = strtotime($date2);

 			return ($equal) ? $date1>=$date2 : $date1>$date2;

-		}else return false;

+		} else {
+			return false;
+		}
 	}

 

 	function validDate($date_str){

@@ -113,8 +132,12 @@ 
 

 			if((isset($date_arr[0]) && is_numeric($date_arr[0])) && (isset($date_arr[1]) && is_numeric($date_arr[1])) && (isset($date_arr[2]) && is_numeric($date_arr[2]))){

 				return (checkdate($date_arr[1], $date_arr[2], $date_arr[0])) ? true : false;

-			}else return false;

-		}else return false;

+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}

 }

 ?>
\ No newline at end of file

contrib/ipImap/report/calendar/calendar_info.php

Spacing +12 added lines, -12 removed lines

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

 require_once("classes/tc_date.php");

 

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

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

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

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

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

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

 

 $tobj = new tc_calendar("");

 $version = $tobj->version;

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

 $tdate = new tc_date();

 

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

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

 

 $wan_enabled = 0;

 $new_version = 0;

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

-	if($check_version && $wan_enabled){

-		if(function_exists("file_get_contents")){

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

+	if ($check_version && $wan_enabled) {

+		if (function_exists("file_get_contents")) {

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

 		}

 	}

 }

-elseif(function_exists("file_get_contents")){

+elseif (function_exists("file_get_contents")) {

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

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

-	if($check_version && $wan_enabled){

-		if(function_exists("file_get_contents")){

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

+	if ($check_version && $wan_enabled) {

+		if (function_exists("file_get_contents")) {

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

 		}

 	}

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

 

 ?>

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

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

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

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

     <script>

Braces +13 added lines, -6 removed lines

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

 require_once("classes/tc_date.php");

 

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

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

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

+if(!isset($show_calendar_info)) {
+	$show_calendar_info = true;
+}
+if(!isset($show_fb_info)) {
+	$show_fb_info = true;
+}
+if(!isset($show_servertime_info)) {
+	$show_servertime_info = true;
+}
 

 $tobj = new tc_calendar("");

 $version = $tobj->version;

@@ -12,7 +18,9 @@ 
 

 $tdate = new tc_date();

 

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

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

 $wan_enabled = 0;

 $new_version = 0;

@@ -22,8 +30,7 @@ 
 			$new_version = @file_get_contents("http://www.triconsole.com/php/tc_calendar_version.php?v=".$version);

 		}

 	}

-}

-elseif(function_exists("file_get_contents")){

+} elseif(function_exists("file_get_contents")){

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

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

 	if($check_version && $wan_enabled){

contrib/ipImap/report/calendar/calendar_form.php

Spacing +155 added lines, -155 removed lines

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

 $timezone = getParameter("tmz");

 

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

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

 @date_default_timezone_set($timezone);

 

 $cdate = new tc_date();

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

 $sly = getParameter("selected_year");

 

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

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

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

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

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

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

 

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

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

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

 

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

-if(!$show_not_allow){

+if (!$show_not_allow) {

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

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

 }

 

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

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

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

-else{

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

+else {

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

 		$m = $slm;

-	}else{

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

+	}else {

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

 			//compare which one is more

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

-			if($year_allow2 >= $year_end){

+			if ($year_allow2>=$year_end) {

 				//use time_allow2

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

-			}else{

+			}else {

 				//use year_end

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

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

 			}

-		}elseif($ta2_set){

+		}elseif ($ta2_set) {

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

-		}elseif($year_end > 0){

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

-		}else{

+		}elseif ($year_end>0) {

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

+		}else {

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

 		}

 	}

 }

 

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

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

 

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

 

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

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

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

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

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

 

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

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

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

 else

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

 

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

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

 

 // ensure m-y fits date allow range

 if (!$show_not_allow) {

 	if ($ta1_set) {

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

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

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

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

 	}

 	if ($ta2_set) {

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

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

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

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

 	}

 }

 

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

 

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

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

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

 

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

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

-	if($time_allow1 != ""){

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

+	if ($time_allow1 != "") {

 		//get date of time allow1

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

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

 			//check valid if today is after date_allow1

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

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

 				//reset default calendar display

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

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

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

 

 //check year display in valid range

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

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

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

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

 

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

 

-if($m == 1){

+if ($m == 1) {

 	$previous_month = 12;

 	$previous_year = $y-1;

-}else{

+}else {

 	$previous_month = $m-1;

 	$previous_year = $y;

 }

 

-if($m == 12){

+if ($m == 12) {

 	$next_month = 1;

 	$next_year = $y+1;

-}else{

+}else {

 	$next_month = $m+1;

 	$next_year = $y;

 }

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

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

 

-if($firstdate == $startDate){

+if ($firstdate == $startDate) {

 	//skip last month

 	$startwrite = $total_lastmonth+1;

-}elseif($firstdate < $startDate){

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

-}else{

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

+}elseif ($firstdate<$startDate) {

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

+}else {

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

 }

 

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

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

 

 //write previous month

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

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

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

 	$dayinweek_counter++;

 

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

 

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

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

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

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

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

 }

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

 

 //check lastmonth is on allowed date

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

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

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

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

 		$show_previous = true;

 	}else $show_previous = false;

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

 

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

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

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

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

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

 }

 

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

 

 $select_days = array();

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

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

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

 

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

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

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

 		$select_days[] = $this_day;

 	}

 }

 

 //write current month

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

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

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

 

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

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

 

 	//check date allowed

-	if($ta1_set && $ta2_set){

+	if ($ta1_set && $ta2_set) {

 		//both date specified

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

-	}elseif($ta1_set){

+	}elseif ($ta1_set) {

 		//only date 1 specified

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

-	}elseif($ta2_set){

+	}elseif ($ta2_set) {

 		//only date 2 specified

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

-	}else{

+	}else {

 		//no date allow specified, assume show all

 		$dateLink = true;

 	}

 

-	if($dateLink){

+	if ($dateLink) {

 		//check for disable days

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

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

 			$dateLink = false;

 		}

 	}

 

 	//check specific date

-	if($dateLink){

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

+	if ($dateLink) {

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

 			//check if it is current date

 			$sp_found = false;

 

 			//check on yearly recursive

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

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

-					if($sp_time != ""){

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

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

-						if($sp_time_md == $this_md){

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

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

+					if ($sp_time != "") {

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

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

+						if ($sp_time_md == $this_md) {

 							$sp_found = true;

 							break;

 						}

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

 

 			//check on monthly recursive

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

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

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

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

-						if($sp_time_d == $day){

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

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

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

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

+						if ($sp_time_d == $day) {

 							$sp_found = true;

 							break;

 						}

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

 

 			//check on no recursive

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

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

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

 			}

 

-			switch($sp_type){

+			switch ($sp_type) {

 				case 0:

 				default:

 					//disabled specific and enabled others

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

 	}

 

-	if($date_pair_value){

+	if ($date_pair_value) {

 		//check date_pair1 & 2

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

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

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

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

 				$htmlClass[] = "select";

 		}

 

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

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

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

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

 				$htmlClass[] = "select";

 		}

 	}

 

 	$htmlClass[] = strtolower($day_txt);

 

-	if($dateLink){

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

+	if ($dateLink) {

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

 			$htmlClass[] = "select";

 		}

 

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

 

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

-	}else{

+	}else {

 		$htmlClass[] = "disabledate";

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

 

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

 

 		//check if selected date is a disabled date

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

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

 			//disabled

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

 		}

 	}

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

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

 		$row_count++;

 

 		$dayinweek_counter = 0;

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

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

 

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

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

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

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

 }

 

 //write next other month

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

-if($write_end_days > 0){

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

+if ($write_end_days>0) {

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

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

 

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

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

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

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

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

 	}

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

 

 //write fulfil row to 6 rows

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

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

 	$tmpday = $write_end_days+1;

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

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

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

 

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

 

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

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

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

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

 	}

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

 

 //check next month is on allowed date

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

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

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

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

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

 		$show_next = true;

 	}else $show_next = false;

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

 ?>

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

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

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

 <head>

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

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

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

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

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

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

 <?php } ?>

 <script type="text/javascript">

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

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

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

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

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

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

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

 

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

 //-->

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

 	<?php

 	//write auto submit script

-	if($auto_submit){

+	if ($auto_submit) {

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

-		if($form_name){

+		if ($form_name) {

 			//submit value by post form

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

-		}elseif($target_url){

+		}elseif ($target_url) {

 			//submit value by get method

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

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

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

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

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

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

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

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

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

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

 		<?php } ?>

 

 		<?php

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

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

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

 		}

 		?>

 

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

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

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

 			<tr>

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

 					<?php

 					$monthnames = $cobj->getMonthNames();

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

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

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

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

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

 					}

 					?>

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

 

 					//write year options

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

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

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

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

 					}

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

 				</tr>

 			</table>

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

-

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

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

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

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

-

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

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

-

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

-

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

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

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

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

-

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

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

-

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

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

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

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

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

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

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

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

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

+

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

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

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

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

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

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

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

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

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

+

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

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

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

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

+

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

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

+

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

+

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

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

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

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

+

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

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

+

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

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

 

 			<!-- focus var //-->

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

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

 

 			//write calendar day header

-			foreach($day_headers as $dh){

+			foreach ($day_headers as $dh) {

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

 			}

 			echo("</tr>");

 

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

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

 				echo("<tr>");

 

-				if ($show_weeks){

+				if ($show_weeks) {

 					asort($week_rows[$row]);

 

 					//get week number with highest member

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

 				}

 

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

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

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

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

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

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

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

 

-					if($this_link){

+					if ($this_link) {

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

-					}else{

+					}else {

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

 					}

 				}

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

 

 		<?php

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

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

 		?>

 		<div id="calendar-footer">

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

 				<?php

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

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

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

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

 				<?php

 				}else echo("&nbsp;");

 				?>

 			</div>

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

 				<?php

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

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

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

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

 				<?php

 				}else echo("&nbsp;");

 				?>

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

 				$footer_links = array();

 

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

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

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

 

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

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

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

 

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

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

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

 				}

 				?>

Braces +136 added lines, -67 removed lines

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

 $timezone = getParameter("tmz");

 

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

+if(!$timezone) {
+	$timezone = date_default_timezone_get();
+}
 @date_default_timezone_set($timezone);

 

 $cdate = new tc_date();

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

 $sly = getParameter("selected_year");

 

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

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

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

+if(!is_numeric($sld)) {
+	$sld = "00";
+}
+if(!is_numeric($slm)) {
+	$slm = "00";
+}
+if(!is_numeric($sly)) {
+	$sly = "0000";
+}
 

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

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

@@ -74,62 +82,79 @@ 
 

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

 if(!$show_not_allow){

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

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

-}

-

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

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

-else{

+  if ($ta1_set && $cdate->validDate($time_allow1)) {
+  	$year_start = $cdate->getDate('Y', $time_allow1);
+  }
+  if ($ta2_set && $cdate->validDate($time_allow2)) {
+  	$year_end = $cdate->getDate('Y', $time_allow2);
+  }
+  }

+

+if(isset($_REQUEST["m"])) {
+	$m = getParameter("m", "number");
+} else{

 	if($slm != "00"){

 		$m = $slm;

-	}else{

+	} else{

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

 			//compare which one is more

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

 			if($year_allow2 >= $year_end){

 				//use time_allow2

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

-			}else{

+			} else{

 				//use year_end

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

 			}

-		}elseif($ta2_set){

+		} elseif($ta2_set){

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

-		}elseif($year_end > 0){

+		} elseif($year_end > 0){

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

-		}else{

+		} else{

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

 		}

 	}

 }

 

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

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

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

 

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

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

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

-

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

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

-else

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

-

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

+if($cyr && $sly && $sly < $year_start) {
+	$sly = $year_start;
+}
+if($cyr && $sly && $sly > $year_end) {
+	$sly = $year_end;
+}
+

+if(isset($_REQUEST["y"])) {
+	$y = getParameter("y", "number");
+} else {
+	$y = ($cyr) ? $sly : $cdate->getDate("Y");
+}
+

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

 // ensure m-y fits date allow range

 if (!$show_not_allow) {

 	if ($ta1_set) {

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

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

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

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

 	if ($ta2_set) {

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

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

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

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

 }

 

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

 

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

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

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

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

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

@@ -168,15 +195,19 @@ 
 $year_end = $cobj->year_end;

 

 //check year display in valid range

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

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

+if($y >= $year_end) {
+	$y = $year_end;
+}
+if($y <= $year_start) {
+	$y = $year_start;
+}
 

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

 

 if($m == 1){

 	$previous_month = 12;

 	$previous_year = $y-1;

-}else{

+} else{

 	$previous_month = $m-1;

 	$previous_year = $y;

 }

@@ -184,7 +215,7 @@ 
 if($m == 12){

 	$next_month = 1;

 	$next_year = $y+1;

-}else{

+} else{

 	$next_month = $m+1;

 	$next_year = $y;

 }

@@ -196,9 +227,9 @@ 
 if($firstdate == $startDate){

 	//skip last month

 	$startwrite = $total_lastmonth+1;

-}elseif($firstdate < $startDate){

+} elseif($firstdate < $startDate){

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

-}else{

+} else{

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

 }

 

@@ -222,8 +253,10 @@ 
 	$wknum = $cdate->getWeekNumber($prev_d);

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

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

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

-}

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

 

 $pvMonthTime = $previous_year."-".$previous_month."-".$total_lastmonth;

 

@@ -231,13 +264,20 @@ 
 if($ta1_set && !$show_not_allow){

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

 		$show_previous = true;

-	}else $show_previous = false;

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

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

 

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

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

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

-}

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

 

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

 

@@ -270,13 +310,13 @@ 
 	if($ta1_set && $ta2_set){

 		//both date specified

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

-	}elseif($ta1_set){

+	} elseif($ta1_set){

 		//only date 1 specified

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

-	}elseif($ta2_set){

+	} elseif($ta2_set){

 		//only date 2 specified

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

-	}else{

+	} else{

 		//no date allow specified, assume show all

 		$dateLink = true;

 	}

@@ -343,13 +383,15 @@ 
 	if($date_pair_value){

 		//check date_pair1 & 2

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

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

-				$htmlClass[] = "select";

+			if(!in_array("select", $htmlClass)) {
+							$htmlClass[] = "select";
+			}
 		}

 

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

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

-				$htmlClass[] = "select";

+			if(!in_array("select", $htmlClass)) {
+							$htmlClass[] = "select";
+			}
 		}

 	}

 

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

 

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

-	}else{

+	} else{

 		$htmlClass[] = "disabledate";

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

 

@@ -381,14 +423,18 @@ 
 		$row_count++;

 

 		$dayinweek_counter = 0;

-	}else $dayinweek_counter++;

+	} else {
+		$dayinweek_counter++;
+	}
 

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

 

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

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

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

-}

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

 

 //write next other month

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

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

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

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

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

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

 	 $row_count++;

 }

@@ -414,7 +462,9 @@ 
 

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

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

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

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

 	$write_end_days += 6;

 }

@@ -424,11 +474,19 @@ 
 	$nxMonthTime = $next_year."-".$next_month."-1";

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

 		$show_next = true;

-	}else $show_next = false;

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

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

 ?>

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

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

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

 <head>

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

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

@@ -459,7 +517,7 @@ 
 		if($form_name){

 			//submit value by post form

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

-		}elseif($target_url){

+		} elseif($target_url){

 			//submit value by get method

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

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

@@ -474,7 +532,10 @@ 
 <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">

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

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

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

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

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

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

 		<?php } ?>

@@ -561,7 +622,9 @@ 
 

 			echo("<tr>");

 

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

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

 			//write calendar day header

 			foreach($day_headers as $dh){

@@ -591,7 +654,7 @@ 
 

 					if($this_link){

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

-					}else{

+					} else{

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

 					}

 				}

@@ -610,7 +673,9 @@ 
 				if($previous_year >= $year_start && $show_previous){

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

 				<?php

-				}else echo("&nbsp;");

+				} else {
+					echo("&nbsp;");
+				}
 				?>

 			</div>

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

@@ -618,18 +683,22 @@ 
 				if($next_year <= $year_end && $show_next){

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

 				<?php

-				}else echo("&nbsp;");

+				} else {
+					echo("&nbsp;");
+				}
 				?>

 			</div>

 			<div class="links">

 				<?php

 				$footer_links = array();

 

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

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

+				if($cobj->validTodayDate() && ($m != $cdate->getDate('m') || $y != $cdate->getDate('Y'))) {
+									$footer_links[] = "<a href=\"javascript:today();\" class=\"txt\" alt=\"Today\" title=\"Today\">Today</a>";
+				}
 

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

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

+				if($sld>0 && $slm>0 && $sly>0) {
+									$footer_links[] = "<a href=\"javascript:unsetValue();\" class=\"txt\" alt=\"Unset\" title=\"Unset\">Unset</a>";
+				}
 

 				if(sizeof($footer_links)>0){

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

contrib/ipImap/getip.php

Indentation +8 added lines, -8 removed lines

@@ -5,10 +5,10 @@ 
 include_once($path.'config.php');
 require_once($path.'function.php');
 if ( !isset($version) ) {
-        openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
-        closelog();
-        exit(255);
+		openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
+		syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
+		closelog();
+		exit(255);
 }
 include_once(dirname(__FILE__) . '/function.php');
 $conf = parse_ini_file($confImap_file);
@@ -35,12 +35,12 @@ 
 
 	/* check you select a right list */
 	if ( !$tables[$conf['list']['spam']]['bl'] ) {
-       		syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
-	       	exit (254);
+	   		syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
+		   	exit (254);
 	}
 	if ( $tables[$conf['list']['ham']]['bl'] ) {
-        	syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
-	        exit (254);
+			syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
+			exit (254);
 	}
 
 	/* Make MYSQL connection Array */

Spacing +16 added lines, -16 removed lines

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

Braces +1 added lines, -3 removed lines

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