crocodic-studio / crudbooster

src/helpers/Helper.php

Spacing +75 added lines, -75 removed lines

@@ -3,58 +3,58 @@ 
 /*
  * Theme Helper
  */
-if(!function_exists("themeLoginBackground")) {
+if (!function_exists("themeLoginBackground")) {
     function themeLoginBackground() {
         return "crudbooster::layouts.login_background_css";
     }
 }
-if(!function_exists("themeFlashMessage")) {
+if (!function_exists("themeFlashMessage")) {
     function themeFlashMessage() {
         return "crudbooster::layouts.flash_message";
     }
 }
 
-if(!function_exists("themeAlertMessage")) {
+if (!function_exists("themeAlertMessage")) {
     function themeAlertMessage() {
         return "crudbooster::layouts.alert_message";
     }
 }
 
-if(!function_exists("themeLayoutPageTitleAndButton")) {
+if (!function_exists("themeLayoutPageTitleAndButton")) {
     function themeLayoutPageTitleAndButton() {
         return 'crudbooster::module.index.index_head_buttons';
     }
 }
 
-if(!function_exists("themeLayoutHead")) {
+if (!function_exists("themeLayoutHead")) {
     function themeLayoutHead() {
         return "crudbooster::layouts.head";
     }
 }
-if(!function_exists("themeTitle")) {
+if (!function_exists("themeTitle")) {
     function themeTitle($page_title) {
-        $page_title = isset($page_title)?$page_title:module()->getPageTitle();
-        return (isset($page_title))?cb()->getAppName().': '.strip_tags($page_title):"Admin Area";
+        $page_title = isset($page_title) ? $page_title : module()->getPageTitle();
+        return (isset($page_title)) ?cb()->getAppName().': '.strip_tags($page_title) : "Admin Area";
     }
 }
 
-if(!function_exists("getThemePath")) {
+if (!function_exists("getThemePath")) {
     function getThemePath($path = null) {
-        return getSetting("theme_path", "crudbooster::themes.adminlte").(($path)?".".$path:null);
+        return getSetting("theme_path", "crudbooster::themes.adminlte").(($path) ? ".".$path : null);
     }
 }
 
 // End Theme Helper
 
-if(!function_exists("isConfigCached")) {
+if (!function_exists("isConfigCached")) {
     function isConfigCached()
     {
-        if(env("APP_NAME")=="" || env("APP_NAME")==null) return true;
+        if (env("APP_NAME") == "" || env("APP_NAME") == null) return true;
         else return false;
     }
 }
 
-if(!function_exists("miscellanousSingleton")) {
+if (!function_exists("miscellanousSingleton")) {
     /**
      * @return \crocodicstudio\crudbooster\helpers\MiscellanousSingleton
      */
@@ -63,14 +63,14 @@ 
     }
 }
 
-if(!function_exists("makeReferalUrl")) {
+if (!function_exists("makeReferalUrl")) {
     function makeReferalUrl($name = null) {
         $ref = [];
         $ref['url'] = request()->fullUrl();
         $ref['name'] = $name;
         $md5Hash = md5(serialize($ref));
 
-        if($exist = \Illuminate\Support\Facades\Cache::get("refurl_".$md5Hash)) {
+        if ($exist = \Illuminate\Support\Facades\Cache::get("refurl_".$md5Hash)) {
             return $exist['id'];
         }
 
@@ -82,12 +82,12 @@ 
     }
 }
 
-if(!function_exists("getReferalUrl")) {
+if (!function_exists("getReferalUrl")) {
     function getReferalUrl($key = null) {
-        if(verifyReferalUrl()) {
+        if (verifyReferalUrl()) {
             $md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"));
             $ref = \Illuminate\Support\Facades\Cache::get("refurl_".$md5hash);
-            if($key) {
+            if ($key) {
                 return @$ref[$key];
             } else {
                 return $ref;
@@ -97,13 +97,13 @@ 
     }
 }
 
-if(!function_exists("verifyReferalUrl")) {
+if (!function_exists("verifyReferalUrl")) {
     function verifyReferalUrl()
     {
-        if(request("ref")) {
-            if($md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"))) {
+        if (request("ref")) {
+            if ($md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"))) {
                 $ref = \Illuminate\Support\Facades\Cache::get("refurl_".$md5hash);
-                if(filter_var($ref['url'], FILTER_VALIDATE_URL)) {
+                if (filter_var($ref['url'], FILTER_VALIDATE_URL)) {
                     return true;
                 }
             }
@@ -112,7 +112,7 @@ 
     }
 }
 
-if(!function_exists("putHtaccess")) {
+if (!function_exists("putHtaccess")) {
     function putHtaccess($stringToPut)
     {
         file_put_contents(base_path(".htaccess"), "\n".$stringToPut, FILE_APPEND);
@@ -120,13 +120,13 @@ 
     }
 }
 
-if(!function_exists("checkHtaccess")) {
+if (!function_exists("checkHtaccess")) {
     function checkHtaccess($stringToCheck)
     {
-        if(file_exists(base_path(".htaccess")) && file_exists(public_path(".htaccess"))) {
+        if (file_exists(base_path(".htaccess")) && file_exists(public_path(".htaccess"))) {
             $htaccess = file_get_contents(base_path(".htaccess"));
-            $htaccess2= file_get_contents(public_path(".htaccess"));
-            if(\Illuminate\Support\Str::contains($htaccess, $stringToCheck) && \Illuminate\Support\Str::contains($htaccess2, $stringToCheck)) {
+            $htaccess2 = file_get_contents(public_path(".htaccess"));
+            if (\Illuminate\Support\Str::contains($htaccess, $stringToCheck) && \Illuminate\Support\Str::contains($htaccess2, $stringToCheck)) {
                 return true;
             }
         }
@@ -135,7 +135,7 @@ 
     }
 }
 
-if(!function_exists("setEnvironmentValue")) {
+if (!function_exists("setEnvironmentValue")) {
     function setEnvironmentValue(array $values)
     {
         $envFile = app()->environmentFilePath();
@@ -166,7 +166,7 @@ 
 }
 
 
-if(!function_exists("cbLang")) {
+if (!function_exists("cbLang")) {
     /**
      * @param string $key
      * @param array $replace
@@ -178,17 +178,17 @@ 
     }
 }
 
-if(!function_exists('rglob')) {
+if (!function_exists('rglob')) {
     function rglob($pattern, $flags = 0) {
         $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
             $files = array_merge($files, rglob($dir.'/'.basename($pattern), $flags));
         }
         return $files;
     }
 }
 
-if(!function_exists('convertPHPToMomentFormat')) {
+if (!function_exists('convertPHPToMomentFormat')) {
     function convertPHPToMomentFormat($format)
     {
         $replacements = [
@@ -235,13 +235,13 @@ 
     }
 }
 
-if(!function_exists('slug')) {
+if (!function_exists('slug')) {
     function slug($string, $separator = '-') {
         return \Illuminate\Support\Str::slug($string, $separator);
     }
 }
 
-if(!function_exists('columnSingleton')) {
+if (!function_exists('columnSingleton')) {
     /**
      * @return \crocodicstudio\crudbooster\controllers\scaffolding\singletons\ColumnSingleton
      */
@@ -250,7 +250,7 @@ 
     }
 }
 
-if(!function_exists('cbHook'))
+if (!function_exists('cbHook'))
 {
     /**
      * @return crocodicstudio\crudbooster\hooks\CBHook
@@ -262,7 +262,7 @@ 
     }
 }
 
-if(!function_exists('getTypeHook'))
+if (!function_exists('getTypeHook'))
 {
     /**
      * @param string $type
@@ -275,7 +275,7 @@ 
     }
 }
 
-if(!function_exists('getPrimaryKey'))
+if (!function_exists('getPrimaryKey'))
 {
     function getPrimaryKey($table_name)
     {
@@ -283,7 +283,7 @@ 
     }
 }
 
-if(!function_exists('cb'))
+if (!function_exists('cb'))
 {
     function cb()
     {
@@ -291,25 +291,25 @@ 
     }
 }
 
-if(!function_exists('cbAsset')) {
+if (!function_exists('cbAsset')) {
     function cbAsset($path, $secure = null) {
         return asset("cb_asset/".$path, $secure);
     }
 }
 
-if(!function_exists("cbConfig")) {
+if (!function_exists("cbConfig")) {
     function cbConfig($name, $default = null) {
         return config("crudbooster.".$name, $default);
     }
 }
 
-if(!function_exists("strRandom")) {
+if (!function_exists("strRandom")) {
     function strRandom($length = 5) {
         return \Illuminate\Support\Str::random($length);
     }
 }
 
-if(!function_exists('module')) {
+if (!function_exists('module')) {
     function module()
     {
         $module = new \crocodicstudio\crudbooster\helpers\Module();
@@ -317,21 +317,21 @@ 
     }
 }
 
-if(!function_exists('getAdminLoginURL')) {
+if (!function_exists('getAdminLoginURL')) {
     function getAdminLoginURL()
     {
         return cb()->getAdminUrl("login");
     }
 }
 
-if(!function_exists('dummyPhoto')) {
+if (!function_exists('dummyPhoto')) {
     function dummyPhoto()
     {
         return cbConfig("DUMMY_PHOTO");
     }
 }
 
-if(!function_exists('extract_unit')) {	
+if (!function_exists('extract_unit')) {	
 	/*
 	Credits: Bit Repository
 	URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html
@@ -356,14 +356,14 @@ 
 |
 */
 
-if(!function_exists('putSetting')) {
+if (!function_exists('putSetting')) {
     function putSetting($key, $value)
     {
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
@@ -377,31 +377,31 @@ 
     }
 }
 
-if(!function_exists('getSetting')) {
+if (!function_exists('getSetting')) {
     function getSetting($key, $default = null)
     {
-        if($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) {
+        if ($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) {
             return $cache;
         }
 
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
-        if(isset($settings[$key])) {
+        if (isset($settings[$key])) {
             \Illuminate\Support\Facades\Cache::forever("setting_".$key, $settings[$key]);
-            return $settings[$key]?:$default;
-        }else{
+            return $settings[$key] ?: $default;
+        } else {
             return $default;
         }
     }
 }
 
-if(!function_exists('timeAgo')) {
+if (!function_exists('timeAgo')) {
     function timeAgo($datetime_to, $datetime_from = null, $full = false)
     {
         $datetime_from = ($datetime_from) ?: date('Y-m-d H:i:s');
@@ -432,7 +432,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -440,22 +440,22 @@ 
     }
 }
 
-if(!function_exists("array_map_r")) {
-    function array_map_r( $func, $arr )
+if (!function_exists("array_map_r")) {
+    function array_map_r($func, $arr)
     {
         $newArr = array();
 
-        foreach( $arr as $key => $value )
+        foreach ($arr as $key => $value)
         {
             $key = $func($key);
-            $newArr[ $key ] = ( is_array( $value ) ? array_map_r( $func, $value ) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value ) ) );
+            $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value)));
         }
 
         return $newArr;
     }
 }
 
-if(!function_exists("sanitizeXSS"))
+if (!function_exists("sanitizeXSS"))
 {
     function sanitizeXSS($value)
     {
@@ -467,7 +467,7 @@ 
     }
 }
 
-if(!function_exists("requestAll")) {
+if (!function_exists("requestAll")) {
     function requestAll() {
         $all = array_map_r("sanitizeXSS", request()->all());
         return $all;
@@ -476,22 +476,22 @@ 
 
 
 
-if(!function_exists('getURLFormat')) {
+if (!function_exists('getURLFormat')) {
     function getURLFormat($name) {
         $url = request($name);
-        if(filter_var($url, FILTER_VALIDATE_URL)) {
+        if (filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else {
             return request()->url();
         }
     }
 }
 
-if(!function_exists('g')) {
+if (!function_exists('g')) {
     function g($name, $safe = true) {
-        if($safe == true) {
+        if ($safe == true) {
             $response = request($name);
-            if(is_string($response)) {
+            if (is_string($response)) {
                 $response = sanitizeXSS($response);
             }elseif (is_array($response)) {
                 array_walk_recursive($response, function(&$response) {
@@ -500,25 +500,25 @@ 
             }
 
             return $response;
-        }else{
+        } else {
             return Request::get($name);
         }
     }
 }
 
-if(!function_exists('min_var_export')) {
+if (!function_exists('min_var_export')) {
     function min_var_export($input) {
-        if(is_array($input)) {
+        if (is_array($input)) {
             $buffer = [];
-            foreach($input as $key => $value)
+            foreach ($input as $key => $value)
                 $buffer[] = var_export($key, true)."=>".min_var_export($value);
-            return "[".implode(",",$buffer)."]";
+            return "[".implode(",", $buffer)."]";
         } else
             return var_export($input, true);
     }
 }
 
-if(!function_exists('rrmdir')) {
+if (!function_exists('rrmdir')) {
 	/*
 	* http://stackoverflow.com/questions/3338123/how-do-i-recursively-delete-a-directory-and-its-entire-contents-files-sub-dir
 	*/

src/configs/crudbooster.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@ 
     /*
      * For security reason we have limit the upload file formats bellow
      */
-    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'],
+    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'],
 
-    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'],
+    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'],
 
     /*
      * Override Local FileSystem From Storage To Another
@@ -58,5 +58,5 @@ 
      * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration"
      * The default is all cb_ prefix will be include in data migration
      */
-    'ADDITIONAL_DATA_MIGRATION'=>['users','migrations']
+    'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations']
 ];
\ No newline at end of file

src/controllers/AdminAuthController.php

Spacing +12 added lines, -12 removed lines

@@ -20,31 +20,31 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if (!auth()->guest()) return redirect(cb()->getAdminUrl());
 
         cbHook()->hookGetLogin();
 
         $data = [];
-        $data['no1'] = rand(1,10);
-        $data['no2'] = rand(1,10);
-        Session::put("captcha_result", $data['no1']+$data['no2']);
+        $data['no1'] = rand(1, 10);
+        $data['no2'] = rand(1, 10);
+        Session::put("captcha_result", $data['no1'] + $data['no2']);
 
         $themeView = getThemePath("login");
-        $loginView = str_replace(".blade.php", "", getSetting('login_page_view',$themeView));
-        return view($loginView, $data );
+        $loginView = str_replace(".blade.php", "", getSetting('login_page_view', $themeView));
+        return view($loginView, $data);
     }
 
     public function postLogin()
     {
-        try{
-            if($this->isSuspendedLogin()) throw new CBValidationException(cbLang("you_have_been_suspended"));
+        try {
+            if ($this->isSuspendedLogin()) throw new CBValidationException(cbLang("you_have_been_suspended"));
 
             cb()->validation([
                 'email'=>'required|email',
                 'password'=>'required'
             ]);
 
-            $credential = request()->only(['email','password']);
+            $credential = request()->only(['email', 'password']);
             if (auth()->attempt($credential)) {
 
                 // When login user success, clear suspend attempt
@@ -55,10 +55,10 @@ 
                 return redirect(cb()->getAdminUrl());
             } else {
                 $this->incrementFailedLogin();
-                return redirect(cb()->getLoginUrl())->with(['message'=>cbLang('password_and_username_is_wrong'),'message_type'=>'warning']);
+                return redirect(cb()->getLoginUrl())->with(['message'=>cbLang('password_and_username_is_wrong'), 'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
-            return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(cb()->getAdminUrl("login"), $e->getMessage(), 'warning');
         }
     }