gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,433 Commits 12 Branches 481 Tags 2.4 GiB
2b59fa3bf9
Commit Graph

106433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2b59fa3bf9 Use PMA_getIp instead of REMOTE_ADDR to get user address 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:38:16 +02:00
Michal Čihař
23c011df36 Move PMA_getIp to core 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:36:55 +02:00
Michal Čihař
08864ebc8c Remove not needed include 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:36:04 +02:00
Michal Čihař
8f93d41d64 Merge branch 'QA_4_6-security' into master-security 2016-07-11 08:33:45 +02:00
Michal Čihař
6aacd7dcfe Make proxy IP parsing aware of multiple proxies 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 08:22:58 +02:00
Isaac Bennetch
c4a595357f Add Secure and HttpOnly flags for session cookie setup in examples 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-07-10 22:35:38 -04:00
Michal Čihař
1ed4007689 Properly escape MySQL status variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-10 18:07:59 +02:00
Michal Čihař
57dd8e6f99 Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-09 09:14:26 +02:00
Michal Čihař
6f75f8a261 Merge branch 'QA_4_6-security' into master-security 2016-07-09 09:14:12 +02:00
Michal Čihař
c0b2d56ac0 Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-09 09:12:43 +02:00
Michal Čihař
a97be3a604 Improve cookie encryption 
- use MAC to validate content before decryption
- create unique IV for every cookie

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-08 17:40:05 +02:00
Michal Čihař
7de139b90c Properly escape generated XML export 
Many fields could contain XML markup, so we need to ensure the generated
XML is valid.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:54:05 +02:00
Michal Čihař
bd2080c40a Adjust test to not use HTML escaping layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:52:49 +02:00
Michal Čihař
99d7407aa2 Fix PHP export tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:30:35 +02:00
Michal Čihař
2b5915ce7b Use phpMyAdmin version in PHP export header 
Using fixed 0.2b really makes no sense.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:27:26 +02:00
Michal Čihař
a82835cf09 Generate valid PHP code even when table/database name contains PHP markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:22:39 +02:00
Michal Čihař
5491d67fb5 Avoid possible path traversal using MySQL username 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 10:05:46 +02:00
Michal Čihař
4183bab696 Send CSP headers on changelog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 09:50:17 +02:00
Michal Čihař
9f3823a6bc Sent CSP headers for phpinfo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-30 09:49:37 +02:00
Michal Čihař
aa8d761305 Add missing quote to scrutinizer yml 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 16:34:29 +02:00
Michal Čihař
d85b701c9b Use ShapeFile library naming of shapes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 16:16:12 +02:00
Michal Čihař
76189e0e43 Revert "Install dbase extension on tests for shapefile" 
The testsuite doesn't work with it.

This reverts commit 3e37e0c92f.
 2016-06-24 16:11:48 +02:00
Michal Čihař
7d650bd548 Use phpmyadmin/shapefile instead of embedded bfShapeFile 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 15:52:40 +02:00
Michal Čihař
3e37e0c92f Install dbase extension on tests for shapefile 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 13:54:20 +02:00
Michal Čihař
1c08750785 Merge branch 'QA_4_6' 2016-06-24 12:58:45 +02:00
Michal Čihař
f204208540 Move count() call outside loop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 12:58:35 +02:00
Michal Čihař
ce67a31ad7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-06-24 12:55:56 +02:00
Michal Čihař
8d6a86b57a Merge branch 'QA_4_6' 2016-06-24 12:55:20 +02:00
Michal Čihař
26b9804185 Merge commit 'cfb38bbcbfd352bb20805b53234609f67bbbe45a' 2016-06-24 12:55:15 +02:00
Michal Čihař
52a01c4bfb Fix type conversion for numeric values 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 12:55:04 +02:00
Weblate
72ae1b7209 Merge remote-tracking branch 'origin/master' 2016-06-24 10:29:17 +02:00
Peter Chen
d53db00a61 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-06-24 10:29:14 +02:00
Michal Čihař
421e8b0f54 Use sftp batch mode for uploading 
This way it will correctly fail on error.

Issue #12336

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 10:28:46 +02:00
Peter Chen
cfb38bbcbf Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-24 02:59:46 +02:00
Isaac Bennetch
292c0a1ff9 Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 02:43:30 -04:00
Isaac Bennetch
58534ce2fc Prepare for 4.6.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 02:40:42 -04:00
Isaac Bennetch
f2db92434b Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:28:35 -04:00
Isaac Bennetch
4f57305eab Release 4.6.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:27:15 -04:00
Isaac Bennetch
f7d1c1f463 Changelog entries for security release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-22 23:53:56 -04:00
Michal Čihař
c3f7aa8190 Merge branch 'QA_4_6-security' into master-security 2016-06-22 13:29:13 +02:00
Michal Čihař
615212a14d Do not allow javascript: links in transformation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 13:28:07 +02:00
Michal Čihař
6ba52a72b4 Merge branch 'QA_4_6-security' into master-security 2016-06-22 13:11:13 +02:00
Michal Čihař
9c8f537a23 Merge branch 'master' into master-security 2016-06-22 13:11:08 +02:00
Michal Čihař
519e634a8d Merge branch 'QA_4_6' into QA_4_6-security 2016-06-22 13:10:55 +02:00
Michal Čihař
4d21b5c077 Fixed rendering of chart of columns with HTML inside 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 13:07:32 +02:00
Michal Čihař
11509c5431 Merge branch 'QA_4_6' 2016-06-22 11:58:24 +02:00
Michal Čihař
301e1b0f7d Fix adjusting privileges for tables/databases with quote in name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:58:05 +02:00
Michal Čihař
d338a61d32 Merge branch 'QA_4_6' 2016-06-22 11:35:42 +02:00
Michal Čihař
e50e37b51d Properly escape database name when listing privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:35:04 +02:00
Michal Čihař
57ae483bad Escape database name when showing dialog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:14:57 +02:00