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

106400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c3ae85b2e1 Merge branch 'QA_4_6' 2016-06-17 08:55:48 +02:00
Michal Čihař
c00fe2cbfd Fix listing routines for non privileged user 
We first need to check if we can read the definition before parsing it.

Fixes #12310

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 08:55:04 +02:00
Michal Čihař
eb942e68b9 Merge branch 'QA_4_6' 2016-06-16 16:18:02 +02:00
Michal Čihař
80c7b8a561 Add missing escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 16:17:36 +02:00
Michal Čihař
bc339b55f0 These are strings, handle them according to that 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:54:19 +02:00
Michal Čihař
2a4a073650 Simplify Index::isPackaged 
We really do not use most of the functionality, so let it do only what
we need.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:43:53 +02:00
Michal Čihař
d3aa8c5fb6 Call htmlspecialchars as we do not need to process complex types here 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:39:39 +02:00
Michal Čihař
9869a95641 Simplify Message adding methods 
The methods are now called based on added type:

- addHtml adds HTML code as is
- addText adds text after escaping it
- addMessage adds Message instance

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:23:45 +02:00
Michal Čihař
54a76de3d8 'Replace addString calls with correct method based on content 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:20:30 +02:00
Michal Čihař
19f76066f2 Separate adding string and Message objects to Message 
This way we can rely on type checking and avoid potential problems with
escaping.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 15:16:29 +02:00
Michal Čihař
a7cd193554 Make it clear whether addMessages expects string or Message object 
With this, it's way easier to anaylize code for potential problems with
escaping.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:56:41 +02:00
Michal Čihař
a87c164435 Actually get warning messages to display 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:50:46 +02:00
Michal Čihař
efac710526 The Html methods accept strings only 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:39:32 +02:00
Michal Čihař
c6a6bbfb2f Fix test expectations to match current code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:30:29 +02:00
Michal Čihař
bba718fa7a Fix type comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:28:51 +02:00
Michal Čihař
18c0786eae Improve addMessage calls 
- add call which accepts HTML markup
- use separator where applicable
- extend testcase to see HTML markup handling

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:25:33 +02:00
Michal Čihař
1277bc4666 Remove unused parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:06:18 +02:00
Michal Čihař
d052c4721e Merge branch 'QA_4_6' 2016-06-16 14:05:56 +02:00
Michal Čihař
1b0fde1b59 Remove duplicated code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:05:20 +02:00
Michal Čihař
7aa93f824d Fix documented parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:53:31 +02:00
Michal Čihař
2f220218de Merge branch 'QA_4_6' 2016-06-16 13:51:30 +02:00
Michal Čihař
69cfcc6abd Ensure width and height are integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:51:22 +02:00
Michal Čihař
9d6157fda7 Ensure we use escaped version of type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:47:15 +02:00
Michal Čihař
9348d0cb16 Separate adding HTML markup to message from others 
We really want this to be explicit for easier review and hiding this in
second parameter of addParam doesn't make it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:41:35 +02:00
Michal Čihař
46e8121e41 Do not pass unexpected value as printview 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:27:19 +02:00
Michal Čihař
16c2b955e8 Fix parameter type documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:23:51 +02:00
Michal Čihař
e130141816 Merge branch 'QA_4_6' 2016-06-16 13:17:42 +02:00
Michal Čihař
a1f69b4c80 Fix syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:17:36 +02:00
Michal Čihař
8170e7fcbc Merge branch 'QA_4_6' 2016-06-16 13:16:30 +02:00
Michal Čihař
8574aa4496 Remove documentatoin for no longer supported use cases 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:15:52 +02:00
Michal Čihař
5b05665ff0 Ensure kill ID is integer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:07:13 +02:00
Michal Čihař
e0a37a7ba0 Merge branch 'QA_4_6' 2016-06-16 13:03:43 +02:00
Michal Čihař
75d70119ed Merge remote-tracking branch 'origin/QA_4_6' 2016-06-16 13:03:39 +02:00
Michal Čihař
53cc34b374 Fix handing of GIS data 
* Force geometry count to be integer
* Ensure proper escaping of GIS data

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:02:48 +02:00
Jocelyn Flament
35b2624296 Translated using Weblate (French) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-16 13:02:27 +02:00
Michal Čihař
f883a111eb Add CII Best Practices badge 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:41:39 +02:00
Michal Čihař
12591f2227 Ask people to contribute code with tests 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:39:35 +02:00
Michal Čihař
2c87ba9846 Remove phpcs config as it makes the build fail (even when we do not use the data) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:23:28 +02:00
Michal Čihař
41ff771462 Add correct ignore list to phpcs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:19:10 +02:00
Michal Čihař
f593b9feb2 Fix path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:03:23 +02:00
Michal Čihař
7d2ee72fcb Install phpMyAdmin coding standard before run 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:59:50 +02:00
Michal Čihař
d907030789 Teach Scrutinizer to use our own standard 
Based on docs, see
https://scrutinizer-ci.com/docs/tools/php/code-sniffer/

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:53:16 +02:00
Weblate
c5beea64fd Merge remote-tracking branch 'origin/master' 2016-06-16 11:40:29 +02:00
Jocelyn Flament
fe477911e4 Translated using Weblate (French) 
Currently translated at 99.6% (3198 of 3208 strings)

[CI skip]
 2016-06-16 11:40:27 +02:00
Michal Čihař
45ef3aed75 Remove needless inclusion of export.php from tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:38:58 +02:00
Michal Čihař
fe18b9477f Remove possibility to use global name as message string 
This is really confusing and can cause surprising effects when parameter
(eg. table name) matches some global.

Also I think this is really not used anywhere.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:35:58 +02:00
Michal Čihař
27caf5b46b Improve detection of script name 
In case PHP_SELF was not set by server, we used REQUEST_URI, which might
embed PATH_INFO as well. However we really need to know the path without
it, so let's strip it as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 09:35:56 +02:00
Michal Čihař
4767f24ea4 Limit number of included scripts in get_scripts.js.php 
This avoids potential DOS, the limit is same as we use for generating
the URLs.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 18:07:12 +02:00
Michal Čihař
5633b1d57b Use javascript for redirection to https 
The current approach is broken since whitelisting is active in url.php
and also allows potential bbcode injection.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 17:51:27 +02:00
Michal Čihař
19eef4eebb Merge branch 'QA_4_6' into QA_4_6-security 2016-06-15 13:03:21 +02:00