librenms / librenmsv2

app/Settings/DatabaseRepository.php

Braces +2 added lines, -4 removed lines

@@ -42,8 +42,7 @@ 
         $results = DbConfig::key($key)->get(['config_name', 'config_value']);
         if (count($results) > 1) {
             return $this->collectionToArray($results);
-        }
-        elseif (count($results) == 1) {
+        } elseif (count($results) == 1) {
             $entry = $results->first();
             if($entry->config_name != $key) { //FIXME: better test
                 // trim the prefix
@@ -53,8 +52,7 @@ 
 
             $value = $entry->config_value;
             return is_null($value) ? $default : $value;
-        }
-        else {
+        } else {
             return $default;
         }
     }

app/Settings/Settings.php

Braces +3 added lines, -6 removed lines

@@ -48,8 +48,7 @@ 
             foreach ($value as $k => $v) {
                 $this->database->set($k, $v);
             }
-        }
-        else {
+        } else {
             $this->database->set($key, $value);
         }
         return $value;
@@ -70,8 +69,7 @@ 
             $currentPath = array_merge($path, array($key));
             if (is_array($val)) {
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
-            }
-            else {
+            } else {
                 $result[$prefix . join('.', $currentPath)] = $val;
             }
         }
@@ -90,8 +88,7 @@ 
                 if (!is_null($config)) {
                     $value = array_replace_recursive($config, $value);
                 }
-            }
-            elseif (is_null($value)) {
+            } elseif (is_null($value)) {
                 return Config::get('config.' . $key);
             }