patrickpr / trapdirector

application/controllers/SettingsController.php

Braces +16 added lines, -15 removed lines

@@ -52,8 +52,7 @@ 
               $this->Config()->saveIni();
               $this->view->configErrorDetected='Configuration is empty : you can run install script with parameters (see Automatic installation below)';
               //$emptyConfig=1;
-          }
-          catch (Exception $e)
+          } catch (Exception $e)
           {
               $this->view->configErrorDetected=$e->getMessage();
           }
@@ -141,8 +140,7 @@ 
               $this->view->apimessage='API config : ' . $e->getMessage();
               $this->view->apimessageError=true;
           }
-      }
-      else
+      } else
       {
           $this->view->apimessage='API parameters not configured';
           $this->view->apimessageError=true;
@@ -208,7 +206,9 @@ 
           $input="154865134987aaaa";
           exec("$phpBin -r \"echo '$input';\"",$output,$retCode);
           
-          if (! isset($output[0])) $output[0]="NO OUT";
+          if (! isset($output[0])) {
+          	$output[0]="NO OUT";
+          }
           
           if ($retCode == 0 && preg_match("/$input/",$output[0]) == 1)
           {
@@ -310,8 +310,7 @@ 
 	    $this->getUIDatabase()->testGetDb(); // Get DB in test mode
 	    printf('Schema already exists');
 	    
-	} 
-	catch (DBException $e) 
+	} catch (DBException $e) 
 	{
 
 		printf('Creating schema : <br>');
@@ -367,8 +366,7 @@ 
           $this->getUIDatabase()->testGetDb(); // Get DB in test mode
           echo 'Schema already exists and is up to date<br>';
           return;
-      }
-      catch (DBException $e)
+      } catch (DBException $e)
       {
           $dberror=$e->getArray(); 
       }
@@ -435,12 +433,15 @@ 
       }
       // Assume there is only one line... TODO : see if there is a better way to do this
       $line = preg_replace('/^.*snmptrapd /','',$psOutput[0]);
-      if (!preg_match('/-n/',$line))
-          return array(1,'snmptrapd has no -n option : '.$line);
-      if (!preg_match('/-O[^ ]*n/',$line))
-          return array(1,'snmptrapd has no -On option : '.$line);
-      if (!preg_match('/-O[^ ]*e/',$line))
-          return array(1,'snmptrapd has no -Oe option : '.$line);
+      if (!preg_match('/-n/',$line)) {
+                return array(1,'snmptrapd has no -n option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*n/',$line)) {
+                return array(1,'snmptrapd has no -On option : '.$line);
+      }
+      if (!preg_match('/-O[^ ]*e/',$line)) {
+                return array(1,'snmptrapd has no -Oe option : '.$line);
+      }
       
       return array(0,'snmptrapd listening to UDP/162, options : '.$line);
   }