Commit Graph

310 Commits

Author SHA1 Message Date
Marc Delisle
9591205e2c Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 09:06:49 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-03 08:50:14 -05:00
Hugues Peccatte
c2d516cac4 Remove unused variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-01 21:19:13 +01:00
Michal Čihař
2ce7aa70c4 Move storing password/username after checking password
The cookie encryption is quite expensive, so let's move it after we
check password validity.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-01 09:50:16 +01:00
Madhura Jayaratne
783cacbd1e Workaround for token mismatch error on server session timeout for config and http authentication types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-20 17:37:39 +05:30
Madhura Jayaratne
52e0087b0e Long messages wrapped
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 17:45:59 +05:30
Hugues Peccatte
80ced5fe8f Fix PHPCS issues.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 18:37:49 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
5df7783e97 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-22 12:41:06 -04:00
Hugues Peccatte
74f0beda8f Fix syntax error.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 20:56:12 +02:00
Madhura Jayaratne
fa3c538341 Align
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 15:08:28 +05:30
Madhura Jayaratne
00f2788a66 bug #4560 PHP error on master branch
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-17 13:35:16 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-16 13:32:15 -04:00
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed"
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:29:55 +05:30
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
0809fd14cb Move include file to a function
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-18 13:01:49 -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
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-12 01:47:20 +05:30
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-11 18:33:59 +05:30
Marc Delisle
4aa4f20b7a Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-23 11:46:19 -04:00
Marc Delisle
17fd38e23e Merge branch 'QA_4_2' 2014-06-05 12:45:07 -04:00
Marc Delisle
94e43de453 Add enforcement of the minimum supported PHP version (5.3.0)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-05 12:44:34 -04:00
Marc Delisle
ee22d3e65d Merge branch 'QA_4_2' 2014-06-05 12:28:25 -04:00
Marc Delisle
9112d7c930 bug #4437 Problems due to missing enforcement of the minimum supported MySQL version
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-05 12:27:03 -04:00
Michal Čihař
e984b2a609 The ini_set function takes string, not booleans or integers
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-10 11:57:10 +02:00
Michal Čihař
2fa4a0084c Simplify condition for running stripslashes
- get_magic_quotes_gpc is always present in supported PHP versions
- get_magic_quotes_gpc returns false since PHP 5.4.0 where related
  setting has been removed

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-04-10 13:30:44 +02:00
Michal Čihař
7233657d4d Remove support for SQL validator
The SOAP service seems to be down for quite some time and it is not
mentioned anywhere on Mimer website.

Signed-off-by: Michal Čihař <michal@cihar.com>
2014-04-02 12:10:52 +02:00
Madhura Jayaratne
22ab13a1dc Merge branch 'QA_4_1' 2014-03-09 14:53:25 +05:30
Madhura Jayaratne
45606abccb bug #4278 reCaptcha re-login requires double effort
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-03-09 14:51:29 +05:30
Dhananjay Nakrani
76c57710f0 Display session expiry msg after auto-redirect.
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
2014-03-03 11:49:17 +05:30
Dhananjay
0a18d86059 Fix for bug#4237.
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
2014-02-07 11:56:46 +05:30
Michal Čihař
923d3b4d8c Merge commit '8219b4cc9c5649e4b06f30130e5fe50c00dfc72b' 2014-02-04 08:11:40 +01:00
Michal Čihař
6f076b34e5 Drop flashcanvas
Let's drop flashcanvas, which we use for rendering charts with MSIE 8
and older. I've tested it a bit and in none of the uses it works
properly, so it really does not work as a drop in replacement for native
browser support and it would probably need some adjustment in our code.

Also it is problematic from licensing point of view as we do not ship
source for it js/canvg/flashcanvas.swf.

Signed-off-by: Michal Čihař <mcihar@suse.cz>
2014-02-03 13:32:01 +01:00
Michal Čihař
767fc8c997 Correct punctuation for sentences
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:38:49 +01:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-11 22:13:10 +01:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Marc Delisle
5544d0cfc6 Fix coding style 2013-10-29 05:59:02 -04:00
Marc Delisle
88da7eeba0 Fixes many coding style "line too long" 2013-10-17 05:41:51 -04:00
Madhura Jayaratne
8d19bb1618 These are not static methods 2013-09-29 22:40:35 +05:30
Michal Čihař
072ed2aed4 Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	libraries/database_interface.lib.php
2013-09-12 10:02:38 +02:00
Michal Čihař
f350e7703f bug #3997 Error handling in case MySQL extension is missing
We can not work with Response object before loading DBI as it uses it.
2013-09-12 09:46:45 +02:00
Marc Delisle
56a9031f4e Fix merge conflicts 2013-08-31 07:56:31 -04:00
Marc Delisle
5298602f8e bug #4046 Exporting huge Tables causes memory-Problems 2013-08-29 10:26:24 -04:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
9816ac0683 Merge pull request #539 from fustundag/master
feature-requests #1444
2013-08-02 02:24:15 -07:00
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Fatih Üstündağ
2666eb81a5 verbose md5 check fix 2013-07-25 14:19:22 +03:00
Fatih Üstündağ
c873c161d0 verbose check added to lookup server 2013-07-25 03:05:09 +03:00
Marc Delisle
7992beb8e4 Move protection statement at beginning of script 2013-07-17 15:18:52 -04:00