diff --git a/config.sample.inc.php b/config.sample.inc.php index 5b484ff043..817d63e6ee 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -5,8 +5,6 @@ * * All directives are explained in documentation in the doc/ folder * or at . - * - * @package PhpMyAdmin */ declare(strict_types=1); diff --git a/examples/config.manyhosts.inc.php b/examples/config.manyhosts.inc.php index ed2e8a0a6a..2f2853e482 100644 --- a/examples/config.manyhosts.inc.php +++ b/examples/config.manyhosts.inc.php @@ -4,9 +4,6 @@ * many hosts that all have identical configuration otherwise. To add * a new host, just drop it into $hosts below. Contributed by * Matthew Hawkins. - * - * @package PhpMyAdmin - * @subpackage Example */ declare(strict_types=1); diff --git a/examples/openid.php b/examples/openid.php index 327b1d4c21..130c0580fb 100644 --- a/examples/openid.php +++ b/examples/openid.php @@ -10,9 +10,6 @@ * * User first authenticates using OpenID and based on content of $AUTH_MAP * the login information is passed to phpMyAdmin in session data. - * - * @package PhpMyAdmin - * @subpackage Example */ declare(strict_types=1); diff --git a/examples/signon-script.php b/examples/signon-script.php index c93d91eddd..9752763be6 100644 --- a/examples/signon-script.php +++ b/examples/signon-script.php @@ -5,9 +5,6 @@ * This is just example how to use script based single signon with * phpMyAdmin, it is not intended to be perfect code and look, only * shows how you can integrate this functionality in your application. - * - * @package PhpMyAdmin - * @subpackage Example */ declare(strict_types=1); diff --git a/examples/signon.php b/examples/signon.php index d9dd8e1714..adc39f65f0 100644 --- a/examples/signon.php +++ b/examples/signon.php @@ -5,9 +5,6 @@ * This is just example how to use session based single signon with * phpMyAdmin, it is not intended to be perfect code and look, only * shows how you can integrate this functionality in your application. - * - * @package PhpMyAdmin - * @subpackage Example */ declare(strict_types=1); diff --git a/index.php b/index.php index 8fee19684a..71995877be 100644 --- a/index.php +++ b/index.php @@ -1,8 +1,6 @@ - */ + /** @var array */ private static $charsets = []; - /** - * @var array> - */ + /** @var array> */ private static $collations = []; /** diff --git a/libraries/classes/Charsets/Charset.php b/libraries/classes/Charsets/Charset.php index 93da8b13c0..fbf6c6d192 100644 --- a/libraries/classes/Charsets/Charset.php +++ b/libraries/classes/Charsets/Charset.php @@ -1,8 +1,6 @@ name; } - /** - * @return string - */ public function getDescription(): string { return $this->description; } - /** - * @return string - */ public function getDefaultCollation(): string { return $this->defaultCollation; } - /** - * @return int - */ public function getMaxLength(): int { return $this->maxLength; diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php index 2e17544110..e080c0a5c5 100644 --- a/libraries/classes/Charsets/Collation.php +++ b/libraries/classes/Charsets/Collation.php @@ -1,8 +1,6 @@ name; } - /** - * @return string - */ public function getDescription(): string { return $this->description; } - /** - * @return string - */ public function getCharset(): string { return $this->charset; } - /** - * @return int - */ public function getId(): int { return $this->id; } - /** - * @return bool - */ public function isDefault(): bool { return $this->isDefault; } - /** - * @return bool - */ public function isCompiled(): bool { return $this->isCompiled; } - /** - * @return int - */ public function getSortLength(): int { return $this->sortLength; } - /** - * @return string - */ public function getPadAttribute(): string { return $this->padAttribute; diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php index e766f5232d..060f55fdad 100644 --- a/libraries/classes/CheckUserPrivileges.php +++ b/libraries/classes/CheckUserPrivileges.php @@ -1,8 +1,6 @@ setDescription('Translates advisory rules to Gettext format'); diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php index 371d1d10c0..258ba58a8e 100644 --- a/libraries/classes/Common.php +++ b/libraries/classes/Common.php @@ -1,21 +1,13 @@ $db]); } - /** - * @return void - */ public static function table(): void { global $db, $table, $db_is_system_schema, $url_query, $url_params, $cfg, $dbi, $err_url, $err_url_0; diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 18a8c4804c..0020466d26 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -1,8 +1,6 @@ = 1 if editing a server */ diff --git a/libraries/classes/Config/Forms/BaseFormList.php b/libraries/classes/Config/Forms/BaseFormList.php index 2b6299d31b..7abb19fb5c 100644 --- a/libraries/classes/Config/Forms/BaseFormList.php +++ b/libraries/classes/Config/Forms/BaseFormList.php @@ -1,8 +1,6 @@ cfg->getValue('AllowArbitraryServer')) { $sAllowArbitraryServerWarn = sprintf( __( @@ -100,10 +92,8 @@ class ServerConfigChecks . 'your server.' ); - // // $cfg['SaveDir'] // should not be world-accessible - // if ($this->cfg->getValue('SaveDir') != '') { SetupIndex::messagesSet( 'notice', @@ -113,10 +103,8 @@ class ServerConfigChecks ); } - // // $cfg['TempDir'] // should not be world-accessible - // if ($this->cfg->getValue('TempDir') != '') { SetupIndex::messagesSet( 'notice', @@ -161,10 +149,8 @@ class ServerConfigChecks $blowfishSecretSet ); - // // $cfg['Servers'][$i]['ssl'] // should be enabled if possible - // if (! $this->cfg->getValue('Servers/' . $i . '/ssl')) { $title = Descriptions::get('Servers/1/ssl') . ' (' . $serverName . ')'; SetupIndex::messagesSet( @@ -190,10 +176,8 @@ class ServerConfigChecks '[/a]' )); - // // $cfg['Servers'][$i]['auth_type'] // warn about full user credentials if 'auth_type' is 'config' - // if ($this->cfg->getValue('Servers/' . $i . '/auth_type') == 'config' && $this->cfg->getValue('Servers/' . $i . '/user') != '' && $this->cfg->getValue('Servers/' . $i . '/password') != '' @@ -219,11 +203,9 @@ class ServerConfigChecks ); } - // // $cfg['Servers'][$i]['AllowRoot'] // $cfg['Servers'][$i]['AllowNoPassword'] // serious security flaw - // if ($this->cfg->getValue('Servers/' . $i . '/AllowRoot') && $this->cfg->getValue('Servers/' . $i . '/AllowNoPassword') ) { @@ -307,10 +289,8 @@ class ServerConfigChecks */ protected function performConfigChecksServersZipdump() { - // // $cfg['ZipDump'] // requires zip_open in import - // if ($this->cfg->getValue('ZipDump') && ! $this->functionExists('zip_open')) { SetupIndex::messagesSet( 'error', @@ -328,10 +308,8 @@ class ServerConfigChecks ); } - // // $cfg['ZipDump'] // requires gzcompress in export - // if ($this->cfg->getValue('ZipDump') && ! $this->functionExists('gzcompress')) { SetupIndex::messagesSet( 'error', @@ -364,10 +342,8 @@ class ServerConfigChecks $blowfishSecretSet, $blowfishSecret ) { - // // $cfg['blowfish_secret'] // it's required for 'cookie' authentication - // if ($cookieAuthUsed) { if ($blowfishSecretSet) { // 'cookie' auth used, blowfish_secret was generated @@ -422,7 +398,6 @@ class ServerConfigChecks */ protected function performConfigChecksLoginCookie() { - // // $cfg['LoginCookieValidity'] // value greater than session.gc_maxlifetime will cause // random session invalidation after that time @@ -448,10 +423,8 @@ class ServerConfigChecks ); } - // // $cfg['LoginCookieValidity'] // should be at most 1800 (30 min) - // if ($loginCookieValidity > 1800) { SetupIndex::messagesSet( 'notice', @@ -469,11 +442,9 @@ class ServerConfigChecks ); } - // // $cfg['LoginCookieValidity'] // $cfg['LoginCookieStore'] // LoginCookieValidity must be less or equal to LoginCookieStore - // if (($this->cfg->getValue('LoginCookieStore') != 0) && ($loginCookieValidity > $this->cfg->getValue('LoginCookieStore')) ) { @@ -503,10 +474,8 @@ class ServerConfigChecks */ protected function performConfigChecksServerBZipdump() { - // // $cfg['BZipDump'] // requires bzip2 functions - // if ($this->cfg->getValue('BZipDump') && (! $this->functionExists('bzopen') || ! $this->functionExists('bzcompress')) ) { @@ -542,10 +511,8 @@ class ServerConfigChecks */ protected function performConfigChecksServerGZipdump() { - // // $cfg['GZipDump'] // requires zlib functions - // if ($this->cfg->getValue('GZipDump') && (! $this->functionExists('gzopen') || ! $this->functionExists('gzencode')) ) { diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php index 9d73773f76..4fb34520f9 100644 --- a/libraries/classes/Config/SpecialSchemaLinks.php +++ b/libraries/classes/Config/SpecialSchemaLinks.php @@ -1,8 +1,6 @@ response->disable(); diff --git a/libraries/classes/Controllers/CheckRelationsController.php b/libraries/classes/Controllers/CheckRelationsController.php index b34ea0f914..56a3b0e8cb 100644 --- a/libraries/classes/Controllers/CheckRelationsController.php +++ b/libraries/classes/Controllers/CheckRelationsController.php @@ -1,8 +1,6 @@ centralColumns = $centralColumns; } - /** - * @return void - */ public function index(): void { global $cfg, $db, $message, $pos, $num_cols; diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php index a634b839f3..04f0c4c703 100644 --- a/libraries/classes/Controllers/Database/DataDictionaryController.php +++ b/libraries/classes/Controllers/Database/DataDictionaryController.php @@ -1,8 +1,6 @@ designerCommon = $designerCommon; } - /** - * @return void - */ public function index(): void { global $db, $script_display_field, $tab_column, $tables_all_keys, $tables_pk_or_unique_keys; diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php index 72703f08c9..d2db28c170 100644 --- a/libraries/classes/Controllers/Database/EventsController.php +++ b/libraries/classes/Controllers/Database/EventsController.php @@ -1,8 +1,6 @@ export = $export; } - /** - * @return void - */ public function index(): void { global $db, $table, $url_query, $sub_part, $url_params, $sql_query; diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php index 58096f76e7..d1c58ca5ed 100644 --- a/libraries/classes/Controllers/Database/ImportController.php +++ b/libraries/classes/Controllers/Database/ImportController.php @@ -1,7 +1,4 @@ response->getHeader(); diff --git a/libraries/classes/Controllers/Database/OperationsController.php b/libraries/classes/Controllers/Database/OperationsController.php index 51b42e0e1e..074fdd4590 100644 --- a/libraries/classes/Controllers/Database/OperationsController.php +++ b/libraries/classes/Controllers/Database/OperationsController.php @@ -1,7 +1,4 @@ relationCleanup = $relationCleanup; } - /** - * @return void - */ public function index(): void { global $cfg, $db, $server, $url_query, $sql_query, $move, $message, $tables_full; diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php index 9c7c40c94e..f859c3b9a7 100644 --- a/libraries/classes/Controllers/Database/PrivilegesController.php +++ b/libraries/classes/Controllers/Database/PrivilegesController.php @@ -1,8 +1,6 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $db, $pmaThemeImage, $url_query, $savedSearchList, $savedSearch, $currentSearchId; diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php index 9a4dd1461d..48405c728e 100644 --- a/libraries/classes/Controllers/Database/RoutinesController.php +++ b/libraries/classes/Controllers/Database/RoutinesController.php @@ -1,8 +1,6 @@ sqlQueryForm = $sqlQueryForm; } - /** - * @return void - */ public function index(): void { global $goto, $back; diff --git a/libraries/classes/Controllers/Database/SqlFormatController.php b/libraries/classes/Controllers/Database/SqlFormatController.php index bba17f3ec8..22da589433 100644 --- a/libraries/classes/Controllers/Database/SqlFormatController.php +++ b/libraries/classes/Controllers/Database/SqlFormatController.php @@ -1,7 +1,4 @@ tracking = $tracking; } - /** - * @return void - */ public function index(): void { global $db, $pmaThemeImage, $text_dir, $url_query, $url_params, $tables, $num_tables, $pos, $data, $cfg; diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php index 6399a400ee..33698caaa0 100644 --- a/libraries/classes/Controllers/Database/TriggersController.php +++ b/libraries/classes/Controllers/Database/TriggersController.php @@ -1,8 +1,6 @@ errorHandler = $errorHandler; } - /** - * @return void - */ public function index(): void { global $cfg; diff --git a/libraries/classes/Controllers/ExportController.php b/libraries/classes/Controllers/ExportController.php index 46d32ecbdd..f48071510e 100644 --- a/libraries/classes/Controllers/ExportController.php +++ b/libraries/classes/Controllers/ExportController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $containerBuilder, $db, $export_type, $filename_template, $sql_query, $err_url, $message; diff --git a/libraries/classes/Controllers/GisDataEditorController.php b/libraries/classes/Controllers/GisDataEditorController.php index 9c26c86e94..92648c0447 100644 --- a/libraries/classes/Controllers/GisDataEditorController.php +++ b/libraries/classes/Controllers/GisDataEditorController.php @@ -1,8 +1,6 @@ display(); } - /** - * @return void - */ private function checkRequirements(): void { global $cfg, $server, $lang; diff --git a/libraries/classes/Controllers/ImportController.php b/libraries/classes/Controllers/ImportController.php index 42716e74de..94a1b5259b 100644 --- a/libraries/classes/Controllers/ImportController.php +++ b/libraries/classes/Controllers/ImportController.php @@ -1,7 +1,4 @@ sql = $sql; } - /** - * @return void - */ public function index(): void { global $cfg, $collation_connection, $db, $import_type, $pmaThemeImage, $table, $goto, $display_query; diff --git a/libraries/classes/Controllers/ImportStatusController.php b/libraries/classes/Controllers/ImportStatusController.php index 8554ffb18e..60f7cc35fd 100644 --- a/libraries/classes/Controllers/ImportStatusController.php +++ b/libraries/classes/Controllers/ImportStatusController.php @@ -1,7 +1,4 @@ template = $template; } - /** - * @return void - */ public function index(): void { global $SESSION_KEY, $upload_id, $plugins, $timestamp; diff --git a/libraries/classes/Controllers/LicenseController.php b/libraries/classes/Controllers/LicenseController.php index 89ef057aef..431497afc7 100644 --- a/libraries/classes/Controllers/LicenseController.php +++ b/libraries/classes/Controllers/LicenseController.php @@ -1,8 +1,6 @@ response->disable(); diff --git a/libraries/classes/Controllers/LintController.php b/libraries/classes/Controllers/LintController.php index 66953bbc12..278a03049c 100644 --- a/libraries/classes/Controllers/LintController.php +++ b/libraries/classes/Controllers/LintController.php @@ -1,8 +1,6 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { if (! $this->response->isAjax()) { diff --git a/libraries/classes/Controllers/NormalizationController.php b/libraries/classes/Controllers/NormalizationController.php index 65e9b8975e..4c997ab8c8 100644 --- a/libraries/classes/Controllers/NormalizationController.php +++ b/libraries/classes/Controllers/NormalizationController.php @@ -1,7 +1,4 @@ normalization = $normalization; } - /** - * @return void - */ public function index(): void { global $db, $table; diff --git a/libraries/classes/Controllers/PhpInfoController.php b/libraries/classes/Controllers/PhpInfoController.php index 2bbf7860d3..1b3cb2863c 100644 --- a/libraries/classes/Controllers/PhpInfoController.php +++ b/libraries/classes/Controllers/PhpInfoController.php @@ -1,8 +1,6 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $cf, $form_param, $form_class, $form_display, $url_params, $error, $tabHash, $hash; diff --git a/libraries/classes/Controllers/Preferences/ManageController.php b/libraries/classes/Controllers/Preferences/ManageController.php index 40a07ccabf..35db746682 100644 --- a/libraries/classes/Controllers/Preferences/ManageController.php +++ b/libraries/classes/Controllers/Preferences/ManageController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $cf, $error, $filename, $import_handle, $json, $PMA_Config, $lang, $max_upload_size; diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php index 98e403c4b9..da8ede26e1 100644 --- a/libraries/classes/Controllers/Preferences/TwoFactorController.php +++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $cfg; diff --git a/libraries/classes/Controllers/SchemaExportController.php b/libraries/classes/Controllers/SchemaExportController.php index 4e33661fae..dd6fa7fad0 100644 --- a/libraries/classes/Controllers/SchemaExportController.php +++ b/libraries/classes/Controllers/SchemaExportController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $cfgRelation; diff --git a/libraries/classes/Controllers/Server/BinlogController.php b/libraries/classes/Controllers/Server/BinlogController.php index 89581c1e61..8aa8e1c7cf 100644 --- a/libraries/classes/Controllers/Server/BinlogController.php +++ b/libraries/classes/Controllers/Server/BinlogController.php @@ -1,8 +1,6 @@ export = $export; } - /** - * @return void - */ public function index(): void { global $db, $table, $sql_query, $num_tables, $unlim_num_rows; diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php index eced9c6fbb..ec14b59b07 100644 --- a/libraries/classes/Controllers/Server/ImportController.php +++ b/libraries/classes/Controllers/Server/ImportController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $db, $table, $err_url, $message, $pmaThemeImage, $text_dir, $url_query, $post_patterns; diff --git a/libraries/classes/Controllers/Server/ReplicationController.php b/libraries/classes/Controllers/Server/ReplicationController.php index b76bf7b87d..97cb7b5e9c 100644 --- a/libraries/classes/Controllers/Server/ReplicationController.php +++ b/libraries/classes/Controllers/Server/ReplicationController.php @@ -1,8 +1,6 @@ advisor = $advisor; } - /** - * @return string - */ public function index(): string { $scripts = $this->response->getHeader()->getScripts(); diff --git a/libraries/classes/Controllers/Server/Status/MonitorController.php b/libraries/classes/Controllers/Server/Status/MonitorController.php index 2687d9b514..30c17a662e 100644 --- a/libraries/classes/Controllers/Server/Status/MonitorController.php +++ b/libraries/classes/Controllers/Server/Status/MonitorController.php @@ -1,8 +1,6 @@ replicationGui = $replicationGui; } - /** - * @return string - */ public function index(): string { global $replication_info; @@ -88,9 +81,6 @@ class StatusController extends AbstractController ]); } - /** - * @return int - */ private function getStartTime(): int { return (int) $this->dbi->fetchValue( @@ -250,9 +240,6 @@ class StatusController extends AbstractController ]; } - /** - * @return string - */ private function getReplicationInfo(): string { global $replication_info, $replication_types; diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index 415a77ae76..859cddf1af 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -1,8 +1,6 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { $cfgRelation = $this->relation->getRelationsParam(); diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php index 48bbf62d49..571c997eb6 100644 --- a/libraries/classes/Controllers/Server/VariablesController.php +++ b/libraries/classes/Controllers/Server/VariablesController.php @@ -1,8 +1,6 @@ checkUserPrivileges = $checkUserPrivileges; } - /** - * @return void - */ public function index(): void { global $cfg, $db, $display_query, $pmaThemeImage, $sql_query, $table, $message; @@ -295,9 +286,6 @@ class SqlController extends AbstractController $this->response->addJSON('select', $select); } - /** - * @return void - */ public function getDefaultForeignKeyCheckValue(): void { $this->checkUserPrivileges->getPrivileges(); @@ -308,9 +296,6 @@ class SqlController extends AbstractController ); } - /** - * @return void - */ public function setColumnOrderOrVisibility(): void { global $db, $table; diff --git a/libraries/classes/Controllers/Table/AbstractController.php b/libraries/classes/Controllers/Table/AbstractController.php index 679935dc96..78270a0ba3 100644 --- a/libraries/classes/Controllers/Table/AbstractController.php +++ b/libraries/classes/Controllers/Table/AbstractController.php @@ -1,8 +1,6 @@ config = $config; } - /** - * @return void - */ public function index(): void { global $err_url, $message, $action, $active_page, $sql_query; diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index 7399ca4662..58eabd08cf 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $cfg, $is_upload, $db, $table, $text_dir, $disp_message, $url_params; diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php index f408a3f17b..4405f01d40 100644 --- a/libraries/classes/Controllers/Table/ChartController.php +++ b/libraries/classes/Controllers/Table/ChartController.php @@ -1,7 +1,4 @@ config = $config; } - /** - * @return void - */ public function index(): void { global $num_fields, $action, $sql_query, $result, $db, $table; diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index 7f0a0ab64b..832169f9bd 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $db, $url_query, $url_params, $table, $export_page_title, $replaces; diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php index 895a264c83..1ba6642404 100644 --- a/libraries/classes/Controllers/Table/FindReplaceController.php +++ b/libraries/classes/Controllers/Table/FindReplaceController.php @@ -1,7 +1,4 @@ response->addJSON('preview', $preview); } - /** - * @return void - */ public function replaceAction(): void { $this->replace( diff --git a/libraries/classes/Controllers/Table/GetFieldController.php b/libraries/classes/Controllers/Table/GetFieldController.php index 4dcbc5e3a0..529649b0b6 100644 --- a/libraries/classes/Controllers/Table/GetFieldController.php +++ b/libraries/classes/Controllers/Table/GetFieldController.php @@ -1,7 +1,4 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $containerBuilder, $url_query, $url_params, $reread_info, $tbl_is_view, $tbl_storage_engine; diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php index 2990b6c53d..928610c423 100644 --- a/libraries/classes/Controllers/Table/PrivilegesController.php +++ b/libraries/classes/Controllers/Table/PrivilegesController.php @@ -1,8 +1,6 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $containerBuilder, $db, $table, $url_params, $message; diff --git a/libraries/classes/Controllers/Table/RowActionController.php b/libraries/classes/Controllers/Table/RowActionController.php index 59194e558b..162f900151 100644 --- a/libraries/classes/Controllers/Table/RowActionController.php +++ b/libraries/classes/Controllers/Table/RowActionController.php @@ -1,7 +1,4 @@ sqlQueryForm = $sqlQueryForm; } - /** - * @return void - */ public function index(): void { global $url_query, $err_url, $goto, $back; diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php index fe730194b1..9dd857b4c4 100644 --- a/libraries/classes/Controllers/Table/StructureController.php +++ b/libraries/classes/Controllers/Table/StructureController.php @@ -1,7 +1,4 @@ table_obj = $this->dbi->getTable($this->db, $this->table); } - /** - * @return void - */ public function index(): void { global $containerBuilder, $sql_query, $reread_info, $showtable; diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index b88d735421..6a1adcc60f 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -1,7 +1,4 @@ tracking = $tracking; } - /** - * @return void - */ public function index(): void { global $pmaThemeImage, $text_dir, $url_query, $url_params, $msg; diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php index 54af08203b..ec21786fa2 100644 --- a/libraries/classes/Controllers/Table/TriggersController.php +++ b/libraries/classes/Controllers/Table/TriggersController.php @@ -1,7 +1,4 @@ _loadTableInfo(); } - /** - * @return void - */ public function index(): void { global $goto; diff --git a/libraries/classes/Controllers/ThemesController.php b/libraries/classes/Controllers/ThemesController.php index c9cf24d443..02c6ba2318 100644 --- a/libraries/classes/Controllers/ThemesController.php +++ b/libraries/classes/Controllers/ThemesController.php @@ -1,7 +1,4 @@ response->getFooter()->setMinimal(); diff --git a/libraries/classes/Controllers/TransformationOverviewController.php b/libraries/classes/Controllers/TransformationOverviewController.php index 6558b127a1..9437ebdbc2 100644 --- a/libraries/classes/Controllers/TransformationOverviewController.php +++ b/libraries/classes/Controllers/TransformationOverviewController.php @@ -1,8 +1,6 @@ relation = $relation; } - /** - * @return void - */ public function index(): void { global $cn, $db, $table, $transform_key, $request_params, $size_params, $where_clause, $row; diff --git a/libraries/classes/Controllers/UserPasswordController.php b/libraries/classes/Controllers/UserPasswordController.php index e60c712142..35e62abc1c 100644 --- a/libraries/classes/Controllers/UserPasswordController.php +++ b/libraries/classes/Controllers/UserPasswordController.php @@ -1,7 +1,4 @@ userPassword = $userPassword; } - /** - * @return void - */ public function index(): void { global $cfg, $hostname, $username, $password, $change_password_message, $msg; diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php index 7aff1f2c0b..3e01cfe1b6 100644 --- a/libraries/classes/Controllers/VersionCheckController.php +++ b/libraries/classes/Controllers/VersionCheckController.php @@ -1,7 +1,4 @@ operations = $operations; } - /** - * @return void - */ public function index(): void { global $sql_query, $url_query, $url_params, $reload, $result, $warning_messages; diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index c8f37ef1b1..1d70b3a7fa 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -3,8 +3,6 @@ * Core functions used all over the scripts. * This script is distinct from libraries/common.inc.php because this * script is called from /test. - * - * @package PhpMyAdmin */ declare(strict_types=1); @@ -15,8 +13,6 @@ use PhpMyAdmin\Display\Error as DisplayError; /** * Core class - * - * @package PhpMyAdmin */ class Core { diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php index 7715620d9b..e966504eee 100644 --- a/libraries/classes/CreateAddField.php +++ b/libraries/classes/CreateAddField.php @@ -1,8 +1,6 @@ 'num', MYSQLI_PART_KEY_FLAG => 'part_key', diff --git a/libraries/classes/Di/Migration.php b/libraries/classes/Di/Migration.php index ff412ef538..5f98aa3f78 100644 --- a/libraries/classes/Di/Migration.php +++ b/libraries/classes/Di/Migration.php @@ -1,8 +1,6 @@ relation = new Relation($GLOBALS['dbi']); diff --git a/libraries/classes/Display/GitRevision.php b/libraries/classes/Display/GitRevision.php index b9771da508..6e85095fb0 100644 --- a/libraries/classes/Display/GitRevision.php +++ b/libraries/classes/Display/GitRevision.php @@ -1,8 +1,6 @@ ..." * + * @see _getTableHeaders(), _getColumnParams() + * * @param array $analyzed_sql_results analyzed sql results * * @return boolean * * @access private - * - * @see _getTableHeaders(), _getColumnParams() */ private function _isSelect(array $analyzed_sql_results) { @@ -736,6 +719,9 @@ class Results /** * Get a navigation button * + * @see _getMoveBackwardButtonsForTableNavigation(), + * _getMoveForwardButtonsForTableNavigation() + * * @param string $caption iconic caption for button * @param string $title text for button * @param integer $pos position for next query @@ -748,9 +734,6 @@ class Results * @return string html content * * @access private - * - * @see _getMoveBackwardButtonsForTableNavigation(), - * _getMoveForwardButtonsForTableNavigation() */ private function _getTableNavigationButton( $caption, @@ -847,6 +830,8 @@ class Results /** * Get a navigation bar to browse among the results of a SQL query * + * @see getTable() + * * @param integer $posNext the offset for the "next" page * @param integer $posPrevious the offset for the "previous" page * @param boolean $isInnodb whether its InnoDB or not @@ -855,8 +840,6 @@ class Results * @return string html content * * @access private - * - * @see getTable() */ private function _getTableNavigation( $posNext, @@ -927,14 +910,14 @@ class Results /** * Prepare move backward buttons - previous and first * + * @see _getTableNavigation() + * * @param string $html_sql_query the sql encoded by html special characters * @param integer $pos_prev the offset for the "previous" page * * @return string html content * * @access private - * - * @see _getTableNavigation() */ private function _getMoveBackwardButtonsForTableNavigation( $html_sql_query, @@ -959,6 +942,8 @@ class Results /** * Prepare move forward buttons - next and last * + * @see _getTableNavigation() + * * @param string $html_sql_query the sql encoded by htmlspecialchars() * @param integer $pos_next the offset for the "next" page * @param boolean $is_innodb whether it's InnoDB or not @@ -966,8 +951,6 @@ class Results * @return string html content * * @access private - * - * @see _getTableNavigation() */ private function _getMoveForwardButtonsForTableNavigation( $html_sql_query, @@ -1025,6 +1008,8 @@ class Results /** * Get the headers of the results table, for all of the columns * + * @see getTableHeaders() + * * @param array $displayParts which elements to display * @param array $analyzed_sql_results analyzed sql results * @param array $sort_expression sort expression @@ -1038,8 +1023,6 @@ class Results * @return string html content * * @access private - * - * @see getTableHeaders() */ private function _getTableHeadersForColumns( array $displayParts, @@ -1142,6 +1125,8 @@ class Results /** * Get the headers of the results table * + * @see getTable() + * * @param array $displayParts which elements to display * @param array $analyzedSqlResults analyzed sql results * @param string $unsortedSqlQuery the unsorted sql query @@ -1153,8 +1138,6 @@ class Results * @return string html content * * @access private - * - * @see getTable() */ private function _getTableHeaders( array &$displayParts, @@ -1244,14 +1227,14 @@ class Results /** * Prepare unsorted sql query and sort by key drop down * + * @see _getTableHeaders() + * * @param array $analyzed_sql_results analyzed sql results * @param array|null $sort_expression sort expression * * @return array two element array - $unsorted_sql_query, $drop_down_html * * @access private - * - * @see _getTableHeaders() */ private function _getUnsortedSqlAndSortByKeyDropDown( array $analyzed_sql_results, @@ -1293,6 +1276,8 @@ class Results /** * Prepare sort by key dropdown - html code segment * + * @see _getTableHeaders() + * * @param Index[] $indexes the indexes of the table for sort criteria * @param array|null $sortExpression the sort expression * @param string $unsortedSqlQuery the unsorted sql query @@ -1300,8 +1285,6 @@ class Results * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getSortByKeyDropDown( $indexes, @@ -1373,14 +1356,14 @@ class Results * Set column span, row span and prepare html with full/partial * text button or link * + * @see _getTableHeaders() + * * @param array $displayParts which elements to display * @param string $full_or_partial_text_link full/partial link or text button * * @return array 2 element array - $colspan, $button_html * * @access private - * - * @see _getTableHeaders() */ private function _getFieldVisibilityParams( array &$displayParts, @@ -1442,13 +1425,13 @@ class Results /** * Get table comments as array * + * @see _getTableHeaders() + * * @param array $analyzed_sql_results analyzed sql results * * @return array table comments * * @access private - * - * @see _getTableHeaders() */ private function _getTableCommentsArray(array $analyzed_sql_results) { @@ -1475,13 +1458,13 @@ class Results /** * Set global array for store highlighted header fields * + * @see _getTableHeaders() + * * @param array $analyzed_sql_results analyzed sql results * * @return void * * @access private - * - * @see _getTableHeaders() */ private function _setHighlightedColumnGlobalField(array $analyzed_sql_results) { @@ -1501,13 +1484,13 @@ class Results /** * Prepare data for column restoring and show/hide * + * @see _getTableHeaders() + * * @param array $analyzedSqlResults analyzed sql results * * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getDataForResettingColumnOrder(array $analyzedSqlResults): string { @@ -1539,11 +1522,11 @@ class Results /** * Prepare option fields block * + * @see _getTableHeaders() + * * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getOptionsBlock() { @@ -1574,11 +1557,11 @@ class Results /** * Get full/partial text button or link * + * @see _getTableHeaders() + * * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getFullOrPartialTextButtonOrLink() { @@ -1611,14 +1594,14 @@ class Results /** * Get comment for row * + * @see _getTableHeaders() + * * @param array $commentsMap comments array * @param array $fieldsMeta set of field properties * * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getCommentForRow(array $commentsMap, $fieldsMeta) { @@ -1632,6 +1615,8 @@ class Results /** * Prepare parameters and html for sorted table header fields * + * @see _getTableHeaders() + * * @param stdClass $fields_meta set of field properties * @param array $sort_expression sort expression * @param array $sort_expression_nodirection sort expression without direction @@ -1647,8 +1632,6 @@ class Results * @return array 2 element array - $order_link, $sorted_header_html * * @access private - * - * @see _getTableHeaders() */ private function _getOrderLinkAndSortedHeaderHtml( $fields_meta, @@ -1751,6 +1734,8 @@ class Results /** * Prepare parameters and html for sorted table header fields * + * @see _getOrderLinkAndSortedHeaderHtml() + * * @param array $sort_expression sort expression * @param array $sort_expression_nodirection sort expression without direction * @param string $sort_tbl The name of the table to which @@ -1763,8 +1748,6 @@ class Results * @return array 3 element array - $single_sort_order, $sort_order, $order_img * * @access private - * - * @see _getOrderLinkAndSortedHeaderHtml() */ private function _getSingleAndMultiSortUrls( array $sort_expression, @@ -1895,6 +1878,8 @@ class Results /** * Check whether the column is sorted * + * @see _getTableHeaders() + * * @param array $sort_expression sort expression * @param array $sort_expression_nodirection sort expression without direction * @param string $sort_tbl the table name @@ -1903,8 +1888,6 @@ class Results * @return boolean the column sorted or not * * @access private - * - * @see _getTableHeaders() */ private function _isInSorted( array $sort_expression, @@ -1974,6 +1957,8 @@ class Results /** * Get sort url parameters - sort order and order image * + * @see _getSingleAndMultiSortUrls() + * * @param array $sort_direction the sort direction * @param string $sort_order the sorting order * @param integer $index the index of sort direction array. @@ -1981,8 +1966,6 @@ class Results * @return array 2 element array - $sort_order, $order_img * * @access private - * - * @see _getSingleAndMultiSortUrls() */ private function _getSortingUrlParams(array $sort_direction, $sort_order, $index) { @@ -2032,6 +2015,8 @@ class Results /** * Get sort order link * + * @see _getTableHeaders() + * * @param string $order_img the sort order image * @param stdClass $fields_meta set of field properties * @param string $order_url the url for sort @@ -2040,8 +2025,6 @@ class Results * @return string the sort order link * * @access private - * - * @see _getTableHeaders() */ private function _getSortOrderLink( $order_img, @@ -2068,12 +2051,12 @@ class Results * Check if the column contains numeric data. If yes, then set the * column header's alignment right * + * @see _getDraggableClassForSortableColumns() + * * @param stdClass $fields_meta set of field properties * @param array $th_class array containing classes * * @return void - * - * @see _getDraggableClassForSortableColumns() */ private function _getClassForNumericColumnType($fields_meta, array &$th_class) { @@ -2088,6 +2071,8 @@ class Results /** * Prepare columns to draggable effect for sortable columns * + * @see _getTableHeaders() + * * @param boolean $col_visib the column is visible (false) * array the column is not visible (string array) * @param string $col_visib_j element of $col_visib array @@ -2098,8 +2083,6 @@ class Results * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getDraggableClassForSortableColumns( $col_visib, @@ -2136,6 +2119,8 @@ class Results /** * Prepare columns to draggable effect for non sortable columns * + * @see _getTableHeaders() + * * @param boolean $col_visib the column is visible (false) * array the column is not visible (string array) * @param string $col_visib_j element of $col_visib array @@ -2146,8 +2131,6 @@ class Results * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getDraggableClassForNonSortableColumns( $col_visib, @@ -2183,6 +2166,8 @@ class Results /** * Prepare column to show at right side - check boxes or empty column * + * @see _getTableHeaders() + * * @param array $displayParts which elements to display * @param string $full_or_partial_text_link full/partial link or text button * @param string $colspan column span of table header @@ -2190,8 +2175,6 @@ class Results * @return string html content * * @access private - * - * @see _getTableHeaders() */ private function _getColumnAtRightSide( array &$displayParts, @@ -2242,6 +2225,9 @@ class Results /** * Prepares the display for a value * + * @see _getDataCellForGeometryColumns(), + * _getDataCellForNonNumericColumns() + * * @param string $class class of table cell * @param bool $conditionField whether to add CSS class condition * @param string $value value to display @@ -2249,9 +2235,6 @@ class Results * @return string the td * * @access private - * - * @see _getDataCellForGeometryColumns(), - * _getDataCellForNonNumericColumns() */ private function _buildValueDisplay($class, $conditionField, $value) { @@ -2265,6 +2248,10 @@ class Results /** * Prepares the display for a null value * + * @see _getDataCellForNumericColumns(), + * _getDataCellForGeometryColumns(), + * _getDataCellForNonNumericColumns() + * * @param string $class class of table cell * @param bool $conditionField whether to add CSS class condition * @param stdClass $meta the meta-information about this field @@ -2273,10 +2260,6 @@ class Results * @return string the td * * @access private - * - * @see _getDataCellForNumericColumns(), - * _getDataCellForGeometryColumns(), - * _getDataCellForNonNumericColumns() */ private function _buildNullDisplay($class, $conditionField, $meta, $align = '') { @@ -2292,6 +2275,10 @@ class Results /** * Prepares the display for an empty value * + * @see _getDataCellForNumericColumns(), + * _getDataCellForGeometryColumns(), + * _getDataCellForNonNumericColumns() + * * @param string $class class of table cell * @param bool $conditionField whether to add CSS class condition * @param stdClass $meta the meta-information about this field @@ -2300,10 +2287,6 @@ class Results * @return string the td * * @access private - * - * @see _getDataCellForNumericColumns(), - * _getDataCellForGeometryColumns(), - * _getDataCellForNonNumericColumns() */ private function _buildEmptyDisplay($class, $conditionField, $meta, $align = '') { @@ -2318,6 +2301,8 @@ class Results /** * Adds the relevant classes. * + * @see _buildNullDisplay(), _getRowData() + * * @param string $class class of table cell * @param bool $condition_field whether to add CSS class * condition @@ -2333,8 +2318,6 @@ class Results * @return string the list of classes * * @access private - * - * @see _buildNullDisplay(), _getRowData() */ private function _addClass( $class, @@ -2394,6 +2377,8 @@ class Results /** * Prepare the body of the results table * + * @see getTable() + * * @param integer $dt_result the link id associated to the query * which results have to be displayed * @param array $displayParts which elements to display @@ -2404,10 +2389,7 @@ class Results * @return string html content * * @global array $row current row data - * * @access private - * - * @see getTable() */ private function _getTableBody( &$dt_result, @@ -2719,6 +2701,8 @@ class Results /** * Get the values for one data row * + * @see _getTableBody() + * * @param integer $dt_result the link id associated to * the query which results * have to be displayed @@ -2739,8 +2723,6 @@ class Results * @return string html content * * @access private - * - * @see _getTableBody() */ private function _getRowValues( &$dt_result, @@ -3087,13 +3069,13 @@ class Results /** * Get url sql query without conditions to shorten URLs * + * @see _getTableBody() + * * @param array $analyzed_sql_results analyzed sql results * * @return string analyzed sql query * * @access private - * - * @see _getTableBody() */ private function _getUrlSqlQuery(array $analyzed_sql_results) { @@ -3125,13 +3107,13 @@ class Results /** * Get column order and column visibility * + * @see _getTableBody() + * * @param array $analyzed_sql_results analyzed sql results * * @return array 2 element array - $col_order, $col_visib * * @access private - * - * @see _getTableBody() */ private function _getColumnParams(array $analyzed_sql_results) { @@ -3163,13 +3145,13 @@ class Results /** * Get HTML for repeating headers * + * @see _getTableBody() + * * @param array $display_params holds various display info * * @return string html content * * @access private - * - * @see _getTableBody() */ private function _getRepeatingHeaders( array $display_params @@ -3202,6 +3184,8 @@ class Results /** * Get modified links * + * @see _getTableBody() + * * @param string $where_clause the where clause of the sql * @param boolean $clause_is_unique the unique condition of clause * @param string $url_sql_query the analyzed sql query @@ -3210,8 +3194,6 @@ class Results * $edit_str, $copy_str, $edit_anchor_class * * @access private - * - * @see _getTableBody() */ private function _getModifiedLinks( $where_clause, @@ -3264,6 +3246,8 @@ class Results /** * Get delete and kill links * + * @see _getTableBody() + * * @param string $where_clause the where clause of the sql * @param boolean $clause_is_unique the unique condition of clause * @param string $url_sql_query the analyzed sql query @@ -3274,8 +3258,6 @@ class Results * $del_url, $del_str, $js_conf * * @access private - * - * @see _getTableBody() */ private function _getDeleteAndKillLinks( $where_clause, @@ -3354,14 +3336,14 @@ class Results /** * Get content inside the table row action links (Edit/Copy/Delete) * + * @see _getModifiedLinks(), _getDeleteAndKillLinks() + * * @param string $icon The name of the file to get * @param string $display_text The text displaying after the image icon * * @return string * * @access private - * - * @see _getModifiedLinks(), _getDeleteAndKillLinks() */ private function _getActionLinkContent($icon, $display_text) { @@ -3393,6 +3375,8 @@ class Results /** * Prepare placed links * + * @see _getTableBody() + * * @param string $dir the direction of links should place * @param string $del_url the url for delete row * @param array $displayParts which elements to display @@ -3411,8 +3395,6 @@ class Results * @return string html content * * @access private - * - * @see _getTableBody() */ private function _getPlacedLinks( $dir, @@ -3455,6 +3437,8 @@ class Results /** * Get the combined classes for a column * + * @see _getTableBody() + * * @param string $grid_edit_class the class for all editable columns * @param string $not_null_class the class for not null columns * @param string $relation_class the class for relations in a column @@ -3464,8 +3448,6 @@ class Results * @return string the combined classes * * @access private - * - * @see _getTableBody() */ private function _getClassesForColumn( $grid_edit_class, @@ -3481,13 +3463,13 @@ class Results /** * Get class for datetime related fields * + * @see _getTableBody() + * * @param string $type the type of the column field * * @return string the class for the column * * @access private - * - * @see _getTableBody() */ private function _getClassForDateTimeRelatedFields($type) { @@ -3510,6 +3492,8 @@ class Results /** * Prepare data cell for numeric type fields * + * @see _getTableBody() + * * @param string|null $column the column's value * @param string $class the html class for column * @param boolean $condition_field the column should highlighted @@ -3528,8 +3512,6 @@ class Results * @return string the prepared cell, html content * * @access private - * - * @see _getTableBody() */ private function _getDataCellForNumericColumns( ?string $column, @@ -3585,6 +3567,8 @@ class Results /** * Get data cell for geometry type fields * + * @see _getTableBody() + * * @param string|null $column the relevant column in data row * @param string $class the html class for column * @param stdClass $meta the meta-information about @@ -3603,8 +3587,6 @@ class Results * @return string the prepared data cell, html content * * @access private - * - * @see _getTableBody() */ private function _getDataCellForGeometryColumns( ?string $column, @@ -3732,6 +3714,8 @@ class Results /** * Get data cell for non numeric type fields * + * @see _getTableBody() + * * @param string|null $column the relevant column in data row * @param string $class the html class for column * @param stdClass $meta the meta-information about @@ -3757,8 +3741,6 @@ class Results * @return string the prepared data cell, html content * * @access private - * - * @see _getTableBody() */ private function _getDataCellForNonNumericColumns( ?string $column, @@ -3919,13 +3901,12 @@ class Results * Checks the posted options for viewing query results * and sets appropriate values in the session. * + * @return void + * * @todo make maximum remembered queries configurable * @todo move/split into SQL class!? * @todo currently this is called twice unnecessary * @todo ignore LIMIT and ORDER in query!? - * - * @return void - * * @access public */ public function setConfigParamsForDisplayTable() @@ -4311,11 +4292,11 @@ class Results /** * Get offsets for next page and previous page * + * @see getTable() + * * @return int[] array with two elements - $pos_next, $pos_prev * * @access private - * - * @see getTable() */ private function _getOffsets() { @@ -4343,6 +4324,8 @@ class Results /** * Prepare sorted column message * + * @see getTable() + * * @param integer $dt_result the link id associated to the * query which results have to * be displayed @@ -4351,8 +4334,6 @@ class Results * @return string|null html content, null if not found sorted column * * @access private - * - * @see getTable() */ private function _getSortedColumnMessage( &$dt_result, @@ -4468,6 +4449,8 @@ class Results /** * Set the content that needs to be shown in message * + * @see getTable() + * * @param string $sorted_column_message the message for sorted column * @param array $analyzed_sql_results the analyzed query * @param integer $total the total number of rows returned by @@ -4480,8 +4463,6 @@ class Results * @return Message an object of Message * * @access private - * - * @see getTable() */ private function _setMessageInformation( $sorted_column_message, @@ -4575,13 +4556,13 @@ class Results /** * Set the value of $map array for linking foreign key related tables * + * @see getTable() + * * @param array $map the list of relations * * @return void * * @access private - * - * @see getTable() */ private function _setParamForLinkForeignKeyRelatedTables(array &$map) { @@ -4635,6 +4616,8 @@ class Results /** * Prepare multi field edit/delete links * + * @see getTable() + * * @param integer $dt_result the link id associated to the query which * results have to be displayed * @param array $analyzed_sql_results analyzed sql results @@ -4643,8 +4626,6 @@ class Results * @return string html content * * @access private - * - * @see getTable() */ private function _getMultiRowOperationLinks( &$dt_result, @@ -4743,14 +4724,14 @@ class Results /** * Generates HTML to display the Create view in span tag * + * @see _getResultsOperations() + * * @param array $analyzed_sql_results analyzed sql results * @param array $params Array with URL Parameters * * @return string * * @access private - * - * @see _getResultsOperations() */ private function _getLinkForCreateView(array $analyzed_sql_results, array $params): string { @@ -4779,7 +4760,6 @@ class Results * @return string * * @access public - * */ public function getCreateViewQueryResultOp(array $analyzed_sql_results) { @@ -4844,6 +4824,8 @@ class Results /** * Get operations that are available on results. * + * @see getTable() + * * @param array $displayParts the parts to display * @param array $analyzed_sql_results analyzed sql results * @param boolean $only_view Whether to show only view @@ -4851,8 +4833,6 @@ class Results * @return string html content * * @access private - * - * @see getTable() */ private function _getResultsOperations( array $displayParts, @@ -4983,8 +4963,8 @@ class Results } // CREATE VIEW + /** - * * @todo detect privileges to create a view * (but see 2006-01-19 note in PhpMyAdmin\Display\CreateTable, * I think we cannot detect db-specific privileges reliably) @@ -5011,6 +4991,10 @@ class Results * Verifies what to do with non-printable contents (binary or BLOB) * in Browse mode. * + * @see _getDataCellForGeometryColumns(), + * _getDataCellForNonNumericColumns(), + * _getSortedColumnMessage() + * * @param string $category BLOB|BINARY|GEOMETRY * @param string|null $content the binary content * @param mixed $transformation_plugin transformation plugin. @@ -5027,10 +5011,6 @@ class Results * @return mixed string or float * * @access private - * - * @see _getDataCellForGeometryColumns(), - * _getDataCellForNonNumericColumns(), - * _getSortedColumnMessage() */ private function _handleNonPrintableContents( $category, @@ -5133,7 +5113,6 @@ class Results * @return string formatted data * * @access private - * */ private function _getFromForeign(array $map, $meta, $where_comparison) { @@ -5168,6 +5147,9 @@ class Results * Prepares the displayable content of a data cell in Browse mode, * taking into account foreign key description field and transformations * + * @see _getDataCellForNumericColumns(), _getDataCellForGeometryColumns(), + * _getDataCellForNonNumericColumns(), + * * @param string $class css classes for the td element * @param bool $condition_field whether the column is a part of * the where clause @@ -5191,10 +5173,6 @@ class Results * @return string formatted data * * @access private - * - * @see _getDataCellForNumericColumns(), _getDataCellForGeometryColumns(), - * _getDataCellForNonNumericColumns(), - * */ private function _getRowData( $class, @@ -5346,6 +5324,8 @@ class Results /** * Prepares a checkbox for multi-row submits * + * @see _getTableBody(), _getCheckboxAndLinks() + * * @param string $del_url delete url * @param array $displayParts array with explicit indexes for all * the display elements @@ -5358,8 +5338,6 @@ class Results * @return string the generated HTML * * @access private - * - * @see _getTableBody(), _getCheckboxAndLinks() */ private function _getCheckboxForMultiRowSubmissions( $del_url, @@ -5395,6 +5373,8 @@ class Results /** * Prepares an Edit link * + * @see _getTableBody(), _getCheckboxAndLinks() + * * @param string $edit_url edit url * @param string $class css classes for td element * @param string $edit_str text for the edit link @@ -5404,8 +5384,6 @@ class Results * @return string the generated HTML * * @access private - * - * @see _getTableBody(), _getCheckboxAndLinks() */ private function _getEditLink( $edit_url, @@ -5436,6 +5414,8 @@ class Results /** * Prepares an Copy link * + * @see _getTableBody(), _getCheckboxAndLinks() + * * @param string $copy_url copy url * @param string $copy_str text for the copy link * @param string $where_clause where clause @@ -5445,8 +5425,6 @@ class Results * @return string the generated HTML * * @access private - * - * @see _getTableBody(), _getCheckboxAndLinks() */ private function _getCopyLink( $copy_url, @@ -5482,6 +5460,8 @@ class Results /** * Prepares a Delete link * + * @see _getTableBody(), _getCheckboxAndLinks() + * * @param string $del_url delete url * @param string $del_str text for the delete link * @param string $js_conf text for the JS confirmation @@ -5490,8 +5470,6 @@ class Results * @return string the generated HTML * * @access private - * - * @see _getTableBody(), _getCheckboxAndLinks() */ private function _getDeleteLink($del_url, $del_str, $js_conf, $class) { @@ -5521,6 +5499,8 @@ class Results * Prepare checkbox and links at some position (left or right) * (only called for horizontal mode) * + * @see _getPlacedLinks() + * * @param string $position the position of the checkbox and links * @param string $del_url delete url * @param array $displayParts array with explicit indexes for all the @@ -5540,8 +5520,6 @@ class Results * @return string the generated HTML * * @access private - * - * @see _getPlacedLinks() */ private function _getCheckboxAndLinks( $position, @@ -5637,14 +5615,14 @@ class Results * and Session pftext variable * (string is truncated only if necessary) * + * @see _handleNonPrintableContents(), _getDataCellForGeometryColumns(), + * _getDataCellForNonNumericColumns + * * @param string $str string to be truncated * * @return array * * @access private - * - * @see _handleNonPrintableContents(), _getDataCellForGeometryColumns(), - * _getDataCellForNonNumericColumns */ private function _getPartialText($str): array { diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php index 70fa62cb65..2a67f7b882 100644 --- a/libraries/classes/Encoding.php +++ b/libraries/classes/Encoding.php @@ -1,8 +1,6 @@ [ @@ -54,9 +46,7 @@ class GisVisualization // The height of the GIS visualization. 'height' => 450, ]; - /** - * @var array Options that the user has specified. - */ + /** @var array Options that the user has specified. */ private $_userSpecifiedSettings = null; /** @@ -119,7 +109,7 @@ class GisVisualization } /** - * Constructor. Stores user specified options. + * Stores user specified options. * * @param string $sql_query SQL to fetch raw data for visualization * @param array $options Users specified options diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 659fff0ab1..51f0e52c40 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -1,8 +1,6 @@ [ 'DEFAULT_COLLATE_NAME' => [ @@ -330,9 +324,7 @@ class InternalRelations ], ]; - /** - * @var array - */ + /** @var array */ private static $mysql = [ 'columns_priv' => [ 'Db' => [ diff --git a/libraries/classes/IpAllowDeny.php b/libraries/classes/IpAllowDeny.php index abda9a0ba9..8d01a05000 100644 --- a/libraries/classes/IpAllowDeny.php +++ b/libraries/classes/IpAllowDeny.php @@ -2,8 +2,6 @@ /** * This library is used with the server IP allow/deny host authentication * feature - * - * @package PhpMyAdmin */ declare(strict_types=1); @@ -13,8 +11,6 @@ use PhpMyAdmin\Core; /** * PhpMyAdmin\IpAllowDeny class - * - * @package PhpMyAdmin */ class IpAllowDeny { diff --git a/libraries/classes/Language.php b/libraries/classes/Language.php index 6b0405e6c1..861b926337 100644 --- a/libraries/classes/Language.php +++ b/libraries/classes/Language.php @@ -1,8 +1,6 @@ * * @todo this object should be attached to the PMA_Server object - * @package PhpMyAdmin - * @since phpMyAdmin 2.9.10 */ class ListDatabase extends ListAbstract { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/libraries/classes/Logging.php b/libraries/classes/Logging.php index 8c114e51d5..7ffdebc453 100644 --- a/libraries/classes/Logging.php +++ b/libraries/classes/Logging.php @@ -3,8 +3,6 @@ * Logging functionality for webserver. * * This includes web server specific code to log some information. - * - * @package PhpMyAdmin */ declare(strict_types=1); @@ -14,8 +12,6 @@ use PhpMyAdmin\Core; /** * Misc logging functions - * - * @package PhpMyAdmin */ class Logging { diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index f002aa7590..09b31b9842 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -1,8 +1,6 @@ addMessage($hint); * - * - * @package PhpMyAdmin */ class Message { @@ -128,8 +124,6 @@ class Message protected $addedMessages = []; /** - * Constructor - * * @param string $string The message to be displayed * @param integer $number A numeric representation of the type of message * @param array $params An array of parameters to use in the message diff --git a/libraries/classes/Mime.php b/libraries/classes/Mime.php index 114f3a7389..49e6ff8d87 100644 --- a/libraries/classes/Mime.php +++ b/libraries/classes/Mime.php @@ -2,7 +2,6 @@ /** * MIME detection code. * - * @package PhpMyAdmin * @todo Maybe we could try to use fileinfo module if loaded */ declare(strict_types=1); @@ -11,8 +10,6 @@ namespace PhpMyAdmin; /** * PhpMyAdmin\Mime class; - * - * @package PhpMyAdmin */ class Mime { diff --git a/libraries/classes/MultSubmits.php b/libraries/classes/MultSubmits.php index 12cb515fd1..0f32c1d15c 100644 --- a/libraries/classes/MultSubmits.php +++ b/libraries/classes/MultSubmits.php @@ -3,7 +3,6 @@ * Holds the PhpMyAdmin\MultSubmits class * * @usedby mult_submits.inc.php - * @package PhpMyAdmin */ declare(strict_types=1); @@ -13,29 +12,18 @@ use PhpMyAdmin\Html\Forms\Fields\FKCheckbox; /** * Functions for multi submit forms - * - * @package PhpMyAdmin */ class MultSubmits { - /** - * @var Transformations - */ + /** @var Transformations */ private $transformations; - /** - * @var RelationCleanup - */ + /** @var RelationCleanup */ private $relationCleanup; - /** - * @var Operations - */ + /** @var Operations */ private $operations; - /** - * MultSubmits constructor. - */ public function __construct() { $this->transformations = new Transformations(); diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index e7a07f79e2..99746d0726 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -2,8 +2,6 @@ /** * This class is responsible for instantiating * the various components of the navigation panel - * - * @package PhpMyAdmin-navigation */ declare(strict_types=1); @@ -21,29 +19,19 @@ use PhpMyAdmin\Util; /** * The navigation panel - displays server, db and table selection tree - * - * @package PhpMyAdmin-Navigation */ class Navigation { - /** - * @var Template - */ + /** @var Template */ private $template; - /** - * @var Relation - */ + /** @var Relation */ private $relation; - /** - * @var DatabaseInterface - */ + /** @var DatabaseInterface */ private $dbi; - /** - * @var NavigationTree - */ + /** @var NavigationTree */ private $tree; /** diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index 7c623f7e68..c31383e87f 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -1,8 +1,6 @@ ipAllowDeny = new IpAllowDeny(); diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php index 39c65082cc..87a011499f 100644 --- a/libraries/classes/Plugins/Export/ExportCodegen.php +++ b/libraries/classes/Plugins/Export/ExportCodegen.php @@ -1,9 +1,6 @@ relation = new Relation($GLOBALS['dbi']); diff --git a/libraries/classes/Plugins/IOTransformationsPlugin.php b/libraries/classes/Plugins/IOTransformationsPlugin.php index 270e8d6f97..3c7a364e02 100644 --- a/libraries/classes/Plugins/IOTransformationsPlugin.php +++ b/libraries/classes/Plugins/IOTransformationsPlugin.php @@ -1,8 +1,6 @@ import = new Import(); diff --git a/libraries/classes/Plugins/Schema/Dia/Dia.php b/libraries/classes/Plugins/Schema/Dia/Dia.php index 8ae8d912b0..af92c7f6a5 100644 --- a/libraries/classes/Plugins/Schema/Dia/Dia.php +++ b/libraries/classes/Plugins/Schema/Dia/Dia.php @@ -1,8 +1,6 @@ setProperties(); diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php index 1a06b808ce..a5ea8c5fff 100644 --- a/libraries/classes/Plugins/Schema/SchemaEps.php +++ b/libraries/classes/Plugins/Schema/SchemaEps.php @@ -1,9 +1,6 @@ setProperties(); diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php index 0261d8309a..becddb83dc 100644 --- a/libraries/classes/Plugins/Schema/SchemaPdf.php +++ b/libraries/classes/Plugins/Schema/SchemaPdf.php @@ -1,9 +1,6 @@ setProperties(); diff --git a/libraries/classes/Plugins/Schema/SchemaSvg.php b/libraries/classes/Plugins/Schema/SchemaSvg.php index 537dc1c61b..d8b1ed5500 100644 --- a/libraries/classes/Plugins/Schema/SchemaSvg.php +++ b/libraries/classes/Plugins/Schema/SchemaSvg.php @@ -1,9 +1,6 @@ setProperties(); diff --git a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php index b1d590d3c4..ad933d832e 100644 --- a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php +++ b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php @@ -1,8 +1,6 @@ _google2fa; diff --git a/libraries/classes/Plugins/TwoFactor/Invalid.php b/libraries/classes/Plugins/TwoFactor/Invalid.php index 208da88b00..dbca96946a 100644 --- a/libraries/classes/Plugins/TwoFactor/Invalid.php +++ b/libraries/classes/Plugins/TwoFactor/Invalid.php @@ -1,8 +1,6 @@ upload plugins - * - * @package PhpMyAdmin */ declare(strict_types=1); @@ -11,8 +9,6 @@ namespace PhpMyAdmin\Plugins; /** * Provides a common interface that will have to implemented by all of the * import->upload plugins. - * - * @package PhpMyAdmin */ interface UploadInterface { diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php index d08a9c1db0..901e7c5502 100644 --- a/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php +++ b/libraries/classes/Properties/Options/Groups/OptionsPropertyMainGroup.php @@ -1,8 +1,6 @@ 'No', 'Slave_SQL_Running' => 'No', diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php index 1b840d987a..6c8489f5a9 100644 --- a/libraries/classes/Response.php +++ b/libraries/classes/Response.php @@ -1,8 +1,6 @@ name; } - /** - * @return string|null - */ public function getVersion(): ?string { return $this->version; } - /** - * @return string - */ public function getStatus(): string { return $this->status; } - /** - * @return string - */ public function getType(): string { return $this->type; } - /** - * @return string|null - */ public function getTypeVersion(): ?string { return $this->typeVersion; } - /** - * @return string|null - */ public function getLibrary(): ?string { return $this->library; } - /** - * @return string|null - */ public function getLibraryVersion(): ?string { return $this->libraryVersion; } - /** - * @return string|null - */ public function getAuthor(): ?string { return $this->author; } - /** - * @return string|null - */ public function getDescription(): ?string { return $this->description; } - /** - * @return string - */ public function getLicense(): string { return $this->license; } - /** - * @return string|null - */ public function getLoadOption(): ?string { return $this->loadOption; } - /** - * @return string|null - */ public function getMaturity(): ?string { return $this->maturity; } - /** - * @return string|null - */ public function getAuthVersion(): ?string { return $this->authVersion; diff --git a/libraries/classes/Server/Plugins.php b/libraries/classes/Server/Plugins.php index 71d48ac0a6..4a05945777 100644 --- a/libraries/classes/Server/Plugins.php +++ b/libraries/classes/Server/Plugins.php @@ -1,21 +1,13 @@ template = new Template(); diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php index 5b171bc59a..efef8f3d8d 100644 --- a/libraries/classes/ThemeManager.php +++ b/libraries/classes/ThemeManager.php @@ -1,8 +1,6 @@ themes = []; @@ -132,8 +111,9 @@ class ThemeManager * * @param string $path path to themes folder * - * @access public * @return boolean success + * + * @access public */ public function setThemesPath($path) { @@ -150,8 +130,9 @@ class ThemeManager * * @param boolean $per_server Whether to enable per server flag * - * @access public * @return void + * + * @access public */ public function setThemePerServer($per_server) { @@ -163,8 +144,9 @@ class ThemeManager * * @param string $theme theme name * - * @access public * @return bool true on success + * + * @access public */ public function setActiveTheme($theme = null) { @@ -192,6 +174,7 @@ class ThemeManager * Returns name for storing theme * * @return string cookie name + * * @access public */ public function getThemeCookieName() @@ -208,6 +191,7 @@ class ThemeManager * returns name of theme stored in the cookie * * @return string|bool theme name from cookie or false + * * @access public */ public function getThemeCookie() @@ -227,6 +211,7 @@ class ThemeManager * save theme in cookie * * @return bool true + * * @access public */ public function setThemeCookie() @@ -248,6 +233,7 @@ class ThemeManager * @param string $folder Folder name to test * * @return boolean + * * @access private */ private function _checkThemeFolder($folder) @@ -270,6 +256,7 @@ class ThemeManager * read all themes * * @return bool true + * * @access public */ public function loadThemes() @@ -317,6 +304,7 @@ class ThemeManager * @param string $theme name fo theme to check for * * @return bool + * * @access public */ public function checkTheme($theme) @@ -330,6 +318,7 @@ class ThemeManager * @param boolean $form whether enclosed by from tags or not * * @return string + * * @access public */ public function getHtmlSelectBox($form = true) @@ -369,6 +358,7 @@ class ThemeManager * Renders the previews for all themes * * @return string + * * @access public */ public function getPrintPreviews() @@ -384,6 +374,7 @@ class ThemeManager * Theme initialization * * @return void + * * @access public */ public static function initializeTheme() @@ -398,13 +389,17 @@ class ThemeManager $GLOBALS['PMA_Theme'] = $tmanager->theme; // BC + /** * the theme path + * * @global string $GLOBALS['pmaThemePath'] */ $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath(); + /** * the theme image path + * * @global string $GLOBALS['pmaThemeImage'] */ $GLOBALS['pmaThemeImage'] = $GLOBALS['PMA_Theme']->getImgPath(); diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php index 182edbeea3..5da0e9da25 100644 --- a/libraries/classes/Tracker.php +++ b/libraries/classes/Tracker.php @@ -1,8 +1,6 @@ _writable; } - /** - * @return TwoFactorPlugin - */ public function getBackend(): TwoFactorPlugin { return $this->_backend; @@ -119,9 +97,6 @@ class TwoFactor return $this->_available; } - /** - * @return bool - */ public function showSubmit(): bool { $backend = $this->_backend; diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php index cb493c9c6b..4782cc5599 100644 --- a/libraries/classes/Types.php +++ b/libraries/classes/Types.php @@ -1,8 +1,6 @@ relation = new Relation($GLOBALS['dbi']); diff --git a/libraries/classes/UserPreferencesHeader.php b/libraries/classes/UserPreferencesHeader.php index 455753d24d..5bd76fcadb 100644 --- a/libraries/classes/UserPreferencesHeader.php +++ b/libraries/classes/UserPreferencesHeader.php @@ -1,8 +1,6 @@ '; } - /** - * @return string - */ protected static function displayTabsWithIcon(): string { $form_param = $_GET['form'] ?? null; @@ -115,9 +108,6 @@ class UserPreferencesHeader return $content; } - /** - * @return string|null - */ protected static function displayConfigurationSavedMessage(): ?string { // show "configuration saved" message and reload navigation panel if needed diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index e4a14be699..71a763c410 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -1,8 +1,6 @@ zip = new ZipArchive(); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index e95615717c..09aa574bf7 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -26,8 +26,6 @@ * - loading of an authentication library * - db connection * - authentication work - * - * @package PhpMyAdmin */ declare(strict_types=1); @@ -121,12 +119,10 @@ Core::checkExtensions(); */ Core::configure(); -/******************************************************************************/ /* start procedural code label_start_procedural */ Core::cleanupPathInfo(); -/******************************************************************************/ /* parsing configuration file LABEL_parsing_config_file */ /** @var bool $isConfigLoading Indication for the error handler */ @@ -287,7 +283,6 @@ if (Core::isValid($_POST['sql_query'])) { //$_REQUEST['server']; // checked later in this file //$_REQUEST['lang']; // checked by LABEL_loading_language_file -/******************************************************************************/ /* loading language file LABEL_loading_language_file */ /** @@ -309,7 +304,6 @@ Core::checkConfiguration(); /* Check request for possible attacks */ Core::checkRequest(); -/******************************************************************************/ /* setup servers LABEL_setup_servers */ $PMA_Config->checkServers(); @@ -328,7 +322,6 @@ $diMigration->setGlobal('url_params', ['server' => $containerBuilder->getParamet */ $PMA_Config->enableBc(); -/******************************************************************************/ /* setup themes LABEL_theme_setup */ ThemeManager::initializeTheme(); diff --git a/libraries/config.default.php b/libraries/config.default.php index 485ac97076..22891e4e72 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -14,8 +14,6 @@ * config.inc.php * * All directives are explained in the documentation - * - * @package PhpMyAdmin */ declare(strict_types=1); @@ -2651,9 +2649,6 @@ $cfg['ThemeDefault'] = 'pmahomme'; */ $cfg['ThemePerServer'] = false; -/******************************************************************************* - * - */ /** * Default query for table diff --git a/libraries/config.values.php b/libraries/config.values.php index b7dbec9998..a0fc6a5454 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -2,8 +2,6 @@ /** * Database with allowed values for configuration stored in the $cfg array, * used by setup script and user preferences to generate forms. - * - * @package PhpMyAdmin */ declare(strict_types=1); diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php index 15ba285087..d8b7e5b13c 100644 --- a/libraries/db_table_exists.inc.php +++ b/libraries/db_table_exists.inc.php @@ -2,8 +2,6 @@ /** * Ensure the database and the table exist (else move to the "parent" script) * and display headers - * - * @package PhpMyAdmin */ declare(strict_types=1); diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index d1c59ada14..b2b46a0304 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -1,8 +1,6 @@ - + + + + + + + 4 diff --git a/setup/config.php b/setup/config.php index 928ae37825..a66f76a0dc 100644 --- a/setup/config.php +++ b/setup/config.php @@ -1,8 +1,6 @@ resetConfigData(); // drop post data $response->generateHeader303('index.php' . Url::getCommonRaw()); exit; } elseif (Core::ifSetOr($_POST['submit_download'], '')) { - // // Output generated config file - // Core::downloadHeader('config.inc.php', 'text/plain'); $response->disable(); echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']); exit; } else { - // // Show generated config file in a