stevenbuehner / HtpasswdManager

src/HtpasswdManager/Test/Bootstrap/Bootstrap.php

Indentation +42 added lines, -42 removed lines

@@ -12,48 +12,48 @@
  * Test bootstrap, for setting up autoloading
  */
 class Bootstrap {
-    protected static $serviceManager;
-
-    public static function init() {
-        static::initAutoloader();
-    }
-
-    protected static function initAutoloader() {
-        $vendorPath = static::findParentPath('vendor');
-
-        if (file_exists($vendorPath . '/autoload.php')) {
-            include $vendorPath . '/autoload.php';
-        }
-
-        if (!class_exists('Zend\Loader\AutoloaderFactory')) {
-            throw new RuntimeException(
-                'Unable to load ZF2. Run `php composer.phar install`'
-            );
-        }
-
-        AutoloaderFactory::factory(array(
-            'Zend\Loader\StandardAutoloader' => array(
-                'autoregister_zf' => true,
-                'namespaces'      => array(
-                    __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
-                ),
-            ),
-        ));
-    }
-
-    protected static function findParentPath($path) {
-        $dir         = __DIR__;
-        $previousDir = '.';
-        while (!is_dir($dir . '/' . $path)) {
-            $dir = dirname($dir);
-            if ($previousDir === $dir) {
-                return false;
-            }
-            $previousDir = $dir;
-        }
-
-        return $dir . '/' . $path;
-    }
+	protected static $serviceManager;
+
+	public static function init() {
+		static::initAutoloader();
+	}
+
+	protected static function initAutoloader() {
+		$vendorPath = static::findParentPath('vendor');
+
+		if (file_exists($vendorPath . '/autoload.php')) {
+			include $vendorPath . '/autoload.php';
+		}
+
+		if (!class_exists('Zend\Loader\AutoloaderFactory')) {
+			throw new RuntimeException(
+				'Unable to load ZF2. Run `php composer.phar install`'
+			);
+		}
+
+		AutoloaderFactory::factory(array(
+			'Zend\Loader\StandardAutoloader' => array(
+				'autoregister_zf' => true,
+				'namespaces'      => array(
+					__NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
+				),
+			),
+		));
+	}
+
+	protected static function findParentPath($path) {
+		$dir         = __DIR__;
+		$previousDir = '.';
+		while (!is_dir($dir . '/' . $path)) {
+			$dir = dirname($dir);
+			if ($previousDir === $dir) {
+				return false;
+			}
+			$previousDir = $dir;
+		}
+
+		return $dir . '/' . $path;
+	}
 }
 
 Bootstrap::init();
\ No newline at end of file

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

Indentation +108 added lines, -108 removed lines

@@ -5,153 +5,153 @@
 
 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->assertFileNotExists($testFile);
 
-        new HtpasswdService($testFile);
-        $this->assertFileExists($testFile);
+		new HtpasswdService($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->getUserList();
+		$service  = new HtpasswdService($testFile);
+		$service->getUserList();
 
-        $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

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

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

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

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

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();

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