From af84b002acc072751792c20a264164fd2722fd3a Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 27 Feb 2023 23:11:02 +0100 Subject: [PATCH 1/7] Add documentation for version added of config `$cfg['LintEnable']` Added in https://github.com/phpmyadmin/phpmyadmin/commit/eef994f122121253e2bea856f7259b2a4578bc64 Signed-off-by: William Desportes --- doc/config.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/config.rst b/doc/config.rst index e7423fe73a..bf78fd6561 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1809,6 +1809,8 @@ Generic settings :type: boolean :default: true + .. versionadded:: 4.5.0 + Defines whether to use the parser to find any errors in the query before executing. .. config:option:: $cfg['DefaultForeignKeyChecks'] From 86e6d1270b0da81488a5a5f03c2477f120f289f2 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 28 Feb 2023 01:16:21 +0100 Subject: [PATCH 2/7] Add back documentation for DisplayBinaryAsHex Added in: c67fd7f732e56d668399a4d44bcdf5f2a803a7c3 Removed in: 85390a71693d33c2efabf1857b4f2120c104b735 Signed-off-by: William Desportes --- doc/config.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/config.rst b/doc/config.rst index bf78fd6561..91841f6de0 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2588,6 +2588,19 @@ Browse mode .. versionchanged:: 3.4.0 Since phpMyAdmin 3.4.0 the default value is ``'SMART'``. +.. config:option:: $cfg['DisplayBinaryAsHex'] + + :type: boolean + :default: true + + Defines whether the ":guilabel:`Show binary contents as HEX`" browse option is + ticked by default. + + .. versionadded:: 3.3.0 + .. deprecated:: 4.3.0 + + This setting was removed. + .. config:option:: $cfg['GridEditing'] :type: string From b3c35c2045159829d64a29cc8dc352d928e5988f Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 28 Feb 2023 01:30:50 +0100 Subject: [PATCH 3/7] Do not show "Original length undefined" on binary hex columns Signed-off-by: William Desportes --- ChangeLog | 1 + js/src/makegrid.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 014362dde0..a8c9619936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #18120 Fix bug with numerical tables during renaming database - issue #16851 Fix ($cfg['Order']) default column order doesn't have have any effect since phpMyAdmin 4.2.0 - issue #18112 Fix open base dir warning on git version class +- issue Do not show "Original length undefined" on binary hex columns 5.2.1 (2023-02-07) - issue #17522 Fix case where the routes cache file is invalid diff --git a/js/src/makegrid.js b/js/src/makegrid.js index 6605e90057..6ccadac7aa 100644 --- a/js/src/makegrid.js +++ b/js/src/makegrid.js @@ -2181,6 +2181,9 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid // wrap all truncated data cells with span indicating the original length // todo update the original length after a grid edit $(t).find('td.data.truncated:not(:has(span))') + .filter(function () { + return $(this).data('originallength') !== undefined; + }) .wrapInner(function () { return ''; From ba059251fabe84cdbe2713dacd509c4a9afe3ed2 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 28 Feb 2023 01:57:08 +0100 Subject: [PATCH 4/7] Document back `$cfg['EditInWindow']`, `$cfg['QueryWindowWidth']`, `$cfg['QueryWindowHeight']`, `$cfg['QueryWindowDefTab']` Removed in 35dab58bf5c6532bb62800fca02874c0f809466e Feature-request: https://github.com/phpmyadmin/phpmyadmin/issues/11983 ($cfg['EditInWindow']) Signed-off-by: William Desportes --- doc/config.rst | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/doc/config.rst b/doc/config.rst index 91841f6de0..af61955882 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -3413,11 +3413,49 @@ Various display setting Repeat the headers every X cells, or 0 to deactivate. +.. config:option:: $cfg['EditInWindow'] + + :type: boolean + :default: true + + .. seealso:: `Feature request to add a pop-up window back `_ + + .. deprecated:: 4.3.0 + + This setting was removed. + +.. config:option:: $cfg['QueryWindowWidth'] + + :type: integer + :default: 550 + + .. deprecated:: 4.3.0 + + This setting was removed. + +.. config:option:: $cfg['QueryWindowHeight'] + + :type: integer + :default: 310 + + .. deprecated:: 4.3.0 + + This setting was removed. + .. config:option:: $cfg['QueryHistoryDB'] :type: boolean :default: false +.. config:option:: $cfg['QueryWindowDefTab'] + + :type: string + :default: ``'sql'`` + + .. deprecated:: 4.3.0 + + This setting was removed. + .. config:option:: $cfg['QueryHistoryMax'] :type: integer From f57012dcff4aca3a0f3284e108c5e2c37bc38183 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 28 Feb 2023 02:05:16 +0100 Subject: [PATCH 5/7] Fix weird website on .info, they seem to now use .com at dongleauth Ref: https://github.com/Nitrokey/dongleauth Ref: https://github.com/2factorauth/twofactorauth/issues/7348#issuecomment-1409488754 Signed-off-by: William Desportes --- doc/two_factor.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/two_factor.rst b/doc/two_factor.rst index b5077185d5..39f5a5dd70 100644 --- a/doc/two_factor.rst +++ b/doc/two_factor.rst @@ -54,7 +54,7 @@ There are several manufacturers of these tokens, for example: * `youbico FIDO U2F Security Key `_ * `HyperFIDO `_ * `Trezor Hardware Wallet `_ can act as an `U2F token `_ -* `List of Two Factor Auth (2FA) Dongles `_ +* `List of Two Factor Auth (2FA) Dongles `_ .. _simple2fa: From b8849f56908549cea9f3c28c01019f2599da80ad Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 28 Feb 2023 02:07:45 +0100 Subject: [PATCH 6/7] Fix .rst doc links Signed-off-by: William Desportes --- doc/conf.py | 2 -- doc/config.rst | 2 +- doc/faq.rst | 34 +++++++++++++++++----------------- doc/setup.rst | 2 +- doc/two_factor.rst | 2 +- doc/vendors.rst | 6 +++--- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index b7f2e21528..925e51af1d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -315,6 +315,4 @@ linkcheck_ignore = [ r'https://authy.com/.*', # Site often changes links and reverts changes (9362bde02d0535a2f8cb74a18797249cb734c4b0) r'https://www.yubico.com/.*', - # Some timeouts and SSL issues: https://github.com/sektioneins/suhosin/issues/119 - r'https://suhosin.org/.*', ] diff --git a/doc/config.rst b/doc/config.rst index af61955882..5ce1ed29d0 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1970,7 +1970,7 @@ Cookie authentication options * ``Strict`` * ``None`` - .. seealso:: `rfc6265 bis `_ + .. seealso:: `rfc6265 bis `_ .. config:option:: $cfg['LoginCookieRecall'] diff --git a/doc/faq.rst b/doc/faq.rst index 78be8c44f8..1cc7d295ec 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -552,41 +552,41 @@ The default values for most Suhosin configuration options will work in most scenarios, however you might want to adjust at least following parameters: -* `suhosin.request.max\_vars `_ should +* `suhosin.request.max\_vars `_ should be increased (eg. 2048) -* `suhosin.post.max\_vars `_ should be +* `suhosin.post.max\_vars `_ should be increased (eg. 2048) -* `suhosin.request.max\_array\_index\_length `_ +* `suhosin.request.max\_array\_index\_length `_ should be increased (eg. 256) -* `suhosin.post.max\_array\_index\_length `_ +* `suhosin.post.max\_array\_index\_length `_ should be increased (eg. 256) -* `suhosin.request.max\_totalname\_length `_ +* `suhosin.request.max\_totalname\_length `_ should be increased (eg. 8192) -* `suhosin.post.max\_totalname\_length `_ should be +* `suhosin.post.max\_totalname\_length `_ should be increased (eg. 8192) -* `suhosin.get.max\_value\_length `_ +* `suhosin.get.max\_value\_length `_ should be increased (eg. 1024) -* `suhosin.sql.bailout\_on\_error `_ +* `suhosin.sql.bailout\_on\_error `_ needs to be disabled (the default) -* `suhosin.log.\* `_ should not +* `suhosin.log.\* `_ should not include :term:`SQL`, otherwise you get big slowdown -* `suhosin.sql.union `_ must be disabled (which is the default). -* `suhosin.sql.multiselect `_ must be disabled (which is the default). -* `suhosin.sql.comment `_ must be disabled (which is the default). To further improve security, we also recommend these modifications: -* `suhosin.executor.include.max\_traversal `_ should be enabled as a mitigation against local file inclusion attacks. We suggest setting this to 2 as ``../`` is used with the ReCaptcha library. -* `suhosin.cookie.encrypt `_ should be enabled. -* `suhosin.executor.disable_emodifier `_ should be enabled. You can also disable the warning using the :config:option:`$cfg['SuhosinDisableWarning']`. @@ -850,8 +850,8 @@ Here are a few points to check: Dorninger for the hint). * In the :file:`php.ini` directive ``arg_separator.input``, a value of ";" will cause this error. Replace it with "&;". -* If you are using `Suhosin `_, you - might want to increase `request limits `_. +* If you are using `Suhosin `_, you + might want to increase `request limits `_. * The directory specified in the :file:`php.ini` directive ``session.save_path`` does not exist or is read-only (this can be caused by `bug in the PHP installer `_). diff --git a/doc/setup.rst b/doc/setup.rst index 1520e9d008..f645a6cf63 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -67,7 +67,7 @@ Red Hat Enterprise Linux Red Hat Enterprise Linux itself and thus derivatives like CentOS don't ship phpMyAdmin, but the Fedora-driven repository -`Extra Packages for Enterprise Linux (EPEL) `_ +`Extra Packages for Enterprise Linux (EPEL) `_ is doing so, if it's `enabled `_. But be aware that the configuration file is maintained in diff --git a/doc/two_factor.rst b/doc/two_factor.rst index 39f5a5dd70..9103f61da1 100644 --- a/doc/two_factor.rst +++ b/doc/two_factor.rst @@ -53,7 +53,7 @@ There are several manufacturers of these tokens, for example: * `youbico FIDO U2F Security Key `_ * `HyperFIDO `_ -* `Trezor Hardware Wallet `_ can act as an `U2F token `_ +* `Trezor Hardware Wallet `_ can act as an `U2F token `_ * `List of Two Factor Auth (2FA) Dongles `_ .. _simple2fa: diff --git a/doc/vendors.rst b/doc/vendors.rst index f171ec6b50..3f26572f14 100644 --- a/doc/vendors.rst +++ b/doc/vendors.rst @@ -36,8 +36,8 @@ Specific files LICENSES phpMyAdmin distributed themes contain some content that is under licenses. -- The icons of the `Original` and `pmahomme` themes are from the `Silk Icons `_. -- Some icons of the `Metro` theme are from the `Silk Icons `_. +- The icons of the `Original` and `pmahomme` themes are from the `Silk Icons `_. +- Some icons of the `Metro` theme are from the `Silk Icons `_. - `themes/*/img/b_rename.svg` Is a `Icons8 `_, icon from the `Android L Icon Pack Collection `_. The icon `rename `_. - `themes/metro/img/user.svg` Is a IcoMoon the `user `_ @@ -46,6 +46,6 @@ CC BY 4.0 or GPL Licenses for vendors -------------------- -- Silk Icons are under the `CC BY 2.5 or CC BY 3.0 `_ licenses. +- Silk Icons are under the `CC BY 2.5 or CC BY 3.0 `_ licenses. - `rename` from `Icons8` is under the `"public domain" `_ (CC0 1.0) license. - IcoMoon Free is under `"CC BY 4.0 or GPL" `_. From 2a8932588dc48296111114790d0e17143cd5b7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 28 Feb 2023 12:53:52 -0300 Subject: [PATCH 7/7] Add some configuration options to documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- doc/config.rst | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/doc/config.rst b/doc/config.rst index 5ce1ed29d0..1d94c70722 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1899,6 +1899,13 @@ Generic settings .. seealso:: :ref:`faq2_10` +.. config:option:: $cfg['maxRowPlotLimit'] + + :type: integer + :default: 500 + + Maximum number of rows retrieved for zoom search. + Cookie authentication options ----------------------------- @@ -2394,6 +2401,13 @@ Navigation panel setup Whether to show events under database in the navigation panel. +.. config:option:: $cfg['NavigationTreeAutoexpandSingleDb'] + + :type: boolean + :default: true + + Whether to expand single database in the navigation tree automatically. + .. config:option:: $cfg['NavigationWidth'] :type: integer @@ -2489,6 +2503,20 @@ Main panel Database structure ------------------ +.. config:option:: $cfg['ShowDbStructureCharset'] + + :type: boolean + :default: false + + Defines whether to show a column displaying the charset for all tables in the database structure page. + +.. config:option:: $cfg['ShowDbStructureComment'] + + :type: boolean + :default: false + + Defines whether to show a column displaying the comments for all tables in the database structure page. + .. config:option:: $cfg['ShowDbStructureCreation'] :type: boolean @@ -2748,6 +2776,13 @@ Export and import settings * ``custom-no-form`` same as ``custom`` but does not display the option of using quick export +.. config:option:: $cfg['Export']['compression'] + + :type: string + :default: ``'none'`` + + Default export compression method. Possible values are ``'none'``, ``'zip'`` or ``'gzip'``. + .. config:option:: $cfg['Export']['charset'] :type: string @@ -2809,6 +2844,18 @@ Export and import settings Defines charset for import. By default no charset conversion is done assuming UTF-8. +.. config:option:: $cfg['Schema'] + + :type: array + :default: array(...) + +.. config:option:: $cfg['Schema']['format'] + + :type: string + :default: ``'pdf'`` + + Defines the default format for schema export. Possible values are ``'pdf'``, ``'eps'``, ``'dia'`` or ``'svg'``. + Tabs display settings ---------------------