Skip to content

Commit 00fa112

Browse files
committed
php7 related fixes
1 parent 5385671 commit 00fa112

9 files changed

Lines changed: 10 additions & 10 deletions

File tree

config/auth.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
// CUSTOM = Use a custom authentication scheme (see docs for details)
2323
define('AUTH_TYPE', 'LOGIN');
2424

25-
// if either of the required extensions are available, secure login will be available
26-
$secure_login_available = (extension_loaded('openssl') && extension_loaded('gmp')) || extension_loaded('bcmath');
25+
// if required extensions are available, secure login will be available
26+
$secure_login_available = (extension_loaded('openssl') && extension_loaded('gmp') && extension_loaded('bcmath'));
2727
// avoid sending plain text login info for additional security (disabled for HTTPS automatically)
2828
define('SECURE_LOGIN', $secure_login_available);
2929

lib/db/manager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DbManager {
1919
var $conn;
2020
var $errMsg;
2121

22-
function DbManager() {
22+
function __construct() {
2323
}
2424

2525
function connect($server, $user, $password, $db="") {

lib/db/mysql4.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DB_Mysql4 {
2424
var $lastQuery;
2525
var $queryTime;
2626

27-
function DB_Mysql4() {
27+
function __construct() {
2828
$this->conn = null;
2929
$this->errMsg = null;
3030
$this->escapeData = true;

lib/db/mysql5.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DB_Mysql5 {
3535
246 => 'numeric'
3636
);
3737

38-
function DB_Mysql5() {
38+
function __construct() {
3939
$this->conn = null;
4040
$this->errMsg = null;
4141
$this->escapeData = true;

lib/db/mysqli.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class DB_Mysqli {
4848
246 => 'numeric'
4949
);
5050

51-
function DB_Mysqli() {
51+
function __construct() {
5252
$this->conn = null;
5353
$this->errMsg = null;
5454
$this->escapeData = true;

lib/db/pgsql.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class DB_Pgsql {
4040
var $stack_last; // we need it for getting affected rows
4141
var $includeStandardObjects;
4242

43-
function DB_Pgsql() {
43+
function __construct() {
4444
$this->conn = null;
4545
$this->errMsg = null;
4646
$this->escapeData = true;

lib/db/sqlite.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class DB_Sqlite {
4646
'secure_delete','synchronous','temp_store','user_version','wal_autocheckpoint'
4747
);
4848

49-
function DB_Sqlite() {
49+
function __construct() {
5050
$this->conn = null;
5151
$this->errMsg = null;
5252
$this->escapeData = true;

lib/external/jcryption-legacy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class jCryption {
3232
*
3333
* @access public
3434
*/
35-
function jCryption($e = "\x01\x00\x01") {
35+
function __construct($e = "\x01\x00\x01") {
3636
$this->_e = $e;
3737
}
3838

lib/external/rijndael.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ class Crypt_Rijndael {
366366
* @return Crypt_Rijndael
367367
* @access public
368368
*/
369-
function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC)
369+
function __construct($mode = CRYPT_RIJNDAEL_MODE_CBC)
370370
{
371371
switch ($mode) {
372372
case CRYPT_RIJNDAEL_MODE_ECB:

0 commit comments

Comments
 (0)