stevenbuehner / HtpasswdManager

src/HtpasswdManager/Controller/UserController.php

Indentation +183 added lines, -183 removed lines

@@ -11,188 +11,188 @@
 use Zend\View\Model\ViewModel;
 
 class UserController extends AbstractActionController {
-    private $htpasswdService = NULL;
-    private $userService = NULL;
-
-    /**
-     * Check Login
-     *
-     * @see \Zend\Mvc\Controller\AbstractActionController::onDispatch()
-     */
-    public function onDispatch(\Zend\Mvc\MvcEvent $e) {
-        $username = $this->getUserService()->getCurrentUser();
-
-        if (false === $this->getUserService()->isUserAllowedToManageUsers($username)) {
-            $this->getResponse()->setStatusCode(401);
-
-            return;
-        }
-
-        return parent::onDispatch($e);
-    }
-
-    public function indexAction() {
-        $htpasswdService = $this->getHtpasswdService();
-        $userList        = $htpasswdService->getUserList();
-
-        $result = array();
-        foreach ($userList as $username => $pass) {
-
-            $result [] = array(
-                'username'    => $username,
-                'paswd'       => $pass,
-                'isAdmin'     => $this->getUserService()->isUserAllowedToManageUsers($username),
-                'isDeletable' => $this->getUserService()->isUserDeleteable($username)
-            );
-        }
-
-        $userService = $this->getServiceLocator()->get('HtpasswdManager\Service\UserService');
-
-        $model = new ViewModel (array(
-            'userList'    => $result,
-            'currentUser' => $userService->getCurrentUser()
-        ));
-
-        return $model;
-    }
-
-    public function deleteAction() {
-        $user     = $this->params('user');
-        $messages = array();
-
-        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.";
-        }
-
-        $model = $this->indexAction();
-        $model->setTemplate('htpasswd-manager/user/index');
-        $model->setVariable('messages', $messages);
-
-        return $model;
-    }
-
-    public function editAction() {
-        $user     = $this->params('user');
-        $messages = array();
-        $htpasswd = $this->getHtpasswdService();
-
-        $model = new ViewModel ();
-        $model->setVariable('user', $user);
-
-        $post = $this->getRequest()->getPost();
-        if (!isset ($post ['password'])) {
-            // Formular initialisieren
-            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.";
-
-            $model = $this->indexAction();
-            $model->setTemplate('htpasswd-manager/user/index');
-        }
-
-        $model->setVariable('messages', $messages);
-
-        return $model;
-    }
-
-    public function addAction() {
-        $username = $this->getRequest()->getPost('username', '');
-        $password = $this->getRequest()->getPost('password', '');
-        $messages = array();
-        $model    = new ViewModel ();
-
-        $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);
-        if (true !== $uValid) {
-            $messages [] = $uValid;
-        }
-
-        $model->setVariable('password', $password);
-        $pValid = $this->isPasswordValid($password);
-        if (true !== $pValid) {
-            $messages [] = $pValid;
-        }
-
-        if (true === $uValid && true === $pValid) {
-            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.";
-            }
-
-            $model = $this->indexAction();
-            $model->setTemplate('htpasswd-manager/user/index');
-        }
-
-        $model->setVariable('messages', $messages);
-
-        return $model;
-    }
-
-    /**
-     * Returns true if valid, of not it returns a string with information about the reason
-     *
-     * @param string $username
-     * @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";
-
-        return true;
-    }
-
-    /**
-     * Returns true if valid, of not it returns a string with information about the reason
-     *
-     * @param string $password
-     * @return boolean string
-     */
-    private function isPasswordValid($password) {
-        return true;
-    }
-
-    private function getHtpasswdService() {
-        if ($this->htpasswdService === NULL) {
-            $sl                    = $this->getServiceLocator();
-            $this->htpasswdService = $sl->get('HtpasswdManager\Service\HtpasswdService');
-        }
-
-        return $this->htpasswdService;
-    }
-
-    private function getUserService() {
-        if ($this->userService === NULL) {
-            $sl                = $this->getServiceLocator();
-            $this->userService = $sl->get('HtpasswdManager\Service\UserService');
-        }
-
-        return $this->userService;
-    }
+	private $htpasswdService = NULL;
+	private $userService = NULL;
+
+	/**
+	 * Check Login
+	 *
+	 * @see \Zend\Mvc\Controller\AbstractActionController::onDispatch()
+	 */
+	public function onDispatch(\Zend\Mvc\MvcEvent $e) {
+		$username = $this->getUserService()->getCurrentUser();
+
+		if (false === $this->getUserService()->isUserAllowedToManageUsers($username)) {
+			$this->getResponse()->setStatusCode(401);
+
+			return;
+		}
+
+		return parent::onDispatch($e);
+	}
+
+	public function indexAction() {
+		$htpasswdService = $this->getHtpasswdService();
+		$userList        = $htpasswdService->getUserList();
+
+		$result = array();
+		foreach ($userList as $username => $pass) {
+
+			$result [] = array(
+				'username'    => $username,
+				'paswd'       => $pass,
+				'isAdmin'     => $this->getUserService()->isUserAllowedToManageUsers($username),
+				'isDeletable' => $this->getUserService()->isUserDeleteable($username)
+			);
+		}
+
+		$userService = $this->getServiceLocator()->get('HtpasswdManager\Service\UserService');
+
+		$model = new ViewModel (array(
+			'userList'    => $result,
+			'currentUser' => $userService->getCurrentUser()
+		));
+
+		return $model;
+	}
+
+	public function deleteAction() {
+		$user     = $this->params('user');
+		$messages = array();
+
+		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.";
+		}
+
+		$model = $this->indexAction();
+		$model->setTemplate('htpasswd-manager/user/index');
+		$model->setVariable('messages', $messages);
+
+		return $model;
+	}
+
+	public function editAction() {
+		$user     = $this->params('user');
+		$messages = array();
+		$htpasswd = $this->getHtpasswdService();
+
+		$model = new ViewModel ();
+		$model->setVariable('user', $user);
+
+		$post = $this->getRequest()->getPost();
+		if (!isset ($post ['password'])) {
+			// Formular initialisieren
+			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.";
+
+			$model = $this->indexAction();
+			$model->setTemplate('htpasswd-manager/user/index');
+		}
+
+		$model->setVariable('messages', $messages);
+
+		return $model;
+	}
+
+	public function addAction() {
+		$username = $this->getRequest()->getPost('username', '');
+		$password = $this->getRequest()->getPost('password', '');
+		$messages = array();
+		$model    = new ViewModel ();
+
+		$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);
+		if (true !== $uValid) {
+			$messages [] = $uValid;
+		}
+
+		$model->setVariable('password', $password);
+		$pValid = $this->isPasswordValid($password);
+		if (true !== $pValid) {
+			$messages [] = $pValid;
+		}
+
+		if (true === $uValid && true === $pValid) {
+			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.";
+			}
+
+			$model = $this->indexAction();
+			$model->setTemplate('htpasswd-manager/user/index');
+		}
+
+		$model->setVariable('messages', $messages);
+
+		return $model;
+	}
+
+	/**
+	 * Returns true if valid, of not it returns a string with information about the reason
+	 *
+	 * @param string $username
+	 * @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";
+
+		return true;
+	}
+
+	/**
+	 * Returns true if valid, of not it returns a string with information about the reason
+	 *
+	 * @param string $password
+	 * @return boolean string
+	 */
+	private function isPasswordValid($password) {
+		return true;
+	}
+
+	private function getHtpasswdService() {
+		if ($this->htpasswdService === NULL) {
+			$sl                    = $this->getServiceLocator();
+			$this->htpasswdService = $sl->get('HtpasswdManager\Service\HtpasswdService');
+		}
+
+		return $this->htpasswdService;
+	}
+
+	private function getUserService() {
+		if ($this->userService === NULL) {
+			$sl                = $this->getServiceLocator();
+			$this->userService = $sl->get('HtpasswdManager\Service\UserService');
+		}
+
+		return $this->userService;
+	}
 
 }

src/HtpasswdManager/Test/HtpasswdServiceTest.php

Indentation +106 added lines, -106 removed lines

@@ -5,150 +5,150 @@
 
 class HtpasswdServiceTest extends \PHPUnit_Framework_TestCase {
 
-    protected $testDataDir;
+	protected $testDataDir;
 
-    public function setUp() {
-        $this->testDataDir = __DIR__ . '/TestData';
+	public function setUp() {
+		$this->testDataDir = __DIR__ . '/TestData';
 
-        parent::setUp();
-    }
+		parent::setUp();
+	}
 
 
-    public function testCreateFileIfNotExistant() {
-        $testFile = $this->testDataDir . '/notExistant';
+	public function testCreateFileIfNotExistant() {
+		$testFile = $this->testDataDir . '/notExistant';
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
 
-        $this->assertFileNotExists($testFile);
-        $this->assertFileExists($testFile);
+		$this->assertFileNotExists($testFile);
+		$this->assertFileExists($testFile);
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
-    public function testGetUserList_Empty() {
-        $testFile = $this->testDataDir . '/htaccess_UserServiceTest_empty';
+	public function testGetUserList_Empty() {
+		$testFile = $this->testDataDir . '/htaccess_UserServiceTest_empty';
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
-        $this->assertFileNotExists($testFile);
-        touch($testFile);
-        $this->assertFileExists($testFile);
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
+		$this->assertFileNotExists($testFile);
+		touch($testFile);
+		$this->assertFileExists($testFile);
 
-        $service = new HtpasswdService($testFile);
+		$service = new HtpasswdService($testFile);
 
-        $userList = $service->getUserList();
-        $this->assertEquals($expected = [ ], $userList, "UserList");
+		$userList = $service->getUserList();
+		$this->assertEquals($expected = [ ], $userList, "UserList");
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
-    public function testGetUserList_Filled() {
-        $testFile = $this->testDataDir . '/htaccess_UserServiceTest';
-        $this->assertFileExists($testFile);
+	public function testGetUserList_Filled() {
+		$testFile = $this->testDataDir . '/htaccess_UserServiceTest';
+		$this->assertFileExists($testFile);
 
-        $service = new HtpasswdService($testFile);
+		$service = new HtpasswdService($testFile);
 
-        $userList = $service->getUserList();
-        $this->assertEquals(
-            $expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0',
-                          'blub'   => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/'
-            ], $userList, "UserList");
-    }
+		$userList = $service->getUserList();
+		$this->assertEquals(
+			$expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0',
+						  'blub'   => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/'
+			], $userList, "UserList");
+	}
 
-    public function testAddUser() {
-        $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
-        $testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
-        $this->assertFileExists($testFileTemplate);
+	public function testAddUser() {
+		$testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
+		$testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
+		$this->assertFileExists($testFileTemplate);
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
-        $this->assertFileNotExists($testFile);
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
+		$this->assertFileNotExists($testFile);
 
-        copy($testFileTemplate, $testFile);
-        $this->assertFileExists($testFile);
+		copy($testFileTemplate, $testFile);
+		$this->assertFileExists($testFile);
 
-        $service  = new HtpasswdService($testFile);
-        $userList = $service->getUserList();
-        $this->assertCount(2, $userList);
-        $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
+		$service  = new HtpasswdService($testFile);
+		$userList = $service->getUserList();
+		$this->assertCount(2, $userList);
+		$this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        $service->addUser('test', 'test');
+		$service->addUser('test', 'test');
 
-        $userList = $service->getUserList();
-        $this->assertCount(3, $userList);
-        $this->assertEquals($expected = [ 'steven', 'blub', 'test' ],
-            array_keys($userList));
-        $this->assertEquals(3, $this->getNumberOfLines($testFile), "Number of Lines");
+		$userList = $service->getUserList();
+		$this->assertCount(3, $userList);
+		$this->assertEquals($expected = [ 'steven', 'blub', 'test' ],
+			array_keys($userList));
+		$this->assertEquals(3, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
 
-    public function testdeleteUser() {
-        $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
-        $testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
-        $this->assertFileExists($testFileTemplate);
+	public function testdeleteUser() {
+		$testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest';
+		$testFile         = $this->testDataDir . '/htaccess_UserServiceTest_addUser';
+		$this->assertFileExists($testFileTemplate);
 
-        if (true === file_exists($testFile)) {
-            unlink($testFile);
-        }
-        $this->assertFileNotExists($testFile);
+		if (true === file_exists($testFile)) {
+			unlink($testFile);
+		}
+		$this->assertFileNotExists($testFile);
 
-        copy($testFileTemplate, $testFile);
-        $this->assertFileExists($testFile);
+		copy($testFileTemplate, $testFile);
+		$this->assertFileExists($testFile);
 
-        $service  = new HtpasswdService($testFile);
-        $userList = $service->getUserList();
-        $this->assertCount(2, $userList);
-        $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
+		$service  = new HtpasswdService($testFile);
+		$userList = $service->getUserList();
+		$this->assertCount(2, $userList);
+		$this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        $service->deleteUser('steven');
-        $userList = $service->getUserList();
-        $this->assertCount(1, $userList);
-        $this->assertEquals($expected = [ 'blub' ],
-            array_keys($userList));
-        $this->assertEquals(1, $this->getNumberOfLines($testFile), "Number of Lines");
+		$service->deleteUser('steven');
+		$userList = $service->getUserList();
+		$this->assertCount(1, $userList);
+		$this->assertEquals($expected = [ 'blub' ],
+			array_keys($userList));
+		$this->assertEquals(1, $this->getNumberOfLines($testFile), "Number of Lines");
 
 
-        // Cleanup
-        unlink($testFile);
-    }
+		// Cleanup
+		unlink($testFile);
+	}
 
-    public function testUserExists() {
-        $testFile = $this->testDataDir . '/htaccess_UserServiceTest';
-        $this->assertFileExists($testFile);
+	public function testUserExists() {
+		$testFile = $this->testDataDir . '/htaccess_UserServiceTest';
+		$this->assertFileExists($testFile);
 
-        $service  = new HtpasswdService($testFile);
+		$service  = new HtpasswdService($testFile);
 
-        $this->assertTrue($service->userExists('steven'), 'User should exist');
-        $this->assertTrue($service->userExists('blub'), 'User should exist');
-        $this->assertFalse($service->userExists(''), "User '' should not exist");
-        $this->assertFalse($service->userExists('notExistant'), "User 'notExistant' should not exist");
-        $this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist");
-    }
+		$this->assertTrue($service->userExists('steven'), 'User should exist');
+		$this->assertTrue($service->userExists('blub'), 'User should exist');
+		$this->assertFalse($service->userExists(''), "User '' should not exist");
+		$this->assertFalse($service->userExists('notExistant'), "User 'notExistant' should not exist");
+		$this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist");
+	}
 
-    protected function getNumberOfLines($filename) {
-        $cont  = file_get_contents($filename);
-        $lines = explode("\n", $cont);
+	protected function getNumberOfLines($filename) {
+		$cont  = file_get_contents($filename);
+		$lines = explode("\n", $cont);
 
-        // Remove emtpy lines
-        foreach ($lines as $i => $line) {
-            if (empty(trim($line))) {
-                unset($lines[$i]);
-            }
-        }
+		// Remove emtpy lines
+		foreach ($lines as $i => $line) {
+			if (empty(trim($line))) {
+				unset($lines[$i]);
+			}
+		}
 
-        return count($lines);
-    }
+		return count($lines);
+	}
 
 }
\ No newline at end of file