juliushaertl / apporder

lib/Util.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,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

@@ -34,24 +34,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;
 	}
 

Indentation +31 added lines, -31 removed lines

@@ -27,36 +27,36 @@
 
 class Util {
 
-	private $userId;
-	private $appConfig;
-
-	public function __construct(ConfigService $appConfig, $userId) {
-		$this->userId = $userId;
-		$this->appConfig = $appConfig;
-	}
-
-	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;
-		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))
-				$result[$app] = $nav_tmp[$app];
-		foreach ($nav as $app)
-			if (!array_key_exists($app['href'], $result))
-				$result[$app['href']] = $app;
-		return $result;
-	}
+    private $userId;
+    private $appConfig;
+
+    public function __construct(ConfigService $appConfig, $userId) {
+        $this->userId = $userId;
+        $this->appConfig = $appConfig;
+    }
+
+    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;
+        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))
+                $result[$app] = $nav_tmp[$app];
+        foreach ($nav as $app)
+            if (!array_key_exists($app['href'], $result))
+                $result[$app['href']] = $app;
+        return $result;
+    }
 
 }
\ No newline at end of file

lib/Controller/AppController.php

Spacing +4 added lines, -4 removed lines

@@ -52,14 +52,14 @@
 	 */
     public function index() {
     	$order = json_decode($this->util->getAppOrder());
-		if($order !== null && sizeof($order)>0) {
+		if ($order !== null && sizeof($order) > 0) {
 			$firstPage = $order[0];
 		} else {
 			$appId = 'files';
-			if(getenv('front_controller_active') === 'true') {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
+			if (getenv('front_controller_active') === 'true') {
+				$firstPage = $this->urlGenerator->getAbsoluteURL('/apps/'.$appId.'/');
 			} else {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
+				$firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/'.$appId.'/');
 			}
 		}
         return new RedirectResponse($firstPage);

Indentation +18 added lines, -18 removed lines

@@ -36,33 +36,33 @@
     private $userId;
     private $appConfig;
     private $urlGenerator;
-	private $util;
+    private $util;
 
     public function __construct($appName, IRequest $request, ConfigService $appConfig, IURLGenerator $urlGenerator, Util $util, $userId) {
         parent::__construct($appName, $request);
         $this->userId = $userId;
         $this->appConfig = $appConfig;
         $this->urlGenerator = $urlGenerator;
-		$this->util = $util;
+        $this->util = $util;
     }
 
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @return RedirectResponse
-	 */
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @return RedirectResponse
+     */
     public function index() {
-    	$order = json_decode($this->util->getAppOrder());
-		if($order !== null && sizeof($order)>0) {
-			$firstPage = $order[0];
-		} else {
-			$appId = 'files';
-			if(getenv('front_controller_active') === 'true') {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
-			} else {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
-			}
-		}
+        $order = json_decode($this->util->getAppOrder());
+        if($order !== null && sizeof($order)>0) {
+            $firstPage = $order[0];
+        } else {
+            $appId = 'files';
+            if(getenv('front_controller_active') === 'true') {
+                $firstPage = $this->urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
+            } else {
+                $firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
+            }
+        }
         return new RedirectResponse($firstPage);
     }
 

appinfo/routes.php

Indentation +6 added lines, -6 removed lines

@@ -22,10 +22,10 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'app#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'settings#getOrder', 'url' => 'ajax/order.php', 'verb' => 'GET'],
-		['name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'GET'],
-		['name' => 'settings#saveDefaultOrder', 'url' => 'ajax/admin.php', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'app#index', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'settings#getOrder', 'url' => 'ajax/order.php', 'verb' => 'GET'],
+        ['name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'GET'],
+        ['name' => 'settings#saveDefaultOrder', 'url' => 'ajax/admin.php', 'verb' => 'GET'],
+    ]
 ];

lib/Service/ConfigService.php

Indentation +18 added lines, -18 removed lines

@@ -27,28 +27,28 @@
 
 class ConfigService {
 
-	private $config;
-	private $appName;
+    private $config;
+    private $appName;
 
-	public function __construct(IConfig $config, $appName) {
-		$this->config = $config;
-		$this->appName = $appName;
-	}
+    public function __construct(IConfig $config, $appName) {
+        $this->config = $config;
+        $this->appName = $appName;
+    }
 
-	public function getAppValue($key) {
-		return $this->config->getAppValue($this->appName, $key);
-	}
+    public function getAppValue($key) {
+        return $this->config->getAppValue($this->appName, $key);
+    }
 
-	public function setAppValue($key, $value) {
-		$this->config->setAppValue($this->appName, $key, $value);
-	}
+    public function setAppValue($key, $value) {
+        $this->config->setAppValue($this->appName, $key, $value);
+    }
 
-	public function getUserValue($key, $userId) {
-		return $this->config->getUserValue($userId, $this->appName, $key);
-	}
+    public function getUserValue($key, $userId) {
+        return $this->config->getUserValue($userId, $this->appName, $key);
+    }
 
-	public function setUserValue($key, $userId, $value) {
-		$this->config->setUserValue($userId, $this->appName, $key, $value);
-	}
+    public function setUserValue($key, $userId, $value) {
+        $this->config->setUserValue($userId, $this->appName, $key, $value);
+    }
 
 }

lib/Controller/SettingsController.php

Indentation +67 added lines, -67 removed lines

@@ -32,78 +32,78 @@
 
 class SettingsController extends Controller {
 
-	private $userId;
-	private $appConfig;
-	private $navigationManager;
-	private $util;
+    private $userId;
+    private $appConfig;
+    private $navigationManager;
+    private $util;
 
-	public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $urlGenerator, Util $util, $userId) {
-		parent::__construct($appName, $request);
-		$this->userId = $userId;
-		$this->appConfig = $appConfig;
-		$this->navigationManager = $urlGenerator;
-		$this->util = $util;
-	}
+    public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $urlGenerator, Util $util, $userId) {
+        parent::__construct($appName, $request);
+        $this->userId = $userId;
+        $this->appConfig = $appConfig;
+        $this->navigationManager = $urlGenerator;
+        $this->util = $util;
+    }
 
-	/**
-	 * Admin: render admin page
-	 * FIXME: Move to dedicated class
-	 *
-	 * @return TemplateResponse
-	 */
-	public function adminIndex() {
-		// Private API call
-		$navigation = $this->navigationManager->getAll();
-		$order = json_decode($this->appConfig->getAppValue('order'));
-		$nav = $this->util->matchOrder($navigation, $order);
-		return new TemplateResponse(
-			$this->appName,
-			'admin',
-			["nav" => $nav],
-			'blank'
-		);
-	}
+    /**
+     * Admin: render admin page
+     * FIXME: Move to dedicated class
+     *
+     * @return TemplateResponse
+     */
+    public function adminIndex() {
+        // Private API call
+        $navigation = $this->navigationManager->getAll();
+        $order = json_decode($this->appConfig->getAppValue('order'));
+        $nav = $this->util->matchOrder($navigation, $order);
+        return new TemplateResponse(
+            $this->appName,
+            'admin',
+            ["nav" => $nav],
+            'blank'
+        );
+    }
 
-	/**
-	 * Admin: save default order
-	 *
-	 * @param $order
-	 * @return array response
-	 */
-	public function saveDefaultOrder($order) {
-		if (!is_null($order)) {
-			$this->appConfig->setAppValue('order', $order);
-		}
-		return array('status' => 'success', 'order' => $order);
-	}
+    /**
+     * Admin: save default order
+     *
+     * @param $order
+     * @return array response
+     */
+    public function saveDefaultOrder($order) {
+        if (!is_null($order)) {
+            $this->appConfig->setAppValue('order', $order);
+        }
+        return array('status' => 'success', 'order' => $order);
+    }
 
-	/**
-	 * Return order for current user
-	 *
-	 * @NoAdminRequired
-	 * @return array response
-	 */
-	public function getOrder() {
-		$order = $this->util->getAppOrder();
-		return array('status' => 'success', 'order' => $order);
-	}
+    /**
+     * Return order for current user
+     *
+     * @NoAdminRequired
+     * @return array response
+     */
+    public function getOrder() {
+        $order = $this->util->getAppOrder();
+        return array('status' => 'success', 'order' => $order);
+    }
 
-	/**
-	 * Save order for current user
-	 *
-	 * @NoAdminRequired
-	 * @param $order string
-	 * @return array response
-	 */
-	public function savePersonal($order) {
-		$this->appConfig->setUserValue('order', $this->userId, $order);
-		$response = array(
-			'status' => 'success',
-			'data' => array('message' => 'User order saved successfully.'),
-			'order' => $order
-		);
-		return $response;
-	}
+    /**
+     * Save order for current user
+     *
+     * @NoAdminRequired
+     * @param $order string
+     * @return array response
+     */
+    public function savePersonal($order) {
+        $this->appConfig->setUserValue('order', $this->userId, $order);
+        $response = array(
+            'status' => 'success',
+            'data' => array('message' => 'User order saved successfully.'),
+            'order' => $order
+        );
+        return $response;
+    }
 
 
 }

lib/AppInfo/Application.php

Indentation +10 added lines, -10 removed lines

@@ -28,14 +28,14 @@
 
 class Application extends App {
 
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('apporder', $urlParams);
-		$container = $this->getContainer();
-		$container->registerService('ConfigService', function($c) {
-			return new ConfigService(
-				$c->query('Config'),
-				$c->query('AppName')
-			);
-		});
-	}
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('apporder', $urlParams);
+        $container = $this->getContainer();
+        $container->registerService('ConfigService', function($c) {
+            return new ConfigService(
+                $c->query('Config'),
+                $c->query('AppName')
+            );
+        });
+    }
 }