Eric Schirra
ea969ed219
- Update to 5.1.0 - issue #15350 Change Media (MIME) type references to Media type - issue #15377 Add a request router - issue Automatically focus input in the two-factor authentication window - issue #15509 Replace gender-specific pronouns with gender-neutral pronouns - issue #15491 Improve complexity of generated passwords - issue #14909 Add a configuration option to define the 1st day of week - issue #12726 Made user names clickable in user accounts overview - issue #15729 Improve virtuality dropdown for MariaDB > 10.1 - issue #15312 Added an option to perform ALTER ONLINE (ALGORITHM=INPLACE) when editing a table structure - issue Added missing 'IF EXISTS' to 'DROP EVENT' when exporting databases - issue #15232 Improve the padding in query result tool links - issue #15064 Support exporting raw SQL queries - issue #15555 Added ip2long transformation - issue #15194 Fixed horizontal scroll on structure edit page - issue #14820 Move table hide buttons in navigation to avoid hiding a table by mistake - issue #14947 Use correct MySQL version if the version is 8.0 or above for documentation links - issue #15790 Use "MariaDB Documentation" instead of "MySQL Documentation" on a MariaDB server - issue #15880 Change "Show Query" link to a button - issue #13371 Automatically toggle the radio button to "Create a page and save it" on Designer - issue #12969 Tap and hold will not dismiss the error box anymore, you can now copy the error - issue #15582 Don't disable "Empty" table button after clicking it - issue #15662 Stay on the structure page after editing/adding/dropping indexes - issue #15663 show structure after adding a column - issue #16005 Remove symfony/yaml dependency - issue #16005 Improve performance of dependency injection system by removing yaml parsing - issue #15447 Disable phpMyAdmin storage database checkbox on databases list - issue #16001 Add autocomplete attributes on login form - issue #13519 Add "Preview SQL" option on Index dialog box when creating a new table - issue #15954 Fixed export maximal length of created query input is too small - issue Redesign the server status advisor page - issue #13124 Use same height for SQL query textarea and Columns select in SQL page - issue #16005 Add a new vendor constant "CACHE_DIR" that defaults to "libraries/cache/" and store routing cache into this folder - issue #16005 Warm-up the routing cache before building the release - issue #16005 Use --optimize-autoloader when installing composer vendors before building the release - issue #15992 Add back the table name to the printable version on "Structure" page - issue #14815 Allow simplifying exported view syntax to only "CREATE VIEW" - issue #15496 Add $cfg['CaptchaSiteVerifyURL'] for Google ReCaptcha siteVerifyUrl - issue #14772 Add the password_hash PHP function as an option when inserting data - issue #15136 Add a notice for Hex converter giving invalid results - issue #16139 Use a textarea for JSON columns - issue #16223 Make JSON input transformation editor less narrow - issue #14340 Add a button on Export Page to show the SQL Query - issue #16304 Add support for INET6 column type - issue #16337 Fix example insert/update query default values - issue #12961 Remove indexes from table relation - issue #13557 Use a full list of functions instead of a separated one on insert/edit page "Function" selector - issue #14795 Include routines in the export in a predictable order - issue #16227 Fixed autocomplete is not working in case the table name is quoted by "`" symbols - issue #15463 Force BINARY comparison when looking at privileges to avoid an SQL error on privileges tab - issue #16430 Fixed Windows error message uses trailing / instead of \ - issue #16316 Added support for "SameSite=Strict" on cookies using configuration "$cfg['CookieSameSite']" - issue #16451 Fixed AWS RDS IAM authentication doesn't work because pma_password is truncated - issue #16451 Show an error message when the security limit is reached instead of silently trimming the password to avoid confusion - issue #15001 Add back Login Cookie Validity setting to the features form - issue #16457 Add config parameters to support third-party ReCaptcha v2 compatible APIs like hCaptcha - issue #13077 Moved tools section to left on large devices (Bootstrap xl) - issue #15711 Moved some buttons to left on large devices (Bootstrap xl) - issue #15584 Add $cfg['MysqlSslWarningSafeHosts'] to set the red text black when ssl is not used on a private network - issue #15652 Replace deprecated FOUND_ROWS() function call on "distinct values" feature - issue Export blobs as hex on JSON export - issue #16095 Fix leading space not shown in a CHAR column when browsing a table - issue Make procedures/functions SQL editor both side scrollable - issue #16407 Bump pragmarx/google2fa conflict to >8.0 - issue #14953 Added a rename Button to use RENAME INDEX syntax of MySQL 5.7 (and MariaDB >= 10.5.2) - issue #16477 Fixed no Option to enter TABLE specific permissions when the database name contains an "_" (underscore) - issue #16498 Fixed empty text not appearing after deleting all Routines - issue #16467 Fixed a PHP notice "Trying to access array offset on value of type null" on Designer PDF export - issue #15658 Fixed saving UI displayed columns on a non database request fails - issue #16495 Fix drop tables checkbox is above the checkbox for foreign keys - issue #16485 Fix visual query builder missing "Build Query" button - issue #16565 Added 'IF EXISTS' to 'DROP EVENT' when updating events to avoid replication issues - issue Removed metro fonts that where Apache-2.0 files that are incompatible with GPL-2.0 - issue #16464 Made the relation view default to the current database when creating relations - issue #16463 Fixed 'REFERENCES' privilege checkbox's title on new MySQL versions and on MariaDB - issue #16405 Added jest as a Unit Testing tool for our javascript code - issue #16252 Fixed the too small font size when editing rows (textareas) - issue #16585 Fixed BLOB to JPG transformation PHP errors - issue Made the console setup async to avoid blocking the page render - issue #16429 Use PHP 8.0 fixed version (commit) for TCPDF - issue #16005 Major performance improvements on browsing a lot of rows - issue #16595 Fixed editing columns having a `_` in their name in specific conditions - issue #16608 Fix "Sort by key" restore auto saved value - issue #16611 Fixed unable to add tables to rename aliases twice on Export - issue #16621 Fixed link HTML messed up in Advisor - issue #16622 Fixed Advisor formatting incorrect for long_query_time notice - issue #15389 Fixed reset current page indicator after deleting all rows to current page and not page 1 - issue #15997 Fixed auto save query - issue #15997 Made auto saved query database or database+table independent - issue #16641 Fixed query generation that was allowing JSON to have a length - issue #15994 Fixed the selected value detection for "on update current_timestamp" - issue #16614 Fixed PHP 8.0 dataseek offset call to the MySQLI extension - issue #16662 Fixed Uncaught TypeError on "delete" button click of a database search results page - issue Fixed Undefined index: selected_usr when the user tried to delete no selected user - issue #16657 Fixed the QBE interface when the configuration storage is not enabled - issue #16479 Fix our Selenium test-suite - issue #16669 Fixed table search modal for BETWEEN - issue #16667 Fixed LIKE and TINYINT in search not working properly - issue #16424 Fixed numerical search in table and zoom - issue Improve the version handling (new Version class) and add a VERSION_SUFFIX for vendors - issue #14494 Fix uncaught TypeError when editing partitioning - issue #16525 Fix PHP 8.0 failing tests when comparing 0 to '' - issue #16429 Fixed PHP 8.0 errors on preg_replace and operand types - issue #16490 Fixed PHP 8.0 function libxml_disable_entity_loader() is deprecated - issue #16429 Fixed failing unit tests on PHP 8.0 - issue #16609 Fixed Sql.rearrangeStickyColumns is not a function - Rebase phpMyAdmin-config.patch. OBS-URL: https://build.opensuse.org/request/show/875360 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=366
290 lines
12 KiB
Diff
290 lines
12 KiB
Diff
Index: config.sample.inc.php
|
|
===================================================================
|
|
--- config.sample.inc.php.orig
|
|
+++ config.sample.inc.php
|
|
@@ -10,13 +10,56 @@
|
|
declare(strict_types=1);
|
|
|
|
/**
|
|
+ * Disable the default warning that is displayed on the DB Details Structure
|
|
+ * page if any of the required Tables for the relationfeatures could not be
|
|
+ * found
|
|
+ *
|
|
+ * Default: false
|
|
+ */
|
|
+/* $cfg['PmaNoRelation_DisableWarning'] = true;
|
|
+
|
|
+/**
|
|
+ * Zero Configuration mode.
|
|
+ *
|
|
+ * Enables Zero Configuration mode in which the user will be offered a choice
|
|
+ * to create phpMyAdmin configuration storage in the current database or use
|
|
+ * the existing one, if already present.
|
|
+ *
|
|
+ * Note: If there is no central configuration storage defined then you may end
|
|
+ * up with different set of phpMyAdmin configuration storage tables for
|
|
+ * different databases.
|
|
+ *
|
|
+ * Default: true
|
|
+ */
|
|
+$cfg['ZeroConf'] = false;
|
|
+
|
|
+/**
|
|
+ * Disable the default warning that is displayed if Suhosin is detected
|
|
+ *
|
|
+ * Default: false
|
|
+ */
|
|
+/* $cfg['SuhosinDisableWarning'] = true;
|
|
+
|
|
+/**
|
|
+ * Default language to use, if not browser-defined or user-defined
|
|
+ *
|
|
+ * Default: en
|
|
+ */
|
|
+/* $cfg['DefaultLang'] = 'de';
|
|
+
|
|
+/**
|
|
* This is needed for cookie based authentication to encrypt password in
|
|
* cookie. Needs to be 32 chars long.
|
|
+ *
|
|
+ * YOU MUST FILL IN THIS FOR COOKIE AUTH!
|
|
*/
|
|
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
|
|
+$cfg['blowfish_secret'] = '';
|
|
|
|
/**
|
|
* Servers configuration
|
|
+ *
|
|
+ * for more info/explanation about these VARS have look at
|
|
+ * libraries/config.default.php
|
|
*/
|
|
$i = 0;
|
|
|
|
@@ -24,44 +67,153 @@ $i = 0;
|
|
* First server
|
|
*/
|
|
$i++;
|
|
-/* Authentication type */
|
|
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
|
|
-/* Server parameters */
|
|
-$cfg['Servers'][$i]['host'] = 'localhost';
|
|
-$cfg['Servers'][$i]['compress'] = false;
|
|
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
|
|
+
|
|
+$cfg['Servers'][$i]['host'] = 'localhost';
|
|
+$cfg['Servers'][$i]['port'] = '';
|
|
+$cfg['Servers'][$i]['socket'] = '';
|
|
+$cfg['Servers'][$i]['ssl'] = false;
|
|
+$cfg['Servers'][$i]['connect_type'] = 'socket';
|
|
+$cfg['Servers'][$i]['extension'] = 'mysqli';
|
|
+$cfg['Servers'][$i]['compress'] = false;
|
|
+$cfg['Servers'][$i]['auth_type'] = 'cookie';
|
|
+$cfg['Servers'][$i]['user'] = 'root';
|
|
+$cfg['Servers'][$i]['password'] = '';
|
|
+$cfg['Servers'][$i]['AllowNoPassword'] = false;
|
|
+$cfg['Servers'][$i]['AllowRoot'] = true;
|
|
+$cfg['Servers'][$i]['SignonSession'] = '';
|
|
+$cfg['Servers'][$i]['SignonURL'] = '';
|
|
+$cfg['Servers'][$i]['LogoutURL'] = '';
|
|
+$cfg['Servers'][$i]['only_db'] = '';
|
|
+$cfg['Servers'][$i]['verbose'] = '';
|
|
+$cfg['Servers'][$i]['verbose_check'] = true;
|
|
+$cfg['Servers'][$i]['AllowDeny']['order'] = '';
|
|
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
|
|
|
|
/**
|
|
* phpMyAdmin configuration storage settings.
|
|
+ *
|
|
+ * for more info/explanation about these VARS have look at
|
|
+ * libraries/config.default.php
|
|
*/
|
|
|
|
/* User used to manipulate with storage */
|
|
-// $cfg['Servers'][$i]['controlhost'] = '';
|
|
-// $cfg['Servers'][$i]['controlport'] = '';
|
|
-// $cfg['Servers'][$i]['controluser'] = 'pma';
|
|
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
|
|
-
|
|
-/* Storage database and tables */
|
|
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
|
|
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
|
|
-// $cfg['Servers'][$i]['relation'] = 'pma__relation';
|
|
-// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
|
|
-// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
|
|
-// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
|
|
-// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
|
|
-// $cfg['Servers'][$i]['history'] = 'pma__history';
|
|
-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
|
|
-// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
|
|
-// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
|
|
-// $cfg['Servers'][$i]['recent'] = 'pma__recent';
|
|
-// $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
|
|
-// $cfg['Servers'][$i]['users'] = 'pma__users';
|
|
-// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
|
|
-// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
|
-// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
|
-// $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
|
|
-// $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
|
|
-// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
|
|
+$cfg['Servers'][$i]['controlhost'] = 'localhost';
|
|
+$cfg['Servers'][$i]['controlport'] = '';
|
|
+/*
|
|
+$cfg['Servers'][$i]['controluser'] = 'pma';
|
|
+$cfg['Servers'][$i]['controlpass'] = 'pmapass';
|
|
+
|
|
+/**
|
|
+ * The name of the database containing the phpMyAdmin configuration storage.
|
|
+ *
|
|
+ * For a whole set of additional features (bookmarks, comments, SQL-history,
|
|
+ * tracking mechanism, PDF-generation, column contents transformation, etc.)
|
|
+ * you need to create a set of special tables. Those tables can be located in
|
|
+ * your own database, or in a central database for a multi-user installation
|
|
+ * (this database would then be accessed by the controluser, so no other user
|
|
+ * should have rights to it).
|
|
+ *
|
|
+ * Default: ''
|
|
+ *
|
|
+ */
|
|
+/* $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
|
|
+
|
|
+/* Other Storage tables */
|
|
+
|
|
+$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
|
|
+$cfg['Servers'][$i]['relation'] = 'pma__relation';
|
|
+$cfg['Servers'][$i]['table_info'] = 'pma__table_info';
|
|
+$cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
|
|
+$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
|
|
+$cfg['Servers'][$i]['column_info'] = 'pma__column_info';
|
|
+$cfg['Servers'][$i]['history'] = 'pma__history';
|
|
+$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
|
|
+$cfg['Servers'][$i]['tracking'] = 'pma__tracking';
|
|
+$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
|
|
+$cfg['Servers'][$i]['recent'] = 'pma__recent';
|
|
+$cfg['Servers'][$i]['favorite'] = 'pma__favorite';
|
|
+$cfg['Servers'][$i]['users'] = 'pma__users';
|
|
+$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
|
|
+$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
|
+$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
|
+$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
|
|
+$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
|
|
+$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
|
|
+/* $cfg['Servers'][$i]['auth_swekey_config'] = '';
|
|
+
|
|
+
|
|
+
|
|
+/**
|
|
+ * Second Server
|
|
+ */
|
|
+
|
|
+/*
|
|
+$i++;
|
|
+$cfg['Servers'][$i]['host'] = 'localhost';
|
|
+$cfg['Servers'][$i]['port'] = '';
|
|
+$cfg['Servers'][$i]['socket'] = '';
|
|
+$cfg['Servers'][$i]['ssl'] = false;
|
|
+$cfg['Servers'][$i]['connect_type'] = 'socket';
|
|
+$cfg['Servers'][$i]['extension'] = 'mysqli';
|
|
+$cfg['Servers'][$i]['compress'] = false;
|
|
+$cfg['Servers'][$i]['auth_type'] = 'cookie';
|
|
+$cfg['Servers'][$i]['user'] = 'root';
|
|
+$cfg['Servers'][$i]['password'] = '';
|
|
+$cfg['Servers'][$i]['AllowNoPassword'] = false;
|
|
+$cfg['Servers'][$i]['AllowRoot'] = true;
|
|
+$cfg['Servers'][$i]['SignonSession'] = '';
|
|
+$cfg['Servers'][$i]['SignonURL'] = '';
|
|
+$cfg['Servers'][$i]['LogoutURL'] = '';
|
|
+$cfg['Servers'][$i]['only_db'] = '';
|
|
+$cfg['Servers'][$i]['verbose'] = '';
|
|
+$cfg['Servers'][$i]['verbose_check'] = true;
|
|
+$cfg['Servers'][$i]['AllowDeny']['order'] = '';
|
|
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
|
|
+*/
|
|
+
|
|
+/*
|
|
+ * phpMyAdmin configuration storage settings.
|
|
+ */
|
|
+
|
|
+/*
|
|
+$cfg['Servers'][$i]['controlhost'] = 'localhost';
|
|
+$cfg['Servers'][$i]['controlport'] = '';
|
|
+$cfg['Servers'][$i]['controluser'] = 'pma';
|
|
+$cfg['Servers'][$i]['controlpass'] = 'pmapass';
|
|
+$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
|
|
+$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
|
|
+$cfg['Servers'][$i]['relation'] = 'pma__relation';
|
|
+$cfg['Servers'][$i]['table_info'] = 'pma__table_info';
|
|
+$cfg['Servers'][$i]['table_coords'] = 'pma__table_cords';
|
|
+$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
|
|
+$cfg['Servers'][$i]['column_info'] = 'pma__column_info';
|
|
+$cfg['Servers'][$i]['history'] = 'pma__history';
|
|
+$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
|
|
+$cfg['Servers'][$i]['tracking'] = 'pma__tracking';
|
|
+$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
|
|
+$cfg['Servers'][$i]['recent'] = 'pma__recent';
|
|
+$cfg['Servers'][$i]['users'] = 'pma__users';
|
|
+$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
|
|
+$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
|
+$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
|
+$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
|
|
+$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
|
|
+$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
|
|
+$cfg['Servers'][$i]['auth_swekey_config'] = '';
|
|
+*/
|
|
+
|
|
+/**
|
|
+ * If you have more than one server configured, you can set $cfg['ServerDefault']
|
|
+ * to any one of them to autoconnect to that server when phpMyAdmin is started,
|
|
+ * or set it to 0 to be given a list of servers without logging in
|
|
+ * If you have only one server configured, $cfg['ServerDefault'] *MUST* be
|
|
+ * set to that server.
|
|
+ *
|
|
+ * Default server (0 = no default server)
|
|
+ */
|
|
+$cfg['ServerDefault'] = 1;
|
|
+$cfg['Server'] = '0';
|
|
+unset($cfg['Servers'][0]);
|
|
|
|
/**
|
|
* End of servers configuration
|
|
Index: libraries/vendor_config.php
|
|
===================================================================
|
|
--- libraries/vendor_config.php.orig
|
|
+++ libraries/vendor_config.php
|
|
@@ -24,31 +24,31 @@ define('AUTOLOAD_FILE', ROOT_PATH . 'ven
|
|
/**
|
|
* Directory where cache files are stored.
|
|
*/
|
|
-define('TEMP_DIR', ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR);
|
|
+define('TEMP_DIR', '@tmpdir@' . DIRECTORY_SEPARATOR);
|
|
|
|
/**
|
|
* Path to changelog file, can be gzip compressed. Useful when you want to
|
|
* have documentation somewhere else, eg. /usr/share/doc.
|
|
*/
|
|
-define('CHANGELOG_FILE', ROOT_PATH . 'ChangeLog');
|
|
+define('CHANGELOG_FILE', '@docdir@' . DIRECTORY_SEPARATOR . 'ChangeLog');
|
|
|
|
/**
|
|
* Path to license file. Useful when you want to have documentation somewhere
|
|
* else, eg. /usr/share/doc.
|
|
*/
|
|
-define('LICENSE_FILE', ROOT_PATH . 'LICENSE');
|
|
+define('LICENSE_FILE', '@docdir@' . DIRECTORY_SEPARATOR . 'LICENSE');
|
|
|
|
/**
|
|
* Directory where SQL scripts to create/upgrade configuration storage reside.
|
|
*/
|
|
-define('SQL_DIR', ROOT_PATH . 'sql' . DIRECTORY_SEPARATOR);
|
|
+define('SQL_DIR', '@docdir@' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR);
|
|
|
|
/**
|
|
* Directory where configuration files are stored.
|
|
* It is not used directly in code, just a convenient
|
|
* define used further in this file.
|
|
*/
|
|
-define('CONFIG_DIR', ROOT_PATH);
|
|
+define('CONFIG_DIR', '@sysconfdir@' . DIRECTORY_SEPARATOR);
|
|
|
|
/**
|
|
* Filename of a configuration file.
|