@@ -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 | |
@@ -28,7 +28,6 @@ |
||
| 28 | 28 | use App\Models\DbConfig; |
| 29 | 29 | use Cache; |
| 30 | 30 | use Config; |
| 31 | -use DB; |
|
| 32 | 31 | use Illuminate\Contracts\Config\Repository as ConfigContract; |
| 33 | 32 | |
| 34 | 33 | // adds the possibility to replace the default Config facade |
@@ -50,8 +50,7 @@ discard block |
||
| 50 | 50 | DbConfig::updateOrCreate(['config_name' => $k], ['config_value' => $v]); |
| 51 | 51 | Cache::put($k, $v, $this->cache_time); |
| 52 | 52 | } |
| 53 | - } |
|
| 54 | - else { |
|
| 53 | + } else { |
|
| 55 | 54 | DbConfig::updateOrCreate(['config_name' => $key], ['config_value' => $value]); |
| 56 | 55 | Cache::put($key, $value, $this->cache_time); |
| 57 | 56 | } |
@@ -68,16 +67,14 @@ discard block |
||
| 68 | 67 | if (count($db_data) == 1 && $db_data->first()->config_name == $key) { |
| 69 | 68 | // return a bare value if we are getting one item |
| 70 | 69 | return $db_data->first()->config_value; |
| 71 | - } |
|
| 72 | - elseif (count($db_data) >= 1) { |
|
| 70 | + } elseif (count($db_data) >= 1) { |
|
| 73 | 71 | $result = self::collectionToArray($db_data, $key); |
| 74 | 72 | $config = Config::get('config.' . $key, $default); |
| 75 | 73 | if (!is_null($config)) { |
| 76 | 74 | $result = array_replace_recursive($config, $result); |
| 77 | 75 | } |
| 78 | 76 | return $result; |
| 79 | - } |
|
| 80 | - else { |
|
| 77 | + } else { |
|
| 81 | 78 | return Config::get('config.' . $key, $default); |
| 82 | 79 | } |
| 83 | 80 | |
@@ -166,8 +163,7 @@ discard block |
||
| 166 | 163 | $currentPath = array_merge($path, array($key)); |
| 167 | 164 | if (is_array($val)) { |
| 168 | 165 | $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath)); |
| 169 | - } |
|
| 170 | - else { |
|
| 166 | + } else { |
|
| 171 | 167 | $result[$prefix . join('.', $currentPath)] = $val; |
| 172 | 168 | } |
| 173 | 169 | } |