Commit Graph

53 Commits

Author SHA1 Message Date
William Desportes
6cc7b0f170
Fix #15240 - Apply a Settings form with errors shows a JSON response after using return back
Fixes: #15240
Fixes: 'Warning - htmlspecialchars() expects parameter 1 to be string, array given'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-05-04 16:30:50 +02:00
Maurício Meneghini Fauth
6b443266c7 Fix failing test of Config\FormDisplayTemplateTest
Related to 2a4729c18e

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-05-01 01:46:51 -03:00
Saurabh Srivastava
d792bc68a2 Fix #15119 - Uninterpreted HTML on Settings->Export page
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
2019-03-30 18:58:39 +05:30
Isaac Bennetch
5445d51a64 Improve grammar for a message from the validator.
Thanks mostly to Si Jie sijie123@gmail.com for raising pull request

This modifies the po files as well to prevent the string from being
marked as fuzzy.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-03-20 11:20:08 -04:00
Jack Cherng
d0233a047a Fix PHP 7.3 warning: "continue" in "switch" is equal to "break"
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
(cherry picked from commit 9a7a1e35b0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-06 20:55:07 -03:00
Isaac Bennetch
f2b068e1d3 Better fix for issue #14309
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-05-20 21:17:16 -04:00
Maurício Meneghini Fauth
54eb5ffff8 Fix Config\FormDisplayTemplateTest failed test
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-19 16:29:17 -03:00
Phoenix Eve Aspacio
e84c7f60e3 fixes broken links to icons in the setup page
fixes broken links to icons in the setup page

Signed-off-by: Phoenix Eve Aspacio <aspaciop@phoenixpeca.xyz>
(cherry picked from commit bc1fee27be)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-19 14:56:08 -03:00
Maurício Meneghini Fauth
35eb2da38a Remove @ operator from function_exists
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-03-01 22:36:35 -03:00
Maurício Meneghini Fauth
17bf8b7309 Replace static methods with instance methods
Replaces PhpMyAdmin\UserPreferences static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-23 15:26:02 -03:00
Michal Čihař
1ebf6c4953 Remove references to sourceforge.net issue trackers
We do not use it for years and all issues have been migrated.

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-02 13:24:05 +01:00
Maurício Meneghini Fauth
01fd301003 Use 'elseif' keyword istead of 'else if'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-12-04 13:31:25 -02:00
Michal Čihař
3b6a994dcd Move collation connection setting to user preferences
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-29 14:16:31 +01:00
Michal Čihař
48c0a1081d Remember state of navigation panel
The NavigationPanel width is now 0 when panel should be collapsed.

Issue #13466
Fixes #13397

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 16:07:08 +01:00
Michal Čihař
216f403c28 Store navigation width in user preferences
There is no need to have this separetely.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 15:36:08 +01:00
Michal Čihař
f9c73c7b10 Remove special casing for font size
It is now stored in configuration in same way as any other setting.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 15:16:01 +01:00
Michal Čihař
cbbf0d5ccf Integrate debug console settings into user preferences
Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 13:52:07 +01:00
Michal Čihař
b30ab4af58 Generalize code for console preferences
We can reuse and better cache locally the operations to avoid additional
roundtrip to server when changing settings.

Issue #13466
Issue #11688

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 13:45:14 +01:00
Michal Čihař
a2fd98d9f1 Add console preferences
This will allow to use console preferences using normal userconfig
framework.

Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-28 13:08:49 +01:00
Michal Čihař
bed6fb4ebd Avois passing extension to Util::getImage
We do not use it anyway for quite some time and this way it's less
processing to generate the img tag.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 14:24:42 +01:00
Michal Čihař
22efbd263e Fix typo in transformation
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-14 10:48:43 +01:00
Maurício Meneghini Fauth
1f482ff6e7 Use template for displayFormBottom
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
70b592ba61 Usa template for displayTabsBottom
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
ed76f7cffd Remove displayFieldsetBottomSimple method
Can be replaced by displayFieldsetBottom(false)

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
f64e0e1742 Use template for displayErrors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
ce9902b5f5 Use template for displayGroupHeader
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-10 18:20:32 -02:00
Maurício Meneghini Fauth
729349d326 Use template for displayFieldsetTop
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-10 16:07:00 -02:00
Maurício Meneghini Fauth
72bcc1336f Use template for displayFieldsetBottom
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-10 15:08:28 -02:00
Maurício Meneghini Fauth
1d4125f15c Add array type declarations
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-24 23:49:59 -03:00
Maurício Meneghini Fauth
614b8a6978 Refactor setup/index functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-14 17:51:34 -03:00
Maurício Meneghini Fauth
695f51034d Refactor FormDisplay.tpl functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-14 11:53:56 -03:00
Maurício Meneghini Fauth
ce49e7f60f Refactor user_preferences functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-12 22:31:02 -03:00
Maurício Meneghini Fauth
711b462dea Automatic fixes by phpcbf
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-09 14:55:17 -03:00
Michal Čihař
35fca8e2d5 Remove not used BaseFormList::getDefault
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 12:00:17 +02:00
Michal Čihař
3559f7a8a5 Remove special casing for UserprefsDeveloperTab
- include it in user form only if allowed
- always include it in setup form

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:06:51 +02:00
Michal Čihař
e065793dc8 Fold validity check with getting class
There is no need to do this twice (once in ::get).

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:06:51 +02:00
Michal Čihař
5788613cbc Use form name for menu in user preferences
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:05:10 +02:00
Michal Čihař
953ef05b92 Use forms to define menu and titles on setup
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:05:10 +02:00
Michal Čihař
8490161073 Share code for testing FormLists
The tests were same anyway, so avoid duplicating code.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:05:10 +02:00
Michal Čihař
09642df6fc Avoid using abstract static functions
This does not work in PHP 5, only in PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:05:09 +02:00
Michal Čihař
8490d3a571 Rewrite Setup settings forms as classes
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:05:09 +02:00
Michal Čihař
1fb2887a2a Bring User settings in sync with Setup
- add server navigation configuration, it makes no sense to hide this
  from user as it configures just UI
- reorganize Features form a bit to be in sync with Setup
- add DisableShortcutKeys settings to User
- remove LoginCookieValidity from User settings (there are more cookie
  related settings and all should be handled same)

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:05:09 +02:00
Michal Čihař
73d1599a1a Rewrite Page settings forms as classes
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:02:07 +02:00
Michal Čihař
df7f328f79 Rewrite User preferences forms as clases
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-06 11:02:07 +02:00
Michal Čihař
4b983d6648 Remove unused strings
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-05 14:44:05 +02:00
Michal Čihař
94219fffab Wrap function_exists in ServerConfigChecks to allow testing
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-05 14:44:05 +02:00
Michal Čihař
89fc550862 Use Url::getCommon to generate full URLs
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-05 14:44:05 +02:00
Michal Čihař
0b81218a10 Refactor configuration descriptions into class
This avoids loading them all into global namespace on every request.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-05 14:44:05 +02:00
Michal Čihař
dc6d06f5ca Avoid defining error messages centrally in server config check
- better load them only when needed
- avoid using PMA_lang which really serves different purpose

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-05 14:44:05 +02:00
Michal Čihař
541e72a019 Fix parameter description
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-09-05 09:12:25 +02:00