joaogl / base

src/Controllers/GroupsController.php

Braces +9 added lines, -6 removed lines

@@ -76,8 +76,9 @@ 
 
         $groups2 = Sentinel::getRoleRepository()->all(['id', 'name']);
 
-        foreach ($groups2 as $g)
-            $groups[$g->id] = $g->name;
+        foreach ($groups2 as $g) {
+                    $groups[$g->id] = $g->name;
+        }
 
         // Show the page
         return View('admin.groups.edit', compact('group', 'groups'));
@@ -154,8 +155,9 @@ 
 
         $groups2 = Sentinel::getRoleRepository()->all(['id', 'name']);
 
-        foreach ($groups2 as $g)
-            $groups[$g->id] = $g->name;
+        foreach ($groups2 as $g) {
+                    $groups[$g->id] = $g->name;
+        }
 
         // Show the page
         return View('admin.groups.create', compact('groups'));
@@ -184,8 +186,9 @@ 
 
         $group = Sentinel::getRoleRepository()->findBySlug($slug);
 
-        if ($group != null)
-            return Redirect::route("groups")->with('error', Lang::get('base.groups.already_exists'));
+        if ($group != null) {
+                    return Redirect::route("groups")->with('error', Lang::get('base.groups.already_exists'));
+        }
 
         $group = Sentinel::getRoleRepository()->create([
             'name' => Input::get('name'),

src/Controllers/UsersController.php

Braces +57 added lines, -48 removed lines

@@ -130,8 +130,9 @@ 
         $user->gender = Input::get('gender');

         $user->description = Input::get('description');

 

-        if (Input::get('birthday') != null)

-            $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));

+        if (Input::get('birthday') != null) {
+                    $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));
+        }
 

         $passwordChanged = false;

 

@@ -142,8 +143,7 @@ 
             {

                 $passwordChanged = true;

                 $user->password = Hash::make($password);

-            }

-            else

+            } else

             {

                 $error = Lang::get('base.auth.wrong_password');

                 $validator->messages()->add('old-password', Lang::get('base.auth.wrong_password'));

@@ -162,8 +162,9 @@ 
             $file->move($destinationPath, $safeName);

 

             //delete old pic if exists

-            if (File::exists(public_path() . $folderName . $user->pic))

-                File::delete(public_path() . $folderName . $user->pic);

+            if (File::exists(public_path() . $folderName . $user->pic)) {
+                            File::delete(public_path() . $folderName . $user->pic);
+            }
 

             //save new file path into db

             $user->pic = $safeName;

@@ -261,8 +262,7 @@ 
                     // Redirect to the user page

                     return Redirect::route($redirect)->with('success', $success);

                 }

-            }

-            else

+            } else

             {

                 $error = Lang::get('base.auth.wrong_password');

                 $validator->messages()->add('old-password', Lang::get('base.auth.wrong_password'));

@@ -353,8 +353,9 @@ 
                 $activation = Activation::exists($user);

             }

 

-            if($activation)

-                Activation::complete($user, $activation->code);

+            if($activation) {
+                            Activation::complete($user, $activation->code);
+            }
 

             Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') account was accepted. ', $user->id);

 

@@ -401,9 +402,10 @@ 
         {

             Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') account was refused. ', $user->id);

 

-            if (Base::getSetting('SEND_EMAIL_ON_REFUSE'))

-                Mail::queue('emails.account.refused-by-admin', [ 'user' => $user ], function ($m) use ($user) {

-                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);

+            if (Base::getSetting('SEND_EMAIL_ON_REFUSE')) {
+                            Mail::queue('emails.account.refused-by-admin', [ 'user' => $user ], function ($m) use ($user) {

+                    $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+            }
                     $m->subject(Lang::get('base.mails.account_accepted'));

                 });

 

@@ -584,8 +586,7 @@ 
 

             // Get a list of all the available groups

             $roles = Sentinel::getRoleRepository()->all();

-        }

-        else

+        } else

         {

             // Prepare the error message

             $error = Lang::get('base.auth.not_found');

@@ -604,12 +605,14 @@ 
         foreach ($groups2 as $g)

         {

             $has = false;

-            foreach ($user->roles as $g2)

-                if ($g2->id == $g->id)

-                    $has = true;

-

-            if (!$has)

-                $groups[$g->id] = $g->name;

+            foreach ($user->roles as $g2) {
+                            if ($g2->id == $g->id)

+                    $has = true;
+            }
+

+            if (!$has) {
+                            $groups[$g->id] = $g->name;
+            }
         }

 

         // Show the page

@@ -663,13 +666,15 @@ 
             $user->email       = Input::get('email');

             $user->description = Input::get('description');

 

-            if (Input::get('force_new_password'))

-                $user->force_new_password = 1;

-            else

-                $user->force_new_password = 0;

+            if (Input::get('force_new_password')) {
+                            $user->force_new_password = 1;
+            } else {
+                            $user->force_new_password = 0;
+            }
 

-            if (Input::get('birthday') != null)

-                $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));

+            if (Input::get('birthday') != null) {
+                            $user->birthday = \Carbon\Carbon::createFromFormat('d/m/Y', Input::get('birthday'));
+            }
 

             $password_changed = false;

 

@@ -694,8 +699,9 @@ 
                     $file->move($destinationPath, $safeName);

 

                     //delete old pic if exists

-                    if(File::exists(public_path() . $folderName . $user->pic))

-                        File::delete(public_path() . $folderName . $user->pic);

+                    if(File::exists(public_path() . $folderName . $user->pic)) {
+                                            File::delete(public_path() . $folderName . $user->pic);
+                    }
 

                     //save new file path into db

                     $user->pic   = $safeName;

@@ -735,10 +741,10 @@ 
 

             if($currentStatus != $status)

             {

-                if ($currentStatus == 0)

-                    // Remove existing activation record

-                    Activation::remove($user);

-                else

+                if ($currentStatus == 0) {
+                                    // Remove existing activation record

+                    Activation::remove($user);
+                } else

                 {

                     $activation = Activation::exists($user);

 

@@ -749,14 +755,15 @@ 
                         $activation = Activation::exists($user);

                     }

 

-                    if($activation)

-                        Activation::complete($user, $activation->code);

+                    if($activation) {
+                                            Activation::complete($user, $activation->code);
+                    }
                 }

 

                 $user->status = $currentStatus;

-            }

-            else

-                $user->status = $currentStatus;

+            } else {
+                            $user->status = $currentStatus;
+            }
 

             // Was the user updated?

             if ($user->save())

@@ -769,8 +776,9 @@ 
                     });

                 }

 

-                if ($password_changed)

-                    Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') password was changed by an admin. ', $user->id);

+                if ($password_changed) {
+                                    Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') password was changed by an admin. ', $user->id);
+                }
 

                 Base::TargettedLog($user->username . ' (' . $user->first_name . ' ' . $user->last_name . ') profile was changed by an admin. ', $user->id);

 

@@ -850,10 +858,11 @@ 
             $user->password = Hash::make(Input::get('password'));

             $user->description = Input::get('description');

 

-            if (Input::get('force_new_password'))

-                $user->force_new_password = 1;

-            else

-                $user->force_new_password = 0;

+            if (Input::get('force_new_password')) {
+                            $user->force_new_password = 1;
+            } else {
+                            $user->force_new_password = 0;
+            }
 

             // is new image uploaded?

             if ($file = Input::file('pic'))

@@ -869,8 +878,9 @@ 
                     $file->move($destinationPath, $safeName);

 

                     //delete old pic if exists

-                    if(File::exists(public_path() . $folderName . $user->pic))

-                        File::delete(public_path() . $folderName . $user->pic);

+                    if(File::exists(public_path() . $folderName . $user->pic)) {
+                                            File::delete(public_path() . $folderName . $user->pic);
+                    }
 

                     //save new file path into db

                     $user->pic   = $safeName;

@@ -889,8 +899,7 @@ 
                         $m->to($user->email, $user->first_name . ' ' . $user->last_name);

                         $m->subject(Lang::get('base.mails.account_created'));

                     });

-                }

-                else

+                } else

                 {

                     Mail::queue('emails.account.account-created-by-admin-inactive', [ 'user' => $user, 'new_password' => Input::get('password') ], function ($m2) use ($user) {

                         $m2->to($user->email, $user->first_name . ' ' . $user->last_name);

src/Controllers/AuthController.php

Braces +49 added lines, -38 removed lines

@@ -49,10 +49,11 @@ 
         // Is the user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Show the page

@@ -69,10 +70,11 @@ 
         // Is the user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Show the page

@@ -89,10 +91,11 @@ 
         // Is the user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Show the page

@@ -145,10 +148,11 @@ 
         // Is user logged in?

         if (Sentinel::check())

         {

-            if (Sentinel::inRole('admin'))

-                return Redirect::route('home');

-            else

-                return Redirect::route('user.home');

+            if (Sentinel::inRole('admin')) {
+                            return Redirect::route('home');
+            } else {
+                            return Redirect::route('user.home');
+            }
         }

 

         // Find the user using the password reset code

@@ -167,8 +171,7 @@ 
             // Activation was successful

             // Redirect to the login page

             return Redirect::route('login')->with('success', Lang::get('base.auth.activate.success'));

-        }

-        else

+        } else

         {

             // Activation not found or not completed.

             $error = Lang::get('base.auth.activate.error');

@@ -192,8 +195,9 @@ 
             'password' => 'required|between:3,32',

         );

 

-        if (!$isEmail)

-            $rules['email'] = 'required';

+        if (!$isEmail) {
+                    $rules['email'] = 'required';
+        }
 

         // Create a new validator instance from our validation rules

         $validator = Validator::make(Input::all(), $rules);

@@ -258,14 +262,16 @@ 
         $userActivation = $signupStatus == 2;

         $adminActivation = $signupStatus == 3;

 

-        if (!$signupEnabled)

-            return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_disabled'));

+        if (!$signupEnabled) {
+                    return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_disabled'));
+        }
 

         $rules = array();

 

         // Declare the rules for the form validation

-        foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

-            $rules[$fieldid] = $field['validator'];

+        foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field) {
+                    $rules[$fieldid] = $field['validator'];
+        }
 

         $rules['g-recaptcha-response'] = 'required';

 

@@ -276,8 +282,9 @@ 
 

         // If validation fails, we'll exit the operation now.

         if ($validator->fails() || ($err = $this->captchaCheck()) == false) {

-            if ($err)

-                return Redirect::to(URL::previous())->withInput()->withErrors(['g-recaptcha-response' => Lang::get('base.captcha.error')]);

+            if ($err) {
+                            return Redirect::to(URL::previous())->withInput()->withErrors(['g-recaptcha-response' => Lang::get('base.captcha.error')]);
+            }
 

             // Ooops.. something went wrong

             return Redirect::to(URL::previous())->withInput()->withErrors($validator);

@@ -287,15 +294,17 @@ 
             $data = array();

 

             // Set the data to the user from the User class

-            foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field)

-                $data[$fieldid] = Input::get($fieldid);

+            foreach(Sentinel::createModel()->getRegisterFields() as $fieldid => $field) {
+                            $data[$fieldid] = Input::get($fieldid);
+            }
 

             // Set the standard data to the user

             $data['ip'] = Request::getClientIP();

             $data['status'] = 0;

             $data['staff'] = 0;

-            if ($data['birthday'] != null)

-                $data['birthday'] = \Carbon\Carbon::createFromFormat('d/m/Y', $data['birthday']);

+            if ($data['birthday'] != null) {
+                            $data['birthday'] = \Carbon\Carbon::createFromFormat('d/m/Y', $data['birthday']);
+            }
 

             // Find the user if it exists and needs to be created

             $user = Sentinel::getUserRepository()->findByCredentials(['email' => Input::get('email')]);

@@ -307,19 +316,21 @@ 
                     $testing = Sentinel::createModel()->getRegisterFields();

                     $user = Sentinel::findById($user->id);

 

-                    foreach($data as $fieldid => $field)

-                        if (!isset($testing[$fieldid]) || $testing[$fieldid]['save'] == true)

-                            $user[$fieldid] = $field;

+                    foreach($data as $fieldid => $field) {
+                                            if (!isset($testing[$fieldid]) || $testing[$fieldid]['save'] == true)

+                            $user[$fieldid] = $field;
+                    }
 

                     $user['password'] = bcrypt($user['password']);

                     Sentinel::update($user, ['email' => Input::get('email')]);

-                }

-                else

-                    return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_failed'));

+                } else {
+                                    return Redirect::to(URL::previous())->withInput()->with('error', Lang::get('base.auth.account.registration_failed'));
+                }
             }

             // Register the user

-            else

-                $user = Sentinel::register($data, false);

+            else {
+                            $user = Sentinel::register($data, false);
+            }
 

             // If the user needs to activate the account send him an email

             if ($userActivation)