1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Commit Graph

50 Commits

Author SHA1 Message Date
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ř
31f6d76405 Merge branch 'QA_4_6' 2016-08-24 11:55:10 +02:00
Michal Čihař
cbd6137c03 Avoid double escaping of built in transformation URLs
We do already escape them in the tranformation, so avoid doing that
before.

Issue #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-24 11:48:48 +02:00
Michal Čihař
e14c334d7a Merge branch 'QA_4_6' 2016-07-26 16:47:33 +02:00
Michal Čihař
16c4ca0daa Properly escape configuration parameters when rendering
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-26 16:47:01 +02:00
Michal Čihař
7de035439d Merge branch 'QA_4_6' 2016-07-22 16:42:58 +02:00
Michal Čihař
76e87c3e33 Do not use mb_strlen on data we know are bytes
Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-22 16:39:12 +02:00
Michal Čihař
325122658a Fix parameter type documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 12:59:37 +02:00
Michal Čihař
dce94f229f More consistency for URL::getCommon
Now URL::getCommon always returns HTML encoded string, if you want
unencded one, use URL::getCommonRaw. This makes it easier to review the
code if uses correct variant.

Also I've fixed several wrong uses of the HTML encoded variant in
Location header.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 12:44:29 +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ř
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ř
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ř
7aa93f824d Fix documented parameter types
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-16 13:53:31 +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ř
16c2b955e8 Fix parameter type documentation
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-16 13:23:51 +02:00
Michal Čihař
5bb7349e0d Merge branch 'QA_4_6' 2016-05-23 09:21:33 +02:00
Michal Čihař
b061096abd Avoid not neeedded urlencode/urldecode steps in multi submits
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-23 09:12:52 +02:00
Madhura Jayaratne
84deb574d3 Merge branch 'QA_4_6' 2016-03-08 16:09:17 +11:00
Madhura Jayaratne
ff743830ff Fix #12073 Hide edit and delete buttons when the results are not related to a table
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-03-08 16:02:05 +11:00
Durgesh
307f7069e5 Templating getWithSelected() and getCheckbox(), Issue #12004
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-23 18:10:24 +05:30
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:45:19 +05:30
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990
Signed-off-by: Durgesh <007durgesh219@gmail.com>
2016-02-22 14:36:41 +05:30
Piyush
1d3f8ed037 remove_msie9 (fix_11987)
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
2016-02-20 12:26:54 +05:30
Michal Čihař
a7d2473025 Avoid ignoring error
There should be no error here as we've queried the result few lines ago.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-05 08:57:25 +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
Michal Čihař
d0c6f5fc9e Check for non printable chrars as well before displaying text as is
Issue #6321

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-16 13:41:35 +01:00
Michal Čihař
a85f3f80f2 Display binary strings as text if they are valid UTF-8
Also prepend 0x to the binary string to make it cleaner what is going on
(especially when there are only numeric results such as 616263, it's
much easier to undestand when it's there as 0x616263).

Fixes #6321

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-12-16 12:33:17 +01:00
Nisarg Jhaveri
b463cfc0ff Show table header and create bookmark on empty results
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-11-30 04:28:50 +05:30
Atul Pratap Singh
50a9c19fe4 Rename 'Print view' to 'Print'
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-11-18 19:46:28 +05:30
Marc Delisle
f11b49c3c7 Fix message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-18 06:46:25 -05:00
Achilles-96
d336301566 Fixes issue #11504
Signed-off-by: Achilles-96 <raghuram.vadapalli@research.iiit.ac.in>
2015-11-17 22:32:05 +05:30
Hugues Peccatte
bb0094d02d Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-11-08 16:09:29 +01:00
Hugues Peccatte
0df3e58fc8 Reduce nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-11-08 16:05:36 +01:00
Hugues Peccatte
c3e1c981c0 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-11-08 16:05:25 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-11-08 15:58:48 +01:00
Marc Delisle
db6992a5a9 Fix coding style and missing initialization
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-02 09:03:08 -05:00
Marc Delisle
9fb38a7a94 Remove the side effect of a method
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-11-02 08:42:57 -05:00
Marc Delisle
b4abc6b985 Coding style; missing param doc
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-14 13:43:39 -04:00
Marc Delisle
ce792ca3c0 Move "Sort by key" to the navigation bar
Replace Ascending/Descending with ASC/DESC (non translatable keywords)

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-10-14 12:09:20 -04:00
Michal Čihař
e2916b8a3e Remove extra spacing when navbar is not displayed
Not showing navbar is not reason for adding extra whitespace, there is
already enough whitespace arround.

Issue #11507

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-10-14 14:50:12 +02: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
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Hugues Peccatte
3bf856e4c4 Merge branch 'master' into useNamespaces_master 2015-09-13 15:53:04 +02:00
Hugues Peccatte
8c289e523b Revert transformation classes rename.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 21:48:43 +02:00
Hugues Peccatte
857c8a92cf Move abstract transformation plugins to abs folder.
Update templates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 14:13:31 +02:00
Hugues Peccatte
b92491d799 Merge branch 'master' into useNamespaces_master 2015-09-12 00:53:39 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +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