Commit Graph

81 Commits

Author SHA1 Message Date
Michal Čihař
46b329c32b Merge branch 'QA_4_6' 2016-08-18 17:37:34 +02:00
Michal Čihař
6faa1fe46a Add rel="noopener noreferrer" to all external target="_blank" links
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-18 17:35:20 +02:00
Michal Čihař
aebbb31aad Merge branch 'master' into master-security 2016-07-29 14:08:23 +02:00
Michal Čihař
1221b5ea4a Merge branch 'QA_4_6' into QA_4_6-security 2016-07-29 14:05:48 +02:00
Michal Čihař
108b71c3f6 Merge branch 'QA_4_6' 2016-07-29 14:04:46 +02:00
Michal Čihař
b27020f108 Avoid typecasting to float when not needed
Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-29 14:03:13 +02:00
Michal Čihař
6f75f8a261 Merge branch 'QA_4_6-security' into master-security 2016-07-09 09:14:12 +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ř
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
1363ce5749 Merge branch 'QA_4_6' into QA_4_6-security 2016-06-17 14:27:02 +02:00
Michal Čihař
e531526bc5 Merge branch 'QA_4_6' 2016-06-17 13:22:06 +02:00
Michal Čihař
58da975117 Add missing URL encoding
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 13:22:01 +02:00
Michal Čihař
170c045507 Simplify code for processing SQL query to display
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 13:21:01 +02:00
Michal Čihař
84507dfeb6 Merge branch 'QA_4_6' 2016-06-17 13:10:28 +02:00
Michal Čihař
a5950f9ecd Fix link to mariadb explain analyzer
- avoid double urlencoding of the query
- properly escape html entities

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 13:05:11 +02:00
Michal Čihař
ef1493d9b4 Move request conversion to generic code
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-17 09:35:57 +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ř
98ad7d1ba4 Merge branch 'QA_4_6'
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:42:37 +02:00
Michal Čihař
05a45fe23f Use https for links to bugs.mysql.com
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:41:13 +02:00
Michal Čihař
aaa707ab4d Merge branch 'QA_4_6' 2016-05-17 10:18:52 +02:00
Michal Čihař
11089cbe41 Use https for links to dev.mysql.com
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:16:44 +02:00
Michal Čihař
44a6ae9b50 Use https when linking to php.net
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-17 10:13:16 +02:00
Michal Čihař
0fac07105e Remove unused method
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-12 15:13:48 +02:00
Michal Čihař
efa1845e23 Merge branch 'QA_4_6' 2016-05-10 15:05:32 +02:00
Michal Čihař
bbe8efaf7c Use https for documentation links
Fixes #12225

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-05-10 15:04:29 +02:00
Michal Čihař
dcce22b742 Merge branch 'QA_4_6' 2016-04-21 12:11:29 +02:00
Michal Čihař
7e19be3a10 Check if sessions are working and report failures
- Always check for session_start erorrs and report them, this catches
  completely broken session storage or no free inodes for files
- Check whether session can be written, this catches the full disk case

Fixes #12204

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-21 12:09:50 +02:00
Michal Čihař
d014c2893a Merge branch 'QA_4_6' 2016-04-20 10:09:24 +02:00
Michal Čihař
e0724d2660 Fixed check for ndb version
Fixes #12200

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-20 10:07:06 +02:00
Michal Čihař
daf5b0d329 Use php.net to link to their website
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-18 17:11:15 +02:00
Michal Čihař
0758b601e7 Move charset query generation to to the Util class
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-11 12:07:27 +02:00
Michal Čihař
f9ef2eb37e Improve performance with SkipLockedTables
We now fetch all table status in one query, so this has pretty much same
speed as SkipLockedTables disabled.

Issue #12129

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-07 09:25:53 +02:00
Michal Čihař
338686589b Filter in use tables at MySQL server to improve performance on big servers
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-07 08:46:43 +02:00
Michal Čihař
319441274c Share code for getting table status
This way it correctly respects DisableIS setting.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-06 11:03:33 +02:00
Michal Čihař
c136a74705 Cache current user information for DBI lifetime
We query this information quite often, so it makes sense to fetch it
only once from the MySQL server.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-04-06 09:45:53 +02:00
Michal Čihař
4dce6ec2db Merge branch 'QA_4_6' 2016-03-01 15:39:45 +01:00
Michal Čihař
02aa0729dc Make PMA_fatalError work even early
The messaging framework can not make assumptions about available objects
as this doesn't have to be satisfied in early PMA_fatalError case.

Issue #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-03-01 15:36:05 +01:00
Atul Pratap Singh
4d09f855bb Rename some templates, formatting changes
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2016-02-29 12:03:47 +05:30
Atul Pratap Singh
386cbc8f6c Merge pull request #12009 from poush/fix_#12005
Templating toggleButton() and getDivForSliderEffect() (Fix #12005)
2016-02-29 10:21:45 +05:30
Piyush Agrawal
2e64aec16e Templating toggleButton() and getDivForSliderEffect()
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
2016-02-25 10:42:33 +05:30
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
Madhura Jayaratne
6f547b5d9a Remove superfluous white spaces
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-02-19 22:38:56 +11:00
Michal Čihař
cd0e1000a8 Merge branch 'QA_4_6' 2016-02-17 11:37:35 +01:00
Michal Čihař
6d33a475eb Fixed rendering of messages without SQL query
It should get rounded boxes at bottom, but didn't get it.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-17 11:37:02 +01:00
Michal Čihař
a411cd0ca4 The cell_align_left is defined in common.inc.php so it should available in all cases
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-02-17 11:35:36 +01:00
Madhura Jayaratne
566caa5143 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-16 15:28:48 +11:00