stevenbuehner / HtpasswdManager

src/HtpasswdManager/Test/HtpasswdServiceTest.php

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
         // Remove emtpy lines
         foreach ($lines as $i => $line) {
             if (empty(trim($line))) {
-                unset($lines[$i]);
+                unset($lines[ $i ]);
             }
         }
 

src/HtpasswdManager/Service/Factory/UserServiceFactory.php

Spacing +8 added lines, -8 removed lines

@@ -7,25 +7,25 @@
 class UserServiceFactory {
 
 	public function __invoke($sm) {
-		$config = $sm->get ( 'Config' );
+		$config = $sm->get('Config');
 		
 		// Default
 		$not_deletable_users = array();
-		if (isset ( $config ['HtpasswdManager'] ['not_deletable_users'] ) && is_array ( $config ['HtpasswdManager'] ['not_deletable_users'] )) {
-			$not_deletable_users = $config ['HtpasswdManager'] ['not_deletable_users'];
+		if (isset ($config [ 'HtpasswdManager' ] [ 'not_deletable_users' ]) && is_array($config [ 'HtpasswdManager' ] [ 'not_deletable_users' ])) {
+			$not_deletable_users = $config [ 'HtpasswdManager' ] [ 'not_deletable_users' ];
 		}
 		
 		// Default
 		$user_with_management_permission = true;
-		if (isset ( $config ['HtpasswdManager'] ['usermanagement_users'] ) && is_array ( $config ['HtpasswdManager'] ['usermanagement_users'] )) {
-			$user_with_management_permission = $config ['HtpasswdManager'] ['usermanagement_users'];
-		} else if ($config ['HtpasswdManager'] ['usermanagement_users'] === false) {
+		if (isset ($config [ 'HtpasswdManager' ] [ 'usermanagement_users' ]) && is_array($config [ 'HtpasswdManager' ] [ 'usermanagement_users' ])) {
+			$user_with_management_permission = $config [ 'HtpasswdManager' ] [ 'usermanagement_users' ];
+		} else if ($config [ 'HtpasswdManager' ] [ 'usermanagement_users' ] === false) {
 			$user_with_management_permission = false;
 		}
 		
-		$request = $sm->get ( 'Request' );
+		$request = $sm->get('Request');
 		
-		return new UserService ( $request, $not_deletable_users, $user_with_management_permission );
+		return new UserService($request, $not_deletable_users, $user_with_management_permission);
 	}
 
 }

src/HtpasswdManager/Service/UserService.php

Spacing +15 added lines, -15 removed lines

@@ -28,31 +28,31 @@ 
 	 * @return string
 	 */
 	public function getCurrentUser() {
-		return $this->request->getServer ()->get ( 'REMOTE_USER', null );
+		return $this->request->getServer()->get('REMOTE_USER', null);
 	}
 
 	public function isUserDeleteable($username) {
-		$eResult = $this->getEventManager ()->trigger ( 'pre_' . __FUNCTION__, $this, array( 
+		$eResult = $this->getEventManager()->trigger('pre_' . __FUNCTION__, $this, array( 
 				$username 
-		) );
+		));
 		
-		if ($eResult->stopped ())
-			return $eResult->last ();
+		if ($eResult->stopped())
+			return $eResult->last();
 		
-		return ! in_array ( $username, $this->not_deletable_users );
+		return !in_array($username, $this->not_deletable_users);
 	}
 
 	public function isUserAllowedToManageUsers($username) {
-		$eResult = $this->getEventManager ()->trigger ( 'pre_' . __FUNCTION__, $this, array( 
+		$eResult = $this->getEventManager()->trigger('pre_' . __FUNCTION__, $this, array( 
 				'user' => $username 
-		) );
+		));
 		
-		if ($eResult->stopped ())
-			return $eResult->last ();
+		if ($eResult->stopped())
+			return $eResult->last();
 			
 			/* If parameter is an array => allow only users in list. IF parameter is boolean, return boolean value */
-		if (is_array ( $this->user_with_management_permission )) {
-			$accessAllowed = in_array ( $username, $this->user_with_management_permission );
+		if (is_array($this->user_with_management_permission)) {
+			$accessAllowed = in_array($username, $this->user_with_management_permission);
 		} else {
 			$accessAllowed = ($this->user_with_management_permission === true);
 		}
@@ -61,10 +61,10 @@ 
 	}
 
 	public function setEventManager(EventManagerInterface $eventManager) {
-		$eventManager->setIdentifiers ( array( 
+		$eventManager->setIdentifiers(array( 
 				__CLASS__,
-				get_class ( $this ) 
-		) );
+				get_class($this) 
+		));
 		$this->eventManager = $eventManager;
 	}
 

src/HtpasswdManager/Service/HtpasswdService.php

Spacing +28 added lines, -28 removed lines

@@ -19,20 +19,20 @@ 
 
 	public function __construct($htpasswd_filename) {
 		$this->filename = $htpasswd_filename;
-		$this->createFileIfNotExistant ();
+		$this->createFileIfNotExistant();
 	}
 
 	private function createFileIfNotExistant() {
-		if (true === file_exists ( $this->filename )) {
+		if (true === file_exists($this->filename)) {
 		} else {
-			touch ( $this->filename );
+			touch($this->filename);
 		}
 	}
 
 	private function getHtpasswdContent() {
 		if ($this->htpasswdCache === null) {
 			
-			$this->htpasswdCache = file_get_contents ( $this->filename );
+			$this->htpasswdCache = file_get_contents($this->filename);
 		}
 		
 		return $this->htpasswdCache;
@@ -41,18 +41,18 @@ 
 	private function updateHtpasswdContent() {
 		$this->htpasswdCache = null;
 		$this->userListCache = null;
-		$this->getUserList ();
+		$this->getUserList();
 	}
 
 	public function getUserList() {
 		if ($this->userListCache === null) {
 			$result = array();
 			
-			$content = $this->getHtpasswdContent ();
+			$content = $this->getHtpasswdContent();
 			
-			if (preg_match_all ( $this::$REGULAR_USER_PASSWORD, $content, $matches, PREG_PATTERN_ORDER ) !== false) {
-				foreach ( $matches [1] as $i => $user ) {
-					$result [$user] = $matches [2] [$i];
+			if (preg_match_all($this::$REGULAR_USER_PASSWORD, $content, $matches, PREG_PATTERN_ORDER) !== false) {
+				foreach ($matches [ 1 ] as $i => $user) {
+					$result [ $user ] = $matches [ 2 ] [ $i ];
 				}
 			}
 			
@@ -63,45 +63,45 @@ 
 	}
 
 	private function encodePassword($password) {
-		return crypt ( $password, substr ( str_replace ( '+', '.', base64_encode ( pack ( 'N4', mt_rand (), mt_rand (), mt_rand (), mt_rand () ) ) ), 0, 22 ) );
+		return crypt($password, substr(str_replace('+', '.', base64_encode(pack('N4', mt_rand(), mt_rand(), mt_rand(), mt_rand()))), 0, 22));
 	}
 
 	private function getNewUserEncodedString($username, $password) {
-		return $username . ':' . $this->encodePassword ( $password ) . "\n";
+		return $username . ':' . $this->encodePassword($password) . "\n";
 	}
 
 	public function addUser($username, $password) {
-		$newContent = $this->getHtpasswdContent ();
-		$newContent .= $this->getNewUserEncodedString ( $username, $password );
+		$newContent = $this->getHtpasswdContent();
+		$newContent .= $this->getNewUserEncodedString($username, $password);
 		
-		$this->replaceHtPasswdContent ( $newContent );
+		$this->replaceHtPasswdContent($newContent);
 	}
 
 	public function updateUser($username, $password) {
-		if ($this->userExists ( $username )) {
-			$this->deleteUser ( $username );
+		if ($this->userExists($username)) {
+			$this->deleteUser($username);
 		}
 		
-		$this->addUser ( $username, $password );
+		$this->addUser($username, $password);
 	}
 
 	public function deleteUser($username) {
-		$content = $this->getHtpasswdContent ();
+		$content = $this->getHtpasswdContent();
 		
 		$newContent = '';
 		$usernameDeleted = false;
 		
-		if (preg_match_all ( $this::$REGULAR_USER_PASSWORD, $this->getHtpasswdContent (), $match ) > 0) {
-			foreach ( $match [1] as $i => $user ) {
+		if (preg_match_all($this::$REGULAR_USER_PASSWORD, $this->getHtpasswdContent(), $match) > 0) {
+			foreach ($match [ 1 ] as $i => $user) {
 				if ($user == $username) {
 					$usernameDeleted = true;
 				} else {
-					$newContent .= $match [0] [$i] . "\n";
+					$newContent .= $match [ 0 ] [ $i ] . "\n";
 				}
 			}
 			
 			if (true === $usernameDeleted) {
-				$this->replaceHtPasswdContent ( $newContent );
+				$this->replaceHtPasswdContent($newContent);
 			}
 		}
 		
@@ -110,17 +110,17 @@ 
 
 	private function replaceHtPasswdContent($newContent) {
 		// file_put_contents ( $this->filename, $newContent );
-		$fp = fopen ( $this->filename, 'w' );
-		fwrite ( $fp, $newContent );
-		fclose ( $fp );
+		$fp = fopen($this->filename, 'w');
+		fwrite($fp, $newContent);
+		fclose($fp);
 		
-		$this->updateHtpasswdContent ();
+		$this->updateHtpasswdContent();
 	}
 
 	public function userExists($username) {
-		$userList = $this->getUserList ();
+		$userList = $this->getUserList();
 		
-		if (isset ( $userList [$username] ))
+		if (isset ($userList [ $username ]))
 			return true;
 		
 		return false;

src/HtpasswdManager/Controller/UserController.php

Spacing +65 added lines, -65 removed lines

@@ -21,130 +21,130 @@ 
 	 * @see \Zend\Mvc\Controller\AbstractActionController::onDispatch()
 	 */
 	public function onDispatch(\Zend\Mvc\MvcEvent $e) {
-		$username = $this->getUserService ()->getCurrentUser ();
+		$username = $this->getUserService()->getCurrentUser();
 		
-		if (false === $this->getUserService ()->isUserAllowedToManageUsers ( $username )) {
-			$this->getResponse ()->setStatusCode ( 401 );
+		if (false === $this->getUserService()->isUserAllowedToManageUsers($username)) {
+			$this->getResponse()->setStatusCode(401);
 			return;
 		}
 		
-		return parent::onDispatch ( $e );
+		return parent::onDispatch($e);
 	}
 
 	function indexAction() {
-		$htpasswdService = $this->getHtpasswdService ();
-		$userList = $htpasswdService->getUserList ();
+		$htpasswdService = $this->getHtpasswdService();
+		$userList = $htpasswdService->getUserList();
 		
 		$result = array();
-		foreach ( $userList as $username => $pass ) {
+		foreach ($userList as $username => $pass) {
 			
-			$result [] = array( 
+			$result [ ] = array( 
 					'username' => $username,
 					'paswd' => $pass,
-					'isAdmin' => $this->getUserService ()->isUserAllowedToManageUsers ( $username ),
-					'isDeletable' => $this->getUserService ()->isUserDeleteable ( $username ) 
+					'isAdmin' => $this->getUserService()->isUserAllowedToManageUsers($username),
+					'isDeletable' => $this->getUserService()->isUserDeleteable($username) 
 			);
 		}
 		
-		$userService = $this->getServiceLocator ()->get ( 'HtpasswdManager\Service\UserService' );
+		$userService = $this->getServiceLocator()->get('HtpasswdManager\Service\UserService');
 		
-		$model = new ViewModel ( array( 
+		$model = new ViewModel(array( 
 				'userList' => $result,
-				'currentUser' => $userService->getCurrentUser () 
-		) );
+				'currentUser' => $userService->getCurrentUser() 
+		));
 		
 		return $model;
 	}
 
 	public function deleteAction() {
-		$user = $this->params ( 'user' );
+		$user = $this->params('user');
 		$messages = array();
 		
-		if (true === $this->getUserService ()->isUserDeleteable ( $user )) {
-			$this->getHtpasswdService ()->deleteUser ( $user );
-			$messages [] = "Der Benutzer '{$user}' wurde gelöscht.";
+		if (true === $this->getUserService()->isUserDeleteable($user)) {
+			$this->getHtpasswdService()->deleteUser($user);
+			$messages [ ] = "Der Benutzer '{$user}' wurde gelöscht.";
 		} else {
-			$messages [] = "Der Benutzer '{$user}' steht auf einer Sperrliste und kann nicht gelöscht werden.";
+			$messages [ ] = "Der Benutzer '{$user}' steht auf einer Sperrliste und kann nicht gelöscht werden.";
 		}
 		
-		$model = $this->indexAction ();
-		$model->setTemplate ( 'htpasswd-manager/user/index' );
-		$model->setVariable ( 'messages', $messages );
+		$model = $this->indexAction();
+		$model->setTemplate('htpasswd-manager/user/index');
+		$model->setVariable('messages', $messages);
 		
 		return $model;
 	}
 
 	public function editAction() {
-		$user = $this->params ( 'user' );
+		$user = $this->params('user');
 		$messages = array();
-		$htpasswd = $this->getHtpasswdService ();
+		$htpasswd = $this->getHtpasswdService();
 		
-		$model = new ViewModel ();
-		$model->setVariable ( 'user', $user );
+		$model = new ViewModel();
+		$model->setVariable('user', $user);
 		
-		$post = $this->getRequest ()->getPost ();
-		if (! isset ( $post ['password'] )) {
+		$post = $this->getRequest()->getPost();
+		if (!isset ($post [ 'password' ])) {
 			// Formular initialisieren
-			if (false === $htpasswd->userExists ( $user )) {
-				$this->redirect ()->toRoute ( 'htpasswdmanager', array( 
+			if (false === $htpasswd->userExists($user)) {
+				$this->redirect()->toRoute('htpasswdmanager', array( 
 						'action' => 'index' 
-				) );
+				));
 			}
 		} else {
 			// Formular speichern
-			$password = $post ['password'];
-			$htpasswd->updateUser ( $user, $password );
-			$messages [] = "Passwort für '{$user}' wurde aktualisiert.";
+			$password = $post [ 'password' ];
+			$htpasswd->updateUser($user, $password);
+			$messages [ ] = "Passwort für '{$user}' wurde aktualisiert.";
 			
-			$model = $this->indexAction ();
-			$model->setTemplate ( 'htpasswd-manager/user/index' );
+			$model = $this->indexAction();
+			$model->setTemplate('htpasswd-manager/user/index');
 		}
 		
-		$model->setVariable ( 'messages', $messages );
+		$model->setVariable('messages', $messages);
 		return $model;
 	}
 
 	public function addAction() {
-		$username = $post = $this->getRequest ()->getPost ( 'username', '' );
-		$password = $post = $this->getRequest ()->getPost ( 'password', '' );
+		$username = $post = $this->getRequest()->getPost('username', '');
+		$password = $post = $this->getRequest()->getPost('password', '');
 		$messages = array();
-		$model = new ViewModel ();
+		$model = new ViewModel();
 		
-		$post = $this->getRequest ()->getPost ();
-		if (! isset ( $post ['username'] )) {
-			return new ViewModel ( array( 
+		$post = $this->getRequest()->getPost();
+		if (!isset ($post [ 'username' ])) {
+			return new ViewModel(array( 
 					'username' => $username,
 					'password' => $password,
 					'messages' => $messages 
-			) );
+			));
 		}
 		
-		$model->setVariable ( 'username', $username );
-		$uValid = $this->isUsernameValid ( $username );
+		$model->setVariable('username', $username);
+		$uValid = $this->isUsernameValid($username);
 		if (true !== $uValid) {
-			$messages [] = $uValid;
+			$messages [ ] = $uValid;
 		}
 		
-		$model->setVariable ( 'password', $password );
-		$pValid = $this->isPasswordValid ( $password );
+		$model->setVariable('password', $password);
+		$pValid = $this->isPasswordValid($password);
 		if (true !== $pValid) {
-			$messages [] = $pValid;
+			$messages [ ] = $pValid;
 		}
 		
 		if (true === $uValid && true === $pValid) {
-			if (true === $this->getHtpasswdService ()->userExists ( $username )) {
-				$this->getHtpasswdService ()->updateUser ( $username, $password );
-				$messages [] = "Benutzer '{$username}' wurde aktualisiert.";
+			if (true === $this->getHtpasswdService()->userExists($username)) {
+				$this->getHtpasswdService()->updateUser($username, $password);
+				$messages [ ] = "Benutzer '{$username}' wurde aktualisiert.";
 			} else {
-				$this->getHtpasswdService ()->addUser ( $username, $password );
-				$messages [] = "Benutzer '{$username}' wurde hinzugefügt.";
+				$this->getHtpasswdService()->addUser($username, $password);
+				$messages [ ] = "Benutzer '{$username}' wurde hinzugefügt.";
 			}
 			
-			$model = $this->indexAction ();
-			$model->setTemplate ( 'htpasswd-manager/user/index' );
+			$model = $this->indexAction();
+			$model->setTemplate('htpasswd-manager/user/index');
 		}
 		
-		$model->setVariable ( 'messages', $messages );
+		$model->setVariable('messages', $messages);
 		return $model;
 	}
 
@@ -155,11 +155,11 @@ 
 	 * @return boolean string
 	 */
 	private function isUsernameValid($username) {
-		if (strlen ( $username ) <= 2)
+		if (strlen($username) <= 2)
 			return "Benutzername ist zu kurz.";
-		else if (preg_match ( '~[a-zäöo][a-zäöu_0-9-]+~i', $username ) !== 1)
+		else if (preg_match('~[a-zäöo][a-zäöu_0-9-]+~i', $username) !== 1)
 			return "Benutzername enthält ungültige Zeichen";
-		else if (strpos ( $username, ' ' ) !== false)
+		else if (strpos($username, ' ') !== false)
 			return "Leerzeichen sind im Benutzernamen nicht erlaubt";
 		return true;
 	}
@@ -176,8 +176,8 @@ 
 
 	private function getHtpasswdService() {
 		if ($this->htpasswdService === null) {
-			$sl = $this->getServiceLocator ();
-			$this->htpasswdService = $sl->get ( 'HtpasswdManager\Service\HtpasswdService' );
+			$sl = $this->getServiceLocator();
+			$this->htpasswdService = $sl->get('HtpasswdManager\Service\HtpasswdService');
 		}
 		
 		return $this->htpasswdService;
@@ -185,8 +185,8 @@ 
 
 	private function getUserService() {
 		if ($this->userService === null) {
-			$sl = $this->getServiceLocator ();
-			$this->userService = $sl->get ( 'HtpasswdManager\Service\UserService' );
+			$sl = $this->getServiceLocator();
+			$this->userService = $sl->get('HtpasswdManager\Service\UserService');
 		}
 		
 		return $this->userService;

Module.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 				'Zend\Loader\StandardAutoloader' => array( 
 						'namespaces' => array( 
 								// if we're in a namespace deeper than one level we need to fix the \ in the path
-								__NAMESPACE__ => __DIR__ . '/src/' . str_replace ( '\\', '/', __NAMESPACE__ ) 
+								__NAMESPACE__ => __DIR__ . '/src/' . str_replace('\\', '/', __NAMESPACE__) 
 						) 
 				) 
 		);
@@ -34,23 +34,23 @@ 
 	public function onBootstrap(MvcEvent $e) {
 		// You may not need to do this if you're doing it elsewhere in your
 		// application
-		$eventManager = $e->getApplication ()->getEventManager ();
-		$moduleRouteListener = new ModuleRouteListener ();
-		$moduleRouteListener->attach ( $eventManager );
+		$eventManager = $e->getApplication()->getEventManager();
+		$moduleRouteListener = new ModuleRouteListener();
+		$moduleRouteListener->attach($eventManager);
 	}
 
 	public function getServiceConfig() {
 		return array( 
 				'factories' => array( 
-						'HtpasswdManager\Service\HtpasswdService' => function ($sm) {
-							$config = $sm->get ( 'Config' );
+						'HtpasswdManager\Service\HtpasswdService' => function($sm) {
+							$config = $sm->get('Config');
 							
-							if (! isset ( $config ['HtpasswdManager'] ) || ! is_array ( $config ['HtpasswdManager'] ) || ! isset ( $config ['HtpasswdManager'] ['htpasswd'] ) || empty ( $config ['HtpasswdManager'] ['htpasswd'] )) {
-								throw new \Exception ( 'HtpasswdManager Config not found' );
+							if (!isset ($config [ 'HtpasswdManager' ]) || !is_array($config [ 'HtpasswdManager' ]) || !isset ($config [ 'HtpasswdManager' ] [ 'htpasswd' ]) || empty ($config [ 'HtpasswdManager' ] [ 'htpasswd' ])) {
+								throw new \Exception('HtpasswdManager Config not found');
 							}
 							
-							$htpasswd_filename = $config ['HtpasswdManager'] ['htpasswd'];
-							$service = new HtpasswdService ( $htpasswd_filename );
+							$htpasswd_filename = $config [ 'HtpasswdManager' ] [ 'htpasswd' ];
+							$service = new HtpasswdService($htpasswd_filename);
 							
 							return $service;
 						}