Commit Graph

121 Commits

Author SHA1 Message Date
Michal Čihař
215f4a8ebe Can not use PMA_fatalError when including fails
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-26 14:30:08 +01:00
Madhura Jayaratne
9730b16dd0 issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-22 23:59:20 +10:00
Madhura Jayaratne
fea1d39fef bug #4899 [security] CSRF vulnerability in setup
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-12 19:56:53 +05:30
Marc Delisle
1429272136 Remove other .htaccess for directories which are not at risk 2013-07-17 15:25:53 -04:00
Michal Čihař
879e7507bb Include util class for setup 2012-11-12 19:59:25 +01:00
Michal Čihař
3e050ff9d9 Various docblocks improvements 2012-09-19 15:05:26 +02:00
Madhura Jayaratne
72cdb4d058 Simplify the logic a bit 2012-07-29 08:10:25 +05:30
Madhura Jayaratne
3ad443a656 Merge branch 'QA_3_5' 2012-07-29 08:09:02 +05:30
Alain ICHE
66100f67d7 bug #3541966 [config] Error in generated configuration array 2012-07-29 08:05:04 +05:30
Madhura Jayaratne
7eaa93c2a9 Coding style fixes 2012-05-10 22:24:39 +05:30
Michal Čihař
54dc10a012 Use PMA_fatalError instead of die 2012-05-09 11:58:10 +02:00
Michal Čihař
b846df7033 Empty line between @param and @return 2012-04-27 13:54:13 +02:00
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Dieter Adriaenssens
ff5bdcf8bf remove author names 2012-03-14 15:44:42 +01:00
Dieter Adriaenssens
43b41a8cbb cleanup package tags 2012-03-14 15:37:36 +01:00
Michal Čihař
40818833af Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5 2012-02-08 14:23:12 +01:00
Michal Čihař
b4296d6acb Escape in correct places to avoid double escaping sometimes 2012-02-08 14:22:39 +01:00
Michal Čihař
b78bd8e8a4 Avoid specifying database server name 2012-01-31 11:00:41 +01:00
Michal Čihař
304283ce37 This is about MySQL server, not web 2012-01-31 11:00:14 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Michal Čihař
85d729ac5f Coding style adjustments 2011-08-02 16:57:32 +02:00
Piotr Przybylski
878cff0205 Comments 2011-07-31 20:41:03 +02:00
Michal Čihař
11937b06bd Merge remote-tracking branch 'origin/QA_3_4' 2011-07-22 15:19:59 +02:00
Jørgen Thomsen
5f9c187010 Fix format parameters 2011-07-22 15:19:31 +02:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Marc Delisle
12fcc270f2 Merge branch 'QA_3_4' 2011-07-02 20:52:10 -04:00
Herman van Rink
0fbedaf5fd Fixed possible code injection incase session variables are compromised, see PMASA-2011-6 2011-06-30 13:21:31 +02:00
Michal Čihař
802b94c0ea Fix order of parameters in doc 2011-06-24 14:09:29 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false.
At least this seems to be the coding standard, so make all files
compliant.
2011-06-06 11:55:09 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
baf339f802 Continue to replace warning level with error level 2011-05-04 06:14:28 -04:00
Michal Čihař
9433f4e78f Fix check for latest version to work with versions like -rc1-dev 2011-04-07 14:35:11 +02:00
Michal Čihař
04acac8235 More uses of standard function for PHP doc links 2011-02-17 10:50:59 +01:00
Marc Delisle
c432089db8 Remove author names per our policy 2011-01-30 06:46:15 -05:00
Crack
da0039bb44 fix message 2010-09-21 14:09:57 +02:00
Crack
6a4766f60c Add setup script warning for when LoginCookieStore < LoginCookieValidity 2010-09-21 13:42:37 +02:00
Crack
2524b2588d Setup script front page messages:
- removed URLs from translatable strings and fixed tab links
- added warning when LoginCookieValidity > 1440
- added error when LoginCookieValidity > session.gc_maxlifetime
2010-09-21 13:24:42 +02:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Crack
8b78fcec26 remove unneeded file 2010-08-04 14:35:09 +02:00
Crack
4a5ffa7a12 File comments:
- remove @license and @version from comments
- add vim settings
- change descriptions in form definition files
2010-08-03 00:55:57 +02:00
Crack
e76b4f8721 fix array definition code 2010-07-31 21:54:38 +02:00
Crack
dcc352a9dc refactor config file generation out of ConfigFile class 2010-07-30 20:25:22 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/config.values.php
2010-07-26 20:24:57 +02:00
Michal Čihař
cfc7fd7a2d The linked-tables infrastructure is now called phpMyAdmin configuration storage. 2010-07-26 17:16:55 +02:00
Michal Čihař
639dc7fcf6 Simplify inclusions of vendor_config. 2010-07-26 16:46:37 +02:00