From 5ec9887d6bcef6f7f11955d50da795d399c6dc59 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 11:39:11 +0100
Subject: [PATCH 01/68] (v3.1) AccountType renamed to UserRole

---
 CHANGELOG.md                                  |  8 ++++++-
 application/controller/LoginController.php    | 13 ++++++-----
 ...AccountTypeModel.php => UserRoleModel.php} | 16 +++++++++----
 application/view/_templates/header.php        |  2 +-
 ...angeAccountType.php => changeUserRole.php} | 23 +++++++++----------
 5 files changed, 37 insertions(+), 25 deletions(-)
 rename application/model/{AccountTypeModel.php => UserRoleModel.php} (76%)
 rename application/view/login/{changeAccountType.php => changeUserRole.php} (55%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f7eb6b36..2264fb5db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,16 @@
 # CHANGE LOG
 
+## 3.1 (currently in develop branch)
+
+**February 2015**
+
+- [panique] renamed AccountType stuff to UserRole, minor changes 
+
 ## 3.0
 
 **February 2015**
 
-- [panique] AccountTypeModel reduced to one method (removed duplicate code)
+- [panique] removed duplicate code in AccountTypeModel
 - [PR](https://github.com/panique/huge/pull/587) [upperwood] Facebook stuff completely removed from SQL
 - [panique] tiny text changes
 
diff --git a/application/controller/LoginController.php b/application/controller/LoginController.php
index bd798716c..25e15362a 100644
--- a/application/controller/LoginController.php
+++ b/application/controller/LoginController.php
@@ -162,10 +162,10 @@ public function uploadAvatar_action()
      * Show the change-account-type page
      * Auth::checkAuthentication() makes sure that only logged in users can use this action and see this page
      */
-    public function changeAccountType()
+    public function changeUserRole()
     {
         Auth::checkAuthentication();
-        $this->View->render('login/changeAccountType');
+        $this->View->render('login/changeUserRole');
     }
 
     /**
@@ -173,20 +173,21 @@ public function changeAccountType()
      * Auth::checkAuthentication() makes sure that only logged in users can use this action
      * POST-request
      */
-    public function changeAccountType_action()
+    public function changeUserRole_action()
     {
         Auth::checkAuthentication();
 
         if (Request::post('user_account_upgrade')) {
             // "2" is quick & dirty account type 2, something like "premium user" maybe. you got the idea :)
-            AccountTypeModel::changeAccountType(2);
+            UserRoleModel::changeUserRole(2);
         }
+
         if (Request::post('user_account_downgrade')) {
             // "1" is quick & dirty account type 1, something like "basic user" maybe.
-            AccountTypeModel::changeAccountType(1);
+            UserRoleModel::changeUserRole(1);
         }
 
-        Redirect::to('login/changeAccountType');
+        Redirect::to('login/changeUserRole');
     }
 
     /**
diff --git a/application/model/AccountTypeModel.php b/application/model/UserRoleModel.php
similarity index 76%
rename from application/model/AccountTypeModel.php
rename to application/model/UserRoleModel.php
index b777e51b6..2801c1ad0 100644
--- a/application/model/AccountTypeModel.php
+++ b/application/model/UserRoleModel.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Class AccountTypeModel
+ * Class UserRoleModel
  *
  * This class contains everything that is related to up- and downgrading accounts.
  */
-class AccountTypeModel
+class UserRoleModel
 {
 	/**
 	 * Upgrades / downgrades the user's account. Currently it's just the field user_account_type in the database that
@@ -16,14 +16,18 @@ class AccountTypeModel
 	 *
 	 * @return bool
 	 */
-	public static function changeAccountType($type)
+	public static function changeUserRole($type)
 	{
 		// this is error-prone, let's rewrite it
 		if (!$type OR ($type !== 1 AND $type !== 2)) {
 			return false;
 		}
 
-		if (AccountTypeModel::saveNewAccountType($type)) {
+		// if user want to upgrade to a higher role (from basic to premium) you could add a role-check and a payment
+		// process here
+
+		// save new role to database
+		if (UserRoleModel::saveRoleToDatabase($type)) {
 
 			$feedback = "";
 
@@ -52,8 +56,10 @@ public static function changeAccountType($type)
 	 *
 	 * @return bool
 	 */
-	public static function saveNewAccountType($type)
+	public static function saveRoleToDatabase($type)
 	{
+		// you should make sure that it's not possible to set non-existing user types (other than 1 or 2)
+
 		$database = DatabaseFactory::getFactory()->getConnection();
 
 		$query = $database->prepare("UPDATE users SET user_account_type = :new_type WHERE user_id = :user_id LIMIT 1");
diff --git a/application/view/_templates/header.php b/application/view/_templates/header.php
index e3850e6ff..d2ade08b0 100644
--- a/application/view/_templates/header.php
+++ b/application/view/_templates/header.php
@@ -65,7 +65,7 @@
                 <a href="<?php echo Config::get('URL'); ?>login/showprofile">My Account</a>
                 <ul class="navigation-submenu">
                     <li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
-                        <a href="<?php echo Config::get('URL'); ?>login/changeaccounttype">Change account type</a>
+                        <a href="<?php echo Config::get('URL'); ?>login/changeUserRole">Change account type</a>
                     </li>
                     <li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
                         <a href="<?php echo Config::get('URL'); ?>login/uploadavatar">Upload an avatar</a>
diff --git a/application/view/login/changeAccountType.php b/application/view/login/changeUserRole.php
similarity index 55%
rename from application/view/login/changeAccountType.php
rename to application/view/login/changeUserRole.php
index 59ef4e445..2a0951c19 100644
--- a/application/view/login/changeAccountType.php
+++ b/application/view/login/changeUserRole.php
@@ -1,5 +1,5 @@
 <div class="container">
-    <h1>LoginController/changeAccountType</h1>
+    <h1>LoginController/changeUserRole</h1>
 
     <!-- echo out the system feedback (error and success messages) -->
     <?php $this->renderFeedbackMessages(); ?>
@@ -14,19 +14,18 @@
             In a real world application you would implement something like a
             pay-process.
         </p>
+	    <p>
+		    Please note: This whole process has been renamed from AccountType (v3.0) to UserRole (v3.1).
+	    </p>
 
         <h2>Currently your account type is: <?php echo Session::get('user_account_type'); ?></h2>
         <!-- basic implementation for two account types: type 1 and type 2 -->
-        <?php if (Session::get('user_account_type') == 1) { ?>
-        <form action="<?php echo Config::get('URL'); ?>login/changeAccountType_action" method="post">
-            <label></label>
-            <input type="submit" name="user_account_upgrade" value="Upgrade my account" />
-        </form>
-        <?php } elseif (Session::get('user_account_type') == 2) { ?>
-        <form action="<?php echo Config::get('URL'); ?>login/changeAccountType_action" method="post">
-            <label></label>
-            <input type="submit" name="user_account_downgrade" value="Downgrade my account" />
-        </form>
-        <?php } ?>
+	    <form action="<?php echo Config::get('URL'); ?>login/changeUserRole_action" method="post">
+            <?php if (Session::get('user_account_type') == 1) { ?>
+                <input type="submit" name="user_account_upgrade" value="Upgrade my account (to Premium User)" />
+	        <?php } else if (Session::get('user_account_type') == 2) { ?>
+	            <input type="submit" name="user_account_downgrade" value="Downgrade my account (to Basic User)" />
+	        <?php } ?>
+	    </form>
     </div>
 </div>

From 89c8428c4de3d72a0b3312c737b2b768b3733641 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 11:41:13 +0100
Subject: [PATCH 02/68] removed unused avatar image code block

---
 application/view/_templates/header.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/application/view/_templates/header.php b/application/view/_templates/header.php
index d2ade08b0..691c8a261 100644
--- a/application/view/_templates/header.php
+++ b/application/view/_templates/header.php
@@ -39,25 +39,6 @@
             <?php } ?>
         </ul>
 
-        <!--
-        <?php if (Session::userIsLoggedIn()) : ?>
-            <div class="header_right_box">
-                <div class="namebox">
-                    Hello <?php echo Session::get('user_name'); ?> !
-                </div>
-                <div class="avatar">
-                    <?php if (Config::get('USE_GRAVATAR')) { ?>
-                        <img src='<?php echo Session::get('user_gravatar_image_url'); ?>'
-                             style='width:<?php echo Config::get('AVATAR_SIZE'); ?>px; height:<?php echo Config::get('AVATAR_SIZE'); ?>px;' />
-                    <?php } else { ?>
-                        <img src='<?php echo Session::get('user_avatar_file'); ?>'
-                             style='width:<?php echo Config::get('AVATAR_SIZE'); ?>px; height:<?php echo Config::get('AVATAR_SIZE'); ?>px;' />
-                    <?php } ?>
-                </div>
-            </div>
-        <?php endif; ?>
-        -->
-
         <!-- my account -->
         <ul class="navigation right">
         <?php if (Session::userIsLoggedIn()) : ?>

From a88c61792fc4904623522c73191a2d69b787cc22 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 11:55:51 +0100
Subject: [PATCH 03/68] (v3.1) avatar model refactoring to improve code quality

---
 application/model/AvatarModel.php | 46 +++++++++++++++++++------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/application/model/AvatarModel.php b/application/model/AvatarModel.php
index 7c55dc63f..7db965080 100644
--- a/application/model/AvatarModel.php
+++ b/application/model/AvatarModel.php
@@ -61,23 +61,36 @@ public static function getPublicUserAvatarFilePathByUserId($user_id)
 
 	/**
 	 * Create an avatar picture (and checks all necessary things too)
-	 * TODO decoupling
-	 * TODO total rebuild, this is too quick & dirty
+	 * TODO decouple
+	 * TODO total rebuild
+	 */
+	public static function createAvatar()
+	{
+		// check avatar folder writing rights, check if upload fits all rules
+		if (AvatarModel::isAvatarFolderWritable() AND AvatarModel::validateImageFile()) {
+
+			// create a jpg file in the avatar folder, write marker to database
+			$target_file_path = Config::get('PATH_AVATARS') . Session::get('user_id');
+			AvatarModel::resizeAvatarImage($_FILES['avatar_file']['tmp_name'], $target_file_path, Config::get('AVATAR_SIZE'), Config::get('AVATAR_SIZE'), Config::get('AVATAR_JPEG_QUALITY'));
+			AvatarModel::writeAvatarToDatabase(Session::get('user_id'));
+			Session::set('user_avatar_file', AvatarModel::getPublicUserAvatarFilePathByUserId(Session::get('user_id')));
+			Session::add('feedback_positive', Text::get('FEEDBACK_AVATAR_UPLOAD_SUCCESSFUL'));
+		}
+	}
+
+	/**
+	 * Checks if the avatar folder exists and is writable
 	 *
 	 * @return bool success status
 	 */
-	public static function createAvatar()
+	public static function isAvatarFolderWritable()
 	{
-		// check if upload fits all rules
-		AvatarModel::validateImageFile();
-
-		// create a jpg file in the avatar folder, write marker to database
-		$target_file_path = Config::get('PATH_AVATARS') . Session::get('user_id');
-		AvatarModel::resizeAvatarImage($_FILES['avatar_file']['tmp_name'], $target_file_path, Config::get('AVATAR_SIZE'), Config::get('AVATAR_SIZE'), Config::get('AVATAR_JPEG_QUALITY'));
-		AvatarModel::writeAvatarToDatabase(Session::get('user_id'));
-		Session::set('user_avatar_file', AvatarModel::getPublicUserAvatarFilePathByUserId(Session::get('user_id')));
-		Session::add('feedback_positive', Text::get('FEEDBACK_AVATAR_UPLOAD_SUCCESSFUL'));
-		return true;
+		if (is_dir(Config::get('PATH_AVATARS')) AND is_writable(Config::get('PATH_AVATARS'))) {
+			return true;
+		}
+
+		Session::add('feedback_negative', Text::get('FEEDBACK_AVATAR_FOLDER_DOES_NOT_EXIST_OR_NOT_WRITABLE'));
+		return false;
 	}
 
 	/**
@@ -88,11 +101,6 @@ public static function createAvatar()
 	 */
 	public static function validateImageFile()
 	{
-		if (!is_dir(Config::get('PATH_AVATARS')) OR !is_writable(Config::get('PATH_AVATARS'))) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_AVATAR_FOLDER_DOES_NOT_EXIST_OR_NOT_WRITABLE'));
-			return false;
-		}
-
 		if (!isset($_FILES['avatar_file']) OR empty ($_FILES['avatar_file']['tmp_name'])) {
 			Session::add('feedback_negative', Text::get('FEEDBACK_AVATAR_IMAGE_UPLOAD_FAILED'));
 			return false;
@@ -117,6 +125,8 @@ public static function validateImageFile()
 			Session::add('feedback_negative', Text::get('FEEDBACK_AVATAR_UPLOAD_WRONG_TYPE'));
 			return false;
 		}
+
+		return true;
 	}
 
 	/**

From 4b4c63f38b2673d4d5d33b5d8942850a5b012371 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 11:56:22 +0100
Subject: [PATCH 04/68] (v3.1) avatar model refactoring to improve code quality

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2264fb5db..b07ed68e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 **February 2015**
 
+- [panique] avatarModel code improvements
 - [panique] renamed AccountType stuff to UserRole, minor changes 
 
 ## 3.0

From 25db12fef722591777f72dec777f270da0291826 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 12:34:48 +0100
Subject: [PATCH 05/68] (v3.1) reduced LOC

---
 application/model/PasswordResetModel.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/application/model/PasswordResetModel.php b/application/model/PasswordResetModel.php
index 6f65afe97..4fa747a72 100644
--- a/application/model/PasswordResetModel.php
+++ b/application/model/PasswordResetModel.php
@@ -177,25 +177,18 @@ public static function saveNewUserPassword($user_name, $user_password_hash, $use
 	{
 		$database = DatabaseFactory::getFactory()->getConnection();
 
-		$sql = "UPDATE users
-                   SET user_password_hash = :user_password_hash,
-                       user_password_reset_hash = NULL,
+		$sql = "UPDATE users SET user_password_hash = :user_password_hash, user_password_reset_hash = NULL,
                        user_password_reset_timestamp = NULL
-                 WHERE user_name = :user_name
-                       AND user_password_reset_hash = :user_password_reset_hash
-                       AND user_provider_type = :user_provider_type
-                 LIMIT 1";
+                 WHERE user_name = :user_name AND user_password_reset_hash = :user_password_reset_hash
+                       AND user_provider_type = :user_provider_type LIMIT 1";
 		$query = $database->prepare($sql);
 		$query->execute(array(
 			':user_password_hash' => $user_password_hash, ':user_name' => $user_name,
 			':user_password_reset_hash' => $user_password_reset_hash, ':user_provider_type' => 'DEFAULT'
 		));
 
-		// if successful
-		if ($query->rowCount() == 1) {
-			return true;
-		}
-		return false;
+		// if one result exists, return true, else false. Could be written even shorter btw.
+		return ($query->rowCount() == 1 ? true : false);
 	}
 
 	/**

From afeb9958e62897ef700f4f85f4b85bf8b93e1b05 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 13:48:01 +0100
Subject: [PATCH 06/68] (v3.1) first experimental PHPUnit tests / config

---
 application/core/Text.php | 11 +++++++++++
 composer.json             |  3 ++-
 tests/bootstrap.php       |  4 ++++
 tests/core/TextTest.php   | 28 ++++++++++++++++++++++++++++
 tests/phpunit.xml.dist    | 17 +++++++++++++++++
 5 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 tests/bootstrap.php
 create mode 100644 tests/core/TextTest.php
 create mode 100644 tests/phpunit.xml.dist

diff --git a/application/core/Text.php b/application/core/Text.php
index cbbc5daab..80ac3e5ea 100644
--- a/application/core/Text.php
+++ b/application/core/Text.php
@@ -6,10 +6,21 @@ class Text
 
     public static function get($key)
     {
+	    // if not $key
+	    if (!$key) {
+		    return null;
+	    }
+
+	    // load config file (this is only done once per application lifecycle)
         if (!self::$texts) {
             self::$texts = require('../application/config/texts.php');
         }
 
+	    // check if array key exists
+	    if (!array_key_exists($key, self::$texts)) {
+		    return null;
+	    }
+
         return self::$texts[$key];
     }
 
diff --git a/composer.json b/composer.json
index 4f23c3527..8461fc8ae 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,8 @@
     "require-dev": {
         "php": ">=5.5.0",
         "phpmailer/phpmailer": "~5.2",
-        "gregwar/captcha": "~1.0.12"
+        "gregwar/captcha": "~1.0.12",
+        "phpunit/phpunit": "3.7.38"
     },
     "autoload": {
         "psr-4": { "": ["application/core/", "application/model/"] }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000..03b729600
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,4 @@
+<?php
+
+$autoloader = require __DIR__ . '/../vendor/autoload.php';
+//$autoloader->add('Huge\\Tests\\', __DIR__);
\ No newline at end of file
diff --git a/tests/core/TextTest.php b/tests/core/TextTest.php
new file mode 100644
index 000000000..1e12d706a
--- /dev/null
+++ b/tests/core/TextTest.php
@@ -0,0 +1,28 @@
+<?php
+
+class TextTest extends PHPUnit_Framework_TestCase
+{
+	/**
+	 * When argument is existing key, then existing value should be returned
+	 */
+	public function testGet()
+	{
+		$this->assertEquals('Password was wrong.', Text::get('FEEDBACK_PASSWORD_WRONG'));
+	}
+
+	/**
+	 * When argument is null, should return null
+	 */
+	public function testGetWithNullKey()
+	{
+		$this->assertEquals(null, Text::get(null));
+	}
+
+	/**
+	 * When key does not exist in text data file, should return null
+	 */
+	public function testGetWithNonExistingKey()
+	{
+		$this->assertEquals(null, Text::get('XXX'));
+	}
+}
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
new file mode 100644
index 000000000..19b4f61c4
--- /dev/null
+++ b/tests/phpunit.xml.dist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false">
+    <testsuites>
+        <testsuite name="Core Suite">
+            <directory>./core/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
\ No newline at end of file

From 6189b04d9bc97d9c0f9e65c1837a7aa30372ed1d Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 13:48:28 +0100
Subject: [PATCH 07/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..3ea1a3a51
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
+language: php
+# list any PHP version you want to test against
+php:
+# using major version aliases
+# aliased to a recent 5.5.x version
+- 5.5
+# aliased to a recent 5.6.x version
+- 5.6
+# omitting "script:" will default to phpunit
+script: phpunit --configuration ./tests/phpunit.xml.dist --coverage-text

From ba983353033837e34da07e61d7c8349ee2b8b7a0 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 14:19:06 +0100
Subject: [PATCH 08/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3ea1a3a51..970c789c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,16 @@
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
 # list any PHP version you want to test against
+
 php:
 # using major version aliases
 # aliased to a recent 5.5.x version
 - 5.5
 # aliased to a recent 5.6.x version
 - 5.6
+
+# elegant and simple solution to run tests from ./tests folder :)
+before_script: cd tests
+
 # omitting "script:" will default to phpunit
-script: phpunit --configuration ./tests/phpunit.xml.dist --coverage-text
+script: phpunit --configuration phpunit.xml.dist --coverage-text
\ No newline at end of file

From 2524ed4cba0be09b11b7bb274cb0d952a7e99353 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 14:26:09 +0100
Subject: [PATCH 09/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml            | 2 +-
 tests/phpunit.xml.dist | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 970c789c8..3f50988c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ php:
 before_script: cd tests
 
 # omitting "script:" will default to phpunit
-script: phpunit --configuration phpunit.xml.dist --coverage-text
\ No newline at end of file
+script: phpunit
\ No newline at end of file
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index 19b4f61c4..a4f056a61 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="bootstrap.php"
+         bootstrap="../vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

From aa37b25e62691fe95286aac2d96a963b321608bb Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 14:40:30 +0100
Subject: [PATCH 10/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f50988c9..9455b1af1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,10 @@ php:
 - 5.6
 
 # elegant and simple solution to run tests from ./tests folder :)
-before_script: cd tests
+before_script:
+- sudo a2enmod rewrite
+- sudo service apache2 restart
+- cd tests
 
 # omitting "script:" will default to phpunit
-script: phpunit
\ No newline at end of file
+script: phpunit

From 09f83ab02c9f0e85452419099edb905ff4f27fd1 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 14:43:27 +0100
Subject: [PATCH 11/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9455b1af1..127a6665f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@ php:
 # aliased to a recent 5.6.x version
 - 5.6
 
+sudo: true
+
 # elegant and simple solution to run tests from ./tests folder :)
 before_script:
 - sudo a2enmod rewrite

From efebf4af5204a9e018689389780d5ff50359ed7e Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 16:10:59 +0100
Subject: [PATCH 12/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 127a6665f..f83497a71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,10 @@
-# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
-# list any PHP version you want to test against
-
 php:
-# using major version aliases
-# aliased to a recent 5.5.x version
-- 5.5
-# aliased to a recent 5.6.x version
-- 5.6
-
-sudo: true
-
-# elegant and simple solution to run tests from ./tests folder :)
+    - 5.5
+    - 5.6
+    - hhvm
 before_script:
-- sudo a2enmod rewrite
-- sudo service apache2 restart
-- cd tests
-
-# omitting "script:" will default to phpunit
-script: phpunit
+    - composer self-update
+    - composer install --prefer-source --no-interaction --dev
+    - cd tests
+script: phpunit --configuration phpunit.xml --coverage-text

From 4655bf1c781a9771e1b64d321aa18a8fcdf4985e Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 16:17:23 +0100
Subject: [PATCH 13/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml                             | 24 ++++++++++++++++++++----
 tests/{phpunit.xml.dist => phpunit.xml} |  0
 2 files changed, 20 insertions(+), 4 deletions(-)
 rename tests/{phpunit.xml.dist => phpunit.xml} (100%)

diff --git a/.travis.yml b/.travis.yml
index f83497a71..64e9d80f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,24 @@ php:
     - 5.5
     - 5.6
     - hhvm
+
+matrix:
+  allow_failures:
+  - php: hhvm
+
+before_install:
+- sudo apt-get update > /dev/null
+
 before_script:
-    - composer self-update
-    - composer install --prefer-source --no-interaction --dev
-    - cd tests
-script: phpunit --configuration phpunit.xml --coverage-text
+   - sudo apt-get install apache2
+   - sudo a2enmod rewrite
+   # configure apache virtual hosts
+   - sudo cp -f build/travis-ci-apache /etc/apache2/sites-available/default
+   - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
+   - sudo service apache2 restart
+   # composer
+   - composer self-update
+   - composer install --prefer-source --no-interaction --dev
+   - cd tests
+
+script: phpunit --configuration phpunit.xml --coverage-text
\ No newline at end of file
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml
similarity index 100%
rename from tests/phpunit.xml.dist
rename to tests/phpunit.xml

From 89cfdc5c0d88ab7e9fa952d4fab980be33cc766d Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 16:21:45 +0100
Subject: [PATCH 14/68] (v3.1) travis config file for first experimental
 automated build process

---
 build/travis-ci-apache | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 build/travis-ci-apache

diff --git a/build/travis-ci-apache b/build/travis-ci-apache
new file mode 100644
index 000000000..10050bf0d
--- /dev/null
+++ b/build/travis-ci-apache
@@ -0,0 +1,7 @@
+<VirtualHost *:80>
+    DocumentRoot "%TRAVIS_BUILD_DIR%/public"
+    <Directory "%TRAVIS_BUILD_DIR%/public">
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>

From 6a74864a8f55beaf14d5114f009973851d028c53 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 16:35:31 +0100
Subject: [PATCH 15/68] (v3.1) travis config file for first experimental
 automated build process

---
 .travis.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64e9d80f4..fde8c94d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ php:
     - 5.6
     - hhvm
 
-matrix:
-  allow_failures:
-  - php: hhvm
+#matrix:
+ # allow_failures:
+  #- php: hhvm
 
 before_install:
 - sudo apt-get update > /dev/null
@@ -21,6 +21,13 @@ before_script:
    # composer
    - composer self-update
    - composer install --prefer-source --no-interaction --dev
+   # go to tests folder
    - cd tests
 
-script: phpunit --configuration phpunit.xml --coverage-text
\ No newline at end of file
+# run unit tests, create result file
+script: phpunit --configuration phpunit.xml --coverage-text --coverage-clover=coverage.clover
+
+# gets tools from Scrutinizer, uploads unit tests results to Scrutinizer (?)
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
\ No newline at end of file

From 0781dca677dfe2880d8b26a18d052205ff236463 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 16:41:02 +0100
Subject: [PATCH 16/68] (v3.1) travis config file for first experimental
 automated build process

---
 .scrutinizer.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .scrutinizer.yml

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 000000000..2bbc9279c
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,5 @@
+# This file just tells the wonderful code quality analyzer Scrutinizer (https://scrutinizer-ci.com/g/panique/huge/)
+# that we are using external services (Travis) to generate code coverage stats
+# TODO is this correct ?
+tools:
+    external_code_coverage: true
\ No newline at end of file

From f00544891db2553ff4f1cc7850d1205929ace89a Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 18:28:04 +0100
Subject: [PATCH 17/68] (v3.1) tests for Request class

---
 tests/core/RequestTest.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tests/core/RequestTest.php

diff --git a/tests/core/RequestTest.php b/tests/core/RequestTest.php
new file mode 100644
index 000000000..e1382b337
--- /dev/null
+++ b/tests/core/RequestTest.php
@@ -0,0 +1,29 @@
+<?php
+
+class RequestTest extends PHPUnit_Framework_TestCase
+{
+	public function testPost()
+	{
+		$_POST["test"] = 22;
+		$this->assertEquals(22, Request::post('test'));
+		$this->assertEquals(null, Request::post('not_existing_key'));
+
+		// test trim & strip_tags: Method is used with second argument "true", triggering a cleaning of the input
+		$_POST["attacker_string"] = '   <script>alert("yo!");</script>   ';
+		$this->assertEquals('alert("yo!");', Request::post('attacker_string', true));
+	}
+
+	public function testGet()
+	{
+		$_GET["test"] = 33;
+		$this->assertEquals(33, Request::get('test'));
+		$this->assertEquals(null, Request::get('not_existing_key'));
+	}
+
+	public function testCookie()
+	{
+		$_COOKIE["test"] = 44;
+		$this->assertEquals(44, Request::cookie('test'));
+		$this->assertEquals(null, Request::cookie('not_existing_key'));
+	}
+}

From dcd54f648e4435793ab93f0cc2d2144696f82f75 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 18:28:39 +0100
Subject: [PATCH 18/68] (v3.1) removed unused bootstrap.php for testing

---
 tests/bootstrap.php | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 tests/bootstrap.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 03b729600..000000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$autoloader = require __DIR__ . '/../vendor/autoload.php';
-//$autoloader->add('Huge\\Tests\\', __DIR__);
\ No newline at end of file

From 81af15f216e026e8e7365b0b3af2ff7f5a43b180 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 18:56:39 +0100
Subject: [PATCH 19/68] (v3.1) tests for Environment class

---
 tests/core/EnvironmentTest.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 tests/core/EnvironmentTest.php

diff --git a/tests/core/EnvironmentTest.php b/tests/core/EnvironmentTest.php
new file mode 100644
index 000000000..a6d32cf72
--- /dev/null
+++ b/tests/core/EnvironmentTest.php
@@ -0,0 +1,23 @@
+<?php
+
+class EnvironmentTest extends PHPUnit_Framework_TestCase
+{
+	public function testGetDefault()
+	{
+		// call for environment should return "development"
+		$this->assertEquals('development', Environment::get());
+	}
+
+	public function testGetDevelopment()
+	{
+		putenv('APPLICATION_ENV=development');
+		// call for environment should return "development"
+		$this->assertEquals('development', Environment::get());
+	}
+
+	public function testGetProduction()
+	{
+		putenv('APPLICATION_ENV=production');
+		$this->assertEquals('production', Environment::get());
+	}
+}

From 43a3ff74e4d13536cafd15fa7cf9fe73c75c841a Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 19:00:08 +0100
Subject: [PATCH 20/68] (v3.1) build badge, branch for badge changed

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f36e63824..5967eb186 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,9 @@ static classes, extremely simple constructs, not-totally-DRY code etc. while kee
 
 Buzzwords: [KISS](http://en.wikipedia.org/wiki/KISS_principle), [YASNI](http://en.wikipedia.org/wiki/You_aren%27t_gonna_need_it). 
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/panique/huge/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/panique/huge/?branch=master)
 [![Code Climate](https://codeclimate.com/github/panique/huge/badges/gpa.svg)](https://codeclimate.com/github/panique/huge)
+[![Travis CI](https://travis-ci.org/panique/huge.svg?branch=develop)](https://travis-ci.org/panique/huge)
 [![Dependency Status](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010)
 
 #### Quick-Index 

From 19c32e0213174bf5cde171f37189ca5aa6b8c3b7 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 19:01:50 +0100
Subject: [PATCH 21/68] (v3.1) build badge, branch for badge changed

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5967eb186..016e44e2e 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ static classes, extremely simple constructs, not-totally-DRY code etc. while kee
 
 Buzzwords: [KISS](http://en.wikipedia.org/wiki/KISS_principle), [YASNI](http://en.wikipedia.org/wiki/You_aren%27t_gonna_need_it). 
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/panique/huge/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/panique/huge/?branch=develop)
 [![Code Climate](https://codeclimate.com/github/panique/huge/badges/gpa.svg)](https://codeclimate.com/github/panique/huge)
 [![Travis CI](https://travis-ci.org/panique/huge.svg?branch=develop)](https://travis-ci.org/panique/huge)
 [![Dependency Status](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010)

From ded52f541223728439bfadd6898d4ca8b927b9c2 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 19:02:30 +0100
Subject: [PATCH 22/68] (v3.1) build badge, branch for badge changed

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 016e44e2e..761da9733 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
 
 # HUGE
 
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/panique/huge/?branch=develop)
+[![Code Climate](https://codeclimate.com/github/panique/huge/badges/gpa.svg)](https://codeclimate.com/github/panique/huge)
+[![Travis CI](https://travis-ci.org/panique/huge.svg?branch=develop)](https://travis-ci.org/panique/huge)
+[![Dependency Status](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010)
+
 Just a simple user authentication solution inside a super-simple framework skeleton that works out-of-the-box
 (and comes with an auto-installer), using the future-proof official bcrypt password hashing/salting implementation of 
 PHP 5.5+, plus some nice features that will speed up the time from idea to first usable prototype application 
@@ -16,12 +21,7 @@ applications that - surprisingly and intentionally - go back to the basics of pr
 static classes, extremely simple constructs, not-totally-DRY code etc. while keeping the code extremely readable 
 ([StackOverflow](http://www.dev-metal.com/architecture-stackoverflow/), Wikipedia, SoundCloud).
 
-Buzzwords: [KISS](http://en.wikipedia.org/wiki/KISS_principle), [YASNI](http://en.wikipedia.org/wiki/You_aren%27t_gonna_need_it). 
-
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/panique/huge/?branch=develop)
-[![Code Climate](https://codeclimate.com/github/panique/huge/badges/gpa.svg)](https://codeclimate.com/github/panique/huge)
-[![Travis CI](https://travis-ci.org/panique/huge.svg?branch=develop)](https://travis-ci.org/panique/huge)
-[![Dependency Status](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010)
+Buzzwords: [KISS](http://en.wikipedia.org/wiki/KISS_principle), [YASNI](http://en.wikipedia.org/wiki/You_aren%27t_gonna_need_it).
 
 #### Quick-Index 
 

From c69bd6aa1717c5f560c303c12eef8c3ec8396eb0 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 20:28:29 +0100
Subject: [PATCH 23/68] (v3.1) Config class rewrite to allow better testing

---
 application/core/Config.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/core/Config.php b/application/core/Config.php
index a3ce036b7..96ace4bed 100644
--- a/application/core/Config.php
+++ b/application/core/Config.php
@@ -2,15 +2,22 @@
 
 class Config
 {
-    private static $config;
+	// this is public to allow better Unit Testing
+    public static $config;
 
     public static function get($key)
     {
         if (!self::$config) {
-            self::$config = require('../application/config/config.' . Environment::get() . '.php');
+
+	        $config_file = '../application/config/config.' . Environment::get() . '.php';
+
+			if (!file_exists($config_file)) {
+				return false;
+			}
+
+	        self::$config = require $config_file;
         }
 
         return self::$config[$key];
     }
-
 }

From 31f7aed9bda9518b96552f539cde2f306d3cf651 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 20:28:46 +0100
Subject: [PATCH 24/68] (v3.1) Config class unit tests

---
 tests/core/ConfigTest.php | 43 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 tests/core/ConfigTest.php

diff --git a/tests/core/ConfigTest.php b/tests/core/ConfigTest.php
new file mode 100644
index 000000000..c6a392805
--- /dev/null
+++ b/tests/core/ConfigTest.php
@@ -0,0 +1,43 @@
+<?php
+
+class ConfigTest extends PHPUnit_Framework_TestCase
+{
+	/*
+	 * Create fake values, necessary to run the tests
+	 */
+	public function setUp()
+	{
+		$_SERVER['HTTP_HOST'] = 'localhost';
+		$_SERVER['SCRIPT_NAME'] = 'index.php';
+		Config::$config = null;
+	}
+
+	/**
+	 * Reset everything
+	 */
+	public function tearDown()
+	{
+		putenv('APPLICATION_ENV=');
+		Config::$config = null;
+	}
+
+	public function testGetDefaultEnvironment()
+	{
+		// fake application constants
+		putenv('APPLICATION_ENV=development');
+
+		// call for environment should return "development"
+		$this->assertEquals('index', Config::get('DEFAULT_ACTION'));
+	}
+
+	public function testGetFailingEnvironment()
+	{
+		// fake application constants
+		putenv('APPLICATION_ENV=foobar');
+
+		var_dump(Environment::get());
+
+		// call for environment should return false because config.foobar.php does not exist
+		$this->assertEquals(false, Config::get('DEFAULT_ACTION'));
+	}
+}

From c7fd3f6b15773980484e78b30cf28755a9e3a748 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 20:56:50 +0100
Subject: [PATCH 25/68] (v3.1) Config class unit tests (removed var_dump)

---
 tests/core/ConfigTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/core/ConfigTest.php b/tests/core/ConfigTest.php
index c6a392805..34113a43c 100644
--- a/tests/core/ConfigTest.php
+++ b/tests/core/ConfigTest.php
@@ -35,8 +35,6 @@ public function testGetFailingEnvironment()
 		// fake application constants
 		putenv('APPLICATION_ENV=foobar');
 
-		var_dump(Environment::get());
-
 		// call for environment should return false because config.foobar.php does not exist
 		$this->assertEquals(false, Config::get('DEFAULT_ACTION'));
 	}

From ca8e98949fa64f93a98c6d70471f2d7084478e69 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 21:56:15 +0100
Subject: [PATCH 26/68] (v3.1) travis config build is now inline, does not need
 external file anymore

---
 .travis.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fde8c94d0..fa9bb9886 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,24 @@ before_install:
 before_script:
    - sudo apt-get install apache2
    - sudo a2enmod rewrite
+
+  # setup hosts file
+  - VHOST=$(cat <<EOF
+  <VirtualHost *:80>
+      DocumentRoot "%TRAVIS_BUILD_DIR%/public"
+      <Directory "%TRAVIS_BUILD_DIR%/public">
+          AllowOverride All
+          Require all granted
+      </Directory>
+  </VirtualHost>
+  EOF
+  )
+  - echo "${VHOST}" > /etc/apache2/sites-available/default
+
    # configure apache virtual hosts
-   - sudo cp -f build/travis-ci-apache /etc/apache2/sites-available/default
+   #- sudo cp -f build/travis-ci-apache /etc/apache2/sites-available/default
    - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
+
    - sudo service apache2 restart
    # composer
    - composer self-update

From 56ae186c9782a4953c053f7175d6987340573f89 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 22:05:22 +0100
Subject: [PATCH 27/68] (v3.1) phpunit update from 3.7 to 4.5

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8461fc8ae..6c8992b9d 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         "php": ">=5.5.0",
         "phpmailer/phpmailer": "~5.2",
         "gregwar/captcha": "~1.0.12",
-        "phpunit/phpunit": "3.7.38"
+        "phpunit/phpunit": "~4.5"
     },
     "autoload": {
         "psr-4": { "": ["application/core/", "application/model/"] }

From 83a63b4e07757460afc0bf66a0a9e513a89e189e Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sun, 15 Feb 2015 22:09:01 +0100
Subject: [PATCH 28/68] (v3.1) back to old travis config

---
 .travis.yml                                | 24 +++-------------------
 build/travis-ci-apache => travis-ci-apache |  0
 2 files changed, 3 insertions(+), 21 deletions(-)
 rename build/travis-ci-apache => travis-ci-apache (100%)

diff --git a/.travis.yml b/.travis.yml
index fa9bb9886..45ab71539 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,19 @@
 language: php
+
 php:
     - 5.5
     - 5.6
     - hhvm
 
-#matrix:
- # allow_failures:
-  #- php: hhvm
-
 before_install:
 - sudo apt-get update > /dev/null
 
 before_script:
    - sudo apt-get install apache2
    - sudo a2enmod rewrite
-
-  # setup hosts file
-  - VHOST=$(cat <<EOF
-  <VirtualHost *:80>
-      DocumentRoot "%TRAVIS_BUILD_DIR%/public"
-      <Directory "%TRAVIS_BUILD_DIR%/public">
-          AllowOverride All
-          Require all granted
-      </Directory>
-  </VirtualHost>
-  EOF
-  )
-  - echo "${VHOST}" > /etc/apache2/sites-available/default
-
-   # configure apache virtual hosts
-   #- sudo cp -f build/travis-ci-apache /etc/apache2/sites-available/default
+   # configure apache virtual hosts, create vhost via travis-ci-apache file template
+   - sudo cp -f travis-ci-apache /etc/apache2/sites-available/default
    - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-
    - sudo service apache2 restart
    # composer
    - composer self-update
diff --git a/build/travis-ci-apache b/travis-ci-apache
similarity index 100%
rename from build/travis-ci-apache
rename to travis-ci-apache

From bf7e37bc3cc9497f29319b3a97a5463e0f03526b Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Wed, 18 Feb 2015 21:59:06 +0100
Subject: [PATCH 29/68] (v3.1) code quality in LoginModel improved

---
 application/model/LoginModel.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/model/LoginModel.php b/application/model/LoginModel.php
index a1b3a0c77..af1e32f44 100644
--- a/application/model/LoginModel.php
+++ b/application/model/LoginModel.php
@@ -41,7 +41,7 @@ public static function login($user_name, $user_password, $set_remember_me_cookie
 
         // if hash of provided password does NOT match the hash in the database: +1 failed-login counter
         if (!password_verify($user_password, $result->user_password_hash)) {
-            LoginModel::incrementFailedLoginCounterOfUser($user_name);
+            self::incrementFailedLoginCounterOfUser($user_name);
             // we say "password wrong" here, but less details like "login failed" would be better (= less information)
             Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_WRONG'));
             return false;
@@ -57,19 +57,19 @@ public static function login($user_name, $user_password, $set_remember_me_cookie
 
         // reset the failed login counter for that user (if necessary)
         if ($result->user_last_failed_login > 0) {
-            LoginModel::resetFailedLoginCounterOfUser($user_name);
+            self::resetFailedLoginCounterOfUser($user_name);
         }
 
         // save timestamp of this login in the database line of that user
-        LoginModel::saveTimestampOfLoginOfUser($user_name);
+        self::saveTimestampOfLoginOfUser($user_name);
 
         // if user has checked the "remember me" checkbox, then write token into database and into cookie
         if ($set_remember_me_cookie) {
-            LoginModel::setRememberMeInDatabaseAndCookie($result->user_id);
+            self::setRememberMeInDatabaseAndCookie($result->user_id);
         }
 
         // successfully logged in, so we write all necessary data into the session and set "user_logged_in" to true
-        LoginModel::setSuccessfulLoginIntoSession(
+        self::setSuccessfulLoginIntoSession(
             $result->user_id, $result->user_name, $result->user_email, $result->user_account_type
         );
 
@@ -113,11 +113,11 @@ public static function loginWithCookie($cookie)
         // if user with that id and exactly that cookie token exists in database
         if ($result) {
             // successfully logged in, so we write all necessary data into the session and set "user_logged_in" to true
-            LoginModel::setSuccessfulLoginIntoSession(
+            self::setSuccessfulLoginIntoSession(
                 $result->user_id, $result->user_name, $result->user_email, $result->user_account_type
             );
             // save timestamp of this login in the database line of that user
-            LoginModel::saveTimestampOfLoginOfUser($result->user_name);
+            self::saveTimestampOfLoginOfUser($result->user_name);
 
             // NOTE: we don't set another remember_me-cookie here as the current cookie should always
             // be invalid after a certain amount of time, so the user has to login with username/password
@@ -136,7 +136,7 @@ public static function loginWithCookie($cookie)
      */
     public static function logout()
     {
-        LoginModel::deleteCookie();
+        self::deleteCookie();
         Session::destroy();
     }
 

From 66d7226eec9ccd6ffae1f95a44c9f9b37399d3e9 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Wed, 18 Feb 2015 23:23:44 +0100
Subject: [PATCH 30/68] (v3.1) code quality in Mail improved

---
 application/core/Mail.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/application/core/Mail.php b/application/core/Mail.php
index 3b5360d58..2362b0d9c 100644
--- a/application/core/Mail.php
+++ b/application/core/Mail.php
@@ -67,10 +67,7 @@ public function sendMailWithPHPMailer($user_email, $from_email, $from_name, $sub
 			$mail->Username = Config::get('EMAIL_SMTP_USERNAME');
 			$mail->Password = Config::get('EMAIL_SMTP_PASSWORD');
 			$mail->Port = Config::get('EMAIL_SMTP_PORT');
-		}
-
-		// if you want to send mail via PHPMailer using native mail()
-		if (!Config::get('EMAIL_USE_SMTP')) {
+		} else {
 			$mail->IsMail();
 		}
 
@@ -81,15 +78,16 @@ public function sendMailWithPHPMailer($user_email, $from_email, $from_name, $sub
 		$mail->Subject = $subject;
 		$mail->Body = $body;
 
-		// send mail
+		// try to send mail
 		$mail->Send();
+
 		if ($mail) {
 			return true;
+		} else {
+			// if not successful, copy errors into Mail's error property
+			$this->error = $mail->ErrorInfo;
+			return false;
 		}
-
-		// if not successful, copy errors into Mail's error property
-		$this->error = $mail->ErrorInfo;
-		return false;
 	}
 
 	public function sendMail($user_email, $from_email, $from_name, $subject, $body)

From 3a45958cb6fa12b451c76120a2a27784184fd161 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Wed, 18 Feb 2015 23:33:33 +0100
Subject: [PATCH 31/68] (v3.1) code quality in RegistrationModel improved

---
 application/model/RegistrationModel.php | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/application/model/RegistrationModel.php b/application/model/RegistrationModel.php
index 59d1cc71e..e001548cb 100644
--- a/application/model/RegistrationModel.php
+++ b/application/model/RegistrationModel.php
@@ -166,7 +166,8 @@ public static function rollbackRegistrationByUserId($user_id)
 	}
 
 	/**
-	 * Sends the verification email (to confirm the account)
+	 * Sends the verification email (to confirm the account).
+	 * The construction of the mail $body looks weird at first, but it's really just a simple string.
 	 *
 	 * @param int $user_id user's id
 	 * @param string $user_email user's email
@@ -176,27 +177,21 @@ public static function rollbackRegistrationByUserId($user_id)
 	 */
 	public static function sendVerificationEmail($user_id, $user_email, $user_activation_hash)
 	{
-		// create email body
 		$body = Config::get('EMAIL_VERIFICATION_CONTENT') . Config::get('URL') . Config::get('EMAIL_VERIFICATION_URL')
 		        . '/' . urlencode($user_id) . '/' . urlencode($user_activation_hash);
 
-		// create instance of Mail class, try sending and check
 		$mail = new Mail;
-		$mail_sent = $mail->sendMail(
-			$user_email,
-			Config::get('EMAIL_VERIFICATION_FROM_EMAIL'),
-			Config::get('EMAIL_VERIFICATION_FROM_NAME'),
-			Config::get('EMAIL_VERIFICATION_SUBJECT'),
-			$body
+		$mail_sent = $mail->sendMail($user_email, Config::get('EMAIL_VERIFICATION_FROM_EMAIL'),
+			Config::get('EMAIL_VERIFICATION_FROM_NAME'), Config::get('EMAIL_VERIFICATION_SUBJECT'), $body
 		);
 
 		if ($mail_sent) {
 			Session::add('feedback_positive', Text::get('FEEDBACK_VERIFICATION_MAIL_SENDING_SUCCESSFUL'));
 			return true;
+		} else {
+			Session::add('feedback_negative', Text::get('FEEDBACK_VERIFICATION_MAIL_SENDING_ERROR') . $mail->getError() );
+			return false;
 		}
-
-		Session::add('feedback_negative', Text::get('FEEDBACK_VERIFICATION_MAIL_SENDING_ERROR') . $mail->getError() );
-		return false;
 	}
 
 	/**

From fde7dd0593dbc5715463a8a5b7ce8192627b70c3 Mon Sep 17 00:00:00 2001
From: Dominic <dominic-ts@gmx.de>
Date: Fri, 20 Feb 2015 23:53:23 +0100
Subject: [PATCH 32/68] avatar model delete avatar

---
 application/config/texts.php               |  3 ++
 application/controller/LoginController.php | 11 ++++++
 application/model/AvatarModel.php          | 45 ++++++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/application/config/texts.php b/application/config/texts.php
index cf7471e95..1b47b9782 100644
--- a/application/config/texts.php
+++ b/application/config/texts.php
@@ -45,6 +45,9 @@
 	"FEEDBACK_AVATAR_UPLOAD_TOO_BIG" => "Avatar source file is too big. 5 Megabyte is the maximum.",
 	"FEEDBACK_AVATAR_FOLDER_DOES_NOT_EXIST_OR_NOT_WRITABLE" => "Avatar folder does not exist or is not writable. Please change this via chmod 775 or 777.",
 	"FEEDBACK_AVATAR_IMAGE_UPLOAD_FAILED" => "Something went wrong with the image upload.",
+        "FEEDBACK_AVATAR_IMAGE_DELETE_SUCCESSFUL" => "You successfully deleted your avatar.",
+        "FEEDBACK_AVATAR_IMAGE_DELETE_NO_FILE" => "You don't have a custom avatar.",
+        "FEEDBACK_AVATAR_IMAGE_DELETE_FAILED" => "Something went wrong while deleting your avatar.",
 	"FEEDBACK_PASSWORD_RESET_TOKEN_FAIL" => "Could not write token to database.",
 	"FEEDBACK_PASSWORD_RESET_TOKEN_MISSING" => "No password reset token.",
 	"FEEDBACK_PASSWORD_RESET_MAIL_SENDING_ERROR" => "Password reset mail could not be sent due to: ",
diff --git a/application/controller/LoginController.php b/application/controller/LoginController.php
index 25e15362a..ac94736e2 100644
--- a/application/controller/LoginController.php
+++ b/application/controller/LoginController.php
@@ -158,6 +158,17 @@ public function uploadAvatar_action()
         Redirect::to('login/uploadAvatar');
     }
 
+    /**
+     * Delete the current user's avatar
+     * Auth::checkAuthentication() makes sure that only logged in users can use this action and see this page
+     */
+    public function deleteAvatar_action()
+    {
+        Auth::checkAuthentication();
+        AvatarModel::deleteAvatar(Session::get("user_id"));
+        Redirect::to('login/showProfile');
+    }
+
     /**
      * Show the change-account-type page
      * Auth::checkAuthentication() makes sure that only logged in users can use this action and see this page
diff --git a/application/model/AvatarModel.php b/application/model/AvatarModel.php
index 7db965080..2fbb2f178 100644
--- a/application/model/AvatarModel.php
+++ b/application/model/AvatarModel.php
@@ -196,4 +196,49 @@ public static function resizeAvatarImage($source_image, $destination, $final_wid
 		// default return
 		return false;
 	}
+
+        /**
+         * Delete a user's avatar
+         *
+         * @param int $userId
+         *
+         * @return bool success
+         */
+        public static function deleteAvatar($userId)
+        {
+                if (!ctype_digit($userId)) {
+                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
+                        return false;
+                }
+
+                // Check if file exists
+                if (!file_exists(Config::get('PATH_AVATARS').$userId.".jpg")) {
+                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_NO_FILE"));
+                        return false;
+                }
+
+                // Delete avatar file
+                if (!unlink(Config::get('PATH_AVATARS').$userId.".jpg")) {
+                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
+                        return false;
+                }
+
+                $database = DatabaseFactory::getFactory()->getConnection();
+
+                // Set user_has_avatar back to 0
+                $sth = $database->prepare("UPDATE users SET user_has_avatar = 0 WHERE user_id = :user_id LIMIT 1");
+                $sth->bindValue(":user_id", (int)$userId, PDO::PARAM_INT);
+                $sth->execute();
+
+                if ($sth->rowCount() == 1) {
+                        // Reset avatar file path session
+                        Session::set('user_avatar_file', AvatarModel::getPublicUserAvatarFilePathByUserId($userId));
+
+                        Session::add("feedback_positive", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_SUCCESSFUL"));
+                        return true;
+                } else {
+                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
+                        return false;
+                }
+        }
 }

From 4cfd1a7eaee88b93123bbf1d43b60fc71ef93da5 Mon Sep 17 00:00:00 2001
From: Dominic <Dominic28@users.noreply.github.com>
Date: Sat, 21 Feb 2015 00:22:48 +0100
Subject: [PATCH 33/68] Little fix for scrutinizer

---
 application/model/AvatarModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/model/AvatarModel.php b/application/model/AvatarModel.php
index 2fbb2f178..20e2fdce8 100644
--- a/application/model/AvatarModel.php
+++ b/application/model/AvatarModel.php
@@ -232,7 +232,7 @@ public static function deleteAvatar($userId)
 
                 if ($sth->rowCount() == 1) {
                         // Reset avatar file path session
-                        Session::set('user_avatar_file', AvatarModel::getPublicUserAvatarFilePathByUserId($userId));
+                        Session::set('user_avatar_file', self::getPublicUserAvatarFilePathByUserId($userId));
 
                         Session::add("feedback_positive", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_SUCCESSFUL"));
                         return true;

From 181157513ea6b64c32ff76e690d01a0828614be6 Mon Sep 17 00:00:00 2001
From: Dominic <dominic-ts@gmx.de>
Date: Sat, 21 Feb 2015 16:53:50 +0100
Subject: [PATCH 34/68] Linked avatar delete function.

---
 application/controller/LoginController.php | 10 ++++----
 application/view/_templates/header.php     |  2 +-
 application/view/login/editAvatar.php      | 28 ++++++++++++++++++++++
 application/view/login/uploadAvatar.php    | 19 ---------------
 4 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 application/view/login/editAvatar.php
 delete mode 100644 application/view/login/uploadAvatar.php

diff --git a/application/controller/LoginController.php b/application/controller/LoginController.php
index ac94736e2..65aa7aff7 100644
--- a/application/controller/LoginController.php
+++ b/application/controller/LoginController.php
@@ -135,13 +135,13 @@ public function editUserEmail_action()
     }
 
     /**
-     * Upload avatar
+     * Edit avatar
      * Auth::checkAuthentication() makes sure that only logged in users can use this action and see this page
      */
-    public function uploadAvatar()
+    public function editAvatar()
     {
         Auth::checkAuthentication();
-        $this->View->render('login/uploadAvatar', array(
+        $this->View->render('login/editAvatar', array(
             'avatar_file_path' => AvatarModel::getPublicUserAvatarFilePathByUserId(Session::get('user_id'))
         ));
     }
@@ -155,7 +155,7 @@ public function uploadAvatar_action()
     {
         Auth::checkAuthentication();
         AvatarModel::createAvatar();
-        Redirect::to('login/uploadAvatar');
+        Redirect::to('login/editAvatar');
     }
 
     /**
@@ -166,7 +166,7 @@ public function deleteAvatar_action()
     {
         Auth::checkAuthentication();
         AvatarModel::deleteAvatar(Session::get("user_id"));
-        Redirect::to('login/showProfile');
+        Redirect::to('login/editAvatar');
     }
 
     /**
diff --git a/application/view/_templates/header.php b/application/view/_templates/header.php
index 691c8a261..9859a71ea 100644
--- a/application/view/_templates/header.php
+++ b/application/view/_templates/header.php
@@ -49,7 +49,7 @@
                         <a href="<?php echo Config::get('URL'); ?>login/changeUserRole">Change account type</a>
                     </li>
                     <li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
-                        <a href="<?php echo Config::get('URL'); ?>login/uploadavatar">Upload an avatar</a>
+                        <a href="<?php echo Config::get('URL'); ?>login/editAvatar">Edit your avatar</a>
                     </li>
                     <li <?php if (View::checkForActiveController($filename, "login")) { echo ' class="active" '; } ?> >
                         <a href="<?php echo Config::get('URL'); ?>login/editusername">Edit my username</a>
diff --git a/application/view/login/editAvatar.php b/application/view/login/editAvatar.php
new file mode 100644
index 000000000..5a256cd20
--- /dev/null
+++ b/application/view/login/editAvatar.php
@@ -0,0 +1,28 @@
+<div class="container">
+    <h1>Edit your avatar</h1>
+
+    <!-- echo out the system feedback (error and success messages) -->
+    <?php $this->renderFeedbackMessages(); ?>
+
+    <div class="box">
+        <h3>Upload an Avatar</h3>
+
+        <div class="feedback info">
+            If you still see the old picture after uploading a new one: Hard-Reload the page with F5! Your browser doesn't
+            realize there's a new image as new and old one have the same filename.
+        </div>
+
+        <form action="<?php echo Config::get('URL'); ?>login/uploadAvatar_action" method="post" enctype="multipart/form-data">
+            <label for="avatar_file">Select an avatar image from your hard-disk (will be scaled to 44x44 px):</label>
+            <input type="file" name="avatar_file" required />
+            <!-- max size 5 MB (as many people directly upload high res pictures from their digital cameras) -->
+            <input type="hidden" name="MAX_FILE_SIZE" value="5000000" />
+            <input type="submit" value="Upload image" />
+        </form>
+    </div>
+
+    <div class="box">
+        <h3>Delete your avatar</h3>
+        <p>Click this link to delete your (local) avatar: <a href="<?php echo Config::get('URL'); ?>login/deleteAvatar_action">Delete your avatar</a>
+    </div>
+</div>
diff --git a/application/view/login/uploadAvatar.php b/application/view/login/uploadAvatar.php
deleted file mode 100644
index 47aa7ee0d..000000000
--- a/application/view/login/uploadAvatar.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="container">
-    <h1>Upload an avatar</h1>
-
-    <!-- echo out the system feedback (error and success messages) -->
-    <?php $this->renderFeedbackMessages(); ?>
-
-    <div class="feedback info">
-        If you still see the old picture after uploading a new one: Hard-Reload the page with F5! Your browser doesn't
-        realize there's a new image as new and old one have the same filename.
-    </div>
-
-    <form action="<?php echo Config::get('URL'); ?>login/uploadAvatar_action" method="post" enctype="multipart/form-data">
-        <label for="avatar_file">Select an avatar image from your hard-disk (will be scaled to 44x44 px):</label>
-        <input type="file" name="avatar_file" required />
-        <!-- max size 5 MB (as many people directly upload high res pictures from their digital cameras) -->
-        <input type="hidden" name="MAX_FILE_SIZE" value="5000000" />
-        <input type="submit" value="Upload image" />
-    </form>
-</div>

From b124335d377856acba73afb03e55a6a9e94a1931 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 17:02:27 +0100
Subject: [PATCH 35/68] (v3.1) reduced lines of code in
 LoginModel::loginWithCookie

---
 application/model/LoginModel.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/application/model/LoginModel.php b/application/model/LoginModel.php
index af1e32f44..ba4e50144 100644
--- a/application/model/LoginModel.php
+++ b/application/model/LoginModel.php
@@ -94,15 +94,9 @@ public static function loginWithCookie($cookie)
             return false;
         }
 
-        // check cookie's contents, check if cookie contents belong together
+        // check cookie's contents, check if cookie contents belong together or token is empty
         list ($user_id, $token, $hash) = explode(':', $cookie);
-        if ($hash !== hash('sha256', $user_id . ':' . $token)) {
-            Session::add('feedback_negative', Text::get('FEEDBACK_COOKIE_INVALID'));
-            return false;
-        }
-
-        // do not log in when token is empty
-        if (empty($token)) {
+        if ($hash !== hash('sha256', $user_id . ':' . $token) OR empty($token)) {
             Session::add('feedback_negative', Text::get('FEEDBACK_COOKIE_INVALID'));
             return false;
         }

From 0cba98f0605c404cd7a4fa06951ddeb743d5c283 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 17:04:23 +0100
Subject: [PATCH 36/68] (v3.1) reduced lines of code in
 LoginModel::loginWithCookie

---
 application/model/LoginModel.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/application/model/LoginModel.php b/application/model/LoginModel.php
index ba4e50144..b8cc6b1f4 100644
--- a/application/model/LoginModel.php
+++ b/application/model/LoginModel.php
@@ -88,7 +88,6 @@ public static function login($user_name, $user_password, $set_remember_me_cookie
      */
     public static function loginWithCookie($cookie)
     {
-        // do we have a cookie ?
         if (!$cookie) {
             Session::add('feedback_negative', Text::get('FEEDBACK_COOKIE_INVALID'));
             return false;
@@ -103,20 +102,12 @@ public static function loginWithCookie($cookie)
 
         // get data of user that has this id and this token
         $result = UserModel::getUserDataByUserIdAndToken($user_id, $token);
-
-        // if user with that id and exactly that cookie token exists in database
         if ($result) {
             // successfully logged in, so we write all necessary data into the session and set "user_logged_in" to true
-            self::setSuccessfulLoginIntoSession(
-                $result->user_id, $result->user_name, $result->user_email, $result->user_account_type
-            );
+            self::setSuccessfulLoginIntoSession($result->user_id, $result->user_name, $result->user_email, $result->user_account_type);
             // save timestamp of this login in the database line of that user
             self::saveTimestampOfLoginOfUser($result->user_name);
 
-            // NOTE: we don't set another remember_me-cookie here as the current cookie should always
-            // be invalid after a certain amount of time, so the user has to login with username/password
-            // again from time to time. This is good and safe ! ;)
-
             Session::add('feedback_positive', Text::get('FEEDBACK_COOKIE_LOGIN_SUCCESSFUL'));
             return true;
         } else {

From 95e31798790540e8df72db2c91c1a11faa04a556 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 17:26:11 +0100
Subject: [PATCH 37/68] (v3.1) Additions to changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b07ed68e3..e2486091e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 **February 2015**
 
+- [PR](https://github.com/panique/huge/pull/615) [Dominic28] Avatar can now be deleted by the user
+- [panique] First Unit tests :)
+- [panique] several code quality improvements all over the project
 - [panique] avatarModel code improvements
 - [panique] renamed AccountType stuff to UserRole, minor changes 
 

From 0945819eeea28818e3846f11fd9c7c99370c4979 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 17:37:02 +0100
Subject: [PATCH 38/68] (v3.1) explanaitions in README for all the root files

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 761da9733..97830e69e 100644
--- a/README.md
+++ b/README.md
@@ -257,6 +257,23 @@ Then check your server's IP / domain. Everything should work fine.
 
 By default HUGE has a demo-user: username is `demo`, password is `12345678`. The user is already activated.
 
+### What the hell are .travis.yml, .scrutinizer.yml etc. ?
+
+There are several files in the root folder of the project that might be irritating:
+
+ - *.htaccess* (optionally) routes all traffic to /public/index.php! If you installed this project correctly, then this
+   file is not necessary, but as lots of people have problems setting up the vhost correctly, .htaccess it still there
+   to increase security, even on partly-broken-installations.
+ - *.scrutinizer.yml* (can be deleted): Configs for the external code quality analyzer Scrutinizer, just used here on
+   GitHub, you don't need this for your project.
+ - *.travis.yml* (can be deleted): Same like above. Travis is an external service that creates installations of this
+   repo after each code change to make sure everything runs fine. Also runs the unit tests. You don't need this inside
+   your project.
+ - *composer.json* (important): You should know what this does. ;) This file says what external dependencies are used.  
+ - *travis-ci-apache* (can be deleted): Config file for Travis, see above, so Travis knows how to setup the Apache.    
+    
+*README* and *CHANGELOG* are self-explaining.
+
 #### Documentation <a name="documentation"></a>
 
 A real documentation is in the making. Until then, please have a look at the code and use your IDE's code completion 

From 19f44103d24b8ce1c9970de4d0e523b5ebb8d8d6 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 17:45:49 +0100
Subject: [PATCH 39/68] (v3.1) accountTypeChange simplified :)

---
 application/config/texts.php        | 11 ++++-------
 application/model/UserRoleModel.php | 24 ++++--------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/application/config/texts.php b/application/config/texts.php
index 1b47b9782..e474ad86b 100644
--- a/application/config/texts.php
+++ b/application/config/texts.php
@@ -45,9 +45,9 @@
 	"FEEDBACK_AVATAR_UPLOAD_TOO_BIG" => "Avatar source file is too big. 5 Megabyte is the maximum.",
 	"FEEDBACK_AVATAR_FOLDER_DOES_NOT_EXIST_OR_NOT_WRITABLE" => "Avatar folder does not exist or is not writable. Please change this via chmod 775 or 777.",
 	"FEEDBACK_AVATAR_IMAGE_UPLOAD_FAILED" => "Something went wrong with the image upload.",
-        "FEEDBACK_AVATAR_IMAGE_DELETE_SUCCESSFUL" => "You successfully deleted your avatar.",
-        "FEEDBACK_AVATAR_IMAGE_DELETE_NO_FILE" => "You don't have a custom avatar.",
-        "FEEDBACK_AVATAR_IMAGE_DELETE_FAILED" => "Something went wrong while deleting your avatar.",
+	"FEEDBACK_AVATAR_IMAGE_DELETE_SUCCESSFUL" => "You successfully deleted your avatar.",
+    "FEEDBACK_AVATAR_IMAGE_DELETE_NO_FILE" => "You don't have a custom avatar.",
+    "FEEDBACK_AVATAR_IMAGE_DELETE_FAILED" => "Something went wrong while deleting your avatar.",
 	"FEEDBACK_PASSWORD_RESET_TOKEN_FAIL" => "Could not write token to database.",
 	"FEEDBACK_PASSWORD_RESET_TOKEN_MISSING" => "No password reset token.",
 	"FEEDBACK_PASSWORD_RESET_MAIL_SENDING_ERROR" => "Password reset mail could not be sent due to: ",
@@ -57,10 +57,7 @@
 	"FEEDBACK_PASSWORD_RESET_LINK_VALID" => "Password reset validation link is valid. Please change the password now.",
 	"FEEDBACK_PASSWORD_CHANGE_SUCCESSFUL" => "Password successfully changed.",
 	"FEEDBACK_PASSWORD_CHANGE_FAILED" => "Sorry, your password changing failed.",
-	"FEEDBACK_ACCOUNT_UPGRADE_SUCCESSFUL" => "Account upgrade was successful.",
-	"FEEDBACK_ACCOUNT_UPGRADE_FAILED" => "Account upgrade failed.",
-	"FEEDBACK_ACCOUNT_DOWNGRADE_SUCCESSFUL" => "Account downgrade was successful.",
-	"FEEDBACK_ACCOUNT_DOWNGRADE_FAILED" => "Account downgrade failed.",
+	"FEEDBACK_ACCOUNT_TYPE_CHANGE_SUCCESSFUL" => "Account type change successful",
 	"FEEDBACK_ACCOUNT_TYPE_CHANGE_FAILED" => "Account type change failed",
 	"FEEDBACK_NOTE_CREATION_FAILED" => "Note creation failed.",
 	"FEEDBACK_NOTE_EDITING_FAILED" => "Note editing failed.",
diff --git a/application/model/UserRoleModel.php b/application/model/UserRoleModel.php
index 2801c1ad0..9ae93322e 100644
--- a/application/model/UserRoleModel.php
+++ b/application/model/UserRoleModel.php
@@ -23,30 +23,14 @@ public static function changeUserRole($type)
 			return false;
 		}
 
-		// if user want to upgrade to a higher role (from basic to premium) you could add a role-check and a payment
-		// process here
-
 		// save new role to database
 		if (UserRoleModel::saveRoleToDatabase($type)) {
-
-			$feedback = "";
-
-			switch ($type) {
-				case 1:
-					$feedback = Text::get('FEEDBACK_ACCOUNT_DOWNGRADE_SUCCESSFUL');
-					break;
-				case 2:
-					$feedback = Text::get('FEEDBACK_ACCOUNT_UPGRADE_SUCCESSFUL');
-					break;
-			}
-
-			Session::add('feedback_positive', $feedback);
+			Session::add('feedback_positive', Text::get('FEEDBACK_ACCOUNT_TYPE_CHANGE_SUCCESSFUL'));
 			return true;
+		} else {
+			Session::add('feedback_negative', Text::get('FEEDBACK_ACCOUNT_TYPE_CHANGE_FAILED'));
+			return false;
 		}
-
-		// default return
-		Session::add('feedback_negative', Text::get('FEEDBACK_ACCOUNT_TYPE_CHANGE_FAILED'));
-		return false;
 	}
 
 	/**

From 501a4f306a4eb7f1dc1cc3a0f8f0b0fcc508a3af Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 17:50:43 +0100
Subject: [PATCH 40/68] (v3.1) accountTypeChange simplified :)

---
 application/model/UserRoleModel.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/model/UserRoleModel.php b/application/model/UserRoleModel.php
index 9ae93322e..a3b088f92 100644
--- a/application/model/UserRoleModel.php
+++ b/application/model/UserRoleModel.php
@@ -18,8 +18,7 @@ class UserRoleModel
 	 */
 	public static function changeUserRole($type)
 	{
-		// this is error-prone, let's rewrite it
-		if (!$type OR ($type !== 1 AND $type !== 2)) {
+		if (!$type) {
 			return false;
 		}
 
@@ -42,7 +41,9 @@ public static function changeUserRole($type)
 	 */
 	public static function saveRoleToDatabase($type)
 	{
-		// you should make sure that it's not possible to set non-existing user types (other than 1 or 2)
+		if ($type !== 1 AND $type !== 2) {
+			return false;
+		}
 
 		$database = DatabaseFactory::getFactory()->getConnection();
 

From 43e5b8ac584300248e3c3808771651e6f93b4eac Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 17:56:51 +0100
Subject: [PATCH 41/68] (v3.1) accountTypeChange simplified :)

---
 application/model/UserRoleModel.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/model/UserRoleModel.php b/application/model/UserRoleModel.php
index a3b088f92..f45f088c7 100644
--- a/application/model/UserRoleModel.php
+++ b/application/model/UserRoleModel.php
@@ -23,7 +23,7 @@ public static function changeUserRole($type)
 		}
 
 		// save new role to database
-		if (UserRoleModel::saveRoleToDatabase($type)) {
+		if (self::saveRoleToDatabase($type)) {
 			Session::add('feedback_positive', Text::get('FEEDBACK_ACCOUNT_TYPE_CHANGE_SUCCESSFUL'));
 			return true;
 		} else {
@@ -41,7 +41,8 @@ public static function changeUserRole($type)
 	 */
 	public static function saveRoleToDatabase($type)
 	{
-		if ($type !== 1 AND $type !== 2) {
+		// if $type is not 1 or 2
+		if (!in_array($type, [1, 2])) {
 			return false;
 		}
 

From 6dd3b8c1e9abeea4e80d458208f5e8c5f79394e2 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:14:33 +0100
Subject: [PATCH 42/68] (v3.1) login process refactoring (incomplete)

---
 application/model/LoginModel.php | 81 ++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 31 deletions(-)

diff --git a/application/model/LoginModel.php b/application/model/LoginModel.php
index b8cc6b1f4..814a362b7 100644
--- a/application/model/LoginModel.php
+++ b/application/model/LoginModel.php
@@ -24,44 +24,20 @@ public static function login($user_name, $user_password, $set_remember_me_cookie
             return false;
         }
 
-        // get all data of that user (to later check if password and password_hash fit)
-        $result = UserModel::getUserDataByUsername($user_name);
+	    // checks if user exists, if login is not blocked (due to failed logins) and if password fits the hash
+	    $result = self::validateAndGetUser($user_name, $user_password);
 
-        // Check if that user exists. We don't give back a cause in the feedback to avoid giving an attacker details.
-        if (!$result) {
-            Session::add('feedback_negative', Text::get('FEEDBACK_LOGIN_FAILED'));
-            return false;
-        }
-
-        // block login attempt if somebody has already failed 3 times and the last login attempt is less than 30sec ago
-        if (($result->user_failed_logins >= 3) AND ($result->user_last_failed_login > (time() - 30))) {
-            Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_WRONG_3_TIMES'));
-            return false;
-        }
-
-        // if hash of provided password does NOT match the hash in the database: +1 failed-login counter
-        if (!password_verify($user_password, $result->user_password_hash)) {
-            self::incrementFailedLoginCounterOfUser($user_name);
-            // we say "password wrong" here, but less details like "login failed" would be better (= less information)
-            Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_WRONG'));
-            return false;
-        }
-
-        // from here we assume that the password hash fits the database password hash, as password_verify() was true
-
-        // if user is not active (= has not verified account by verification mail)
-        if ($result->user_active != 1) {
-            Session::add('feedback_negative', Text::get('FEEDBACK_ACCOUNT_NOT_ACTIVATED_YET'));
-            return false;
-        }
+	    if (!$result) {
+		    return false;
+	    }
 
         // reset the failed login counter for that user (if necessary)
         if ($result->user_last_failed_login > 0) {
-            self::resetFailedLoginCounterOfUser($user_name);
+            self::resetFailedLoginCounterOfUser($result->user_name);
         }
 
         // save timestamp of this login in the database line of that user
-        self::saveTimestampOfLoginOfUser($user_name);
+        self::saveTimestampOfLoginOfUser($result->user_name);
 
         // if user has checked the "remember me" checkbox, then write token into database and into cookie
         if ($set_remember_me_cookie) {
@@ -78,6 +54,49 @@ public static function login($user_name, $user_password, $set_remember_me_cookie
         return true;
     }
 
+	/**
+	 * Validates the inputs of the users, checks if password is correct etc.
+	 * If successful, user is returned
+	 *
+	 * @param $user_name
+	 * @param $user_password
+	 *
+	 * @return bool|mixed
+	 */
+	private static function validateAndGetUser($user_name, $user_password)
+	{
+		// get all data of that user (to later check if password and password_hash fit)
+		$result = UserModel::getUserDataByUsername($user_name);
+
+		// Check if that user exists. We don't give back a cause in the feedback to avoid giving an attacker details.
+		if (!$result) {
+			Session::add('feedback_negative', Text::get('FEEDBACK_LOGIN_FAILED'));
+			return false;
+		}
+
+		// block login attempt if somebody has already failed 3 times and the last login attempt is less than 30sec ago
+		if (($result->user_failed_logins >= 3) AND ($result->user_last_failed_login > (time() - 30))) {
+			Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_WRONG_3_TIMES'));
+			return false;
+		}
+
+		// if hash of provided password does NOT match the hash in the database: +1 failed-login counter
+		if (!password_verify($user_password, $result->user_password_hash)) {
+			self::incrementFailedLoginCounterOfUser($result->user_name);
+			// we say "password wrong" here, but less details like "login failed" would be better (= less information)
+			Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_WRONG'));
+			return false;
+		}
+
+		// if user is not active (= has not verified account by verification mail)
+		if ($result->user_active != 1) {
+			Session::add('feedback_negative', Text::get('FEEDBACK_ACCOUNT_NOT_ACTIVATED_YET'));
+			return false;
+		}
+
+		return $result;
+	}
+
     /**
      * performs the login via cookie (for DEFAULT user account, FACEBOOK-accounts are handled differently)
      * TODO add throttling here ?

From 0204950e26ad9fc8e220bde63e61e0781929f6e0 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:23:04 +0100
Subject: [PATCH 43/68] (v3.1) removed PNG from avatar creation (as only JPG
 works currently)

---
 application/model/AvatarModel.php     | 6 +++---
 application/view/login/editAvatar.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/model/AvatarModel.php b/application/model/AvatarModel.php
index 20e2fdce8..09a90910c 100644
--- a/application/model/AvatarModel.php
+++ b/application/model/AvatarModel.php
@@ -101,7 +101,7 @@ public static function isAvatarFolderWritable()
 	 */
 	public static function validateImageFile()
 	{
-		if (!isset($_FILES['avatar_file']) OR empty ($_FILES['avatar_file']['tmp_name'])) {
+		if (!isset($_FILES['avatar_file'])) {
 			Session::add('feedback_negative', Text::get('FEEDBACK_AVATAR_IMAGE_UPLOAD_FAILED'));
 			return false;
 		}
@@ -121,7 +121,7 @@ public static function validateImageFile()
 			return false;
 		}
 
-		if (!($image_proportions['mime'] == 'image/jpeg' || $image_proportions['mime'] == 'image/png')) {
+		if (!($image_proportions['mime'] == 'image/jpeg')) {
 			Session::add('feedback_negative', Text::get('FEEDBACK_AVATAR_UPLOAD_WRONG_TYPE'));
 			return false;
 		}
@@ -153,7 +153,7 @@ public static function writeAvatarToDatabase($user_id)
 	 * @param int $final_height The desired height of the new image.
 	 * @param int $quality The quality of the JPG to produce 1 - 100
 	 *
-	 * TODO currently we just allow .jpg / .png
+	 * TODO currently we just allow .jpg
 	 *
 	 * @return bool success state
 	 */
diff --git a/application/view/login/editAvatar.php b/application/view/login/editAvatar.php
index 5a256cd20..f62f4e29a 100644
--- a/application/view/login/editAvatar.php
+++ b/application/view/login/editAvatar.php
@@ -13,7 +13,7 @@
         </div>
 
         <form action="<?php echo Config::get('URL'); ?>login/uploadAvatar_action" method="post" enctype="multipart/form-data">
-            <label for="avatar_file">Select an avatar image from your hard-disk (will be scaled to 44x44 px):</label>
+            <label for="avatar_file">Select an avatar image from your hard-disk (will be scaled to 44x44 px, only .jpg currently):</label>
             <input type="file" name="avatar_file" required />
             <!-- max size 5 MB (as many people directly upload high res pictures from their digital cameras) -->
             <input type="hidden" name="MAX_FILE_SIZE" value="5000000" />

From 2515c1ec1ef061df5f61456de50a67480f4de3b4 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:28:48 +0100
Subject: [PATCH 44/68] (v3.1) password reset code refactored

---
 application/model/PasswordResetModel.php | 43 +++++++++++++++++-------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/application/model/PasswordResetModel.php b/application/model/PasswordResetModel.php
index 4fa747a72..634073f5b 100644
--- a/application/model/PasswordResetModel.php
+++ b/application/model/PasswordResetModel.php
@@ -205,6 +205,36 @@ public static function saveNewUserPassword($user_name, $user_password_hash, $use
 	 * @return bool success state of the password reset
 	 */
 	public static function setNewPassword($user_name, $user_password_reset_hash, $user_password_new, $user_password_repeat)
+	{
+		// validate the password
+		if (!self::validateNewPassword($user_name, $user_password_reset_hash, $user_password_new, $user_password_repeat)) {
+			return false;
+		}
+
+		// crypt the password (with the PHP 5.5+'s password_hash() function, result is a 60 character hash string)
+		$user_password_hash = password_hash($user_password_new, PASSWORD_DEFAULT);
+
+		// write the password to database (as hashed and salted string), reset user_password_reset_hash
+		if (PasswordResetModel::saveNewUserPassword($user_name, $user_password_hash, $user_password_reset_hash)) {
+			Session::add('feedback_positive', Text::get('FEEDBACK_PASSWORD_CHANGE_SUCCESSFUL'));
+			return true;
+		} else {
+			Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_CHANGE_FAILED'));
+			return false;
+		}
+	}
+
+	/**
+	 * Validate the password submission
+	 *
+	 * @param $user_name
+	 * @param $user_password_reset_hash
+	 * @param $user_password_new
+	 * @param $user_password_repeat
+	 *
+	 * @return bool
+	 */
+	public static function validateNewPassword($user_name, $user_password_reset_hash, $user_password_new, $user_password_repeat)
 	{
 		if (empty($user_name)) {
 			Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_FIELD_EMPTY'));
@@ -223,17 +253,6 @@ public static function setNewPassword($user_name, $user_password_reset_hash, $us
 			return false;
 		}
 
-		// crypt the user's password with the PHP 5.5+'s password_hash() function, result is a 60 character hash string
-		$user_password_hash = password_hash($user_password_new, PASSWORD_DEFAULT);
-
-		// write user's new password hash into database, reset user_password_reset_hash
-		if (PasswordResetModel::saveNewUserPassword($user_name, $user_password_hash, $user_password_reset_hash)) {
-			Session::add('feedback_positive', Text::get('FEEDBACK_PASSWORD_CHANGE_SUCCESSFUL'));
-			return true;
-		}
-
-		// default return
-		Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_CHANGE_FAILED'));
-		return false;
+		return true;
 	}
 }

From 9ab94e0fe5cd5bb1126c54e7b4657262fdac30fd Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:34:59 +0100
Subject: [PATCH 45/68] (v3.1) simplified controller / action getter

---
 application/core/Application.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/application/core/Application.php b/application/core/Application.php
index 468270dc6..8a83c7aa0 100644
--- a/application/core/Application.php
+++ b/application/core/Application.php
@@ -26,15 +26,13 @@ public function __construct()
         // create array with URL parts in $url
         $this->splitUrl();
 
-        // check for controller: no controller given ? then make controller = default controller (from config)
-        if (!$this->controller_name) {
-            $this->controller_name = Config::get('DEFAULT_CONTROLLER');
-        }
+	    // controller_name = if controller_name exists = controller_name, else default controller
+	    // btw we are using the shorthand ternary operator syntax here
+	    // @see http://davidwalsh.name/php-shorthand-if-else-ternary-operators
+	    $this->controller_name = ($this->controller_name) ? $this->controller_name : Config::get('DEFAULT_CONTROLLER');
 
-        // check for action: no action given ? then make action = default action (from config)
-        if (!$this->action_name OR (strlen($this->action_name) == 0)) {
-            $this->action_name = Config::get('DEFAULT_ACTION');
-        }
+        // check for action: no action given or empty string ? then make action = default action (from config), else given action
+	    $this->action_name = (!$this->action_name OR (strlen($this->action_name) == 0)) ? Config::get('DEFAULT_ACTION') : $this->action_name;
 
         // rename controller name to real controller class/file name ("index" to "IndexController")
         $this->controller_name = ucwords($this->controller_name) . 'Controller';

From 7e7593e38cf987c633e48a744072127129c30b18 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:35:56 +0100
Subject: [PATCH 46/68] (v3.1) changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2486091e..0141ceda1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 **February 2015**
 
+- [panique] lots of code refactorings and simplifications all over the project
 - [PR](https://github.com/panique/huge/pull/615) [Dominic28] Avatar can now be deleted by the user
 - [panique] First Unit tests :)
 - [panique] several code quality improvements all over the project

From 948f20d84bdacec6c57b62c5738b33b5f9c077f3 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:39:15 +0100
Subject: [PATCH 47/68] (v3.1) reverted controller / action name syntax (it was
 making things worse)

---
 application/core/Application.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/application/core/Application.php b/application/core/Application.php
index 8a83c7aa0..468270dc6 100644
--- a/application/core/Application.php
+++ b/application/core/Application.php
@@ -26,13 +26,15 @@ public function __construct()
         // create array with URL parts in $url
         $this->splitUrl();
 
-	    // controller_name = if controller_name exists = controller_name, else default controller
-	    // btw we are using the shorthand ternary operator syntax here
-	    // @see http://davidwalsh.name/php-shorthand-if-else-ternary-operators
-	    $this->controller_name = ($this->controller_name) ? $this->controller_name : Config::get('DEFAULT_CONTROLLER');
+        // check for controller: no controller given ? then make controller = default controller (from config)
+        if (!$this->controller_name) {
+            $this->controller_name = Config::get('DEFAULT_CONTROLLER');
+        }
 
-        // check for action: no action given or empty string ? then make action = default action (from config), else given action
-	    $this->action_name = (!$this->action_name OR (strlen($this->action_name) == 0)) ? Config::get('DEFAULT_ACTION') : $this->action_name;
+        // check for action: no action given ? then make action = default action (from config)
+        if (!$this->action_name OR (strlen($this->action_name) == 0)) {
+            $this->action_name = Config::get('DEFAULT_ACTION');
+        }
 
         // rename controller name to real controller class/file name ("index" to "IndexController")
         $this->controller_name = ucwords($this->controller_name) . 'Controller';

From bfee7f2693c4ea38a48fd951a90ece3ae0232f3b Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:42:56 +0100
Subject: [PATCH 48/68] (v3.1) controller / action name creation is now in own
 method

---
 application/core/Application.php | 34 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/application/core/Application.php b/application/core/Application.php
index 468270dc6..7f87e15ee 100644
--- a/application/core/Application.php
+++ b/application/core/Application.php
@@ -26,18 +26,8 @@ public function __construct()
         // create array with URL parts in $url
         $this->splitUrl();
 
-        // check for controller: no controller given ? then make controller = default controller (from config)
-        if (!$this->controller_name) {
-            $this->controller_name = Config::get('DEFAULT_CONTROLLER');
-        }
-
-        // check for action: no action given ? then make action = default action (from config)
-        if (!$this->action_name OR (strlen($this->action_name) == 0)) {
-            $this->action_name = Config::get('DEFAULT_ACTION');
-        }
-
-        // rename controller name to real controller class/file name ("index" to "IndexController")
-        $this->controller_name = ucwords($this->controller_name) . 'Controller';
+	    // creates controller and action names (from URL input)
+	    $this->createControllerAndActionNames();
 
         // does such a controller exist ?
         if (file_exists(Config::get('PATH_CONTROLLER') . $this->controller_name . '.php')) {
@@ -87,4 +77,24 @@ private function splitUrl()
             $this->parameters = array_values($url);
         }
     }
+
+	/**
+	 * Checks if controller and action names are given. If not, default values are put into the properties.
+	 * Also renames controller to usable name.
+	 */
+	private function createControllerAndActionNames()
+	{
+		// check for controller: no controller given ? then make controller = default controller (from config)
+		if (!$this->controller_name) {
+			$this->controller_name = Config::get('DEFAULT_CONTROLLER');
+		}
+
+		// check for action: no action given ? then make action = default action (from config)
+		if (!$this->action_name OR (strlen($this->action_name) == 0)) {
+			$this->action_name = Config::get('DEFAULT_ACTION');
+		}
+
+		// rename controller name to real controller class/file name ("index" to "IndexController")
+		$this->controller_name = ucwords($this->controller_name) . 'Controller';
+	}
 }

From b678eee90fa397ce2229e7ad4304c9829293df82 Mon Sep 17 00:00:00 2001
From: Panique <panique@web.de>
Date: Sat, 21 Feb 2015 18:53:33 +0100
Subject: [PATCH 49/68] (v3.1) added code quality ranking to different version
 logs

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0141ceda1..1451f4eed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 3.1 (currently in develop branch)
 
+Code Quality at Scrutinizer 9.6 / 10, at Code Climate 3.9 / 10
+
 **February 2015**
 
 - [panique] lots of code refactorings and simplifications all over the project
@@ -13,6 +15,8 @@
 
 ## 3.0
 
+Code Quality at Scrutinizer 9.3 / 10, at Code Climate 3.9 / 10 
+
 **February 2015**
 
 - [panique] removed duplicate code in AccountTypeModel

From 5e8b88fd4334865d8c7976fbaa50ac839a7c3d62 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 22 Feb 2015 18:09:12 +0100
Subject: [PATCH 50/68] (v3.1) refactored
 RegistrationModel::registrationInputValidation()

---
 application/model/RegistrationModel.php | 103 ++++++++++++++++++------
 1 file changed, 80 insertions(+), 23 deletions(-)

diff --git a/application/model/RegistrationModel.php b/application/model/RegistrationModel.php
index e001548cb..75d92c243 100644
--- a/application/model/RegistrationModel.php
+++ b/application/model/RegistrationModel.php
@@ -89,35 +89,92 @@ public static function registrationInputValidation($captcha, $user_name, $user_p
 		// perform all necessary checks
 		if (!CaptchaModel::checkCaptcha($captcha)) {
 			Session::add('feedback_negative', Text::get('FEEDBACK_CAPTCHA_WRONG'));
-		} else if (empty($user_name)) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_FIELD_EMPTY'));
-		} else if (empty($user_password_new) OR empty($user_password_repeat)) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_FIELD_EMPTY'));
-		} else if ($user_password_new !== $user_password_repeat) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_REPEAT_WRONG'));
-		} else if (strlen($user_password_new) < 6) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_TOO_SHORT'));
-		} else if (strlen($user_name) > 64 OR strlen($user_name) < 2) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_TOO_SHORT_OR_TOO_LONG'));
-		} else if (!preg_match('/^[a-zA-Z0-9]{2,64}$/', $user_name)) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_DOES_NOT_FIT_PATTERN'));
-		} else if (empty($user_email)) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_FIELD_EMPTY'));
-		} else if (strlen($user_email) > 254) {
-			// @see http://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address
-			Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_TOO_LONG'));
-		} else if (!filter_var($user_email, FILTER_VALIDATE_EMAIL)) {
-			Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_DOES_NOT_FIT_PATTERN'));
-		} else {
-			// if no validation failed, return true
-			// hmmm... maybe this could be written in a better way
-			return true;
+            return false;
 		}
 
+        // if username, email and password are all correctly validated
+        if (self::validateUserName($user_name) AND self::validateUserEmail($user_email) AND self::validateUserPassword($user_password_new, $user_password_repeat)) {
+            return true;
+        }
+
 		// otherwise, return false
 		return false;
 	}
 
+    /**
+     * @param $user_name
+     * @return bool
+     */
+    public static function validateUserName($user_name)
+    {
+        if (empty($user_name)) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_FIELD_EMPTY'));
+            return false;
+        }
+
+        if (strlen($user_name) > 64 OR strlen($user_name) < 2) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_TOO_SHORT_OR_TOO_LONG'));
+            return false;
+        }
+
+        if (!preg_match('/^[a-zA-Z0-9]{2,64}$/', $user_name)) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_DOES_NOT_FIT_PATTERN'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param $user_email
+     * @return bool
+     */
+    public static function validateUserEmail($user_email)
+    {
+        if (empty($user_email)) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_FIELD_EMPTY'));
+            return false;
+        }
+
+        if (strlen($user_email) > 254) {
+            // @see http://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address
+            Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_TOO_LONG'));
+            return false;
+        }
+
+        if (!filter_var($user_email, FILTER_VALIDATE_EMAIL)) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_DOES_NOT_FIT_PATTERN'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param $user_password_new
+     * @param $user_password_repeat
+     * @return bool
+     */
+    public static function validateUserPassword($user_password_new, $user_password_repeat)
+    {
+        if (empty($user_password_new) OR empty($user_password_repeat)) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_FIELD_EMPTY'));
+            return false;
+        }
+
+        if ($user_password_new !== $user_password_repeat) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_REPEAT_WRONG'));
+            return false;
+        }
+
+        if (strlen($user_password_new) < 6) {
+            Session::add('feedback_negative', Text::get('FEEDBACK_PASSWORD_TOO_SHORT'));
+            return false;
+        }
+
+        return true;
+    }
+
 	/**
 	 * Writes the new user's data to the database
 	 *

From 7e084ff17a4bd8cf29b388a2d9d7e1334da2d950 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 22 Feb 2015 18:20:06 +0100
Subject: [PATCH 51/68] (v3.1) refactored RegistrationModel validations
 methods, removed unnecessary code (some things are already filtered by others
 filters)

---
 application/config/texts.php            |  3 +--
 application/model/RegistrationModel.php | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/application/config/texts.php b/application/config/texts.php
index e474ad86b..6fd1c7c56 100644
--- a/application/config/texts.php
+++ b/application/config/texts.php
@@ -23,7 +23,7 @@
 	"FEEDBACK_USER_EMAIL_ALREADY_TAKEN" => "Sorry, that email is already in use. Please choose another one.",
 	"FEEDBACK_USERNAME_CHANGE_SUCCESSFUL" => "Your username has been changed successfully.",
 	"FEEDBACK_USERNAME_AND_PASSWORD_FIELD_EMPTY" => "Username and password fields were empty.",
-	"FEEDBACK_USERNAME_DOES_NOT_FIT_PATTERN" => "Username does not fit the name scheme: only a-Z and numbers are allowed, 2 to 64 characters.",
+	"FEEDBACK_USERNAME_DOES_NOT_FIT_PATTERN" => "Username does not fit the name pattern: only a-Z and numbers are allowed, 2 to 64 characters.",
 	"FEEDBACK_EMAIL_DOES_NOT_FIT_PATTERN" => "Sorry, your chosen email does not fit into the email naming pattern.",
 	"FEEDBACK_EMAIL_SAME_AS_OLD_ONE" => "Sorry, that email address is the same as your current one. Please choose another one.",
 	"FEEDBACK_EMAIL_CHANGE_SUCCESSFUL" => "Your email address has been changed successfully.",
@@ -31,7 +31,6 @@
 	"FEEDBACK_PASSWORD_REPEAT_WRONG" => "Password and password repeat are not the same.",
 	"FEEDBACK_PASSWORD_TOO_SHORT" => "Password has a minimum length of 6 characters.",
 	"FEEDBACK_USERNAME_TOO_SHORT_OR_TOO_LONG" => "Username cannot be shorter than 2 or longer than 64 characters.",
-	"FEEDBACK_EMAIL_TOO_LONG" => "Email cannot be longer than 64 characters.",
 	"FEEDBACK_ACCOUNT_SUCCESSFULLY_CREATED" => "Your account has been created successfully and we have sent you an email. Please click the VERIFICATION LINK within that mail.",
 	"FEEDBACK_VERIFICATION_MAIL_SENDING_FAILED" => "Sorry, we could not send you an verification mail. Your account has NOT been created.",
 	"FEEDBACK_ACCOUNT_CREATION_FAILED" => "Sorry, your registration failed. Please go back and try again.",
diff --git a/application/model/RegistrationModel.php b/application/model/RegistrationModel.php
index 75d92c243..9e13b9d60 100644
--- a/application/model/RegistrationModel.php
+++ b/application/model/RegistrationModel.php
@@ -102,6 +102,8 @@ public static function registrationInputValidation($captcha, $user_name, $user_p
 	}
 
     /**
+     * Validates the username
+     *
      * @param $user_name
      * @return bool
      */
@@ -112,11 +114,7 @@ public static function validateUserName($user_name)
             return false;
         }
 
-        if (strlen($user_name) > 64 OR strlen($user_name) < 2) {
-            Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_TOO_SHORT_OR_TOO_LONG'));
-            return false;
-        }
-
+        // if username is too short (2), too long (64) or does not fit the pattern (aZ09)
         if (!preg_match('/^[a-zA-Z0-9]{2,64}$/', $user_name)) {
             Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_DOES_NOT_FIT_PATTERN'));
             return false;
@@ -126,6 +124,8 @@ public static function validateUserName($user_name)
     }
 
     /**
+     * Validates the email
+     *
      * @param $user_email
      * @return bool
      */
@@ -136,12 +136,9 @@ public static function validateUserEmail($user_email)
             return false;
         }
 
-        if (strlen($user_email) > 254) {
-            // @see http://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address
-            Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_TOO_LONG'));
-            return false;
-        }
-
+        // validate the email with PHP's internal filter
+        // side-fact: Max length seems to be 254 chars
+        // @see http://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address
         if (!filter_var($user_email, FILTER_VALIDATE_EMAIL)) {
             Session::add('feedback_negative', Text::get('FEEDBACK_EMAIL_DOES_NOT_FIT_PATTERN'));
             return false;

From 711df74014fed3a94cdbf3d800e87b9247ba540c Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 22 Feb 2015 18:21:46 +0100
Subject: [PATCH 52/68] (v3.1) RegistrationModel comments

---
 application/model/RegistrationModel.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/model/RegistrationModel.php b/application/model/RegistrationModel.php
index 9e13b9d60..b03a7ca9d 100644
--- a/application/model/RegistrationModel.php
+++ b/application/model/RegistrationModel.php
@@ -148,6 +148,8 @@ public static function validateUserEmail($user_email)
     }
 
     /**
+     * Validates the password
+     *
      * @param $user_password_new
      * @param $user_password_repeat
      * @return bool

From 50f0a71a745d515de0ca1c20cf8d2e087154165f Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Wed, 25 Feb 2015 00:10:33 +0100
Subject: [PATCH 53/68] (v3.1) UserModel: unnecessary code removed

---
 application/model/UserModel.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/application/model/UserModel.php b/application/model/UserModel.php
index e1be1c272..99e5eb9c5 100644
--- a/application/model/UserModel.php
+++ b/application/model/UserModel.php
@@ -178,12 +178,6 @@ public static function saveNewEmailAddress($user_id, $new_user_email)
      */
     public static function editUserName($new_user_name)
     {
-        // new username provided ?
-        if (empty($new_user_name)) {
-            Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_FIELD_EMPTY'));
-            return false;
-        }
-
         // new username same as old one ?
         if ($new_user_name == Session::get('user_name')) {
             Session::add('feedback_negative', Text::get('FEEDBACK_USERNAME_SAME_AS_OLD_ONE'));
@@ -210,11 +204,10 @@ public static function editUserName($new_user_name)
             Session::set('user_name', $new_user_name);
             Session::add('feedback_positive', Text::get('FEEDBACK_USERNAME_CHANGE_SUCCESSFUL'));
             return true;
+        } else {
+            Session::add('feedback_negative', Text::get('FEEDBACK_UNKNOWN_ERROR'));
+            return false;
         }
-
-        // default fallback
-        Session::add('feedback_negative', Text::get('FEEDBACK_UNKNOWN_ERROR'));
-        return false;
     }
 
     /**

From 661bd0dbcab0795831ef21dc78b351fcd4deb095 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sat, 28 Feb 2015 14:01:35 +0100
Subject: [PATCH 54/68] (v3.1) UserModel: unnecessary code removed

---
 application/model/UserModel.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/application/model/UserModel.php b/application/model/UserModel.php
index 99e5eb9c5..0179da4dd 100644
--- a/application/model/UserModel.php
+++ b/application/model/UserModel.php
@@ -23,19 +23,15 @@ public static function getPublicProfilesOfAllUsers()
         $all_users_profiles = array();
 
         foreach ($query->fetchAll() as $user) {
-            // a new object for every user. This is eventually not really optimal when it comes
-            // to performance, but it fits the view style better
             $all_users_profiles[$user->user_id] = new stdClass();
             $all_users_profiles[$user->user_id]->user_id = $user->user_id;
             $all_users_profiles[$user->user_id]->user_name = $user->user_name;
             $all_users_profiles[$user->user_id]->user_email = $user->user_email;
 
             if (Config::get('USE_GRAVATAR')) {
-                $all_users_profiles[$user->user_id]->user_avatar_link =
-                    AvatarModel::getGravatarLinkByEmail($user->user_email);
+                $all_users_profiles[$user->user_id]->user_avatar_link = AvatarModel::getGravatarLinkByEmail($user->user_email);
             } else {
-                $all_users_profiles[$user->user_id]->user_avatar_link =
-                    AvatarModel::getPublicAvatarFilePathOfUser($user->user_has_avatar, $user->user_id);
+                $all_users_profiles[$user->user_id]->user_avatar_link = AvatarModel::getPublicAvatarFilePathOfUser($user->user_has_avatar, $user->user_id);
             }
 
             $all_users_profiles[$user->user_id]->user_active = $user->user_active;

From b8f426cfba15a68637414f194e6ac5d16eb05b36 Mon Sep 17 00:00:00 2001
From: Owen Richards <owen.richards88@hotmail.com>
Date: Sat, 28 Feb 2015 14:14:04 +0000
Subject: [PATCH 55/68] Multi view rendering

---
 application/core/View.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/application/core/View.php b/application/core/View.php
index 0d0d121d4..e723eed37 100644
--- a/application/core/View.php
+++ b/application/core/View.php
@@ -26,6 +26,32 @@ public function render($filename, $data = null)
         require Config::get('PATH_VIEW') . '_templates/footer.php';
     }
 
+    /**
+     * Similar to render, but accepts an array of separate views to render between the header and footer. Use like 
+     * the following: $this->view->renderMulti(array('help/index', 'help/banner')); 
+     * @param array $filenames Array of the paths of the to-be-rendered view, usually folder/file(.php) for each
+     * @param array $data Data to be used in the view
+     */
+    public function renderMulti($filenames, $data = null)
+    {
+        if(!is_array($filenames)) {
+            self::render($filenames, $data); 
+            return false;
+        }
+
+        if ($data) {
+            foreach ($data as $key => $value) {
+                $this->{$key} = $value;
+            }
+        }
+
+        require Config::get('PATH_VIEW') . '_templates/header.php';
+        foreach($filenames as $filename) {
+            require Config::get('PATH_VIEW') . $filename . '.php';
+        }
+        require Config::get('PATH_VIEW') . '_templates/footer.php';
+    }
+
     /**
      * Same like render(), but does not include header and footer
      * @param string $filename Path of the to-be-rendered view, usually folder/file(.php)

From ec6815f48eb5eeb23a587656db561cf0287b0f24 Mon Sep 17 00:00:00 2001
From: Owen Richards <owen.richards88@hotmail.com>
Date: Sat, 28 Feb 2015 14:41:04 +0000
Subject: [PATCH 56/68] Revert "Multi view rendering"

This reverts commit b8f426cfba15a68637414f194e6ac5d16eb05b36.
---
 application/core/View.php | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/application/core/View.php b/application/core/View.php
index e723eed37..0d0d121d4 100644
--- a/application/core/View.php
+++ b/application/core/View.php
@@ -26,32 +26,6 @@ public function render($filename, $data = null)
         require Config::get('PATH_VIEW') . '_templates/footer.php';
     }
 
-    /**
-     * Similar to render, but accepts an array of separate views to render between the header and footer. Use like 
-     * the following: $this->view->renderMulti(array('help/index', 'help/banner')); 
-     * @param array $filenames Array of the paths of the to-be-rendered view, usually folder/file(.php) for each
-     * @param array $data Data to be used in the view
-     */
-    public function renderMulti($filenames, $data = null)
-    {
-        if(!is_array($filenames)) {
-            self::render($filenames, $data); 
-            return false;
-        }
-
-        if ($data) {
-            foreach ($data as $key => $value) {
-                $this->{$key} = $value;
-            }
-        }
-
-        require Config::get('PATH_VIEW') . '_templates/header.php';
-        foreach($filenames as $filename) {
-            require Config::get('PATH_VIEW') . $filename . '.php';
-        }
-        require Config::get('PATH_VIEW') . '_templates/footer.php';
-    }
-
     /**
      * Same like render(), but does not include header and footer
      * @param string $filename Path of the to-be-rendered view, usually folder/file(.php)

From b0354e11cc9683e47c18cee88602817ef0013748 Mon Sep 17 00:00:00 2001
From: Owen Richards <owen.richards88@hotmail.com>
Date: Sat, 28 Feb 2015 14:41:43 +0000
Subject: [PATCH 57/68] Multi View Rendering

---
 application/core/View.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/application/core/View.php b/application/core/View.php
index 0d0d121d4..e723eed37 100644
--- a/application/core/View.php
+++ b/application/core/View.php
@@ -26,6 +26,32 @@ public function render($filename, $data = null)
         require Config::get('PATH_VIEW') . '_templates/footer.php';
     }
 
+    /**
+     * Similar to render, but accepts an array of separate views to render between the header and footer. Use like 
+     * the following: $this->view->renderMulti(array('help/index', 'help/banner')); 
+     * @param array $filenames Array of the paths of the to-be-rendered view, usually folder/file(.php) for each
+     * @param array $data Data to be used in the view
+     */
+    public function renderMulti($filenames, $data = null)
+    {
+        if(!is_array($filenames)) {
+            self::render($filenames, $data); 
+            return false;
+        }
+
+        if ($data) {
+            foreach ($data as $key => $value) {
+                $this->{$key} = $value;
+            }
+        }
+
+        require Config::get('PATH_VIEW') . '_templates/header.php';
+        foreach($filenames as $filename) {
+            require Config::get('PATH_VIEW') . $filename . '.php';
+        }
+        require Config::get('PATH_VIEW') . '_templates/footer.php';
+    }
+
     /**
      * Same like render(), but does not include header and footer
      * @param string $filename Path of the to-be-rendered view, usually folder/file(.php)

From 032001e1739541c659be39854dce9673a9917232 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sat, 28 Feb 2015 15:57:37 +0100
Subject: [PATCH 58/68] (v3.1) changelog and PSR code quality fix for PR 620

---
 CHANGELOG.md              | 1 +
 application/core/View.php | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1451f4eed..ba18ca91e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Code Quality at Scrutinizer 9.6 / 10, at Code Climate 3.9 / 10
 
 **February 2015**
 
+- [PR](https://github.com/panique/huge/pull/620) [owenr88] view rending now possible with multiple view files
 - [panique] lots of code refactorings and simplifications all over the project
 - [PR](https://github.com/panique/huge/pull/615) [Dominic28] Avatar can now be deleted by the user
 - [panique] First Unit tests :)
diff --git a/application/core/View.php b/application/core/View.php
index e723eed37..8d8d080e9 100644
--- a/application/core/View.php
+++ b/application/core/View.php
@@ -27,14 +27,15 @@ public function render($filename, $data = null)
     }
 
     /**
-     * Similar to render, but accepts an array of separate views to render between the header and footer. Use like 
-     * the following: $this->view->renderMulti(array('help/index', 'help/banner')); 
+     * Similar to render, but accepts an array of separate views to render between the header and footer. Use like
+     * the following: $this->view->renderMulti(array('help/index', 'help/banner'));
      * @param array $filenames Array of the paths of the to-be-rendered view, usually folder/file(.php) for each
      * @param array $data Data to be used in the view
+     * @return bool
      */
     public function renderMulti($filenames, $data = null)
     {
-        if(!is_array($filenames)) {
+        if (!is_array($filenames)) {
             self::render($filenames, $data); 
             return false;
         }
@@ -46,9 +47,11 @@ public function renderMulti($filenames, $data = null)
         }
 
         require Config::get('PATH_VIEW') . '_templates/header.php';
+
         foreach($filenames as $filename) {
             require Config::get('PATH_VIEW') . $filename . '.php';
         }
+
         require Config::get('PATH_VIEW') . '_templates/footer.php';
     }
 

From 39c7c32ab6952fae019cb8bb736dc3fd70c5146b Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 1 Mar 2015 12:43:01 +0100
Subject: [PATCH 59/68] (v3.1) reduced lines of code

---
 application/model/PasswordResetModel.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/model/PasswordResetModel.php b/application/model/PasswordResetModel.php
index 634073f5b..fdd453327 100644
--- a/application/model/PasswordResetModel.php
+++ b/application/model/PasswordResetModel.php
@@ -63,10 +63,8 @@ public static function setPasswordResetDatabaseToken($user_name, $user_password_
 		$database = DatabaseFactory::getFactory()->getConnection();
 
 		$sql = "UPDATE users
-                SET user_password_reset_hash = :user_password_reset_hash,
-                    user_password_reset_timestamp = :user_password_reset_timestamp
-                WHERE user_name = :user_name AND user_provider_type = :provider_type
-                LIMIT 1";
+                SET user_password_reset_hash = :user_password_reset_hash, user_password_reset_timestamp = :user_password_reset_timestamp
+                WHERE user_name = :user_name AND user_provider_type = :provider_type LIMIT 1";
 		$query = $database->prepare($sql);
 		$query->execute(array(
 			':user_password_reset_hash' => $user_password_reset_hash, ':user_name' => $user_name,

From f9bd193e47abd48ddd00c37d8aa1813443b32cb4 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 1 Mar 2015 12:44:12 +0100
Subject: [PATCH 60/68] (v3.1) reduced lines of code

---
 application/model/PasswordResetModel.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/application/model/PasswordResetModel.php b/application/model/PasswordResetModel.php
index fdd453327..10e064848 100644
--- a/application/model/PasswordResetModel.php
+++ b/application/model/PasswordResetModel.php
@@ -94,17 +94,12 @@ public static function sendPasswordResetMail($user_name, $user_password_reset_ha
 	{
 		// create email body
 		$body = Config::get('EMAIL_PASSWORD_RESET_CONTENT') . ' ' . Config::get('URL') .
-		        Config::get('EMAIL_PASSWORD_RESET_URL') . '/' . urlencode($user_name) . '/' .
-		        urlencode($user_password_reset_hash);
+		        Config::get('EMAIL_PASSWORD_RESET_URL') . '/' . urlencode($user_name) . '/' . urlencode($user_password_reset_hash);
 
 		// create instance of Mail class, try sending and check
 		$mail = new Mail;
-		$mail_sent = $mail->sendMail(
-			$user_email,
-			Config::get('EMAIL_PASSWORD_RESET_FROM_EMAIL'),
-			Config::get('EMAIL_PASSWORD_RESET_FROM_NAME'),
-			Config::get('EMAIL_PASSWORD_RESET_SUBJECT'),
-			$body
+		$mail_sent = $mail->sendMail($user_email, Config::get('EMAIL_PASSWORD_RESET_FROM_EMAIL'), 
+            Config::get('EMAIL_PASSWORD_RESET_FROM_NAME'), Config::get('EMAIL_PASSWORD_RESET_SUBJECT'), $body
 		);
 
 		if ($mail_sent) {

From 1a4be738a7ebabd0bebc9cb6a041a7f2b2ffe962 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 1 Mar 2015 12:51:37 +0100
Subject: [PATCH 61/68] (v3.1) reduced lines of code

---
 application/model/NoteModel.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/model/NoteModel.php b/application/model/NoteModel.php
index b2e9e18aa..468694de7 100644
--- a/application/model/NoteModel.php
+++ b/application/model/NoteModel.php
@@ -82,15 +82,12 @@ public static function updateNote($note_id, $note_text)
 
         $sql = "UPDATE notes SET note_text = :note_text WHERE note_id = :note_id AND user_id = :user_id LIMIT 1";
         $query = $database->prepare($sql);
-        $query->execute(
-            array(':note_id' => $note_id, ':note_text' => $note_text, ':user_id' => Session::get('user_id'))
-        );
+        $query->execute(array(':note_id' => $note_id, ':note_text' => $note_text, ':user_id' => Session::get('user_id')));
 
         if ($query->rowCount() == 1) {
             return true;
         }
 
-        // default return
         Session::add('feedback_negative', Text::get('FEEDBACK_NOTE_EDITING_FAILED'));
         return false;
     }

From b882f90850845180d5029022c45ec0e50fe25990 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 1 Mar 2015 19:06:18 +0100
Subject: [PATCH 62/68] (v3.1) reduced lines of code

---
 application/model/UserModel.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/application/model/UserModel.php b/application/model/UserModel.php
index 0179da4dd..3261db899 100644
--- a/application/model/UserModel.php
+++ b/application/model/UserModel.php
@@ -10,6 +10,9 @@ class UserModel
     /**
      * Gets an array that contains all the users in the database. The array's keys are the user ids.
      * Each array element is an object, containing a specific user's data.
+     * The avatar line is built using Ternary Operators, have a look here for more:
+     * @see http://davidwalsh.name/php-shorthand-if-else-ternary-operators
+     *
      * @return array The profiles of all users
      */
     public static function getPublicProfilesOfAllUsers()
@@ -27,14 +30,8 @@ public static function getPublicProfilesOfAllUsers()
             $all_users_profiles[$user->user_id]->user_id = $user->user_id;
             $all_users_profiles[$user->user_id]->user_name = $user->user_name;
             $all_users_profiles[$user->user_id]->user_email = $user->user_email;
-
-            if (Config::get('USE_GRAVATAR')) {
-                $all_users_profiles[$user->user_id]->user_avatar_link = AvatarModel::getGravatarLinkByEmail($user->user_email);
-            } else {
-                $all_users_profiles[$user->user_id]->user_avatar_link = AvatarModel::getPublicAvatarFilePathOfUser($user->user_has_avatar, $user->user_id);
-            }
-
             $all_users_profiles[$user->user_id]->user_active = $user->user_active;
+            $all_users_profiles[$user->user_id]->user_avatar_link = (Config::get('USE_GRAVATAR') ? AvatarModel::getGravatarLinkByEmail($user->user_email) : AvatarModel::getPublicAvatarFilePathOfUser($user->user_has_avatar, $user->user_id));
         }
 
         return $all_users_profiles;

From 4cd42af6c4f956b3a388fdbaba16fd9391ae5692 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 1 Mar 2015 19:18:32 +0100
Subject: [PATCH 63/68] (v3.1) reduced lines of code

---
 application/model/AvatarModel.php | 96 +++++++++++++++++--------------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/application/model/AvatarModel.php b/application/model/AvatarModel.php
index 09a90910c..0041d2c81 100644
--- a/application/model/AvatarModel.php
+++ b/application/model/AvatarModel.php
@@ -197,48 +197,58 @@ public static function resizeAvatarImage($source_image, $destination, $final_wid
 		return false;
 	}
 
-        /**
-         * Delete a user's avatar
-         *
-         * @param int $userId
-         *
-         * @return bool success
-         */
-        public static function deleteAvatar($userId)
-        {
-                if (!ctype_digit($userId)) {
-                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
-                        return false;
-                }
-
-                // Check if file exists
-                if (!file_exists(Config::get('PATH_AVATARS').$userId.".jpg")) {
-                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_NO_FILE"));
-                        return false;
-                }
-
-                // Delete avatar file
-                if (!unlink(Config::get('PATH_AVATARS').$userId.".jpg")) {
-                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
-                        return false;
-                }
-
-                $database = DatabaseFactory::getFactory()->getConnection();
-
-                // Set user_has_avatar back to 0
-                $sth = $database->prepare("UPDATE users SET user_has_avatar = 0 WHERE user_id = :user_id LIMIT 1");
-                $sth->bindValue(":user_id", (int)$userId, PDO::PARAM_INT);
-                $sth->execute();
-
-                if ($sth->rowCount() == 1) {
-                        // Reset avatar file path session
-                        Session::set('user_avatar_file', self::getPublicUserAvatarFilePathByUserId($userId));
-
-                        Session::add("feedback_positive", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_SUCCESSFUL"));
-                        return true;
-                } else {
-                        Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
-                        return false;
-                }
+    /**
+     * Delete a user's avatar
+     *
+     * @param int $userId
+     * @return bool success
+     */
+    public static function deleteAvatar($userId)
+    {
+        if (!ctype_digit($userId)) {
+            Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
+            return false;
         }
+
+        // try to delete image, but still go on regardless of file deletion result
+        self::deleteAvatarImageFile($userId);
+
+        $database = DatabaseFactory::getFactory()->getConnection();
+
+        $sth = $database->prepare("UPDATE users SET user_has_avatar = 0 WHERE user_id = :user_id LIMIT 1");
+        $sth->bindValue(":user_id", (int)$userId, PDO::PARAM_INT);
+        $sth->execute();
+
+        if ($sth->rowCount() == 1) {
+            Session::set('user_avatar_file', self::getPublicUserAvatarFilePathByUserId($userId));
+            Session::add("feedback_positive", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_SUCCESSFUL"));
+            return true;
+        } else {
+            Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
+            return false;
+        }
+    }
+
+    /**
+     * Removes the avatar image file from the filesystem
+     *
+     * @param $userId
+     * @return bool
+     */
+    public static function deleteAvatarImageFile($userId)
+    {
+        // Check if file exists
+        if (!file_exists(Config::get('PATH_AVATARS') . $userId . ".jpg")) {
+            Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_NO_FILE"));
+            return false;
+        }
+
+        // Delete avatar file
+        if (!unlink(Config::get('PATH_AVATARS') . $userId . ".jpg")) {
+            Session::add("feedback_negative", Text::get("FEEDBACK_AVATAR_IMAGE_DELETE_FAILED"));
+            return false;
+        }
+
+        return true;
+    }
 }

From fe9ba45ff3e081fbdeb2a0c7107c10b4e8380860 Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sun, 1 Mar 2015 19:21:33 +0100
Subject: [PATCH 64/68] (v3.1) reduced lines of code

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba18ca91e..33d1a5123 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Code Quality at Scrutinizer 9.6 / 10, at Code Climate 3.9 / 10
 
 **February 2015**
 
+- [panique] several code quality improvements (and line reductions :) ) all over the project
 - [PR](https://github.com/panique/huge/pull/620) [owenr88] view rending now possible with multiple view files
 - [panique] lots of code refactorings and simplifications all over the project
 - [PR](https://github.com/panique/huge/pull/615) [Dominic28] Avatar can now be deleted by the user

From 325776f3c6a341409c82cf3fa9cda0cf3c08c1ee Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sat, 7 Mar 2015 22:10:40 +0100
Subject: [PATCH 65/68] (v3.1) correct project name, project link etc.

---
 public/index.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/public/index.php b/public/index.php
index ab4eba8c1..fc3bc9b75 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,20 +1,17 @@
 <?php
 
 /**
- * A simple, clean and secure login / user authentication solution embedded into a small PHP framework.
- * Part of a set of login scripts, more on http://www.php-login.net
+ * A super-simple user-authentication solution, embedded into a small framework.
  *
- * PHP LOGIN (FRAMEWORK VERSION) 2.1 (in development)
+ * HUGE
  *
- * @author Panique
- * @link http://www.php-login.net/
- * @link https://github.com/panique/php-login/
+ * @link https://github.com/panique/huge
  * @license http://opensource.org/licenses/MIT MIT License
  */
 
-// Auto-loading the classes (currently only from application/libs) via Composer's PSR-4 autoloader
-// Later it might be useful to use a namespace here, but for now let's keep it as simple as possible
+// auto-loading the classes (currently only from application/libs) via Composer's PSR-4 auto-loader
+// later it might be useful to use a namespace here, but for now let's keep it as simple as possible
 require '../vendor/autoload.php';
 
-// Start our application
+// start our application
 new Application();

From 35a0eb577c3bd0dd35fe24b754c2b8fc34072dfc Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sat, 7 Mar 2015 22:16:11 +0100
Subject: [PATCH 66/68] (v3.1) side-facts to project name

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 97830e69e..ea68cc8fc 100644
--- a/README.md
+++ b/README.md
@@ -342,3 +342,12 @@ https://github.com/panique/huge/issues?state=open
 - [Notes on password & hashing salting in upcoming PHP versions (PHP 5.5.x & 5.6 etc.)](https://github.com/panique/huge/wiki/Notes-on-password-&-hashing-salting-in-upcoming-PHP-versions-%28PHP-5.5.x-&-5.6-etc.%29)
 - [Some basic "benchmarks" of all PHP hash/salt algorithms](https://github.com/panique/huge/wiki/Which-hashing-&-salting-algorithm-should-be-used-%3F)
 - [How to prevent PHP sessions being shared between different apache vhosts / different applications](http://www.dev-metal.com/prevent-php-sessions-shared-different-apache-vhosts-different-applications/)
+
+### Side-facts
+
+1. Weird! When I renamed php-login to HUGE (to get rid off the too generic project name and to make it fitting nicely
+   to MINI, TINY and MINI2, my other projects) I had a research if the word "huge" is already used in the php world for 
+   sure. Nothing came up. Then, weeks later, I stumbled upon this: https://github.com/ffremont/HugeRest
+   I nice little framework in PHP, but it has only 1 star on Github, so it's obviously not so widely used. Looks very 
+   professional, too. Hmm.... The guy behind published the entire readme etc. in pure french (!), so it's hard to use 
+   for non-french-speaking people. However, I'm not related to him in any way, this is pure coincidence.

From d87660094de3517ce6ee0b2db8d57c70673f928e Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sat, 7 Mar 2015 22:19:40 +0100
Subject: [PATCH 67/68] (v3.1) version definition

---
 CHANGELOG.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33d1a5123..656016fae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # CHANGE LOG
 
-## 3.1 (currently in develop branch)
+For the newest (und unstable) version always check the develop branch.
 
-Code Quality at Scrutinizer 9.6 / 10, at Code Climate 3.9 / 10
+## 3.1
+
+Code Quality at Scrutinizer 9.7/10, at Code Climate 3.9/4
 
 **February 2015**
 
@@ -17,7 +19,7 @@ Code Quality at Scrutinizer 9.6 / 10, at Code Climate 3.9 / 10
 
 ## 3.0
 
-Code Quality at Scrutinizer 9.3 / 10, at Code Climate 3.9 / 10 
+Code Quality at Scrutinizer 9.3/10, at Code Climate 3.9/4
 
 **February 2015**
 

From ec7f5c7de85b2c2a37be6f74c38b0f083013dadf Mon Sep 17 00:00:00 2001
From: panique <panique@web.de>
Date: Sat, 7 Mar 2015 22:21:06 +0100
Subject: [PATCH 68/68] (v3.1) badge branch correction for release to master
 branch

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ea68cc8fc..bb50a7f17 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 # HUGE
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/panique/huge/?branch=develop)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/panique/huge/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/panique/huge/?branch=master)
 [![Code Climate](https://codeclimate.com/github/panique/huge/badges/gpa.svg)](https://codeclimate.com/github/panique/huge)
-[![Travis CI](https://travis-ci.org/panique/huge.svg?branch=develop)](https://travis-ci.org/panique/huge)
+[![Travis CI](https://travis-ci.org/panique/huge.svg?branch=master)](https://travis-ci.org/panique/huge)
 [![Dependency Status](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54ca11fbde7924f81a000010)
 
 Just a simple user authentication solution inside a super-simple framework skeleton that works out-of-the-box