juliushaertl / apporder

controller/settingscontroller.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         foreach ($nav as $app)
             $nav_tmp[$app['href']] = $app;
         foreach ($order as $app)
-            if(array_key_exists($app, $nav_tmp))
+            if (array_key_exists($app, $nav_tmp))
                 $result[$app] = $nav_tmp[$app];
         foreach ($nav as $app)
             if (!array_key_exists($app['href'], $result))

Braces +14 added lines, -10 removed lines

@@ -37,24 +37,28 @@
     public function getAppOrder() {
         $order_user = $this->appConfig->getUserValue('order', $this->userId);
         $order_default = $this->appConfig->getAppValue('order');
-        if ($order_user !== null && $order_user !== "")
-            $order = $order_user;
-        else
-            $order = $order_default;
+        if ($order_user !== null && $order_user !== "") {
+                    $order = $order_user;
+        } else {
+                    $order = $order_default;
+        }
         return $order;
     }
 
     public function matchOrder($nav, $order) {
         $nav_tmp = array();
         $result = array();
-        foreach ($nav as $app)
-            $nav_tmp[$app['href']] = $app;
-        foreach ($order as $app)
-            if(array_key_exists($app, $nav_tmp))
+        foreach ($nav as $app) {
+                    $nav_tmp[$app['href']] = $app;
+        }
+        foreach ($order as $app) {
+                    if(array_key_exists($app, $nav_tmp))
                 $result[$app] = $nav_tmp[$app];
-        foreach ($nav as $app)
-            if (!array_key_exists($app['href'], $result))
+        }
+        foreach ($nav as $app) {
+                    if (!array_key_exists($app['href'], $result))
                 $result[$app['href']] = $app;
+        }
         return $result;
     }