Distilleries / Expendable

src/Distilleries/Expendable/Http/Middleware/XSS.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
         $input = $request->all();
 
-        array_walk_recursive($input, function (&$input) {
+        array_walk_recursive($input, function(&$input) {
 
             $input = (new Security)->xss_clean($input);
 

src/Distilleries/Expendable/Helpers/Security.php

Doc Comments +5 added lines, -1 removed lines

@@ -296,6 +296,10 @@ 
       * @param boolean $is_image TRUE if this is an image
       * @return string The string with the evil attributes removed
       */
+
+    /**
+     * @param boolean $evilAttribute
+     */
     protected function _remove_evil_attributes($str, $is_image, $evilAttribute)
     {
         // All javascript event handlers (e.g. onload, onclick, onmouseover), style, and xmlns
@@ -419,7 +423,7 @@ 
      * things like j a v a s c r i p t
      *
      * @param    type
-     * @return    type
+     * @return    string
      */
     protected function _compact_exploded_words($matches)
     {

Spacing +23 added lines, -23 removed lines

@@ -169,7 +169,7 @@ 
             // do the long opening tags.
             $str = preg_replace('/<\?(php)/i', "&lt;?\\1", $str);
         } else {
-            $str = str_replace(['<?', '?' . '>'], ['&lt;?', '?&gt;'], $str);
+            $str = str_replace(['<?', '?'.'>'], ['&lt;?', '?&gt;'], $str);
         }
 
         /*
@@ -195,12 +195,12 @@ 
             $temp = '';
 
             for ($i = 0, $wordlen = strlen($word); $i < $wordlen; $i++) {
-                $temp .= substr($word, $i, 1) . "\s*";
+                $temp .= substr($word, $i, 1)."\s*";
             }
 
             // We only want to do this when it is followed by a non-word character
             // That way valid stuff like "dealer to" does not become "dealerto"
-            $str = preg_replace_callback('#(' . substr($temp, 0, -3) . ')(\W)#is', [$this, '_compact_exploded_words'], $str);
+            $str = preg_replace_callback('#('.substr($temp, 0, -3).')(\W)#is', [$this, '_compact_exploded_words'], $str);
         }
 
         /*
@@ -240,7 +240,7 @@ 
            * Becomes: &lt;blink&gt;
            */
         $naughty = 'alert|applet|audio|basefont|base|behavior|bgsound|blink|body|embed|expression|form|frameset|frame|head|html|ilayer|iframe|input|isindex|layer|link|meta|object|plaintext|style|script|textarea|title|video|xml|xss';
-        $str     = preg_replace_callback('#<(/*\s*)(' . $naughty . ')([^><]*)([><]*)#is', [$this, '_sanitize_naughty_html'], $str);
+        $str     = preg_replace_callback('#<(/*\s*)('.$naughty.')([^><]*)([><]*)#is', [$this, '_sanitize_naughty_html'], $str);
 
         /*
            * Sanitize naughty scripting elements
@@ -315,7 +315,7 @@ 
 
         do {
             $str = preg_replace(
-                "#<(/?[^><]+?)([^A-Za-z\-])(" . implode('|', $evil_attributes) . ")(\s*=\s*)([\"][^>]*?[\"]|[\'][^>]*?[\']|[^>]*?)([\s><])([><]*)#i",
+                "#<(/?[^><]+?)([^A-Za-z\-])(".implode('|', $evil_attributes).")(\s*=\s*)([\"][^>]*?[\"]|[\'][^>]*?[\']|[^>]*?)([\s><])([><]*)#i",
                 "<$1$6",
                 $str, -1, $count
             );
@@ -386,17 +386,17 @@ 
             '?',
             "%20",
             "%22",
-            "%3c",        // <
-            "%253c",    // <
-            "%3e",        // >
-            "%0e",        // >
-            "%28",        // (
-            "%29",        // )
-            "%2528",    // (
-            "%26",        // &
-            "%24",        // $
-            "%3f",        // ?
-            "%3b",        // ;
+            "%3c", // <
+            "%253c", // <
+            "%3e", // >
+            "%0e", // >
+            "%28", // (
+            "%29", // )
+            "%2528", // (
+            "%26", // &
+            "%24", // $
+            "%3f", // ?
+            "%3b", // ;
             "%3d"        // =
         ];
 
@@ -423,7 +423,7 @@ 
      */
     protected function _compact_exploded_words($matches)
     {
-        return preg_replace('/\s+/s', '', $matches[1]) . $matches[2];
+        return preg_replace('/\s+/s', '', $matches[1]).$matches[2];
     }
 
     // --------------------------------------------------------------------
@@ -439,7 +439,7 @@ 
     protected function _sanitize_naughty_html($matches)
     {
         // encode opening brace
-        $str = '&lt;' . $matches[1] . $matches[2] . $matches[3];
+        $str = '&lt;'.$matches[1].$matches[2].$matches[3];
 
         // encode captured opening or closing brace to prevent recursive vectors
         $str .= str_replace(['>', '<'], ['&gt;', '&lt;'],
@@ -571,7 +571,7 @@ 
 
         // 901119URL5918AMP18930PROTECT8198
 
-        $str = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-]+)|i', $this->xss_hash() . "\\1=\\2", $str);
+        $str = preg_replace('|\&([a-z\_0-9\-]+)\=([a-z\_0-9\-]+)|i', $this->xss_hash()."\\1=\\2", $str);
 
         /*
          * Validate standard character entities
@@ -609,7 +609,7 @@ 
         $str = str_replace(array_keys($this->_never_allowed_str), $this->_never_allowed_str, $str);
 
         foreach ($this->_never_allowed_regex as $regex) {
-            $str = preg_replace('#' . $regex . '#is', '[removed]', $str);
+            $str = preg_replace('#'.$regex.'#is', '[removed]', $str);
         }
 
         return $str;
@@ -624,11 +624,11 @@ 
         // carriage return (dec 13), and horizontal tab (dec 09)
 
         if ($url_encoded) {
-            $non_displayables[] = '/%0[0-8bcef]/';    // url encoded 00-08, 11, 12, 14, 15
-            $non_displayables[] = '/%1[0-9a-f]/';    // url encoded 16-31
+            $non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
+            $non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
         }
 
-        $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';    // 00-08, 11, 12, 14-31, 127
+        $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
         do {
             $str = preg_replace($non_displayables, '', $str, -1, $count);

src/Distilleries/Expendable/Models/BaseModel.php

Spacing +11 added lines, -11 removed lines

@@ -520,16 +520,16 @@ 
     public function scopeSearch($query, $searchQuery)
     {
 
-        return $query->where(function ($query) use ($searchQuery) {
+        return $query->where(function($query) use ($searchQuery) {
             $columns = $this->getAllColumnsNames();
 
             foreach ($columns as $column) {
-                $column = $this->isReserved($column) ? '"' . $column . '"' : $column;
+                $column = $this->isReserved($column) ? '"'.$column.'"' : $column;
 
                 if ((DB::connection()->getDriverName()) == 'oracle') {
-                    $query->orWhereRaw('LOWER(' . $column . ') like ? ESCAPE \'\\\'', ['%' . Security::escapeLike(strtolower($searchQuery)) . '%']);
+                    $query->orWhereRaw('LOWER('.$column.') like ? ESCAPE \'\\\'', ['%'.Security::escapeLike(strtolower($searchQuery)).'%']);
                 } else {
-                    $query->orwhere($column, 'like', '%' . Security::escapeLike($searchQuery,'\\\'') . '%');
+                    $query->orwhere($column, 'like', '%'.Security::escapeLike($searchQuery, '\\\'').'%');
                 }
 
             }
@@ -540,13 +540,13 @@ 
     {
         switch (DB::connection()->getDriverName()) {
             case 'pgsql':
-                $query       = "SELECT column_name FROM information_schema.columns WHERE table_name = '" . $this->getTable() . "'";
+                $query       = "SELECT column_name FROM information_schema.columns WHERE table_name = '".$this->getTable()."'";
                 $column_name = 'column_name';
                 $reverse     = true;
                 break;
 
             case 'mysql':
-                $query       = 'SHOW COLUMNS FROM ' . $this->getTable();
+                $query       = 'SHOW COLUMNS FROM '.$this->getTable();
                 $column_name = 'Field';
                 $reverse     = false;
                 break;
@@ -555,17 +555,17 @@ 
                 $parts       = explode('.', $this->getTable());
                 $num         = (count($parts) - 1);
                 $table       = $parts[$num];
-                $query       = "SELECT column_name FROM " . DB::connection()->getConfig('database') . ".INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = N'" . $table . "'";
+                $query       = "SELECT column_name FROM ".DB::connection()->getConfig('database').".INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = N'".$table."'";
                 $column_name = 'column_name';
                 $reverse     = false;
                 break;
             case 'oracle':
-                $query       = 'SELECT COLUMN_NAME from ALL_TAB_COLUMNS WHERE TABLE_NAME=\'' . strtoupper($this->getTable()) . '\' AND DATA_TYPE <> \'CLOB\' AND DATA_TYPE <> \'NUMBER\' AND DATA_TYPE <> \'TIMESTAMP\'';
+                $query       = 'SELECT COLUMN_NAME from ALL_TAB_COLUMNS WHERE TABLE_NAME=\''.strtoupper($this->getTable()).'\' AND DATA_TYPE <> \'CLOB\' AND DATA_TYPE <> \'NUMBER\' AND DATA_TYPE <> \'TIMESTAMP\'';
                 $column_name = 'column_name';
                 $reverse     = false;
                 break;
             default:
-                $error = 'Database driver not supported: ' . DB::connection()->getConfig('driver');
+                $error = 'Database driver not supported: '.DB::connection()->getConfig('driver');
                 throw new Exception($error);
         }
 
@@ -584,12 +584,12 @@ 
 
     public function scopeBetweenCreate($query, $start, $end)
     {
-        return $query->whereBetween($this->getTable() . '.created_at', [$start, $end]);
+        return $query->whereBetween($this->getTable().'.created_at', [$start, $end]);
     }
 
     public function scopeBetweenUpdate($query, $start, $end)
     {
-        return $query->whereBetween($this->getTable() . '.updated_at', [$start, $end]);
+        return $query->whereBetween($this->getTable().'.updated_at', [$start, $end]);
     }
 
 

src/Distilleries/Expendable/Forms/Role/RoleForm.php

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
 
     protected function getUpdateRules()
     {
-        $key                           = \Request::get($this->model->getKeyName());
-        static::$rules_update['initials'] = 'required|unique:roles,initials' . $key;
+        $key = \Request::get($this->model->getKeyName());
+        static::$rules_update['initials'] = 'required|unique:roles,initials'.$key;
 
         return parent::getUpdateRules();
     }

src/Distilleries/Expendable/Http/Controllers/Admin/LoginController.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
     {
         parent::__construct($layoutManager);
 
-        $this->auth      = $auth;
+        $this->auth = $auth;
 
     }
 
@@ -38,7 +38,7 @@ 
 
     public function getLoginRedirect()
     {
-        return redirect()->action('\\' . self::class . '@getIndex');
+        return redirect()->action('\\'.self::class.'@getIndex');
     }
 
     public function getIndex()
@@ -208,7 +208,7 @@ 
         );
 
 
-        $response = $this->broker()->reset($credentials, function ($user, $password) {
+        $response = $this->broker()->reset($credentials, function($user, $password) {
             $user->password = bcrypt($password);
             $user->save();
 
@@ -229,7 +229,7 @@ 
                 return redirect()->back()->with('error', trans($response));
 
             case \Password::PASSWORD_RESET:
-                return redirect()->to(action('\\' . get_class($this) . '@getIndex'));
+                return redirect()->to(action('\\'.get_class($this).'@getIndex'));
         }
 
     }

src/Distilleries/Expendable/Http/Router/Router.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         // First, we will check to see if a controller prefix has been registered in
         // the route group. If it has, we will need to prefix it before trying to
         // reflect into the class instance and pull out the method for routing.
-        if (! empty($this->groupStack)) {
+        if (!empty($this->groupStack)) {
             $prepended = $this->prependGroupUses($controller);
         }
         $routable = (new ControllerInspector)

src/Distilleries/Expendable/Http/Middleware/LanguageDetector.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      *
      * @param \Illuminate\Http\Request $request
      * @param \Closure $next
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function handle($request, Closure $next)
     {

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         preg_match_all('/(\W|^)([a-z]{2})([^a-z]|$)/six', $request->server->get('HTTP_ACCEPT_LANGUAGE'), $m, PREG_PATTERN_ORDER);
 
         $user_langs = $m[2];
-        if (! empty($user_langs[0])) {
+        if (!empty($user_langs[0])) {
             $total = Language::where('iso', '=', $user_langs[0])->count();
             if ($total > 0) {
                 return redirect()->to('/'.$user_langs[0]);

src/Distilleries/Expendable/Http/Middleware/Secure.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function handle($request, Closure $next)
     {
 
-        if (! $request->isSecure() and env('SECURE_COOKIE', false)) {
+        if (!$request->isSecure() and env('SECURE_COOKIE', false)) {
             if (strpos($request->getRequestUri(), '/storage/') === false) {
                 return redirect()->secure($request->getRequestUri());
             }

src/Distilleries/Expendable/Http/Middleware/Cache.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
         if (config('cache.enabled') === true) {
             $url = $request->url();
 
-            $key = md5($url . json_encode($request->query()));
-            $value = \Cache::remember($key, config('cache.minutes'), function () use ($next, $request) {
+            $key = md5($url.json_encode($request->query()));
+            $value = \Cache::remember($key, config('cache.minutes'), function() use ($next, $request) {
                 return $next($request);
             });