stevenbuehner / HtpasswdManager

src/HtpasswdManager/Controller/UserController.php

Spacing +15 added lines, -15 removed lines

@@ -38,7 +38,7 @@ 
         $result = array();
         foreach ($userList as $username => $pass) {
 
-            $result [] = array(
+            $result [ ] = array(
                 'username'    => $username,
                 'paswd'       => $pass,
                 'isAdmin'     => $this->getUserService()->isUserAllowedToManageUsers($username),
@@ -48,7 +48,7 @@ 
 
         $userService = $this->getServiceLocator()->get('HtpasswdManager\Service\UserService');
 
-        $model = new ViewModel (array(
+        $model = new ViewModel(array(
             'userList'    => $result,
             'currentUser' => $userService->getCurrentUser()
         ));
@@ -62,9 +62,9 @@ 
 
         if (true === $this->getUserService()->isUserDeleteable($user)) {
             $this->getHtpasswdService()->deleteUser($user);
-            $messages [] = "Der Benutzer '{$user}' wurde gelöscht.";
+            $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();
@@ -79,11 +79,11 @@ 
         $messages = array();
         $htpasswd = $this->getHtpasswdService();
 
-        $model = new ViewModel ();
+        $model = new ViewModel();
         $model->setVariable('user', $user);
 
         $post = $this->getRequest()->getPost();
-        if (!isset ($post ['password'])) {
+        if (!isset ($post [ 'password' ])) {
             // Formular initialisieren
             if (false === $htpasswd->userExists($user)) {
                 $this->redirect()->toRoute('htpasswdmanager', array(
@@ -92,9 +92,9 @@ 
             }
         } else {
             // Formular speichern
-            $password = $post ['password'];
+            $password = $post [ 'password' ];
             $htpasswd->updateUser($user, $password);
-            $messages [] = "Passwort für '{$user}' wurde aktualisiert.";
+            $messages [ ] = "Passwort für '{$user}' wurde aktualisiert.";
 
             $model = $this->indexAction();
             $model->setTemplate('htpasswd-manager/user/index');
@@ -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(
+        if (!isset ($post [ 'username' ])) {
+            return new ViewModel(array(
                 'username' => $username,
                 'password' => $password,
                 'messages' => $messages
@@ -123,22 +123,22 @@ 
         $model->setVariable('username', $username);
         $uValid = $this->isUsernameValid($username);
         if (true !== $uValid) {
-            $messages [] = $uValid;
+            $messages [ ] = $uValid;
         }
 
         $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.";
+                $messages [ ] = "Benutzer '{$username}' wurde aktualisiert.";
             } else {
                 $this->getHtpasswdService()->addUser($username, $password);
-                $messages [] = "Benutzer '{$username}' wurde hinzugefügt.";
+                $messages [ ] = "Benutzer '{$username}' wurde hinzugefügt.";
             }
 
             $model = $this->indexAction();

src/HtpasswdManager/Service/HtpasswdService.php

Spacing +27 added lines, -27 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,18 +40,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 ];
 				}
 			}
 			
@@ -62,43 +62,43 @@ 
 	}
 
 	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 {
-					$newContent .= $match [0] [$i] . "\n";
+					$newContent .= $match [ 0 ] [ $i ] . "\n";
 				}
 			}
 			
 			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;