stevenbuehner / HtpasswdManager

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;
 	}
 

Braces +6 added lines, -4 removed lines

@@ -36,8 +36,9 @@ 
 				$username 
 		) );
 		
-		if ($eResult->stopped ())
-			return $eResult->last ();
+		if ($eResult->stopped ()) {
+					return $eResult->last ();
+		}
 		
 		return ! in_array ( $username, $this->not_deletable_users );
 	}
@@ -47,8 +48,9 @@ 
 				'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 )) {

src/HtpasswdManager/Service/HtpasswdService.php

Braces +3 added lines, -2 removed lines

@@ -120,8 +120,9 @@
 	public function userExists($username) {
 		$userList = $this->getUserList ();
 		
-		if (isset ( $userList [$username] ))
-			return true;
+		if (isset ( $userList [$username] )) {
+					return true;
+		}
 		
 		return false;
 	}

Spacing +25 added lines, -25 removed lines

@@ -18,20 +18,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;
@@ -40,17 +40,17 @@ 
 	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 ) {
+			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];
 				}
 			}
@@ -62,34 +62,34 @@ 
 	}
 
 	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) {
 		$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 {
@@ -98,7 +98,7 @@ 
 			}
 			
 			if (true === $usernameDeleted) {
-				$this->replaceHtPasswdContent ( $newContent );
+				$this->replaceHtPasswdContent($newContent);
 			}
 		}
 		
@@ -107,17 +107,17 @@ 
 
 	private function replaceHtPasswdContent($newContent) {
 		// Alternative: 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

Braces +7 added lines, -6 removed lines

@@ -157,12 +157,13 @@
      * @return boolean string
      */
     private function isUsernameValid($username) {
-        if (strlen($username) <= 2)
-            return "Benutzername ist zu kurz.";
-        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)
-            return "Leerzeichen sind im Benutzernamen nicht erlaubt";
+        if (strlen($username) <= 2) {
+                    return "Benutzername ist zu kurz.";
+        } 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) {
+                    return "Leerzeichen sind im Benutzernamen nicht erlaubt";
+        }
 
         return true;
     }

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 
         $userService = $this->getServiceLocator()->get('HtpasswdManager\Service\UserService');
 
-        $model = new ViewModel (array(
+        $model = new ViewModel(array(
             'userList'    => $result,
             'currentUser' => $userService->getCurrentUser()
         ));
@@ -79,7 +79,7 @@ 
         $messages = array();
         $htpasswd = $this->getHtpasswdService();
 
-        $model = new ViewModel ();
+        $model = new ViewModel();
         $model->setVariable('user', $user);
 
         $post = $this->getRequest()->getPost();
@@ -109,11 +109,11 @@ 
         $username = $this->getRequest()->getPost('username', '');
         $password = $this->getRequest()->getPost('password', '');
         $messages = array();
-        $model    = new ViewModel ();
+        $model    = new ViewModel();
 
         $post = $this->getRequest()->getPost();
         if (!isset ($post ['username'])) {
-            return new ViewModel (array(
+            return new ViewModel(array(
                 'username' => $username,
                 'password' => $password,
                 'messages' => $messages

Module.php

Spacing +9 added lines, -9 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 );
+							$service = new HtpasswdService($htpasswd_filename);
 							
 							return $service;
 						} 

src/HtpasswdManager/Test/HtpasswdServiceTest.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
         $service = new HtpasswdService($testFile);
 
         $userList = $service->getUserList();
-        $this->assertEquals($expected = [ ], $userList, "UserList");
+        $this->assertEquals($expected = [], $userList, "UserList");
 
         // Cleanup
         unlink($testFile);
@@ -57,7 +57,7 @@ 
 
         $userList = $service->getUserList();
         $this->assertEquals(
-            $expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0',
+            $expected = ['steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0',
                           'blub'   => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/'
             ], $userList, "UserList");
     }
@@ -85,7 +85,7 @@ 
 
         $userList = $service->getUserList();
         $this->assertCount(3, $userList);
-        $this->assertEquals($expected = [ 'steven', 'blub', 'test' ],
+        $this->assertEquals($expected = ['steven', 'blub', 'test'],
             array_keys($userList));
         $this->assertEquals(3, $this->getNumberOfLines($testFile), "Number of Lines");
 
@@ -117,7 +117,7 @@ 
         $service->deleteUser('steven');
         $userList = $service->getUserList();
         $this->assertCount(1, $userList);
-        $this->assertEquals($expected = [ 'blub' ],
+        $this->assertEquals($expected = ['blub'],
             array_keys($userList));
         $this->assertEquals(1, $this->getNumberOfLines($testFile), "Number of Lines");
 

src/HtpasswdManager/Service/Factory/UserServiceFactory.php

Spacing +5 added lines, -5 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'] )) {
+		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'] )) {
+		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);
 	}
 
 }