gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,518 Commits 12 Branches 481 Tags 2.4 GiB
QA_4_6
Commit Graph

118 Commits

Author SHA1 Message Date
Michal Čihař
c962ee4287 Remove setup download/load/delete features 
This removes risk of third party manipulating with the configuration as
there was race condition between editing and using the file.

Downloading the file should not be big hassle and this really makes the
whole setup a bit simpler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:34:42 +01:00
Michal Čihař
be8eb4bf3e Merge commit '90e4325bcf' into QA_4_6-security 2016-12-13 10:31:43 +01:00
Michal Čihař
90e4325bcf Rewrite https in setup and messages handling 
- The client side check is more reliable
- Does not depend on server setup
- Removed related inline javascript (see #12261)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:31:25 +01:00
Michal Čihař
4c84070ad6 Avoid using REQUEST_URI in form action 
It's really not necessary here and might cause redirection issues.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 10:49:06 +01:00
Michal Čihař
80cd2f448c Merge branch 'QA_4_6' into QA_4_6-security 2016-06-20 10:42:29 +02:00
Michal Čihař
1a558a4190 Ensure id is numeric 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 17:12:41 +02:00
Michal Čihař
331c560fbf Improve error handling in setup in case config dir is not present 
We do not show these options in UI, but the scripts should handle it
gracefully.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-17 10:54:11 +02:00
Michal Čihař
5633b1d57b Use javascript for redirection to https 
The current approach is broken since whitelisting is active in url.php
and also allows potential bbcode injection.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 17:51:27 +02:00
Michal Čihař
5fc8020c5b Ensure links from setup go through url.php 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 09:40:17 +02:00
Michal Čihař
830dfe1b3e Migrate setup language selection to LanguageManager 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 10:07:39 +01:00
Michal Čihař
ed96969ff9 Merge branch 'QA_4_5' 2016-01-28 09:23:27 +01:00
Madhura Jayaratne
5aee503564 Fix path disclosure, items 1.4.x, 1.5 and 1.6 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-19 10:22:30 +11: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
06d22e636e Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:41:46 -05:00
Marc Delisle
66c15daba0 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:01:07 -05:00
Marc Delisle
e16bc39f85 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-05 07:27:29 -05:00
Deven Bansod
a1c48add28 Fix build error. Need concatenation here 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-05 19:29:18 +05:30
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-04 09:05:42 -05:00
Hugues Peccatte
2ef92adc1b Fix setup. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-02 08:58:06 +02:00
Hugues Peccatte
cef71b8136 Set VersionInformation in a namespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 21:50:23 +02:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Madhura Jayaratne
2da36e93b2 Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-22 21:35:05 +10:00
Madhura Jayaratne
c3fefc2e4a Fix #11464 phpMyAdmin suggests upgrading to newer version not usable on that system 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-14 20:14:51 +10:00
Hugues Peccatte
e5e447e937 Set namespace on config classes. 
Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:23 +02:00
Hugues Peccatte
bd707b871d Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 23:34:50 +02:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Michal Čihař
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal Čihař
4404f28d4b Replace some links to sourceforge.net with our website 
- donations are no longer processed by sf.net
- support forums are disabled for years, point users to support page

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:15 +02:00
Michal Čihař
a6fd4c2ed4 Cleanup URLs to our website 
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 13:39:10 +02:00
Madhura Jayaratne
31c21b070a Adding token would not harm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:25:36 +05:30
Nisarg Jhaveri
431847b39e Return HTML instead of echo-ing directly in FormDisplay 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-15 00:56:26 +05:30
Madhura Jayaratne
e874e59b69 bug #4899 [security] CSRF vulnerability in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:36:06 -04:00
Madhura Jayaratne
d6afe6ccf6 bug #4899 [security] CSRF vulnerability in setup 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-13 11:28:19 -04: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
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
Marc Delisle
f46865c660 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 09:34:51 -04:00
Ann + J.M
356626bbaa [interface] Highlight active left menu item in setup 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 20:45:49 +01:00
Marc Delisle
b809e36836 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 08:10:24 -05:00
Michal Čihař
cea7f75dab Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:19:15 +01:00
Hugues Peccatte
4f05a8abfa Merge pull request #808 from Tithugues/nestedLevels 
Nested levels
 2013-12-27 05:33:10 -08:00
Hugues Peccatte
ef49eff205 Standardize names of functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-27 13:49:57 +01:00
Madhura Jayaratne
a10ac8859f Minimize using static methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-23 12:55:39 +05:30
Hugues Peccatte
291c4246b8 Replace function PMA_performConfigChecks by a class. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-22 21:32:05 +01:00
Piotr Przybylski
858b20d26d Removed wiki links from setup script and user preferences 2013-11-03 13:07:22 +01:00
Piotr Przybylski
a67e41a646 Refactored ConfigFile class so that it is no longer a singleton 
Fixes bug #4123 Double config including
 2013-11-03 12:54:20 +01:00
Marc Delisle
85c5464cec Fix codestyle 2013-09-09 06:08:26 -04:00
Marc Delisle
24e84b07df Fix codestyle 2013-09-09 05:55:04 -04:00
Marc Delisle
2c41695fe9 Fix codestyle 2013-09-09 05:49:07 -04:00
Marc Delisle
f30b6a6a5f Fix codestyle 2013-09-09 05:40:20 -04:00
Marc Delisle
7694dcf4fd Fix codestyle 2013-09-09 05:35:12 -04:00