gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,450 Commits 12 Branches 481 Tags 2.4 GiB
219df7a48f
Commit Graph

56 Commits

Author SHA1 Message Date
Madhura Jayaratne
d676d6941f Issue phpmyadmin-security/267 SQL injection in Designer feature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-12-26 22:48:47 +11:00
Madhura Jayaratne
048670f1a5 Merge branch 'QA_4_8' into QA_4_8-security 2018-12-07 16:33:18 +11:00
William Desportes
cc2b1c8b99
Fix #14352 - JavaScript errors with Designer 
Closes: #14352

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-30 11:29:31 +01:00
William Desportes
18c23df20f
Issue #13032 - fix designer on QA_4_8 
Used cherry-pick : Merge pull request #14376 from williamdes/issue-13032-designer

Cherry-picked-from: cb2dae58be

Issue #13032 - fix designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-29 20:19:02 +01:00
Maurício Meneghini Fauth
0be9a53fcf Retrieve parameters from $_POST in db_search.php 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-10 20:48:59 -02:00
Maurício Meneghini Fauth
6c03ebad38 Retrieve parameters from $_POST in database QBE 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-10 20:48:58 -02:00
Maurício Meneghini Fauth
9fc76f9215 Add secondary tabs for database query 
Fixes #13621 QBE selenium tests broken since merge of #13342

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 21:52:54 -03:00
William Desportes
56d59a9d67
Fixes #14223 - designer error 
See: https://github.com/phpmyadmin/phpmyadmin/issues/14223#issuecomment-429312975
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-12 15:01:30 +02:00
Maurício Meneghini Fauth
ca7fd2b2c7 Fix case where 'query' is always considered defined 
Related to #14079

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 18:44:28 -03:00
Maurício Meneghini Fauth
d98658187a Replace PhpMyAdmin\Relation static calls 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-25 19:32:13 -03:00
Maurício Meneghini Fauth
0889b52c36 Replace static methods with instance methods 
Replace PhpMyAdmin\Sql static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-27 17:39:16 -03:00
Maurício Meneghini Fauth
c7f3d6e4e6 Rename $GLOBALS['PMD'] to $GLOBALS['designer'] 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-24 17:45:48 -03:00
Maurício Meneghini Fauth
f21bc9668d Replace static methods with instance methods 
Replace PhpMyAdmin\Database\Designer\Common static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-24 16:39:53 -03:00
Maurício Meneghini Fauth
7f62eef8a7 Rename PmdCommon to Database\Designer\Common 
Rename PhpMyAdmin\PmdCommon to PhpMyAdmin\Database\Designer\Common.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-24 16:14:44 -03:00
Maurício Meneghini Fauth
ce42c68823 Fix some coding styles issues 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-23 12:06:54 -03:00
Maurício Meneghini Fauth
92beb1a4f4 Replace static methods with instance methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-02-22 23:58:41 -03:00
Madhura Jayaratne
06d20fb47a Proper fix for the xss issue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-02-08 00:32:35 +11:00
Maurício Meneghini Fauth
f9e4a1c6af Use template for getSearchResults method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-17 03:49:55 -02:00
Maurício Meneghini Fauth
aa48445e9a Use template for getSelectionForm method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-17 03:49:55 -02:00
Maurício Meneghini Fauth
fe91ba10f8 Remove underscores from methods and properties names 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-17 03:49:55 -02:00
Maurício Meneghini Fauth
0e82a5e83e Use template for getResultDivs method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-15 15:44:36 -02:00
Maurício Meneghini Fauth
3010b27bab Use template for _getResultsRow method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-15 11:43:35 -02:00
Gabriel Caruso
a8bd364e02 Clean elses 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2017-12-14 22:02:17 -02:00
Maurício Meneghini Fauth
b996919c47 Move query results logic into MultiTableQuery class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 23:01:31 -02:00
Maurício Meneghini Fauth
fc08cca15b Refactor getFormHTML method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 21:55:41 -02:00
Maurício Meneghini Fauth
45de599d79 Move columns template into form template 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 18:05:39 -02:00
Maurício Meneghini Fauth
a76fb00ce6 Refactor Database/MultiTableQuery to use DI 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 17:20:27 -02:00
Maurício Meneghini Fauth
41dfe10efe Use template for getFormHTML 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 16:13:53 -02:00
Maurício Meneghini Fauth
c82669ba57 Use template for getColumnsHTML 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 15:57:13 -02:00
Maurício Meneghini Fauth
608242662d Make Multi Table Query strings translatable. 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 13:15:56 -02:00
Maurício Meneghini Fauth
1f98dcf1c2 Fix designer not showing table column information 
Fix #13809

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-12 02:11:47 -02:00
Maurício Meneghini Fauth
3eed95aba0 Use template for _getFootersOptions 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 22:39:03 -02:00
Maurício Meneghini Fauth
3a00dc7d0a Use template for _getSortOrderSelectCell 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 22:11:06 -02:00
Maurício Meneghini Fauth
6c90b384f7 Refactor _getSortSelectCell 
Move 'selected' html to template.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 12:48:17 -02:00
Maurício Meneghini Fauth
7586c2904a Use template for _getSortSelectCell 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 12:35:32 -02:00
Maurício Meneghini Fauth
10b8730df5 Use template for _showColumnSelectCell 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 19:57:54 -02:00
Michal Čihař
4fe87fb592 Remove usage of $GLOBALS['controllink'] 
This is now stored internally inside DatabaseInterface instance.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
60c1b32472 Remove usage of $GLOBALS['userlink'] 
The links are internal to DatabaseInterface and user link is default.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Maurício Meneghini Fauth
b35892e6d5 Port database/designer/database_tables to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-14 15:18:35 -03:00
Maurício Meneghini Fauth
e29665b5de Port database/designer/table_list to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-14 12:33:49 -03:00
Maurício Meneghini Fauth
07f1de003d Port database/designer/side_menu to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-14 09:59:35 -03:00
Maurício Meneghini Fauth
5995c4967c Port database/designer/page_save_as to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-14 09:59:35 -03:00
Maurício Meneghini Fauth
f54cfe5d42 Port database/designer/edit_delete_pages to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-14 09:59:35 -03:00
Maurício Meneghini Fauth
0b0833fbd6 Remove Database\Designer::getHtmlForPageSelector 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-12 11:27:41 -03:00
Maurício Meneghini Fauth
565014656f Port database/designer/page_selector to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-12 11:07:16 -03:00
Maurício Meneghini Fauth
f7be7ceec1 Port database/designer/query_details to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-11 23:28:12 -03:00
Michal Čihař
f4cd241f2c Fix MultiTableQuery loading 
The Util class was not accessible.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 13:17:05 +02:00
Michal Čihař
56eee83f39 Remove cell_align_right superglobal 
It can be replaced by proper CSS.

Issue #11731
Issue #12262

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-10 13:15:41 +02:00
Maurício Meneghini Fauth
1621e1ab8a Port database/designer/js_fields template to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-10-07 00:04:06 -03:00
Maurício Meneghini Fauth
387e23a097 Move DbList to Database/DatabaseList 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-26 22:00:39 -03:00