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

134 Commits

Author SHA1 Message Date
Michal Čihař
8beb7f544e Fixed broken links in setup 
Fixes #13133

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:07:42 +02:00
Michal Čihař
332899b968 Remove unused variable 
Introduced by pr #13053

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:58:03 +01:00
Raghuram
e54d5085d9 Fix broken links in setup page 
Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-13 09:55:31 +01:00
Michal Čihař
1dd22f4dea Merge branch 'QA_4_6-security' into master-security 2017-01-07 11:02:01 +01:00
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ř
ea065f54d5 Merge branch 'master' into master-security 2016-12-13 10:55:17 +01:00
Michal Čihař
49a20101e2 Merge branch 'QA_4_6' 2016-12-13 10:39: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ř
7157322719 Merge branch 'QA_4_6-security' into master-security 2016-12-08 11:01:43 +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
Deven Bansod
a530503c22 Replace call to undefined function by correct call 
Fix #12756

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:39:32 +05:30
Michal Čihař
85f297ea6d Remove no longer needed include from setup 
Fixes #12748

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:35:54 +01:00
Michal Čihař
b73175ed12 Merge branch 'master' into master-security 2016-06-20 10:43:21 +02:00
Michal Čihař
80cd2f448c Merge branch 'QA_4_6' into QA_4_6-security 2016-06-20 10:42:29 +02:00
Michal Čihař
ef6b9e8120 Merge branch 'QA_4_6' 2016-06-17 17:13:08 +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ř
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +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ř
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ř
42f94b05e2 Merge branch 'QA_4_6' 2016-05-23 09:40:56 +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
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
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