juliushaertl /
apporder
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | foreach ($nav as $app) { |
| 53 | 53 | $nav_tmp[$app['href']] = $app; |
| 54 | 54 | } |
| 55 | - if(is_array($order)) { |
|
| 55 | + if (is_array($order)) { |
|
| 56 | 56 | foreach ($order as $app) { |
| 57 | 57 | if (array_key_exists($app, $nav_tmp)) { |
| 58 | 58 | $result[$app] = $nav_tmp[$app]; |
@@ -58,26 +58,26 @@ |
||
| 58 | 58 | $firstPage = null; |
| 59 | 59 | |
| 60 | 60 | if ($order !== null && sizeof($order) > 0) { |
| 61 | - if($hidden !== null && sizeof($hidden) > 0){ |
|
| 62 | - foreach($order as $app){ |
|
| 63 | - if(!in_array($app,$hidden)){ |
|
| 61 | + if ($hidden !== null && sizeof($hidden) > 0) { |
|
| 62 | + foreach ($order as $app) { |
|
| 63 | + if (!in_array($app, $hidden)) { |
|
| 64 | 64 | $firstPage = $app; |
| 65 | 65 | break; |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | - else{ |
|
| 69 | + else { |
|
| 70 | 70 | $firstPage = $order[0]; |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | - if($firstPage===null) { |
|
| 73 | + if ($firstPage === null) { |
|
| 74 | 74 | |
| 75 | 75 | $appId = 'files'; |
| 76 | 76 | |
| 77 | 77 | if (getenv('front_controller_active') === 'true') { |
| 78 | - $firstPage = $this->urlGenerator->getAbsoluteURL('/apps/' . $appId . '/'); |
|
| 78 | + $firstPage = $this->urlGenerator->getAbsoluteURL('/apps/'.$appId.'/'); |
|
| 79 | 79 | } else { |
| 80 | - $firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/'); |
|
| 80 | + $firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/'.$appId.'/'); |
|
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | return new RedirectResponse($firstPage); |
@@ -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 | } |
@@ -55,10 +55,10 @@ 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) $order = array(); |
|
| 59 | 59 | $nav = $this->util->matchOrder($navigation, $order); |
| 60 | 60 | $hidden = json_decode($this->appConfig->getAppValue('hidden')); |
| 61 | - if($hidden === null) $hidden = array(); |
|
| 61 | + if ($hidden === null) $hidden = array(); |
|
| 62 | 62 | return new TemplateResponse( |
| 63 | 63 | $this->appName, |
| 64 | 64 | 'admin', |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | // Private API call |
| 72 | 72 | $navigation = $this->navigationManager->getAll(); |
| 73 | 73 | $order = json_decode($this->appConfig->getUserValue('order', $this->userId)); |
| 74 | - if($order === null){ |
|
| 74 | + if ($order === null) { |
|
| 75 | 75 | $order = json_decode($this->appConfig->getAppValue('order')); |
| 76 | - if($order === null) $order = array(); |
|
| 76 | + if ($order === null) $order = array(); |
|
| 77 | 77 | } |
| 78 | 78 | $nav = $this->util->matchOrder($navigation, $order); |
| 79 | - $hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId)); |
|
| 80 | - if($hidden === null){ |
|
| 79 | + $hidden = json_decode($this->appConfig->getUserValue('hidden', $this->userId)); |
|
| 80 | + if ($hidden === null) { |
|
| 81 | 81 | $hidden = json_decode($this->appConfig->getAppValue('hidden')); |
| 82 | - if($hidden === null) $hidden = array(); |
|
| 82 | + if ($hidden === null) $hidden = array(); |
|
| 83 | 83 | } |
| 84 | 84 | return new TemplateResponse( |
| 85 | 85 | $this->appName, |
@@ -55,10 +55,14 @@ 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 | return new TemplateResponse( |
| 63 | 67 | $this->appName, |
| 64 | 68 | 'admin', |
@@ -73,13 +77,17 @@ discard block |
||
| 73 | 77 | $order = json_decode($this->appConfig->getUserValue('order', $this->userId)); |
| 74 | 78 | if($order === null){ |
| 75 | 79 | $order = json_decode($this->appConfig->getAppValue('order')); |
| 76 | - if($order === null) $order = array(); |
|
| 80 | + if($order === null) { |
|
| 81 | + $order = array(); |
|
| 82 | + } |
|
| 77 | 83 | } |
| 78 | 84 | $nav = $this->util->matchOrder($navigation, $order); |
| 79 | 85 | $hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId)); |
| 80 | 86 | if($hidden === null){ |
| 81 | 87 | $hidden = json_decode($this->appConfig->getAppValue('hidden')); |
| 82 | - if($hidden === null) $hidden = array(); |
|
| 88 | + if($hidden === null) { |
|
| 89 | + $hidden = array(); |
|
| 90 | + } |
|
| 83 | 91 | } |
| 84 | 92 | return new TemplateResponse( |
| 85 | 93 | $this->appName, |
