@@ -34,24 +34,28 @@ |
||
| 34 | 34 | public function getAppOrder() { |
| 35 | 35 | $order_user = $this->appConfig->getUserValue('order', $this->userId); |
| 36 | 36 | $order_default = $this->appConfig->getAppValue('order'); |
| 37 | - if ($order_user !== null && $order_user !== "") |
|
| 38 | - $order = $order_user; |
|
| 39 | - else |
|
| 40 | - $order = $order_default; |
|
| 37 | + if ($order_user !== null && $order_user !== "") { |
|
| 38 | + $order = $order_user; |
|
| 39 | + } else { |
|
| 40 | + $order = $order_default; |
|
| 41 | + } |
|
| 41 | 42 | return $order; |
| 42 | 43 | } |
| 43 | 44 | |
| 44 | 45 | public function matchOrder($nav, $order) { |
| 45 | 46 | $nav_tmp = array(); |
| 46 | 47 | $result = array(); |
| 47 | - foreach ($nav as $app) |
|
| 48 | - $nav_tmp[$app['href']] = $app; |
|
| 49 | - foreach ($order as $app) |
|
| 50 | - if(array_key_exists($app, $nav_tmp)) |
|
| 48 | + foreach ($nav as $app) { |
|
| 49 | + $nav_tmp[$app['href']] = $app; |
|
| 50 | + } |
|
| 51 | + foreach ($order as $app) { |
|
| 52 | + if(array_key_exists($app, $nav_tmp)) |
|
| 51 | 53 | $result[$app] = $nav_tmp[$app]; |
| 52 | - foreach ($nav as $app) |
|
| 53 | - if (!array_key_exists($app['href'], $result)) |
|
| 54 | + } |
|
| 55 | + foreach ($nav as $app) { |
|
| 56 | + if (!array_key_exists($app['href'], $result)) |
|
| 54 | 57 | $result[$app['href']] = $app; |
| 58 | + } |
|
| 55 | 59 | return $result; |
| 56 | 60 | } |
| 57 | 61 | |