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

113910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
2cea709661 Fix EnvironmentTest namespace issue 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-25 15:08:20 -03:00
Lakshay arora
9d08a1dcaf Puts PMA import handler in a separate javascript file. 
Makes 'enable_drag_drop_import' as a separate configuration directive, removes it from group of $cfg['IMPORT'] directives.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-25 12:37:43 +05:30
Lakshay arora
61163cd14b Add configuration setting to toggle drag drop file Import 
This commit-
Adds a configuration directive to toggle drag drop Import feature as requested in #13155
TODO:
1. Test it on multiple servers.
2. Disable javascript handlers for drag drop
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-06-24 14:21:24 +05:30
Maurício Meneghini Fauth
ec4911d20c
Merge pull request #14415 from laps15/refactor 
Refactor database templates
 2018-06-21 18:45:37 -03:00
Isaac Bennetch
dcf434b635 Fixup from merge 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 14:00:03 -04:00
Isaac Bennetch
d1360f46ce Merge branch 'QA_4_8' 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:54:08 -04:00
Isaac Bennetch
42f36cce39 Prepare for version 4.8.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:41:45 -04:00
Isaac Bennetch
064f6cc0ec Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:17:18 -04:00
Isaac Bennetch
3115f340b9 Adding composer lock for 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 13:07:34 -04:00
Isaac Bennetch
d363fa02c6 Prepare for version 4.8.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:50:09 -04:00
Isaac Bennetch
2867a95523 Update Changelog for RCE/file inclusion security issue 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-21 11:44:16 -04:00
Isaac Bennetch
26c6e87682 Merge remote-tracking branch 'security/QA_4_8-security' into QA_4_8 2018-06-21 11:31:18 -04:00
Isaac Bennetch
536b214757
Merge pull request #14418 from nijel/page_validity 
Avoid looking for ? when checking for file to be included
 2018-06-21 11:26:15 -04:00
Michal Čihař
7662d02939 Avoid looking for ? when checking for file to be included 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-06-21 13:31:00 +02:00
Michal Čihař
168bfee6b5 Merge branch 'QA_4_8' 2018-06-21 13:30:11 +02:00
Michal Čihař
c27b9c12f2 Fix broken links in docs 
Use replacements when applicable, remove one dead link.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-06-21 13:29:36 +02:00
Maurício Meneghini Fauth
44862584b7 Update test/ci-lint 
Now, PHP_CodeSniffer will exit with a non-zero code if any errors or warnings are found.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-21 00:55:25 -03:00
Maurício Meneghini Fauth
0912a1f178 Fix missing parameter comment on RTE classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-20 23:20:25 -03:00
Leonardo Strozzi
326151a3da Fix Qbe casting error 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-20 22:46:55 -03:00
Leonardo Strozzi
c03214780d Refactor Database Structure templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-20 22:46:44 -03:00
Leonardo Strozzi
414c1979c1 Change search test 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-20 22:12:13 -03:00
Leonardo Strozzi
99506813b6 Refactor db search templates 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-06-20 22:12:13 -03:00
Lakshay arora
39f19fd20f Fix NULL as default not shown, #14333 
Signed-Off-By: Lakshay arora<arora.lakshya123@gmail.com>
 2018-06-20 15:09:07 +05:30
Maurício Meneghini Fauth
3516f4d410 Remove $GLOBALS['dbi'] from Rte\General 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-19 21:53:08 -03:00
Maurício Meneghini Fauth
96dc767efb Remove $GLOBALS['dbi'] from Rte\Footer 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-19 21:46:35 -03:00
Maurício Meneghini Fauth
19476eab73 Remove $GLOBALS['dbi'] from Rte\Export 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-19 21:32:33 -03:00
Maurício Meneghini Fauth
bc2d5ea0d2 Remove $GLOBALS['dbi'] from Rte\RteList 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-19 21:05:36 -03:00
Maurício Meneghini Fauth
43d5c5db66 Remove $GLOBALS['dbi'] from Rte\Triggers 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-19 20:27:21 -03:00
Maurício Meneghini Fauth
510c11b039 Remove $GLOBALS['dbi'] from Rte\Routines 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-19 20:14:48 -03:00
Isaac Bennetch
bd311a89a1 Fix Uncaught TypeError in privilege editor 
Fixes #14407

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-19 12:17:32 -04:00
Isaac Bennetch
ead0d0d985 ChangeLog entry for PMASA-2016-03, XSS in Designer. 
This is commit 6943fff873, cherry-picked
from master.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-19 11:55:41 -04:00
Maurício Meneghini Fauth
66bd8b4a86 Remove $GLOBALS['dbi'] from Rte\Events 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-19 12:44:02 -03:00
William Desportes
6943fff873 Escape database name in URL 
Designer > new page shows iframe when db name is: "'"><iframe onload=alert(1)>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-19 11:32:17 -04:00
Maurício Meneghini Fauth
2d58411bee Some coding style fixes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-18 21:30:06 -03:00
Maurício Meneghini Fauth
5edbdf2063 Remove Template::get() method 
Uses Template::render() instead of Template::get().

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-18 19:46:36 -03:00
Maurício Meneghini Fauth
244d4e8e81 Replace Template::get calls in libraries/classes 
Uses Template::render() instead of Template::get().

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-18 18:18:24 -03:00
Isaac Bennetch
9b28b02582 Fixes #14400, another Uncaught TypeError 
This one in the database structure page when dropping multiple tables.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-16 16:37:09 -04:00
Isaac Bennetch
d8199e2a12
Merge pull request #14392 from williamdes/issue-14391-git-worktree 
Add support for commondir file in .git dir
 2018-06-16 09:04:23 -04:00
Maurício Meneghini Fauth
d6cfb361b3
Merge pull request #14347 from williamdes/phpstan 
Add phpstan / finding errors in php code
 2018-06-16 02:09:17 -03:00
Maurício Meneghini Fauth
cb2dae58be
Merge pull request #14376 from williamdes/issue-13032-designer 
Issue #13032 - fix designer
 2018-06-16 02:03:50 -03:00
William Desportes
7b13da98cd
Added phpstan 
- Added phpstan/phpstan
- Added bootstrap file
- Added phpstan config
- Added ci file
- Added to CI matrix

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 23:18:01 +02:00
Maurício Meneghini Fauth
e6bfa47054
Merge pull request #14389 from williamdes/issue-14388 
Closes #14388 - Search and Insert broken
 2018-06-15 17:31:18 -03:00
William Desportes
913c28ee32
Superfluous Whitespace Fix 
Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:53:06 +02:00
William Desportes
2f82c9c29c
Add --verbose to help debug CI failure 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:40:41 +02:00
William Desportes
27bd5902ad
Fix issue reported by scrutinizer 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:37:46 +02:00
William Desportes
29eaf86fcc
Fix relations 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:37:45 +02:00
William Desportes
24a8518b2a
Fix twig for 
- for 0..-1 does 2 iterations anyway
- for 0..0 does 1 iterations anyway

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:37:44 +02:00
William Desportes
057c6faca2
Fix errors when database has no tables 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:37:43 +02:00
William Desportes
04fe7d0da9
Use php:rawurlencode/twig:url_encode in designer 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:37:42 +02:00
William Desportes
ce06b9422b
Escape database name in URL 
Designer > new page shows iframe when db name is: "'"><iframe onload=alert(1)>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-15 21:37:41 +02:00