juliushaertl /
apporder
@@ -65,8 +65,7 @@ |
||
| 65 | 65 | break; |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | - } |
|
| 69 | - else{ |
|
| 68 | + } else{ |
|
| 70 | 69 | $firstPage = $order[0]; |
| 71 | 70 | } |
| 72 | 71 | } |
@@ -39,7 +39,9 @@ discard block |
||
| 39 | 39 | $order_user = $this->appConfig->getUserValue('order', $this->userId); |
| 40 | 40 | $order_default = $this->appConfig->getAppValue('order'); |
| 41 | 41 | $forced_order = json_decode($this->appConfig->getAppValue('force')); |
| 42 | - if($forced_order === null) $forced_order = false; |
|
| 42 | + if($forced_order === null) { |
|
| 43 | + $forced_order = false; |
|
| 44 | + } |
|
| 43 | 45 | if ($order_user !== null && $order_user !== "" && !($forced_order)) { |
| 44 | 46 | $order = $order_user; |
| 45 | 47 | } else { |
@@ -73,7 +75,9 @@ discard block |
||
| 73 | 75 | $hidden_user = $this->appConfig->getUserValue('hidden', $this->userId); |
| 74 | 76 | $hidden_default = $this->appConfig->getAppValue('hidden'); |
| 75 | 77 | $forced_order = json_decode($this->appConfig->getAppValue('force')); |
| 76 | - if($forced_order === null) $forced_order = false; |
|
| 78 | + if($forced_order === null) { |
|
| 79 | + $forced_order = false; |
|
| 80 | + } |
|
| 77 | 81 | if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) { |
| 78 | 82 | $hidden = $hidden_user; |
| 79 | 83 | } else { |
@@ -55,12 +55,18 @@ discard block |
||
| 55 | 55 | // Private API call |
| 56 | 56 | $navigation = $this->navigationManager->getAll(); |
| 57 | 57 | $order = json_decode($this->appConfig->getAppValue('order')); |
| 58 | - if($order === null) $order = array(); |
|
| 58 | + if($order === null) { |
|
| 59 | + $order = array(); |
|
| 60 | + } |
|
| 59 | 61 | $nav = $this->util->matchOrder($navigation, $order); |
| 60 | 62 | $hidden = json_decode($this->appConfig->getAppValue('hidden')); |
| 61 | - if($hidden === null) $hidden = array(); |
|
| 63 | + if($hidden === null) { |
|
| 64 | + $hidden = array(); |
|
| 65 | + } |
|
| 62 | 66 | $force = json_decode($this->appConfig->getAppValue('force')); |
| 63 | - if($force === null) $force = false; |
|
| 67 | + if($force === null) { |
|
| 68 | + $force = false; |
|
| 69 | + } |
|
| 64 | 70 | return new TemplateResponse( |
| 65 | 71 | $this->appName, |
| 66 | 72 | 'admin', |
@@ -75,16 +81,22 @@ discard block |
||
| 75 | 81 | $order = json_decode($this->appConfig->getUserValue('order', $this->userId)); |
| 76 | 82 | if($order === null){ |
| 77 | 83 | $order = json_decode($this->appConfig->getAppValue('order')); |
| 78 | - if($order === null) $order = array(); |
|
| 84 | + if($order === null) { |
|
| 85 | + $order = array(); |
|
| 86 | + } |
|
| 79 | 87 | } |
| 80 | 88 | $nav = $this->util->matchOrder($navigation, $order); |
| 81 | 89 | $hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId)); |
| 82 | 90 | if($hidden === null){ |
| 83 | 91 | $hidden = json_decode($this->appConfig->getAppValue('hidden')); |
| 84 | - if($hidden === null) $hidden = array(); |
|
| 92 | + if($hidden === null) { |
|
| 93 | + $hidden = array(); |
|
| 94 | + } |
|
| 85 | 95 | } |
| 86 | 96 | $force = json_decode($this->appConfig->getAppValue('force')); |
| 87 | - if($force === null) $force = false; |
|
| 97 | + if($force === null) { |
|
| 98 | + $force = false; |
|
| 99 | + } |
|
| 88 | 100 | return new TemplateResponse( |
| 89 | 101 | $this->appName, |
| 90 | 102 | 'admin', |
