Converted indentation to spaces in application/model files

Also added separate line between comments and code, fixed opening
brackets in method (moved to the new line), removed white spaces, added
new line at the end of the file.

application/model/AdminModel.php

@@ -5,91 +5,91 @@
  */
 class AdminModel
 {
- /**
-  * Sets the deletion and suspension values
-  *
-  * @param $suspensionInDays
-  * @param $softDelete
-  * @param $userId
-  */
- public static function setAccountSuspensionAndDeletionStatus($suspensionInDays, $softDelete, $userId)
- {
+ /**
+  * Sets the deletion and suspension values
+  *
+  * @param $suspensionInDays
+  * @param $softDelete
+  * @param $userId
+  */
+ public static function setAccountSuspensionAndDeletionStatus($suspensionInDays, $softDelete, $userId)
+ {
 
- // Prevent to suspend or delete own account.
- // If admin suspend or delete own account will not be able to do any action.
- if ($userId == Session::get('user_id')) {
- Session::add('feedback_negative', Text::get('FEEDBACK_ACCOUNT_CANT_DELETE_SUSPEND_OWN'));
- return false;
- }
+ // Prevent to suspend or delete own account.
+ // If admin suspend or delete own account will not be able to do any action.
+ if ($userId == Session::get('user_id')) {
+ Session::add('feedback_negative', Text::get('FEEDBACK_ACCOUNT_CANT_DELETE_SUSPEND_OWN'));
+ return false;
+ }
 
- if ($suspensionInDays > 0) {
- $suspensionTime = time() + ($suspensionInDays * 60 * 60 * 24);
- } else {
- $suspensionTime = null;
- }
+ if ($suspensionInDays > 0) {
+ $suspensionTime = time() + ($suspensionInDays * 60 * 60 * 24);
+ } else {
+ $suspensionTime = null;
+ }
 
  // FYI "on" is what a checkbox delivers by default when submitted. Didn't know that for a long time :)
- if ($softDelete == "on") {
- $delete = 1;
- } else {
- $delete = 0;
- }
+ if ($softDelete == "on") {
+ $delete = 1;
+ } else {
+ $delete = 0;
+ }
 
- // write the above info to the database
- self::writeDeleteAndSuspensionInfoToDatabase($userId, $suspensionTime, $delete);
+ // write the above info to the database
+ self::writeDeleteAndSuspensionInfoToDatabase($userId, $suspensionTime, $delete);
 
- // if suspension or deletion should happen, then also kick user out of the application instantly by resetting
- // the user's session :)
- if ($suspensionTime != null OR $delete = 1) {
- self::resetUserSession($userId);
- }
- }
+ // if suspension or deletion should happen, then also kick user out of the application instantly by resetting
+ // the user's session :)
+ if ($suspensionTime != null OR $delete = 1) {
+ self::resetUserSession($userId);
+ }
+ }
 
- /**
-  * Simply write the deletion and suspension info for the user into the database, also puts feedback into session
-  *
-  * @param $userId
-  * @param $suspensionTime
-  * @param $delete
-  * @return bool
-  */
- private static function writeDeleteAndSuspensionInfoToDatabase($userId, $suspensionTime, $delete)
- {
- $database = DatabaseFactory::getFactory()->getConnection();
+ /**
+  * Simply write the deletion and suspension info for the user into the database, also puts feedback into session
+  *
+  * @param $userId
+  * @param $suspensionTime
+  * @param $delete
+  * @return bool
+  */
+ private static function writeDeleteAndSuspensionInfoToDatabase($userId, $suspensionTime, $delete)
+ {
+ $database = DatabaseFactory::getFactory()->getConnection();
 
- $query = $database->prepare("UPDATE users SET user_suspension_timestamp = :user_suspension_timestamp, user_deleted = :user_deleted WHERE user_id = :user_id LIMIT 1");
- $query->execute(array(
- ':user_suspension_timestamp' => $suspensionTime,
- ':user_deleted' => $delete,
- ':user_id' => $userId
- ));
+ $query = $database->prepare("UPDATE users SET user_suspension_timestamp = :user_suspension_timestamp, user_deleted = :user_deleted WHERE user_id = :user_id LIMIT 1");
+ $query->execute(array(
+ ':user_suspension_timestamp' => $suspensionTime,
+ ':user_deleted' => $delete,
+ ':user_id' => $userId
+ ));
 
- if ($query->rowCount() == 1) {
- Session::add('feedback_positive', Text::get('FEEDBACK_ACCOUNT_SUSPENSION_DELETION_STATUS'));
- return true;
- }
- }
+ if ($query->rowCount() == 1) {
+ Session::add('feedback_positive', Text::get('FEEDBACK_ACCOUNT_SUSPENSION_DELETION_STATUS'));
+ return true;
+ }
+ }
 
- /**
-  * Kicks the selected user out of the system instantly by resetting the user's session.
-  * This means, the user will be "logged out".
-  *
-  * @param $userId
-  * @return bool
-  */
- private static function resetUserSession($userId)
- {
- $database = DatabaseFactory::getFactory()->getConnection();
+ /**
+  * Kicks the selected user out of the system instantly by resetting the user's session.
+  * This means, the user will be "logged out".
+  *
+  * @param $userId
+  * @return bool
+  */
+ private static function resetUserSession($userId)
+ {
+ $database = DatabaseFactory::getFactory()->getConnection();
 
- $query = $database->prepare("UPDATE users SET session_id = :session_id WHERE user_id = :user_id LIMIT 1");
- $query->execute(array(
- ':session_id' => null,
- ':user_id' => $userId
- ));
+ $query = $database->prepare("UPDATE users SET session_id = :session_id WHERE user_id = :user_id LIMIT 1");
+ $query->execute(array(
+ ':session_id' => null,
+ ':user_id' => $userId
+ ));
 
- if ($query->rowCount() == 1) {
- Session::add('feedback_positive', Text::get('FEEDBACK_ACCOUNT_USER_SUCCESSFULLY_KICKED'));
- return true;
- }
- }
+ if ($query->rowCount() == 1) {
+ Session::add('feedback_positive', Text::get('FEEDBACK_ACCOUNT_USER_SUCCESSFULLY_KICKED'));
+ return true;
+ }
+ }
 }

application/model/AvatarModel.php

@@ -68,6 +68,7 @@ public static function createAvatar()
  {
  // check avatar folder writing rights, check if upload fits all rules
  if (self::isAvatarFolderWritable() AND self::validateImageFile()) {
+
  // create a jpg file in the avatar folder, write marker to database
  $target_file_path = Config::get('PATH_AVATARS') . Session::get('user_id');
  self::resizeAvatarImage($_FILES['avatar_file']['tmp_name'], $target_file_path, Config::get('AVATAR_SIZE'), Config::get('AVATAR_SIZE'));

application/model/CaptchaModel.php

@@ -9,38 +9,38 @@
  */
 class CaptchaModel
 {
- /**
-  * Generates the captcha, "returns" a real image, this is why there is header('Content-type: image/jpeg')
-  * Note: This is a very special method, as this is echoes out binary data.
-  */
- public static function generateAndShowCaptcha()
- {
- // create a captcha with the CaptchaBuilder lib (loaded via Composer)
- $captcha = new Gregwar\Captcha\CaptchaBuilder;
- $captcha->build(
- Config::get('CAPTCHA_WIDTH'),
- Config::get('CAPTCHA_HEIGHT')
- );
+ /**
+  * Generates the captcha, "returns" a real image, this is why there is header('Content-type: image/jpeg')
+  * Note: This is a very special method, as this is echoes out binary data.
+  */
+ public static function generateAndShowCaptcha()
+ {
+ // create a captcha with the CaptchaBuilder lib (loaded via Composer)
+ $captcha = new Gregwar\Captcha\CaptchaBuilder;
+ $captcha->build(
+ Config::get('CAPTCHA_WIDTH'),
+ Config::get('CAPTCHA_HEIGHT')
+ );
 
- // write the captcha character into session
- Session::set('captcha', $captcha->getPhrase());
+ // write the captcha character into session
+ Session::set('captcha', $captcha->getPhrase());
 
- // render an image showing the characters (=the captcha)
- header('Content-type: image/jpeg');
- $captcha->output();
- }
+ // render an image showing the characters (=the captcha)
+ header('Content-type: image/jpeg');
+ $captcha->output();
+ }
 
- /**
-  * Checks if the entered captcha is the same like the one from the rendered image which has been saved in session
-  * @param $captcha string The captcha characters
-  * @return bool success of captcha check
-  */
- public static function checkCaptcha($captcha)
- {
- if ($captcha == Session::get('captcha')) {
- return true;
- }
+ /**
+  * Checks if the entered captcha is the same like the one from the rendered image which has been saved in session
+  * @param $captcha string The captcha characters
+  * @return bool success of captcha check
+  */
+ public static function checkCaptcha($captcha)
+ {
+ if ($captcha == Session::get('captcha')) {
+ return true;
+ }
 
- return false;
- }
+ return false;
+ }
 }