patrickpr / trapdirector

bin/trap_in.php

Indentation +14 added lines, -14 removed lines

@@ -17,13 +17,13 @@ 
 try
 {
        
-    $trap = new Trap($icingaweb2Etc);
-    //$Trap = new Trap($icingaweb2Etc,4,'display'); // For debug
-    //$Trap = new Trap($icingaweb2Etc,4,'syslog'); // For debug
-    //$Trap->setLogging(4,'syslog'); 
+	$trap = new Trap($icingaweb2Etc);
+	//$Trap = new Trap($icingaweb2Etc,4,'display'); // For debug
+	//$Trap = new Trap($icingaweb2Etc,4,'syslog'); // For debug
+	//$Trap->setLogging(4,'syslog'); 
     
-    // TODO : tranfer this to reset_trap cli command
-    $trap->eraseOldTraps();
+	// TODO : tranfer this to reset_trap cli command
+	$trap->eraseOldTraps();
 
 	$trap->read_trap('php://stdin');
 
@@ -36,15 +36,15 @@ 
 }
 catch (Exception $e) 
 {
-    if ($trap == null)
-    {  // Exception in trap creation : log in display & syslog
-        $logging = new Logging();
-        $logging->log("Caught exception creating Trap class",2);
-    }
-    else
-    {
+	if ($trap == null)
+	{  // Exception in trap creation : log in display & syslog
+		$logging = new Logging();
+		$logging->log("Caught exception creating Trap class",2);
+	}
+	else
+	{
 	   $trap->trapLog("Exception : ". $e->getMessage(),2,0);
-    }
+	}
 }
 
 //end

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 use Trapdirector\Trap;
 
 // start
-$time1 = microtime(true);
+$time1=microtime(true);
 
 require_once ('trap_class.php');
 
@@ -17,7 +17,7 @@ 
 try
 {
        
-    $trap = new Trap($icingaweb2Etc);
+    $trap=new Trap($icingaweb2Etc);
     //$Trap = new Trap($icingaweb2Etc,4,'display'); // For debug
     //$Trap = new Trap($icingaweb2Etc,4,'syslog'); // For debug
     //$Trap->setLogging(4,'syslog'); 
@@ -38,12 +38,12 @@ 
 {
     if ($trap == null)
     {  // Exception in trap creation : log in display & syslog
-        $logging = new Logging();
-        $logging->log("Caught exception creating Trap class",2);
+        $logging=new Logging();
+        $logging->log("Caught exception creating Trap class", 2);
     }
     else
     {
-	   $trap->trapLog("Exception : ". $e->getMessage(),2,0);
+	   $trap->trapLog("Exception : ".$e->getMessage(), 2, 0);
     }
 }
 

Braces +2 added lines, -4 removed lines

@@ -33,15 +33,13 @@
 
 	$trap->add_rule_final(microtime(true) - $time1);
 	
-}
-catch (Exception $e) 
+} catch (Exception $e) 
 {
     if ($trap == null)
     {  // Exception in trap creation : log in display & syslog
         $logging = new Logging();
         $logging->log("Caught exception creating Trap class",2);
-    }
-    else
+    } else
     {
 	   $trap->trapLog("Exception : ". $e->getMessage(),2,0);
     }