diff --git a/ConnectionClass.php b/ConnectionClass.php index 0426823f..86f17a79 100644 --- a/ConnectionClass.php +++ b/ConnectionClass.php @@ -34,7 +34,9 @@ function init($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseNa { $user_agent = explode('/', isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ''); if (isset($user_agent[0]) && $user_agent[0] == 'Mozilla') { - $conn = new mysqli($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName); + $conn = mysqli_init(); + $conn->ssl_set(NULL, NULL, NULL, NULL, NULL); + $conn->real_connect($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName, 3306, null, MYSQLI_CLIENT_SSL); // Disable strict mode to ensure compatibility if ($conn && !$conn->connect_errno) { $conn->query("SET SESSION sql_mode = ''"); diff --git a/DatabaseInc.php b/DatabaseInc.php index 5f0c57a7..41905cfd 100644 --- a/DatabaseInc.php +++ b/DatabaseInc.php @@ -57,6 +57,7 @@ function db_start() ##### Connection help ##### +/* if (!empty($DatabaseServer) && !empty($DatabaseUsername) && !empty($DatabaseName)) $connection = mysqli_connect($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName); @@ -80,11 +81,12 @@ function db_start() if ($result && mysqli_num_rows($result) > 0) { $row = mysqli_fetch_assoc($result); if ((int)$row['lbtfc'] !== 1) { - $connection->query("SET @@GLOBAL.log_bin_trust_function_creators = 1"); + // $connection->query("SET @@GLOBAL.log_bin_trust_function_creators = 1"); } } } } +*/ # ---------- # # Debugger # diff --git a/ForgotPass.php b/ForgotPass.php index 0b370833..7256dc96 100644 --- a/ForgotPass.php +++ b/ForgotPass.php @@ -65,7 +65,9 @@ function db_start() { switch ($DatabaseType) { case 'mysqli': - $connection = new mysqli($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName); + $connection = mysqli_init(); + $connection->ssl_set(NULL, NULL, NULL, NULL, NULL); + $connection->real_connect($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName, 3306, null, MYSQLI_CLIENT_SSL); break; } diff --git a/PasswordCheck.php b/PasswordCheck.php index 3c14c072..d334f2e2 100644 --- a/PasswordCheck.php +++ b/PasswordCheck.php @@ -37,7 +37,9 @@ function db_start() switch($DatabaseType) { case 'mysqli': - $connection = new mysqli($DatabaseServer,$DatabaseUsername,$DatabasePassword,$DatabaseName); + $connection = mysqli_init(); + $connection->ssl_set(NULL, NULL, NULL, NULL, NULL); + $connection->real_connect($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName, 3306, null, MYSQLI_CLIENT_SSL); break; } // Error code for both. @@ -56,7 +58,9 @@ function db_start() ##### Connection help ##### -$connection = mysqli_connect($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName); +$connection = mysqli_init(); +$connection->ssl_set(NULL, NULL, NULL, NULL, NULL); +$connection->real_connect($DatabaseServer, $DatabaseUsername, $DatabasePassword, $DatabaseName, 3306, null, MYSQLI_CLIENT_SSL); if (!$connection) { diff --git a/install/Ins1.php b/install/Ins1.php index 59bba962..910a6d21 100644 --- a/install/Ins1.php +++ b/install/Ins1.php @@ -97,9 +97,11 @@ '; //$dbconn = mysqli_connect($_SESSION['host'],$_SESSION['username'],$_SESSION['password']) try{ - $dbconn = new mysqli($_SESSION['server'], $_SESSION['username'], $_SESSION['password'], '', $_SESSION['port']); + $dbconn = mysqli_init(); + $dbconn->ssl_set(NULL, NULL, NULL, NULL, NULL); + $dbconn->real_connect($_SESSION['server'], $_SESSION['username'], $_SESSION['password'], '', $_SESSION['port'], null, MYSQLI_CLIENT_SSL); } catch (Exception $e) { - // echo 'Caught exception: ', $e->getMessage(), "\n"; + echo 'Caught exception: ', $e->getMessage(), "\n"; exit($err); } if ($dbconn->connect_errno != 0) { diff --git a/install/Ins2.php b/install/Ins2.php index e8f807e3..0304ab7e 100644 --- a/install/Ins2.php +++ b/install/Ins2.php @@ -40,10 +40,12 @@ // Helper function to create mysqli connection with strict mode disabled function createConnection($server, $username, $password, $database = '', $port = 3306) { + $conn = mysqli_init(); + $conn->ssl_set(NULL, NULL, NULL, NULL, NULL); if ($database != '') { - $conn = new mysqli($server, $username, $password, $database, $port); + $conn->real_connect($server, $username, $password, $database, $port, null, MYSQLI_CLIENT_SSL); } else { - $conn = new mysqli($server, $username, $password, '', $port); + $conn->real_connect($server, $username, $password, '', $port, null, MYSQLI_CLIENT_SSL); } if ($conn && !$conn->connect_errno) { $conn->query("SET SESSION sql_mode = ''"); @@ -188,7 +190,7 @@ function executeSQL($myFile) $dbconn = createConnection($_SESSION['server'], $_SESSION['username'], $_SESSION['password'], $_SESSION['db'], $_SESSION['port']); // Enable function creation with binary logging - $dbconn->query("SET GLOBAL log_bin_trust_function_creators = 1"); + // $dbconn->query("SET GLOBAL log_bin_trust_function_creators = 1"); $sql = file_get_contents($myFile); $sqllines = par_spt("/[\n]/", $sql); @@ -223,7 +225,7 @@ function createUpdatedByTriggers() $dbconn = createConnection($_SESSION['server'], $_SESSION['username'], $_SESSION['password'], $_SESSION['db'], $_SESSION['port']); // Enable trigger/function creation with binary logging - $dbconn->query("SET GLOBAL log_bin_trust_function_creators = 1"); + // $dbconn->query("SET GLOBAL log_bin_trust_function_creators = 1"); if ($result = $dbconn->query("SELECT DISTINCT TABLE_NAME FROM INFORMATION_SCHEMA.COLUMNS diff --git a/install/Ins3.php b/install/Ins3.php index 6178fac5..0764e937 100644 --- a/install/Ins3.php +++ b/install/Ins3.php @@ -32,7 +32,9 @@ // Helper function to create mysqli connection with strict mode disabled function createConnectionIns3($server, $username, $password, $database = '', $port = 3306) { - $conn = new mysqli($server, $username, $password, $database, $port); + $conn = mysqli_init(); + $conn->ssl_set(NULL, NULL, NULL, NULL, NULL); + $conn->real_connect($server, $username, $password, $database, $port, null, MYSQLI_CLIENT_SSL); if ($conn && !$conn->connect_errno) { $conn->query("SET SESSION sql_mode = ''"); } @@ -106,7 +108,7 @@ function executeSQL($myFile) $dbconn = createConnectionIns3($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port']); // Enable trigger/function creation with binary logging - $dbconn->query("SET GLOBAL log_bin_trust_function_creators = 1"); + // $dbconn->query("SET GLOBAL log_bin_trust_function_creators = 1"); $sql = file_get_contents($myFile); $sqllines = par_spt("/[\n]/",$sql); diff --git a/install/Ins4.php b/install/Ins4.php index de1d8c17..85deb6c8 100644 --- a/install/Ins4.php +++ b/install/Ins4.php @@ -38,7 +38,9 @@ require_once "../functions/PragRepFnc.php"; //mysql_select_db($_SESSION['db']); -$dbconn = new mysqli($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port']); +$dbconn = mysqli_init(); +$dbconn->ssl_set(NULL, NULL, NULL, NULL, NULL); +$dbconn->real_connect($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port'], null, MYSQLI_CLIENT_SSL); if ($dbconn && !$dbconn->connect_errno) { $dbconn->query("SET SESSION sql_mode = ''"); } diff --git a/install/OpensisProcsMysqlInc.sql b/install/OpensisProcsMysqlInc.sql index 217f1c97..82261516 100644 --- a/install/OpensisProcsMysqlInc.sql +++ b/install/OpensisProcsMysqlInc.sql @@ -794,9 +794,9 @@ DELIMITER ; -- EVENT: SET EVENT SCHEDULER ON TEMPORARILY. TO DO IT PERMANENTLY, YOU NEED TO SET THE MYSQL CONFIG -- -SET @@GLOBAL.event_scheduler = ON; -SET GLOBAL log_bin_trust_function_creators = 1; -SET @@GLOBAL.SQL_MODE = "NO_ENGINE_SUBSTITUTION"; +-- SET @@GLOBAL.event_scheduler = ON; +-- SET GLOBAL log_bin_trust_function_creators = 1; +-- SET @@GLOBAL.SQL_MODE = "NO_ENGINE_SUBSTITUTION"; -- -- EVENT: ES_HANDLER_MISSING_ATTENDANCE diff --git a/install/OpensisUpdateProcsMysql.sql b/install/OpensisUpdateProcsMysql.sql index ad56de66..fc47dffa 100644 --- a/install/OpensisUpdateProcsMysql.sql +++ b/install/OpensisUpdateProcsMysql.sql @@ -718,8 +718,8 @@ DELIMITER ; -- EVENT: SET EVENT SCHEDULER ON TEMPORARILY. TO DO IT PERMANENTLY, YOU NEED TO SET THE MYSQL CONFIG -- -SET @@GLOBAL.event_scheduler = ON; -SET GLOBAL log_bin_trust_function_creators = 1; +-- SET @@GLOBAL.event_scheduler = ON; +-- SET GLOBAL log_bin_trust_function_creators = 1; -- -- EVENT: ES_HANDLER_MISSING_ATTENDANCE diff --git a/install/Selectdb.php b/install/Selectdb.php index a7e4472e..f0bbea61 100644 --- a/install/Selectdb.php +++ b/install/Selectdb.php @@ -31,10 +31,12 @@ // Helper function to create mysqli connection with strict mode disabled function createConnectionSelectDb($server, $username, $password, $database = '', $port = 3306) { + $conn = mysqli_init(); + $conn->ssl_set(NULL, NULL, NULL, NULL, NULL); if ($database != '') { - $conn = new mysqli($server, $username, $password, $database, $port); + $conn->real_connect($server, $username, $password, $database, $port, null, MYSQLI_CLIENT_SSL); } else { - $conn = new mysqli($server, $username, $password); + $conn->real_connect($server, $username, $password, '', $port, null, MYSQLI_CLIENT_SSL); } if ($conn && !$conn->connect_errno) { $conn->query("SET SESSION sql_mode = ''"); diff --git a/install/SqlForClientSchoolAndSampleDataInc.php b/install/SqlForClientSchoolAndSampleDataInc.php index 860adf15..4e1d2399 100644 --- a/install/SqlForClientSchoolAndSampleDataInc.php +++ b/install/SqlForClientSchoolAndSampleDataInc.php @@ -1640,7 +1640,9 @@ (5, 'admin', 'Admin Asst', '2019-07-28 08:26:33', NULL), (6, 'admin', 'Test', '2022-10-13 22:08:47', NULL);"; -$dbconn = new mysqli($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port']); +$dbconn = mysqli_init(); +$dbconn->ssl_set(NULL, NULL, NULL, NULL, NULL); +$dbconn->real_connect($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port'], null, MYSQLI_CLIENT_SSL); if ($dbconn && !$dbconn->connect_errno) { $dbconn->query("SET SESSION sql_mode = ''"); } diff --git a/install/SqlForClientSchoolInc.php b/install/SqlForClientSchoolInc.php index 781640e5..0a709eb4 100644 --- a/install/SqlForClientSchoolInc.php +++ b/install/SqlForClientSchoolInc.php @@ -215,7 +215,9 @@ INSERT INTO `user_profiles` (`id`, `profile`, `title`, `last_updated`, `updated_by`) VALUES (1,'admin','Administrator','2019-07-28 08:26:33',NULL),(2,'teacher','Teacher','2019-07-28 08:26:33',NULL),(3,'student','Student','2019-07-28 08:26:33',NULL),(4,'parent','Parent','2019-07-28 08:26:33',NULL),(5,'admin','Admin Asst','2019-07-28 08:26:33',NULL);"; -$dbconn = new mysqli($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port']); +$dbconn = mysqli_init(); +$dbconn->ssl_set(NULL, NULL, NULL, NULL, NULL); +$dbconn->real_connect($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port'], null, MYSQLI_CLIENT_SSL); if ($dbconn && !$dbconn->connect_errno) { $dbconn->query("SET SESSION sql_mode = ''"); } diff --git a/install/SqlSampleDataInc.php b/install/SqlSampleDataInc.php index 699f3702..4e801bf5 100644 --- a/install/SqlSampleDataInc.php +++ b/install/SqlSampleDataInc.php @@ -1590,7 +1590,9 @@ (5, 'admin', 'Admin Asst', '2019-07-28 08:26:33', NULL), (6, 'admin', 'Test', '2022-10-13 22:08:47', NULL);"; -$dbconn = new mysqli($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port']); +$dbconn = mysqli_init(); +$dbconn->ssl_set(NULL, NULL, NULL, NULL, NULL); +$dbconn->real_connect($_SESSION['server'],$_SESSION['username'],$_SESSION['password'],$_SESSION['db'],$_SESSION['port'], null, MYSQLI_CLIENT_SSL); if ($dbconn && !$dbconn->connect_errno) { $dbconn->query("SET SESSION sql_mode = ''"); }