Commit Graph

44 Commits

Author SHA1 Message Date
Madhura Jayaratne
8cdaf81e27 bug #4702 URL is non RFC-2396 compatible in get_scripts.js.php
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-14 20:56:22 +05:30
Madhura Jayaratne
33c819b8b4 Remove token from JS file requests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-15 13:13:52 +05:30
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues.
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-01 22:07:18 +01:00
Hugues Peccatte
9ca79b379d Replace mb functions by standard string functions.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-05 14:15:42 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-28 20:53:01 +02:00
Marc Delisle
c85c9fd417 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-13 10:39:21 -04:00
Marc Delisle
33b39f9f1d bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-13 10:30:47 -04:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations)
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-07-12 01:52:32 +05:30
Ann + J.M
9207203a56 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:51:33 +02:00
Hugues Peccatte
cc9460e798 Update PHPDoc.
Add missing initialisation.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-05-18 18:13:17 +02:00
Michal Čihař
0e2b847f4e Honor URL separator in get_scripts parameters
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-27 09:12:49 +01:00
Hugues Peccatte
4f05a8abfa Merge pull request #808 from Tithugues/nestedLevels
Nested levels
2013-12-27 05:33:10 -08:00
Hugues Peccatte
88e3c73d65 Reduce nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-21 23:21:26 +01:00
Hugues Peccatte
d68b901132 Remove unused local variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-21 23:19:26 +01:00
Mohamed Ashraf
7cd2f7a598 Fixed failing tests 2013-09-05 19:56:59 +02:00
Mohamed Ashraf
ed3171cb87 Fixed testcases that test the script class 2013-09-03 15:53:51 +02:00
Mohamed Ashraf
1bbb3816a8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	libraries/Scripts.class.php
	libraries/config.default.php
2013-08-07 01:05:48 +02:00
Michal Čihař
e8e46416fc Wrap long lines 2013-08-06 15:06:04 +02:00
Mohamed Ashraf
b83f0eb463 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	doc/config.rst
	js/messages.php
	libraries/config/setup.forms.php
	version_check.php

changed 'libraries/Util.class.php' to accept the newly renamed proxy variables
2013-07-29 18:12:04 +02:00
Michal Čihař
240b8332db Readd AllowThirdPartyFraming option
We want by default no framing of phpMyAdmin, but still some sites might
need to embed it, so configuration option (with appropriate security
warning) is there.

This basically reverts d7e0bed284.
2013-07-29 14:55:22 +02:00
Mohamed Ashraf
0fb14931cd Corrected comments by Rouslan
* Added doc blocks to functions
* Removed syntax error
* Changed string in error report form
* resized error report notification to full screen size
2013-06-25 07:45:45 +02:00
Mohamed Ashraf
3541a6d2b5 error reporting now respects settings 2013-06-24 15:38:13 +02:00
Dieter Adriaenssens
ef423e145c remove unused variables : key is not used 2013-01-24 17:31:06 +01:00
Rouslan Placella
c3d8eba07d Prevent pointless requests for js files 2012-12-19 13:10:36 +00:00
Rouslan Placella
44c12545fc Generate a single js file server-side for any number of requested files
IMPLEMENTS feature request #3583340
2012-12-19 13:10:36 +00:00
Rouslan Placella
c573b0c566 Moved setUrlHash module into ajax.js 2012-11-06 15:20:53 +00:00
Rouslan Placella
483dab2feb phpcs fixes 2012-10-30 20:24:01 +00:00
Rouslan Placella
753e1f3648 Initial implementation of microhistory 2012-10-30 20:24:00 +00:00
Rouslan Placella
7356b407ad Rewrite and integration of js/common.js 2012-10-30 20:23:59 +00:00
Rouslan Placella
d7e0bed284 Dropped configuration directive: AllowThirdPartyFraming 2012-10-30 20:16:56 +00:00
Rouslan Placella
307fff3570 The events for the navigation only need to be registered once 2012-10-30 20:10:20 +00:00
Rouslan Placella
7acfbd6544 Record which files to fire events for on initial page load 2012-10-30 20:07:01 +00:00
Rouslan Placella
5838a44339 Use AJAX.registerOnload() instead of $(document).ready() 2012-10-30 20:07:01 +00:00
Rouslan Placella
5486bdb312 Implemented page, menu and scripts loading via ajax 2012-10-30 20:04:52 +00:00
Rouslan Placella
547282a240 Fixed missing function argument in the PMA_Scripts class 2012-06-17 22:05:07 +01:00
Rouslan Placella
e7cd6a1e8a PHP seems to reset the CWD after a call to exit, so we need to collect the file timestamps early 2012-06-11 14:06:04 +01:00
Rouslan Placella
07c7b29f48 Fixes for disabling the response 2012-06-11 14:06:03 +01:00
Rouslan Placella
e712968b96 Coding style fixes 2012-06-11 14:06:03 +01:00
Rouslan Placella
d5fa1c666f Handle scripts in the PMA_Footer class 2012-06-11 14:06:03 +01:00
Rouslan Placella
de36567ea6 Docblocks and coding style fixes for the new classes 2012-06-11 14:06:03 +01:00
Rouslan Placella
46de9ecf01 Fixed JS bug in user prefs 2012-06-11 14:06:03 +01:00
Rouslan Placella
e306fadaab Integrated pmd with the new Header class 2012-06-11 14:06:03 +01:00
Rouslan Placella
97449dae42 New classes PMA_Header and PMA_Scripts 2012-06-11 14:06:02 +01:00