jdrda / olapus

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/Media/ImageController.php

Spacing +7 added lines, -7 removed lines

@@ -52,17 +52,17 @@ 
         /**
          * File not cached
          */
-        else{
+        else {
             
             /**
              * Get META information
              */
-            $imageMeta = Image::where(['url' => $request->imageName, 'image_extension' => $request->imageExtension])->first(['image_mime_type', 'image_size', 'id', 'updated_at', 'image_etag']);
+            $imageMeta = Image::where([ 'url' => $request->imageName, 'image_extension' => $request->imageExtension ])->first([ 'image_mime_type', 'image_size', 'id', 'updated_at', 'image_etag' ]);
             
             /**
              * File does not exist
              */
-            if(empty($imageMeta) == TRUE){
+            if (empty($imageMeta) == TRUE) {
                 App::abort(404);
             }
             
@@ -91,7 +91,7 @@ 
             'Content-Type'              => $imageMeta->image_mime_type,
             'Content-Transfer-Encoding' => 'binary',
             'Pragma'                    => 'public',
-            'Expires'                   => Carbon::createFromTimestamp(time()+3600)->toRfc2822String(),
+            'Expires'                   => Carbon::createFromTimestamp(time() + 3600)->toRfc2822String(),
             'Last-Modified'             => $imageMeta->updated_at->toRfc2822String(),
             'Etag'                      => $imageMeta->image_etag,
         );
@@ -99,8 +99,8 @@ 
         /**
          * Response code cached
          */
-        if( (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $imageMeta->image_etag)
-                || (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $imageMeta->updated_at->toRfc2822String()) ){
+        if ((isset($_SERVER[ 'HTTP_IF_NONE_MATCH' ]) && $_SERVER[ 'HTTP_IF_NONE_MATCH' ] == $imageMeta->image_etag)
+                || (isset($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ]) && $_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ] == $imageMeta->updated_at->toRfc2822String())) {
             
             $responseCode = 304;
         }
@@ -108,7 +108,7 @@ 
         /**
          * Response code not cached, but OK
          */
-        else{
+        else {
             
             $responseCode = 200;
         }

app/AdminModelTrait.php

Spacing +17 added lines, -17 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,30 +90,30 @@ 
      *
      * @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);
                 
-                $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){
+                if (is_numeric($value) == TRUE) {
                     
-                    $query->where(strtolower($key)."_id", '=', $value);
+                    $query->where(strtolower($key) . "_id", '=', $value);
                 }
             }
             
-             request()->merge(['external_tables_filter' => $allTables]);
+             request()->merge([ 'external_tables_filter' => $allTables ]);
         }
         
         return $query;