Commit Graph

291 Commits

Author SHA1 Message Date
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
Marc Delisle
8e4fe7c57a [security] Avoid full path disclosure from libraries/common.inc.php, see PMASA-2013-12 2013-07-17 15:06:18 -04:00
Marc Delisle
0fea53b7b8 [security] Avoid full path disclosure from some libraries script, see
PMASA-2013-12

Move the PHPMYADMIN constant definition earlier
2013-07-17 14:56:50 -04:00
Madhura Jayaratne
e5519859fb Make all string function accessible via $GLOBALS['PMA_String'] 2013-07-17 16:36:13 +05:30
Marc Delisle
22884539af No need for this to be a global variable 2013-07-14 15:55:44 -04:00
Michal Čihař
37d142bc3f Remove compatibility code for PHP 5.2 2013-07-01 15:29:56 +02:00
Michal Čihař
0f3754a271 Raise requirements to PHP 5.3 2013-07-01 15:29:47 +02:00
Marc Delisle
4ea69f0536 Merge commit 'f0232c3' 2013-06-24 08:00:47 -04:00
Marc Delisle
f0232c3cda bug #3985 Call to undefined function mb_detect_encoding 2013-06-24 07:58:23 -04:00
Michal Čihař
b38c7637d8 Merge branch 'QA_4_0' 2013-06-04 09:07:14 +02:00
Michal Čihař
9afc2fba57 Add check for json module in PHP
Debian no longer ships JSON support built in into PHP because of some
licensing issues found in the PHP 5.5 and others might follow, so we
need to check whether JSON module is there.
2013-06-04 09:05:47 +02:00
Madhura Jayaratne
2baf473ad7 Merge branch 'master' into OOP_DBI
Conflicts:
	libraries/database_interface.lib.php
2013-05-26 21:43:33 +05:30
Madhura Jayaratne
0dab7f2463 Separate DatabaseInterface class and creation of an instance of it 2013-05-26 21:28:42 +05:30
Madhura Jayaratne
50b0eed668 isSuperuser() is also a part of DatabaseInterface class 2013-05-26 09:18:11 +05:30
Atul Pratap Singh
8cd420ac94 Remove duplicate code, profiling scripts already included 2013-05-25 16:47:32 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Atul Pratap Singh
c88762e386 Include profiling scripts initially, bug#3639 in QA_4_0 2013-05-23 23:54:29 +05:30
Atul Pratap Singh
dbb0ed3e6a Include profiling scripts initially, bug#3639 2013-05-23 18:07:24 +05:30
Michal Čihař
2bcc317b1c Better name for a function 2013-05-10 10:10:09 +02:00
Kasun Chathuranga
adb2e43f7d Implement feature request #1414 - Allow specifying crontrolport
Set the value of controlport based on the value of controlhost
2013-05-02 21:36:05 +05:30