Commit Graph

23 Commits

Author SHA1 Message Date
Isaac Bennetch
1f24e5c755 Merge branch 'master-security' 2016-11-25 01:22:59 -05:00
Patric Gustafsson
1bd5fe709d Merge remote-tracking branch 'upstream/master' 2016-11-15 18:08:24 +02:00
Michal Čihař
19c24a8c6c Merge branch 'master' into master-security 2016-09-16 10:30:28 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-16 10:29:21 +02:00
Michal Čihař
d3e4faded4 Merge branch 'QA_4_6-security' into master-security 2016-08-18 17:10:01 +02:00
Michal Čihař
45e33d63a2 Limit maximal number of rows in QBE
User would be lost in them anyway by that count and it prevents DOS.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-18 17:02:42 +02:00
Patric Gustafsson
ea764e74cc Remove odd CSS class handling from PHP code
Odd class is no longed needed as it's now done with CSS.

Signed-off-by: Patric Gustafsson <patricjgustafsson@outlook.com>
2016-08-11 14:04:30 +03:00
Michal Čihař
6ba52a72b4 Merge branch 'QA_4_6-security' into master-security 2016-06-22 13:11:13 +02:00
Michal Čihař
36df83a97a Escape saved search name
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-22 11:00:14 +02:00
Michal Čihař
5b8608657f Simplify finding largest table
We really do not need intermediate array for that.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-20 18:20:57 +02:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Marc Delisle
4f42679f0d Clarify variables
Signed-off-by: Marc Delisle <marc@infomarc.info>
2016-01-07 09:04:50 -05:00
Marc Delisle
71bf8768a0 Merge branch 'QA_4_5' 2016-01-06 12:14:51 -05:00
Michal Čihař
a74efb0c30 Simplify getting first element of an array
Calling current() after reset() is duplicate as reset() already returns
current index value.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-05 12:37:50 +01:00
Michal Čihař
03f2e37ef4 Simplify code to get largest table
We really do not have to sort the array, we just need the maximal value.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-05 12:29:03 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-04 16:35:28 +01:00
Marc Delisle
e5306b495a Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-12-27 07:21:09 -05:00
Michal Čihař
98d88ef134 Remove unused pmaString variable
It was used in past when we didn't rely on mbstring.

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-21 11:35:36 +01:00
Hugues Peccatte
dffc8c34e9 Remove logic code in declaration files.
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-27 18:56:39 +01:00
Hugues Peccatte
09f87f4770 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-10-07 22:09:55 +02:00
Hugues Peccatte
f94d6739c6 Update namespace of Util in a static call.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-14 22:05:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files.
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:21 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes.
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:22:52 +02:00