@@ -17,8 +17,6 @@ |
||
| 17 | 17 | |
| 18 | 18 | namespace App\Http\Controllers; |
| 19 | 19 | |
| 20 | -use App\Http\Requests; |
|
| 21 | -use App\Models\DbConfig; |
|
| 22 | 20 | use Illuminate\Http\Request; |
| 23 | 21 | use Settings; |
| 24 | 22 | |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | public function scopeKey($query, $key) |
| 51 | 51 | { |
| 52 | - return $query->where('config_name', 'LIKE', $key . '%'); |
|
| 52 | + return $query->where('config_name', 'LIKE', $key.'%'); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | public function scopeExactKey($query, $key) |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | // save the value to the database |
| 73 | 73 | if (is_array($value)) { |
| 74 | 74 | foreach ($value as $k => $v) { |
| 75 | - if(!empty($key)) { |
|
| 75 | + if (!empty($key)) { |
|
| 76 | 76 | $temp = $key.'.'.$k; |
| 77 | 77 | } else { |
| 78 | 78 | $temp = $k; |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | private static function recursive_keys(array $array, $prefix = "", array $path = array()) |
| 104 | 104 | { |
| 105 | 105 | if ($prefix != "") { |
| 106 | - $prefix = trim($prefix, '.') . '.'; |
|
| 106 | + $prefix = trim($prefix, '.').'.'; |
|
| 107 | 107 | } |
| 108 | 108 | $result = array(); |
| 109 | 109 | foreach ($array as $key => $val) { |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath)); |
| 113 | 113 | } |
| 114 | 114 | else { |
| 115 | - $result[$prefix . join('.', $currentPath)] = $val; |
|
| 115 | + $result[$prefix.join('.', $currentPath)] = $val; |
|
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | return $result; |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | public function get($key, $default = null) |
| 129 | 129 | { |
| 130 | 130 | // return value from cache or fetch it and return it |
| 131 | - return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function () use ($key, $default) { |
|
| 131 | + return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function() use ($key, $default) { |
|
| 132 | 132 | $db_data = DbConfig::key($key)->get(['config_name', 'config_value']); |
| 133 | 133 | |
| 134 | 134 | if (count($db_data) == 1 && $db_data->first()->config_name == $key) { |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | elseif (count($db_data) >= 1) { |
| 139 | 139 | // convert collection to an array and merge with the config fallback |
| 140 | 140 | $result = self::collectionToArray($db_data, $key); |
| 141 | - $config = Config::get('config.' . $key, $default); |
|
| 141 | + $config = Config::get('config.'.$key, $default); |
|
| 142 | 142 | if (!is_null($config) && is_array($config)) { |
| 143 | 143 | $result = array_replace_recursive($config, $result); |
| 144 | 144 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | } |
| 147 | 147 | else { |
| 148 | 148 | // fallback to the config or return the default value |
| 149 | - return Config::get('config.' . $key, $default); |
|
| 149 | + return Config::get('config.'.$key, $default); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | }); |