Completed
Branch master (e6f5a5)
by Julius
02:11
created
templates/admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
     <h2><?php p($l->t('App Order')) ?></h2>
3 3
     <p><?php p($l->t('Set default order for all users')) ?></p>
4 4
     <ul id="appsorter">
5
-    <?php foreach($_['nav'] as $entry) { ?>
5
+    <?php foreach ($_['nav'] as $entry) { ?>
6 6
         <li>
7 7
             <img class="app-icon svg" alt="" src="<?php print_unescaped($entry['icon']); ?>">
8 8
             <a href="<?php print_unescaped($entry['href']); ?>">
Please login to merge, or discard this patch.
controller/settingscontroller.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -8,21 +8,21 @@  discard block
 block discarded – undo
8 8
 use \OCP\INavigationManager;
9 9
 use \OCA\AppOrder\Service\ConfigService;
10 10
 
11
-class SettingsController extends Controller{
11
+class SettingsController extends Controller {
12 12
 
13 13
     private $userId;
14 14
     private $l10n;
15 15
     private $appConfig;
16 16
     private $navigationManager;
17 17
 
18
-    public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $navigationManager, $userId){
18
+    public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $navigationManager, $userId) {
19 19
         parent::__construct($appName, $request);
20 20
         $this->userId = $userId;
21 21
         $this->appConfig = $appConfig;
22 22
         $this->navigationManager = $navigationManager;
23 23
     }
24 24
 
25
-    public function adminIndex(){
25
+    public function adminIndex() {
26 26
         $navigation = $this->navigationManager->getAll();
27 27
         $order = json_decode($this->appConfig->getAppValue('order'));
28 28
         $nav = $this->matchOrder($navigation, $order);
@@ -47,12 +47,12 @@  discard block
 block discarded – undo
47 47
     private function matchOrder($nav, $order) {
48 48
         $nav_tmp = array();
49 49
         $result = array();
50
-        foreach($nav as $app)
50
+        foreach ($nav as $app)
51 51
             $nav_tmp[$app['href']] = $app;
52
-        foreach($order as $app)
52
+        foreach ($order as $app)
53 53
             $result[$app] = $nav_tmp[$app];
54
-        foreach($nav as $app)
55
-            if(!array_key_exists($app['href'], $result))
54
+        foreach ($nav as $app)
55
+            if (!array_key_exists($app['href'], $result))
56 56
                 $result[$app['href']] = $app;
57 57
         return $result;
58 58
     }
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
     /**
61 61
      * @NoAdminRequired
62 62
      */
63
-    public function getOrder(){
63
+    public function getOrder() {
64 64
         $order = $this->getAppOrder();
65 65
         return array('status' => 'success', 'order' => $order);
66 66
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     /**
69 69
      * @NoAdminRequired
70 70
      */
71
-    public function savePersonal($order){
71
+    public function savePersonal($order) {
72 72
         $this->appConfig->setUserValue('order', $this->userId, $order);
73 73
         $response = array(
74 74
             'status' => 'success',
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
         return $response;
79 79
     }
80 80
 
81
-    public function saveDefaultOrder($order){
82
-        if (!is_null($order)){
83
-            $this->appConfig->setAppValue('order',$order);
81
+    public function saveDefaultOrder($order) {
82
+        if (!is_null($order)) {
83
+            $this->appConfig->setAppValue('order', $order);
84 84
         }
85 85
         return array('status' => 'success', 'order' => $order);
86 86
     }
Please login to merge, or discard this patch.
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -37,23 +37,27 @@
 block discarded – undo
37 37
     private function getAppOrder() {
38 38
         $order_user = $this->appConfig->getUserValue('order', $this->userId);
39 39
         $order_default = $this->appConfig->getAppValue('order');
40
-        if ($order_user !== null && $order_user !== "")
41
-            $order = $order_user;
42
-        else
43
-            $order = $order_default;
40
+        if ($order_user !== null && $order_user !== "") {
41
+                    $order = $order_user;
42
+        } else {
43
+                    $order = $order_default;
44
+        }
44 45
         return $order;
45 46
     }
46 47
 
47 48
     private function matchOrder($nav, $order) {
48 49
         $nav_tmp = array();
49 50
         $result = array();
50
-        foreach($nav as $app)
51
-            $nav_tmp[$app['href']] = $app;
52
-        foreach($order as $app)
53
-            $result[$app] = $nav_tmp[$app];
54
-        foreach($nav as $app)
55
-            if(!array_key_exists($app['href'], $result))
51
+        foreach($nav as $app) {
52
+                    $nav_tmp[$app['href']] = $app;
53
+        }
54
+        foreach($order as $app) {
55
+                    $result[$app] = $nav_tmp[$app];
56
+        }
57
+        foreach($nav as $app) {
58
+                    if(!array_key_exists($app['href'], $result))
56 59
                 $result[$app['href']] = $app;
60
+        }
57 61
         return $result;
58 62
     }
59 63
 
Please login to merge, or discard this patch.
appinfo/application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 
8 8
 class Application extends App {
9 9
 
10
-    public function __construct(array $urlParams=array()){
10
+    public function __construct(array $urlParams = array()) {
11 11
         parent::__construct('apporder', $urlParams);
12 12
         $container = $this->getContainer();
13 13
         $container->registerService('ConfigService', function($c) {
Please login to merge, or discard this patch.
service/configservice.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
     private $config;
10 10
     private $appName;
11 11
 
12
-    public function __construct(IConfig $config, $appName){
12
+    public function __construct(IConfig $config, $appName) {
13 13
         $this->config = $config;
14 14
         $this->appName = $appName;
15 15
     }
Please login to merge, or discard this patch.