jdrda / olapus

app/Feedback.php

Spacing +5 added lines, -5 removed lines

@@ -33,21 +33,21 @@ 
      *
      * @var array
      */
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+    protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ];
     
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'description', 'position', 'image_id'];
+    protected $fillable = [ 'name', 'description', 'position', 'image_id' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = ['image'];
+    protected $excludedFromIndex = [ 'image' ];
     
     /**
      * Fields to search in fulltext mode
@@ -83,7 +83,7 @@ 
      * 
      * @return object
      */
-    public function images(){
+    public function images() {
         
         return $this->belongsTo('App\Image', 'image_id')->select('id', 'name', 'description', 
                 'alt', 'url', 'imagecategory_id', 'image_mime_type', 'image_extension', 
@@ -97,7 +97,7 @@ 
      * @param query $query
      * @return query
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('images', 'images.imagecategories');
     }

app/AdminModelTrait.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
     {
         if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){
             return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) );
-        }
-        else{
+        } else{
             return $query;
         }
     }

Spacing +16 added lines, -16 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeFulltextAllColumns(Builder $query){
+    public function scopeFulltextAllColumns(Builder $query) {
   
         return Helpers::virtualFulltextSearchColumns($query, request('search'), $this->fulltextFields);
     }
@@ -45,7 +45,7 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeOrderByColumns(Builder $query){
+    public function scopeOrderByColumns(Builder $query) {
         
         return Helpers::orderByColumns($query, $this->defaultOrderBy);
     }
@@ -57,7 +57,7 @@ 
      */
     public function scopeExcludeFromIndex(Builder $query)
     {
-        return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromIndex) );
+        return $query->select(array_diff(Schema::getColumnListing($this->table), $this->excludedFromIndex));
     }
     
     /**
@@ -67,10 +67,10 @@ 
      */
     public function scopeExcludeFromFind(Builder $query)
     {
-        if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){
-            return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) );
+        if (isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE) {
+            return $query->select(array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind));
         }
-        else{
+        else {
             return $query;
         }
     }
@@ -80,7 +80,7 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeRelationships(Builder $query){
+    public function scopeRelationships(Builder $query) {
         
         return $query;
     }
@@ -90,24 +90,24 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeExternalTablesFilter(Builder $query){
+    public function scopeExternalTablesFilter(Builder $query) {
         
-        if(Request::input('relation')){
+        if (Request::input('relation')) {
             
-            $allTables = [];
+            $allTables = [ ];
             
             $relations = explode(',', Request::input('relation'));
             
-            foreach ($relations as $relation){
+            foreach ($relations as $relation) {
                 
                 $keyvalue = explode(':', $relation);
 
-                if(count($keyvalue) > 1) {
+                if (count($keyvalue) > 1) {
 
-                    $key = trim($keyvalue[0]);
-                    $value = trim($keyvalue[1]);
+                    $key = trim($keyvalue[ 0 ]);
+                    $value = trim($keyvalue[ 1 ]);
 
-                    $allTables[$key] = $value;
+                    $allTables[ $key ] = $value;
 
                     if (is_numeric($value) == TRUE) {
 
@@ -116,7 +116,7 @@ 
                 }
             }
             
-             request()->merge(['external_tables_filter' => $allTables]);
+             request()->merge([ 'external_tables_filter' => $allTables ]);
         }
         
         return $query;

app/Http/Controllers/Admin/DashboardController.php

Braces +1 added lines, -2 removed lines

@@ -126,8 +126,7 @@
         {
             return round((($thisValue / ($lastValue / 100)) - 100), $round);
 
-        }
-        else {
+        } else {
 
             return 0;
         }

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
      * 
      * @var array
      */
-    protected $gaData = [];
+    protected $gaData = [ ];
 
     /**
      * Constructor
@@ -58,7 +58,7 @@ 
          * Module name for blade
          */
         $temp = explode('.', $this->moduleBasicRoute);
-        View::share('moduleNameBlade', $temp[0] . "_module_" . $temp[1]);
+        View::share('moduleNameBlade', $temp[ 0 ] . "_module_" . $temp[ 1 ]);
 
 
     }
@@ -78,14 +78,14 @@ 
             $ga = $this->getGAValues();
         } else {
 
-            $ga = [];
+            $ga = [ ];
         }
 
         $statistics = [
             'ga' => $ga
         ];
 
-        return view('admin.modules.dashboard.index', ['statistics' => $statistics]);
+        return view('admin.modules.dashboard.index', [ 'statistics' => $statistics ]);
     }
 
     /**
@@ -100,7 +100,7 @@ 
         /**
          * Get the data
          */
-        $data =  \Analytics::getVisitorsAndPageViews($days);
+        $data = \Analytics::getVisitorsAndPageViews($days);
 
         /**
          * Calculate total
@@ -108,7 +108,7 @@ 
         $total = 0;
         foreach ($data as $value) {
 
-            $total += $value[$type];
+            $total += $value[ $type ];
         }
 
         return $total;

app/Http/Controllers/Admin/SettingsController.php

Spacing +1 added lines, -1 removed lines

@@ -24,5 +24,5 @@
     protected $arValidationArray = [
                     'name' => 'required|max:255|unique:settings,name',
                     'value' => 'max:255',
-                    'description' => 'max:255'];
+                    'description' => 'max:255' ];
 }

app/Http/Controllers/Auth/RegisterController.php

Spacing +3 added lines, -3 removed lines

@@ -63,9 +63,9 @@
     protected function create(array $data)
     {
         return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]);
     }
 }
\ No newline at end of file

app/Http/Controllers/Auth/LoginController.php

Spacing +1 added lines, -1 removed lines

@@ -35,6 +35,6 @@
      */
     public function __construct()
     {
-        $this->middleware('guest', ['except' => 'logout']);
+        $this->middleware('guest', [ 'except' => 'logout' ]);
     }
 }
\ No newline at end of file

app/Http/Controllers/Frontend/PageController.php

Spacing +28 added lines, -28 removed lines

@@ -40,7 +40,7 @@ 
      * @param Request $request
      * @return View|void
      */
-    public function getHomepage(Request $request){
+    public function getHomepage(Request $request) {
 
         /**
          * Load data
@@ -50,22 +50,22 @@ 
         /**
          * Number of users
          */
-        $this->_arViewData['users_no'] = User::count() + 135000;
+        $this->_arViewData[ 'users_no' ] = User::count() + 135000;
 
         /**
          * Number of campaigns
          */
-        $this->_arViewData['campaigns_no'] = Campaign::count();
+        $this->_arViewData[ 'campaigns_no' ] = Campaign::count();
 
         /**
          * Number of payments total
          */
-        $this->_arViewData['payments_no_total'] = Payment::sum('amount');
+        $this->_arViewData[ 'payments_no_total' ] = Payment::sum('amount');
 
         /**
          * Number of payments last month
          */
-        $this->_arViewData['payments_no_last_month'] = Payment::where('created_at', '>=', Carbon::now()->subMonth())->count();
+        $this->_arViewData[ 'payments_no_last_month' ] = Payment::where('created_at', '>=', Carbon::now()->subMonth())->count();
 
         /**
          * Return view
@@ -79,7 +79,7 @@ 
      * @param Request $request
      * @return View|void
      */
-    public function getContact(Request $request){
+    public function getContact(Request $request) {
 
         /**
          * Clear sessions
@@ -103,12 +103,12 @@ 
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function registerEmail(Request $request){
+    public function registerEmail(Request $request) {
 
         /**
          * Validate
          */
-        if(env('RECAPTCHA_ENABLED') == 1){
+        if (env('RECAPTCHA_ENABLED') == 1) {
             $this->validate($request, [
                 'email' => 'email|required|max:255',
                 'g-recaptcha-response' => 'required|recaptcha'
@@ -143,7 +143,7 @@ 
         /**
          * User not exists
          */
-        if(empty($user)){
+        if (empty($user)) {
 
             $login = $email;
             $password = str_random(10);
@@ -159,7 +159,7 @@ 
             /**
              * Save recommendation
              */
-            if(Cache::has('recommendation_id')){
+            if (Cache::has('recommendation_id')) {
 
                 $recommendation_id = Cache::get('recommendation_id');
 
@@ -177,7 +177,7 @@ 
                 /**
                  * If not , add to user
                  */
-                if(empty($test)){
+                if (empty($test)) {
                     $user->recommendation_id = $recommendation_id;
 
                 }
@@ -188,13 +188,13 @@ 
             /**
              * Send e-mail
              */
-            Mail::send(['emails.html.registration', 'emails.plain.registration'], [
+            Mail::send([ 'emails.html.registration', 'emails.plain.registration' ], [
                 'user' => $user,
                 'login' => $login,
                 'password' => $password,
                 'activation_code' => $activation_code
 
-            ], function ($message) {
+            ], function($message) {
                 $message->from(env('MAIL_FROM_EMAIL', 'info@surimail.cz'), env('MAIL_FROM_NAME', 'Surimail.cz'));
                 $message->to(request('email'), request('email'));
                 $message->subject('Registrace na serveru Surimail.cz');
@@ -207,7 +207,7 @@ 
         /**
          * User exists - error
          */
-        else{
+        else {
 
             $request->session()->flash('custom_error', 'Zadaný e-mail nebo IP již existuje');
         }
@@ -223,7 +223,7 @@ 
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function checkActivationCode($email, $activationCode, Request $request){
+    public function checkActivationCode($email, $activationCode, Request $request) {
 
         /**
          * Check if user exists
@@ -233,14 +233,14 @@ 
         /**
          * User not exists or code is not valid
          */
-        if(empty($user)){
+        if (empty($user)) {
             $request->session()->flash('custom_error', 'Zadaný e-mail neexistuje nebo je neplatný aktivační kód');
         }
 
         /**
          * User exists - activate him
          */
-        else{
+        else {
             $user->active = true;
             $user->activation_code = str_random(16);
             $user->save();
@@ -249,7 +249,7 @@ 
              * Add reward for registration
              */
             $rewardsCount = Transaction::where('transactionstatus_id', 5)->where('user_id', $user->id)->count();
-            if($rewardsCount < 1){
+            if ($rewardsCount < 1) {
 
                 /**
                  * Save transaction
@@ -261,25 +261,25 @@ 
              * Add reward for recommedation
              */
 
-            if(!empty($user->recomendation_id) ){
+            if (!empty($user->recomendation_id)) {
 
                 $recommendation = Recommendation::find($user->reccomendation_id);
 
-                if(!empty($recommendation)){
+                if (!empty($recommendation)) {
 
                    /**
                     * Check transaction
                     */
                     $transactionCount = Transaction::where('recommendation_id', $recommendation->id)->count();
 
-                    if($transactionCount < 1){
+                    if ($transactionCount < 1) {
 
                         /**
                          * Find user and save money
                          */
                         $rUser = User::find($recommendation->user_id);
 
-                        if(!empty($rUser)){
+                        if (!empty($rUser)) {
 
                             $this->_saveTransation(2, $rUser->id, $this->_getSettings(2));
                         }
@@ -288,12 +288,12 @@ 
             }
 
             $request->session()->flash('success', 'Gratulujeme, váš účet byl úspěšně aktivován. Přihlásit se můžete zde: '
-            . '<br><a href="'.route('admin.dashboard.index').'">'.route('admin.dashboard.index').'</a>');
+            . '<br><a href="' . route('admin.dashboard.index') . '">' . route('admin.dashboard.index') . '</a>');
 
             /**
              * Save reward
              */
-            if($user->recommendation_id != null && $user->recommendation_id > 0){
+            if ($user->recommendation_id != null && $user->recommendation_id > 0) {
 
                 /**
                  * Load recommendation
@@ -314,7 +314,7 @@ 
      * @param Request $request
      * @return View|void
      */
-    public function index($pageUrl, Request $request){
+    public function index($pageUrl, Request $request) {
 
         /**
          * Clear sessions
@@ -339,19 +339,19 @@ 
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function checkRecommmendation($id, Request $request){
+    public function checkRecommmendation($id, Request $request) {
 
         /**
          * @todo Use validator
          */
-        if(is_numeric($id)){
+        if (is_numeric($id)) {
 
             $recommendation = Recommendation::find($id);
 
             /**
              * If exists, than remember
              */
-            if(!empty($recommendation)){
+            if (!empty($recommendation)) {
                 Cache::forever('recommendation_id', $id);
             }
         }

Braces +1 added lines, -2 removed lines

@@ -113,8 +113,7 @@
                 'email' => 'email|required|max:255',
                 'g-recaptcha-response' => 'required|recaptcha'
             ]);
-        }
-        else {
+        } else {
 
             $this->validate($request, [
                 'email' => 'email|required|max:255'

app/Http/Controllers/Frontend/FrontendController.php

Spacing +25 added lines, -25 removed lines

@@ -31,9 +31,9 @@ 
      *
      * @var array
      */
-    protected $_arViewData = [];
+    protected $_arViewData = [ ];
 
-    protected $_arViewGeneratedData = [];
+    protected $_arViewGeneratedData = [ ];
 
     /**
      * Check if view exists, if so - return, if not throw 404
@@ -41,13 +41,13 @@ 
      * @param string $strView
      * @return View|void
      */
-    protected function _showViewOr404($strView){
+    protected function _showViewOr404($strView) {
 
 
         if (view()->exists($strView)) {
             return view($strView, $this->_arViewData);
         }
-        else{
+        else {
             return abort(404);
         }
     }
@@ -56,10 +56,10 @@ 
      * Save all inputs to session
      * @param $request
      */
-    protected function _saveSessionFields($request){
+    protected function _saveSessionFields($request) {
 
-        foreach ($request->all() as $key=>$value){
-            $arData[$key] = $value;
+        foreach ($request->all() as $key=>$value) {
+            $arData[ $key ] = $value;
         }
 
         $request->session()->put('frontend_fields', $arData);
@@ -68,7 +68,7 @@ 
     /**
      * Reset all session fields
      */
-    protected function _resetSessionFields($request){
+    protected function _resetSessionFields($request) {
 
         $request->session()->forget('frontend_fields');
     }
@@ -78,7 +78,7 @@ 
      *
      * @param $request
      */
-    protected function _calculatePrice($request){
+    protected function _calculatePrice($request) {
 
         return 0;
     }
@@ -89,24 +89,24 @@ 
      * @param $request
      * @return mixed
      */
-    protected function _getSessionFields($request){
+    protected function _getSessionFields($request) {
 
         $fields = $request->session()->get('frontend_fields');
 
-        if(isset($request->id)){
+        if (isset($request->id)) {
             //$fields['price'] = $this->_calculatePrice($request);
         }
 
-        if(isset($fields['city'])) {
-            $arCityInfo = explode('|', $fields['city']);
+        if (isset($fields[ 'city' ])) {
+            $arCityInfo = explode('|', $fields[ 'city' ]);
 
-            $fields['citypart'] = @trim($arCityInfo[0]);
-            $fields['citymain'] = @trim($arCityInfo[1]);
-            $fields['county'] = @trim($arCityInfo[2]);
-            $fields['zip'] = @trim($arCityInfo[3]);
+            $fields[ 'citypart' ] = @trim($arCityInfo[ 0 ]);
+            $fields[ 'citymain' ] = @trim($arCityInfo[ 1 ]);
+            $fields[ 'county' ] = @trim($arCityInfo[ 2 ]);
+            $fields[ 'zip' ] = @trim($arCityInfo[ 3 ]);
         }
 
-        $this->_arViewData['fields'] = $fields;
+        $this->_arViewData[ 'fields' ] = $fields;
     }
 
     /**
@@ -115,7 +115,7 @@ 
      * @param $url
      * @return mixed
      */
-    protected function _loadPageByUrl($url){
+    protected function _loadPageByUrl($url) {
 
         return Page::where('url', $url)->firstOrFail();
     }
@@ -126,18 +126,18 @@ 
      * @param $id
      * @return mixed
      */
-    protected function _loadPageById($id){
+    protected function _loadPageById($id) {
         return Page::findOrFail($id);
     }
 
-    protected function _getSettings($id){
+    protected function _getSettings($id) {
 
         $settings = Settings::find($id);
 
-        if(!empty($settings)){
-            return $settings['value'];
+        if (!empty($settings)) {
+            return $settings[ 'value' ];
         }
-        else{
+        else {
             return NULL;
         }
     }
@@ -151,7 +151,7 @@ 
      * @param $amount
      */
     protected function _saveTransation($status_id = 1, $user_id, $amount,
-                                       $campaign_id = null, $payment_id = null, $recommendation_id = null){
+                                       $campaign_id = null, $payment_id = null, $recommendation_id = null) {
 
         /**
          * Save transaction

Braces +2 added lines, -4 removed lines

@@ -46,8 +46,7 @@ 
 
         if (view()->exists($strView)) {
             return view($strView, $this->_arViewData);
-        }
-        else{
+        } else{
             return abort(404);
         }
     }
@@ -136,8 +135,7 @@ 
 
         if(!empty($settings)){
             return $settings['value'];
-        }
-        else{
+        } else{
             return NULL;
         }
     }

app/User.php

Spacing +8 added lines, -8 removed lines

@@ -41,29 +41,29 @@ 
      *
      * @var array
      */
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+    protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ];
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password', 'age', 'blacklisted', 'ip', 'activation_code', 'active',
-    'fname', 'sname', 'bno', 'city', 'citypart', 'street', 'hno', 'zip', 'registration_data', 'phone'];
+    protected $fillable = [ 'name', 'email', 'password', 'age', 'blacklisted', 'ip', 'activation_code', 'active',
+    'fname', 'sname', 'bno', 'city', 'citypart', 'street', 'hno', 'zip', 'registration_data', 'phone' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token'];
+    protected $hidden = [ 'password', 'remember_token' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = ['password'];
+    protected $excludedFromIndex = [ 'password' ];
     
     /**
      * Fields to search in fulltext mode
@@ -98,7 +98,7 @@ 
      * 
      * @return object
      */
-    public function articles(){
+    public function articles() {
         
         return $this->hasMany('App\Article', 'user_id');
     }
@@ -108,7 +108,7 @@ 
      *
      * @return object
      */
-    public function usergroups(){
+    public function usergroups() {
 
         return $this->belongsTo('App\Usergroup', 'usergroup_id');
     }
@@ -119,7 +119,7 @@ 
      * @param query $query
      * @return query
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('usergroups');
     }