@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | if (isset($route_options['middleware'])) { |
| 38 | 38 | $route_options['middleware'] = |
| 39 | - array_unique(array_merge( |
|
| 40 | - array_keys($this->middleware), |
|
| 41 | - is_array($route_options['middleware']) ? |
|
| 39 | + array_unique(array_merge( |
|
| 40 | + array_keys($this->middleware), |
|
| 41 | + is_array($route_options['middleware']) ? |
|
| 42 | 42 | $route_options['middleware'] : [$route_options['middleware']] |
| 43 | 43 | )); |
| 44 | 44 | } else { |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | foreach ($route['action'] as $key => $value) { |
| 78 | 78 | if ($key == "middleware") { |
| 79 | 79 | $this->route_options['middleware'] = |
| 80 | - array_unique(array_merge( |
|
| 81 | - $this->route_options['middleware'], |
|
| 82 | - is_array($value) ? $value : [$value] |
|
| 80 | + array_unique(array_merge( |
|
| 81 | + $this->route_options['middleware'], |
|
| 82 | + is_array($value) ? $value : [$value] |
|
| 83 | 83 | )); |
| 84 | 84 | } elseif ($key == "uses") { |
| 85 | 85 | $this->route_options[$key] = "\\{$value}"; |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $router->get( |
| 103 | 103 | $this->route_path . '/resources', |
| 104 | 104 | ['uses' => 'LumenerController@getResource', |
| 105 | - 'as' => 'lumener-resources'] |
|
| 105 | + 'as' => 'lumener-resources'] |
|
| 106 | 106 | ); |
| 107 | 107 | }); |
| 108 | 108 | } |
@@ -169,6 +169,6 @@ discard block |
||
| 169 | 169 | 'command.lumener.update', |
| 170 | 170 | 'command.lumener.stylize', |
| 171 | 171 | 'command.lumener.plugin' |
| 172 | - ]; |
|
| 172 | + ]; |
|
| 173 | 173 | } |
| 174 | 174 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | // Laravel |
| 62 | 62 | // TODO: Merge routes for laravel |
| 63 | 63 | \Route::namespace($this->namespace) |
| 64 | - ->group(function () { |
|
| 64 | + ->group(function() { |
|
| 65 | 65 | Route::any($this->route_path, $this->route_options); |
| 66 | 66 | $this->route_options['uses'] = "LumenerController@getResource'"; |
| 67 | 67 | Route::get($this->route_path.'/resources', $this->route_options); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | $this->route_path = $uri; |
| 91 | 91 | } |
| 92 | 92 | $this->route_options['namespace'] = $this->namespace; |
| 93 | - $this->app->router->group($this->route_options, function ($router) { |
|
| 93 | + $this->app->router->group($this->route_options, function($router) { |
|
| 94 | 94 | $router->addRoute( |
| 95 | 95 | ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], |
| 96 | 96 | $this->route_path, |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $this->route_options['as'] = "lumener-resources"; |
| 101 | 101 | $this->route_options['uses'] = 'LumenerController@getResource'; |
| 102 | 102 | $router->get( |
| 103 | - $this->route_path . '/resources', |
|
| 103 | + $this->route_path.'/resources', |
|
| 104 | 104 | ['uses' => 'LumenerController@getResource', |
| 105 | 105 | 'as' => 'lumener-resources'] |
| 106 | 106 | ); |
@@ -134,20 +134,20 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | $this->app->singleton( |
| 136 | 136 | 'command.lumener.update', |
| 137 | - function ($app) { |
|
| 137 | + function($app) { |
|
| 138 | 138 | return new UpdateCommand(); |
| 139 | 139 | } |
| 140 | 140 | ); |
| 141 | 141 | |
| 142 | 142 | $this->app->singleton( |
| 143 | 143 | 'command.lumener.stylize', |
| 144 | - function ($app) { |
|
| 144 | + function($app) { |
|
| 145 | 145 | return new StylizeCommand(); |
| 146 | 146 | } |
| 147 | 147 | ); |
| 148 | 148 | $this->app->singleton( |
| 149 | 149 | 'command.lumener.plugin', |
| 150 | - function ($app) { |
|
| 150 | + function($app) { |
|
| 151 | 151 | return new PluginCommand(); |
| 152 | 152 | } |
| 153 | 153 | ); |
@@ -1,31 +1,31 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | return [ |
| 3 | - "name" => "Lumener", |
|
| 4 | - "auto_login" => false, |
|
| 5 | - "logout_cooldown" => 10, // Time until auto login is enabled again (seconds) |
|
| 6 | - // "logout_redirect" => "admin/dashboard", |
|
| 7 | - "storage" => base_path('storage/lumener'), |
|
| 3 | + "name" => "Lumener", |
|
| 4 | + "auto_login" => false, |
|
| 5 | + "logout_cooldown" => 10, // Time until auto login is enabled again (seconds) |
|
| 6 | + // "logout_redirect" => "admin/dashboard", |
|
| 7 | + "storage" => base_path('storage/lumener'), |
|
| 8 | 8 | |
| 9 | - /** |
|
| 10 | - * Route |
|
| 11 | - */ |
|
| 12 | - // For Lumen, a route that has ("as" => "lumener") will be automatically |
|
| 13 | - // merged into main route |
|
| 14 | - "route" => |
|
| 15 | - [ |
|
| 9 | + /** |
|
| 10 | + * Route |
|
| 11 | + */ |
|
| 12 | + // For Lumen, a route that has ("as" => "lumener") will be automatically |
|
| 13 | + // merged into main route |
|
| 14 | + "route" => |
|
| 15 | + [ |
|
| 16 | 16 | // namespace is Lumener, cannot be overriden |
| 17 | 17 | "path" => "lumener", |
| 18 | 18 | "options" =>[ |
| 19 | - "as" => "lumener", |
|
| 20 | - "uses" => 'LumenerController@index', |
|
| 21 | - "middleware" => [] |
|
| 19 | + "as" => "lumener", |
|
| 20 | + "uses" => 'LumenerController@index', |
|
| 21 | + "middleware" => [] |
|
| 22 | 22 | ] |
| 23 | - ], |
|
| 23 | + ], |
|
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * Adminer |
|
| 27 | - */ |
|
| 28 | - "adminer" => [ |
|
| 25 | + /** |
|
| 26 | + * Adminer |
|
| 27 | + */ |
|
| 28 | + "adminer" => [ |
|
| 29 | 29 | // Check https://github.com/vrana/adminer/releases for custom releases |
| 30 | 30 | // (e.g. adminer-{version}-mysql-en.php or editor-{version}.php) |
| 31 | 31 | // This url format supports v4.2.5+ |
@@ -38,43 +38,43 @@ discard block |
||
| 38 | 38 | /** |
| 39 | 39 | * Plugins |
| 40 | 40 | */ |
| 41 | - "plugins" => [ |
|
| 41 | + "plugins" => [ |
|
| 42 | 42 | // plugin.php is required to use any plugin |
| 43 | 43 | // Downloaded when no file/url is supplied to the lumener:plugin command |
| 44 | 44 | "plugin_php" => "https://raw.github.com/vrana/adminer/master/plugins/plugin.php", |
| 45 | 45 | // You must install the required plugins using the lumener:plugin command |
| 46 | 46 | "enabled" => [ |
| 47 | - // No constructor arguments |
|
| 48 | - // "AdminerDumpXml" => [], |
|
| 49 | - // With constructor arguments |
|
| 50 | - // "AdminerDatabaseHide" => [['information_schema', 'mysql']], |
|
| 47 | + // No constructor arguments |
|
| 48 | + // "AdminerDumpXml" => [], |
|
| 49 | + // With constructor arguments |
|
| 50 | + // "AdminerDatabaseHide" => [['information_schema', 'mysql']], |
|
| 51 | + ], |
|
| 51 | 52 | ], |
| 52 | - ], |
|
| 53 | 53 | |
| 54 | - // "extension_file" => base_path("app/Logic/LumenerExtension.php") |
|
| 55 | - ], |
|
| 54 | + // "extension_file" => base_path("app/Logic/LumenerExtension.php") |
|
| 55 | + ], |
|
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * Security |
|
| 59 | - */ |
|
| 60 | - // Uncomment any of the following lines to limit access by db/user |
|
| 61 | - // Note that *_protected overrides *_allowed in conflicts |
|
| 62 | - "security" => [ |
|
| 57 | + /** |
|
| 58 | + * Security |
|
| 59 | + */ |
|
| 60 | + // Uncomment any of the following lines to limit access by db/user |
|
| 61 | + // Note that *_protected overrides *_allowed in conflicts |
|
| 62 | + "security" => [ |
|
| 63 | 63 | // "allowed_db" => ['my_db'], |
| 64 | 64 | // "protected_db" => ['information_schema', 'mysql'], |
| 65 | 65 | // "allowed_users" => ['admin'], |
| 66 | 66 | // "protected_users" => ['root'] |
| 67 | - ], |
|
| 67 | + ], |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Database Access Info (For Auto Login) |
|
| 71 | - */ |
|
| 72 | - // Uncomment any of the following lines to override .env values |
|
| 73 | - "db" => [ |
|
| 69 | + /** |
|
| 70 | + * Database Access Info (For Auto Login) |
|
| 71 | + */ |
|
| 72 | + // Uncomment any of the following lines to override .env values |
|
| 73 | + "db" => [ |
|
| 74 | 74 | // "host" => "www.example.com", |
| 75 | 75 | // "port" => 9999, |
| 76 | 76 | // "username" => "root", |
| 77 | 77 | // "password" => "toor", |
| 78 | 78 | // "database" => "my_database" |
| 79 | - ] |
|
| 79 | + ] |
|
| 80 | 80 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | return [ |
| 3 | 3 | "name" => "Lumener", |
| 4 | 4 | "auto_login" => false, |
| 5 | - "logout_cooldown" => 10, // Time until auto login is enabled again (seconds) |
|
| 5 | + "logout_cooldown" => 10, // Time until auto login is enabled again (seconds) |
|
| 6 | 6 | // "logout_redirect" => "admin/dashboard", |
| 7 | 7 | "storage" => base_path('storage/lumener'), |
| 8 | 8 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | // This url format supports v4.2.5+ |
| 32 | 32 | "source" => "https://github.com/vrana/adminer/releases/download/v{version}/adminer-{version}.php", |
| 33 | 33 | // These functions will be replaced by adminer_{name} to avoid conflicts |
| 34 | - "rename_list" => ['redirect','cookie','view', 'exit', 'ob_flush'], |
|
| 34 | + "rename_list" => ['redirect', 'cookie', 'view', 'exit', 'ob_flush'], |
|
| 35 | 35 | // version can be exact (e.g. v4.7.1) if version_type is NOT "url" |
| 36 | 36 | "version" => "https://api.github.com/repos/vrana/adminer/releases/latest", |
| 37 | 37 | "version_type" => "url", |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | return config('lumener.name', 'Lumener'); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - public function permanentLogin($j=false) |
|
| 48 | + public function permanentLogin($j = false) |
|
| 49 | 49 | { |
| 50 | 50 | // key used for permanent login |
| 51 | 51 | $key = config('lumener.adminer_perma_key'); |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | } else { |
| 80 | 80 | $this->error('Lumener: Could not retrieve plugin file. ' |
| 81 | 81 | . |
| 82 | - ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n" . ShellHelper::$LastError)); |
|
| 82 | + ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n".ShellHelper::$LastError)); |
|
| 83 | 83 | return; |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | try { |
| 67 | 67 | if (file_exists($this->filename)) { |
| 68 | 68 | $fn = fopen($this->filename, "r"); |
| 69 | - for ($i=0; !$current_version && $i < 20 && !feof($fn); $i++) { |
|
| 69 | + for ($i = 0; !$current_version && $i < 20 && !feof($fn); $i++) { |
|
| 70 | 70 | $line = fgets($fn, 30); |
| 71 | 71 | preg_match_all("/@version ((\d([\.-]|$))+)/", $line, $m); |
| 72 | 72 | if (!empty($m[1])) { |
@@ -91,14 +91,14 @@ discard block |
||
| 91 | 91 | if (!$response || $response->getStatusCode() != '200') { |
| 92 | 92 | $this->error('Lumener: Could not retrieve version information from url. ' |
| 93 | 93 | . |
| 94 | - ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n" . ShellHelper::$LastError)); |
|
| 94 | + ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n".ShellHelper::$LastError)); |
|
| 95 | 95 | return; |
| 96 | 96 | } |
| 97 | 97 | $latest_version = ltrim(json_decode((string) $response->getBody())->tag_name, 'v'); |
| 98 | - $this->info("Lumener: Latest Adminer Version " . $latest_version); |
|
| 98 | + $this->info("Lumener: Latest Adminer Version ".$latest_version); |
|
| 99 | 99 | } else { |
| 100 | 100 | $latest_version = $vsource; |
| 101 | - $this->info("Lumener: Required Adminer Version " . $latest_version); |
|
| 101 | + $this->info("Lumener: Required Adminer Version ".$latest_version); |
|
| 102 | 102 | } |
| 103 | 103 | if ($force || !file_exists($this->filename) || $latest_version != $current_version) { |
| 104 | 104 | $this->info("Lumener: Downloading..."); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | } else { |
| 116 | 116 | $this->error('Lumener: Could not download adminer.' |
| 117 | 117 | . |
| 118 | - ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n" . ShellHelper::$LastError)); |
|
| 118 | + ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n".ShellHelper::$LastError)); |
|
| 119 | 119 | return; |
| 120 | 120 | } |
| 121 | 121 | } else { |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | { |
| 131 | 131 | foreach (config( |
| 132 | 132 | 'lumener.adminer.rename_list', |
| 133 | - ['redirect','cookie','view', 'exit', 'ob_flush'] |
|
| 133 | + ['redirect', 'cookie', 'view', 'exit', 'ob_flush'] |
|
| 134 | 134 | ) as $var) { |
| 135 | 135 | ShellHelper::rename($var, $this->filename); |
| 136 | 136 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | } else { |
| 71 | 71 | $this->error('Lumener: Could not retrieve theme file. ' |
| 72 | 72 | . |
| 73 | - ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n" . ShellHelper::$LastError)); |
|
| 73 | + ($response ? "\r\n[{$response->getStatusCode()}] {$response->getReasonPhrase()} {(string)$response->getBody()}" : "Connection Failed.\r\n".ShellHelper::$LastError)); |
|
| 74 | 74 | return; |
| 75 | 75 | } |
| 76 | 76 | } else { |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | * |
| 16 | 16 | * @return bool|mixed|\Psr\Http\Message\ResponseInterface |
| 17 | 17 | */ |
| 18 | - public static function get($uri, $params=[]) |
|
| 18 | + public static function get($uri, $params = []) |
|
| 19 | 19 | { |
| 20 | 20 | try { |
| 21 | 21 | $client = new Client(); //GuzzleHttp\Client |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | // Security Check |
| 49 | 49 | $allowed_db = config('lumener.security.allowed_db'); |
| 50 | 50 | $protected_db = config('lumener.security.protected_db'); |
| 51 | - $db_blocked = function ($db) use ($allowed_db, $protected_db) { |
|
| 51 | + $db_blocked = function($db) use ($allowed_db, $protected_db) { |
|
| 52 | 52 | return ($allowed_db !== null && !in_array($db, $allowed_db)) |
| 53 | 53 | ||($protected_db !== null && in_array($db, $protected_db)); |
| 54 | 54 | }; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | $content = ""; |
| 72 | 72 | while ($level = ob_get_clean()) { |
| 73 | - $content = $level . $content; |
|
| 73 | + $content = $level.$content; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | if (strpos($content, "<!DOCTYPE html>") === false) { |