Commit Graph

99 Commits

Author SHA1 Message Date
Isaac Bennetch
1e36be831e Merge pull request #13342 from Achilles-96/Multi-Table-Query-UI
Replace "Query By Example" with new "Multi Table Query" interface
2017-08-23 12:23:59 -04:00
Michal Čihař
8621b70c88 Various coding style fixes
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-23 15:43:54 +02:00
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-22 20:51:27 -03:00
Deven Bansod
36d8d98988 Fix error introduced in f36ed72 (#13602)
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2017-08-22 15:32:52 +05:30
Michal Čihař
1f02f85b29 Avoid usage of soon deprecated $php_errormsg
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-22 09:30:22 +02:00
Maurício Meneghini Fauth
bb0555bb25 Refactor tracking functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-21 13:04:36 -03:00
Michal Čihař
87ec560346 Merge branch 'QA_4_7' 2017-08-21 11:47:34 +02:00
Maurício Meneghini Fauth
0d11ecc728 Refactor operations functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-20 21:28:36 -03:00
Maurício Meneghini Fauth
8a2dd938ef Refactor insert_edit functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-19 20:55:52 -03:00
Michal Čihař
b146b9195c Merge branch 'QA_4_7' 2017-08-16 17:14:34 +02:00
Michal Čihař
dc4747d478 Configure session.save_handler when SessionSavePath is set
When user configures the path he wants to use files handler regardless
what is currently set.

See also #8346

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-16 16:22:21 +02:00
Raghuram
75404f72a8 Interface design for Multi-table query
Signed-off-by: Raghuram <raghuram.vadapalli@research.iiit.ac.in>
2017-08-15 11:04:40 +05:30
Michal Čihař
5c8fa210fc Merge branch 'QA_4_7' 2017-08-10 09:13:38 -04:00
Michal Čihař
a14b823a2e Merge branch 'QA_4_7' 2017-08-06 08:45:30 -04:00
Maurício Meneghini Fauth
b803dc42dd Move server privileges to static methods
Move libraries/server_privileges.lib.php to libraries/classes/Server/Privileges.php

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-04 19:29:22 -03:00
Michal Čihař
cbcc9fba85 Avoid using response object for non ajax errors
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 10:02:17 +02:00
Michal Čihař
b6e86dfabf Use same variable in both code paths
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 09:56:12 +02:00
Michal Čihař
ec259e8afd Allow checking parameters in the request
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 09:38:17 +02:00
Michal Čihař
4f80efb477 Remove no longer valid comment
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 09:27:17 +02:00
Michal Čihař
b02e1855e6 Fixed handling AJAX request errors in case Response is already created
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 09:18:48 +02:00
Michal Čihař
6f8b2963aa Fix JSON error handling
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-02 09:04:43 +02:00
Manish Bisht
b4f32585e2 server variables out of table fixed
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
2017-08-01 20:46:55 +05:30
Michal Čihař
9404287ac0 Show MySQL warnings when executing SQL queries
Fixes #13408

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 16:29:44 +02:00
Michal Čihař
edc98c7754 Fix condition for getting MIME information
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 15:24:47 +02:00
Michal Čihař
61028c408a Fixed filename calculation
The folder name is now uppercase.

Fixes #13522

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 15:24:46 +02:00
Maurício Meneghini Fauth
0e47bd11e0 Merge pull request #13534 from mauriciofauth/session
Add Session class
2017-08-01 09:16:57 -03:00
Michal Čihař
3c7362c739 Stricten typechecking of parameters
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 13:46:00 +02:00
Michal Čihař
46e82fef4f Optimize zip creation a bit
Avoid constructing temporary strings and concatenating them, create each
record at once.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 13:26:33 +02:00
Michal Čihař
c67e83a57c Fixed creating zip file with single entry
And add tests to cover that.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 13:26:26 +02:00
Michal Čihař
1c166aef3a Fix creating single file zip
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 13:05:06 +02:00
Michal Čihař
b3cd03d4f9 Fix handling of string parameter
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-01 09:37:56 +02:00
Michal Čihař
4a83171c30 Merge branch 'QA_4_7' 2017-08-01 09:09:19 +02:00
Maurício Meneghini Fauth
bed21bc30c Move session.*.php to Session class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-31 20:43:22 -03:00
Michal Čihař
c146127b73 Merge branch 'QA_4_7' 2017-07-31 16:36:09 +02:00
Maurício Meneghini Fauth
cc48840350 Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-26 16:47:11 -03:00
Raghuram
44028973ee Fixes #5666 - Default options for transformations
Signed-off-by: Raghuram <raghuram.vadapalli@research.iiit.ac.in>
2017-07-23 13:21:48 +05:30
Michal Čihař
8270a1c1e1 Indicate SSL status on main page
- indicate status on main page
- indicate possible configuration issues
- show in red if remote connection is not using SSL
- add overview documentation for server SSL setup

Fixes #12354

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-21 15:04:59 +02:00
Michal Čihař
ff7309079a Remove unused ThemeManager::makeBc
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-21 14:33:12 +02:00
Michal Čihař
39c5b79627 Remove global variable theme
It contained theme name and does not seem to be used.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-21 14:32:46 +02:00
Michal Čihař
5b906a781a Remove todo which no longer makes sense
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-21 14:30:18 +02:00
Michal Čihař
f9d14ced73 Move ThemeManager init code to the constructor
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-21 14:26:45 +02:00
Michal Čihař
b1fac665e7 Remove unused ThemeManager::checkConfig
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-21 14:26:02 +02:00
Michal Čihař
bccb3ff27a Merge branch 'QA_4_7' 2017-07-21 14:23:01 +02:00
Maurício Meneghini Fauth
570e826155 Move util.lib function into Util class
Move PMA\Util\get function to PhpMyAdmin\Util::getValueByKey

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-21 08:04:58 -03:00
Maurício Meneghini Fauth
85866598e5 Move Twig classes to PhpMyAdmin namespace
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-20 12:19:48 -03:00
Maurício Meneghini Fauth
6e53b22991 Move properties classes to PhpMyAdmin namespace
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-20 12:08:58 -03:00
Maurício Meneghini Fauth
2631bcedba Move plugins classes to PhpMyAdmin namespace
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-20 11:50:12 -03:00
Maurício Meneghini Fauth
67753d579c Fix class not found
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-20 09:37:39 -03:00
Maurício Meneghini Fauth
dc1407ca66 Move navigation classes to PhpMyAdmin namespace
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-19 21:52:26 -03:00
Maurício Meneghini Fauth
13006d735c Move GIS classes to PhpMyAdmin namespace
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-18 23:09:26 -03:00