idevelopment / RingMe

app/Http/Controllers/StaffController.php

Unused Use Statements -3 removed lines

@@ -5,10 +5,7 @@
 use App\Departments;
 use App\User;
 use App\Roles;
-
 use Chrisbjr\ApiGuard\Models\ApiKey;
-use Illuminate\Http\Request;
-
 use App\Http\Requests;
 use Bouncer;
 

Indentation +32 added lines, -32 removed lines

@@ -64,36 +64,36 @@ 
 
         if ($user->is('Manager') || $user->is('Administrator'))
         {
-          $password = $faker->password;
-          // Save the user to the database.
-          $NewUser = User::create(
+            $password = $faker->password;
+            // Save the user to the database.
+            $NewUser = User::create(
             [
-              'fname'     => $input->fname,
-              'name'      => $input->name,
-              'email'     => $input->email,
-              'password'  => \Hash::make($password),
-              'biography' => nl2br($input->biography),
+                'fname'     => $input->fname,
+                'name'      => $input->name,
+                'email'     => $input->email,
+                'password'  => \Hash::make($password),
+                'biography' => nl2br($input->biography),
             ]
-          )->id;
-          // Assign the user to the selected department
+            )->id;
+            // Assign the user to the selected department
             User::find($NewUser)->departments()->attach($input->department);
-          // Assign the user to the selected role.
+            // Assign the user to the selected role.
             Bouncer::assign($input->role)->to($user);
-         // Send a confirmation mail to the user.
+            // Send a confirmation mail to the user.
             Mail::send('emails.welcome', ['user' => $NewUser, 'password' => $password], function ($message) use ($user)
             {
-              $message->from(env('MAIL_USERNAME'));
-              $message->to('glenn.hermans@idevelopment.be', 'John Smith')->subject('Welcome to Ring Me!');
+                $message->from(env('MAIL_USERNAME'));
+                $message->to('glenn.hermans@idevelopment.be', 'John Smith')->subject('Welcome to Ring Me!');
             }
-          );
-          session()->flash('message', 'The new user has been created and is assigned to his department and role.');
-          return redirect("staff");
-         }
-         else
-         {
-          return redirect()->back(302);
-         }
-       }
+            );
+            session()->flash('message', 'The new user has been created and is assigned to his department and role.');
+            return redirect("staff");
+            }
+            else
+            {
+            return redirect()->back(302);
+            }
+        }
 
     /**
      * Update the staff member.
@@ -128,10 +128,10 @@ 
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index()
-	{
+    {
         $data["departments"] = Departments::all();
-		$data['users'] = User::paginate(15);
-    	return view('users/index', $data);
+        $data['users'] = User::paginate(15);
+        return view('users/index', $data);
     }
 
     /**
@@ -171,7 +171,7 @@ 
     {
         $id = auth()->user()->id;
         $data['tokens'] = ApiKey::where('user_id', $id)->get();
-    	return view('users/profile', $data);
+        return view('users/profile', $data);
     }
 
     /**
@@ -193,11 +193,11 @@ 
         session()->flash('message', 'The user has been removed.');
 
         return redirect()->to('/staff');
-      }
-      else
-      {
+        }
+        else
+        {
         return redirect()->back();
-      }
+        }
     }
 
     public function get_roles()
@@ -206,7 +206,7 @@ 
         $data2 = [];
         foreach($items as $role)
         {
-         $data2[] = [
+            $data2[] = [
         'value' => $role["id"],
         'text'  => $role["name"]
         ];

Spacing +15 added lines, -15 removed lines

@@ -41,8 +41,8 @@ 
         $user = auth()->user();
 
         if ($user->is('Manager') || $user->is('Administrator')) {
-            $data['departments'] = Departments::all();
-            $data['roles'] = Roles::all();
+            $data[ 'departments' ] = Departments::all();
+            $data[ 'roles' ] = Roles::all();
 
             return view('staff.create', $data);
         }
@@ -80,7 +80,7 @@ 
           // Assign the user to the selected role.
             Bouncer::assign($input->role)->to($user);
          // Send a confirmation mail to the user.
-            Mail::send('emails.welcome', ['user' => $NewUser, 'password' => $password], function ($message) use ($user)
+            Mail::send('emails.welcome', [ 'user' => $NewUser, 'password' => $password ], function($message) use ($user)
             {
               $message->from(env('MAIL_USERNAME'));
               $message->to('glenn.hermans@idevelopment.be', 'John Smith')->subject('Welcome to Ring Me!');
@@ -105,7 +105,7 @@ 
      */
     public function update(Requests\NewStaffValidator $input, $id)
     {
-        User::find($id)-update($input->except('_token'));
+        User::find($id) - update($input->except('_token'));
         //session()->flash('message', 'Staff member has been updated');
 
     }
@@ -118,7 +118,7 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = User::find($id);
+        $data[ 'query' ] = User::find($id);
         return view('staff.edit', $data);
     }
 
@@ -129,8 +129,8 @@ 
      */
     public function index()
 	{
-        $data["departments"] = Departments::all();
-		$data['users'] = User::paginate(15);
+        $data[ "departments" ] = Departments::all();
+		$data[ 'users' ] = User::paginate(15);
     	return view('users/index', $data);
     }
 
@@ -170,7 +170,7 @@ 
     public function profile()
     {
         $id = auth()->user()->id;
-        $data['tokens'] = ApiKey::where('user_id', $id)->get();
+        $data[ 'tokens' ] = ApiKey::where('user_id', $id)->get();
     	return view('users/profile', $data);
     }
 
@@ -184,10 +184,10 @@ 
     {
         $user = auth()->user();
 
-        if (! $user->is('Manager') || ! $user->is('Administrator')) {
+        if (!$user->is('Manager') || !$user->is('Administrator')) {
 
         $user = User::find($id);
-        $user->roles()->sync([]);
+        $user->roles()->sync([ ]);
 
         User::destroy($id);
         session()->flash('message', 'The user has been removed.');
@@ -203,12 +203,12 @@ 
     public function get_roles()
     {
         $items = Roles::all();
-        $data2 = [];
-        foreach($items as $role)
+        $data2 = [ ];
+        foreach ($items as $role)
         {
-         $data2[] = [
-        'value' => $role["id"],
-        'text'  => $role["name"]
+         $data2[ ] = [
+        'value' => $role[ "id" ],
+        'text'  => $role[ "name" ]
         ];
 
         }

Braces +2 added lines, -4 removed lines

@@ -88,8 +88,7 @@ 
           );
           session()->flash('message', 'The new user has been created and is assigned to his department and role.');
           return redirect("staff");
-         }
-         else
+         } else
          {
           return redirect()->back(302);
          }
@@ -193,8 +192,7 @@ 
         session()->flash('message', 'The user has been removed.');
 
         return redirect()->to('/staff');
-      }
-      else
+      } else
       {
         return redirect()->back();
       }

app/Roles.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
      *
      * @var array
      */
-    protected $fillable = ['name'];
+    protected $fillable = [ 'name' ];
 }

app/Http/Controllers/RolesController.php

Indentation +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
      */
     public function index()
     {
-    	$data['roles'] = Roles::all();
-    	return view('roles.index', $data);
+        $data['roles'] = Roles::all();
+        return view('roles.index', $data);
     }
 
     /**

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Http\Requests;
 use Silber\Bouncer\Database\Constraints\Roles;
 
 class RolesController extends Controller

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function index()
     {
-    	$data['roles'] = Roles::all();
+    	$data[ 'roles' ] = Roles::all();
     	return view('roles.index', $data);
     }
 
@@ -29,7 +29,7 @@ 
     public function search(Request $request)
     {
         $term = $request->get('term');
-        $data['roles'] = Roles::where('name', 'LIKE', "$term")->get();
+        $data[ 'roles' ] = Roles::where('name', 'LIKE', "$term")->get();
         return view('roles.index', $data);
     }
 
@@ -41,7 +41,7 @@ 
      */
     public function show($id)
     {
-        $data['query'] = Roles::find($id);
+        $data[ 'query' ] = Roles::find($id);
         return view('roles.specific', $data);
     }
 
@@ -75,8 +75,8 @@ 
      */
     public function edit($id)
     {
-        $data['query'] = Roles::find($id);
-        $data['permissions'] = Permissions::orderBy('name', 'asc')->get();
+        $data[ 'query' ] = Roles::find($id);
+        $data[ 'permissions' ] = Permissions::orderBy('name', 'asc')->get();
 
         return view('roles.edit', $data);
     }

app/Http/Controllers/BackupController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Customer;
-use Illuminate\Http\Request;
-
 use App\Http\Requests;
 
 class CustomersController extends Controller

Indentation +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 
 class BackupController extends Controller
 {
-	    public function __construct()
+        public function __construct()
     {
         $this->middleware('auth');
         $this->middleware('lang');
@@ -30,7 +30,7 @@ 
         $data['MonthlyBackups']    = Config::get('laravel-backup.cleanup.defaultStrategy.keepMonthlyBackupsForMonths');
         $data['KeepYearlyBackups'] = Config::get('laravel-backup.cleanup.defaultStrategy.keepYearlyBackupsForYears');
 
-    	return view('settings.backups', $data);
+        return view('settings.backups', $data);
     }
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -24,11 +24,11 @@ 
     {
 
         // Config data
-        $data['StoreAllBackups']   = Config::get('laravel-backup.cleanup.defaultStrategy.keepAllBackupsForDays');
-        $data['KeepDailyBackups']  = Config::get('laravel-backup.cleanup.defaultStrategy.keepDailyBackupsForDays');
-        $data['WeeklyBackups']     = Config::get('laravel-backup.cleanup.defaultStrategy.keepWeeklyBackupsForWeeks');
-        $data['MonthlyBackups']    = Config::get('laravel-backup.cleanup.defaultStrategy.keepMonthlyBackupsForMonths');
-        $data['KeepYearlyBackups'] = Config::get('laravel-backup.cleanup.defaultStrategy.keepYearlyBackupsForYears');
+        $data[ 'StoreAllBackups' ]   = Config::get('laravel-backup.cleanup.defaultStrategy.keepAllBackupsForDays');
+        $data[ 'KeepDailyBackups' ]  = Config::get('laravel-backup.cleanup.defaultStrategy.keepDailyBackupsForDays');
+        $data[ 'WeeklyBackups' ]     = Config::get('laravel-backup.cleanup.defaultStrategy.keepWeeklyBackupsForWeeks');
+        $data[ 'MonthlyBackups' ]    = Config::get('laravel-backup.cleanup.defaultStrategy.keepMonthlyBackupsForMonths');
+        $data[ 'KeepYearlyBackups' ] = Config::get('laravel-backup.cleanup.defaultStrategy.keepYearlyBackupsForYears');
 
     	return view('settings.backups', $data);
     }
@@ -43,11 +43,11 @@ 
     public function storeBackup(Requests\BackupSettingValidator $input)
     {
         $config = new \Larapack\ConfigWriter\Repository('laravel-backup');
-        $config->set('cleanup.defaultStrategy.keepAllBackupsForDays',       $input->keepAllBackupsForDaysAll);
-        $config->set('cleanup.defaultStrategy.keepDailyBackupsForDays',     $input->keepAllBackupsForDays);
-        $config->set('cleanup.defaultStrategy.keepWeeklyBackupsForWeeks',   $input->keepWeeklyBackupsForWeeks);
+        $config->set('cleanup.defaultStrategy.keepAllBackupsForDays', $input->keepAllBackupsForDaysAll);
+        $config->set('cleanup.defaultStrategy.keepDailyBackupsForDays', $input->keepAllBackupsForDays);
+        $config->set('cleanup.defaultStrategy.keepWeeklyBackupsForWeeks', $input->keepWeeklyBackupsForWeeks);
         $config->set('cleanup.defaultStrategy.keepMonthlyBackupsForMonths', $input->keepMonthlyBackupsForWeeks);
-        $config->set('cleanup.defaultStrategy.keepYearlyBackupsForYears',   $input->keepAllBackupsYearly);
+        $config->set('cleanup.defaultStrategy.keepYearlyBackupsForYears', $input->keepAllBackupsYearly);
         $config->save();
 
         if ($config) {

app/Http/Controllers/ProfileController.php

Unused Use Statements -3 removed lines

@@ -3,11 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\User;
-use Illuminate\Http\Request;
-
 use App\Http\Requests;
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Facades\Image;
 
 class ProfileController extends Controller

Spacing +4 added lines, -4 removed lines

@@ -30,13 +30,13 @@ 
     public function updateProfile(Requests\ProfileValidator $input)
     {
         // User information
-        User::find(auth()->user()->id)->update($input->except(['_token', 'avatar']));
+        User::find(auth()->user()->id)->update($input->except([ '_token', 'avatar' ]));
 
         // User image information.
         if (Input::file()) {
             $image    = Input::file('avatar');
-            $filename = time() . '.' . $image->getClientOriginalExtension();
-            $path     = public_path('avatars/' . $filename);
+            $filename = time().'.'.$image->getClientOriginalExtension();
+            $path     = public_path('avatars/'.$filename);
             
             //Image::make($image->getRealPath())->resize(80, 80)->save($path);
             $image->move(public_path('avatars'), $filename);
@@ -58,7 +58,7 @@ 
      */
     public function updateSecurity(Requests\PasswordValidation $input)
     {
-        $data['password'] = bcrypt($input->password);
+        $data[ 'password' ] = bcrypt($input->password);
 
         User::find(auth()->user()->id)->update($data);
         session()->flash('message', 'Your password has been updated.');

app/Http/Controllers/SettingsController.php

Indentation +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
 {
     // TODO: Needs phpunit tests. -> create github issue
 
-	/**
+    /**
      * SettingsController constructor.
      */
     public function __construct()
@@ -26,17 +26,17 @@ 
      */
     public function index()
     {
-    	return view('settings.index');
+        return view('settings.index');
     }
 
-		/**
-		 * Get the email settings page.
-		 *
-		 * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-		 */
-		public function email()
-		{
-			return view('settings.email');
-		}
+        /**
+         * Get the email settings page.
+         *
+         * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+         */
+        public function email()
+        {
+            return view('settings.email');
+        }
 
 }

app/ProductsCategories.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
      *
      * @var array
      */
-    protected $fillable = ['name'];
+    protected $fillable = [ 'name' ];
 }

Indentation +6 added lines, -6 removed lines

@@ -10,12 +10,12 @@
  */
 class ProductsCategories extends Model
 {
-  /**
-   * Model table.
-   *
-   * @var string
-   */
-  protected $table = 'products_categories';
+    /**
+     * Model table.
+     *
+     * @var string
+     */
+    protected $table = 'products_categories';
 
     /**
      * Mass-assign fields

app/Products.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      *
      * @var array
      */
-    protected $fillable = ['name', 'category_id'];
+    protected $fillable = [ 'name', 'category_id' ];
 
 
     /**

app/Http/Controllers/ProductsController.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use App\Departments;
 use Illuminate\Http\Request;
-
 use App\Http\Requests;
 
 /**

Indentation +15 added lines, -15 removed lines

@@ -35,17 +35,17 @@ 
 
     public function edit_categories($id)
     {
-      $data['category'] = ProductsCategories::find($id);
-      return view('products.edit_category', $data);
+        $data['category'] = ProductsCategories::find($id);
+        return view('products.edit_category', $data);
     }
 
     public function remove_category($id)
     {
-      $category = ProductsCategories::find($id);
-      $category->delete();
+        $category = ProductsCategories::find($id);
+        $category->delete();
 
-      session()->flash('message', trans('products.removed_category'));
-      return redirect()->back();
+        session()->flash('message', trans('products.removed_category'));
+        return redirect()->back();
     }
 
 
@@ -61,9 +61,9 @@ 
     public function store(Requests\ProductValidator $input)
     {
         $this->validate($input, [
-          'name' => 'required',
-          'category' => 'required',
-         ]);
+            'name' => 'required',
+            'category' => 'required',
+            ]);
 
         $product       = new Products();
         $product->name = $input->name;
@@ -85,9 +85,9 @@ 
      */
     public function saveCat(Request $input)
     {
-      $this->validate($input, [
+        $this->validate($input, [
         'name' => 'required|unique:products_categories'
-       ]);
+        ]);
 
         $category       = new ProductsCategories();
         $category->name = $input->name;
@@ -100,10 +100,10 @@ 
 
     public function remove($id)
     {
-      $product = Products::find($id);
-      $product->delete();
+        $product = Products::find($id);
+        $product->delete();
 
-      session()->flash('message', trans('products.removed'));
-      return redirect()->back();
+        session()->flash('message', trans('products.removed'));
+        return redirect()->back();
     }
 }

Spacing +4 added lines, -4 removed lines

@@ -21,21 +21,21 @@
 
     public function index()
     {
-        $data['products'] = Products::with('category')->paginate(10);
-        $data['category'] = ProductsCategories::with('products')->paginate(10)->sortBy("name")->all();
+        $data[ 'products' ] = Products::with('category')->paginate(10);
+        $data[ 'category' ] = ProductsCategories::with('products')->paginate(10)->sortBy("name")->all();
 
         return view('products.index', $data);
     }
 
     public function categories()
     {
-        $data['category'] = ProductsCategories::with('products')->paginate(10)->sortBy("name")->all();
+        $data[ 'category' ] = ProductsCategories::with('products')->paginate(10)->sortBy("name")->all();
         return view('products.categories', $data);
     }
 
     public function edit_categories($id)
     {
-      $data['category'] = ProductsCategories::find($id);
+      $data[ 'category' ] = ProductsCategories::find($id);
       return view('products.edit_category', $data);
     }