Skip to content

Commit aa92674

Browse files
ywarnierywarnier
committed
Update to PDO to support PHP 7
1 parent b67d5da commit aa92674

7 files changed

+81
-84
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Chamilo Munin 2.1 (20170619)
2+
============================
3+
* Use PDO for database connections to avoid issues with PHP 7.1
4+
15
Chamilo Munin 2.0 (20160714)
26
============================
37
* Update for Chamilo 1.10 and PHP 7

‎get_connected_users_5_munin.php‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -100,46 +100,44 @@ function get_connections($bd, $sub, $last_connect_minutes)
100100
//check the existence of configuration.php
101101
$config_file = '';
102102
if (is_file($bd.'/'.$dir.$sub.'/app/config/configuration.php')) {
103-
// Chamilo 1.10
103+
// Chamilo 1.10+
104104
$config_file = $bd.'/'.$dir.$sub.'/app/config/configuration.php';
105105
} elseif (is_file($bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php')) {
106106
// Chamilo 1.9
107107
$config_file = $bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php';
108108
}
109109
if (!empty($config_file)) {
110+
$_configuration = [];
110111
$inc = include_once($config_file);
111-
$dbh = mysqli_connect($_configuration['db_host'], $_configuration['db_user'],
112-
$_configuration['db_password']);
112+
$dsn = 'mysql:dbname='.$_configuration['main_database'].';host='.$_configuration['db_host'];
113+
try {
114+
$dbh = new PDO($dsn, $_configuration['db_user'], $_configuration['db_password']);
115+
} catch (PDOException $e) {
116+
die('Failed to connect to database: '.$e->getMessage());
117+
}
113118
if ($inc !== false && $dbh !== false) {
114-
$db = $_configuration['main_database'];
115119
$sql = "SELECT CONCAT(UTC_DATE(),' ',UTC_TIME())";
116-
$res = mysqli_query($dbh, $sql);
117-
$row = mysqli_fetch_row($res);
120+
$res = $dbh->query($sql);
121+
$row = $res->fetch();
118122
$current_date = $row[0];
119-
$track_online_table = $db.'.track_e_online';
123+
$track_online_table = 'track_e_online';
120124
$query = "SELECT count(login_user_id) ".
121125
" FROM ".$track_online_table.
122126
" WHERE DATE_ADD(login_date, ".
123127
"INTERVAL $last_connect_minutes MINUTE) >= '".$current_date."' ";
124-
//echo $query."\n";
125-
$res = mysqli_query($dbh, $query);
128+
$res = $dbh->query($query);
126129
if ($res === false) {
127130
$num = 0;
128-
//echo " There was a query error for the following portal\n";
129131
} else {
130-
$row = mysqli_fetch_row($res);
132+
$row = $res->fetch();
131133
$num = $row[0];
132134
}
133-
//echo sprintf("[%7d]",$num)." users connected to ".$_configuration['root_web']." last $last_connect_minutes'\n";
134135
$cut_point = 7;
135136
if (substr($_configuration['root_web'], 0, 5) == 'https') {
136137
$cut_point = 8;
137138
}
138139
$connections[str_replace('.', '_', substr($_configuration['root_web'], $cut_point, -1))] = $num;
139140
$match_count += $num;
140-
mysqli_close($dbh);
141-
} else {
142-
//echo "$bd/$dir$sub:could not open configuration.php or database:\n";
143141
}
144142
}
145143
}

‎get_live_answers_munin.php‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -104,48 +104,46 @@ function get_connections($bd, $sub, $last_connect_minutes)
104104
//check the existence of configuration.php
105105
$config_file = '';
106106
if (is_file($bd.'/'.$dir.$sub.'/app/config/configuration.php')) {
107-
// Chamilo 1.10
107+
// Chamilo 1.10+
108108
$config_file = $bd.'/'.$dir.$sub.'/app/config/configuration.php';
109109
} elseif (is_file($bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php')) {
110110
// Chamilo 1.9
111111
$config_file = $bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php';
112112
}
113113
if (!empty($config_file)) {
114+
$_configuration = [];
114115
$inc = include_once($config_file);
115-
$dbh = mysqli_connect($_configuration['db_host'], $_configuration['db_user'],
116-
$_configuration['db_password']);
116+
$dsn = 'mysql:dbname='.$_configuration['main_database'].';host='.$_configuration['db_host'];
117+
try {
118+
$dbh = new PDO($dsn, $_configuration['db_user'], $_configuration['db_password']);
119+
} catch (PDOException $e) {
120+
die('Failed to connect to database: '.$e->getMessage());
121+
}
117122
if ($inc !== false && $dbh !== false) {
118-
$db = $_configuration['main_database'];
119123
$sql = "SELECT CONCAT(UTC_DATE(),' ',UTC_TIME())";
120-
$res = mysqli_query($dbh, $sql);
121-
$row = mysqli_fetch_row($res);
124+
$res = $dbh->query($sql);
125+
$row = $res->fetch();
122126
$current_date = $row[0];
123127
//$current_date=date('Y-m-d H:i:s',time());
124-
$track_table = $db.'.track_e_attempt';
128+
$track_table = 'track_e_attempt';
125129
$query = "SELECT count(distinct(question_id)) ".
126130
" FROM ".$track_table.
127131
" WHERE DATE_ADD(tms, ".
128132
"INTERVAL $last_connect_minutes MINUTE) >= '".$current_date."' ";
129133
//"INTERVAL $last_connect_minutes MINUTE) >= NOW() ";
130-
//echo $query."\n";
131-
$res = mysqli_query($dbh, $query);
134+
$res = $dbh->query($query);
132135
if ($res === false) {
133136
$num = 0;
134-
//echo " There was a query error for the following portal\n";
135137
} else {
136-
$row = mysqli_fetch_row($res);
138+
$row = $res->fetch();
137139
$num = $row[0];
138140
}
139-
//echo sprintf("[%7d]",$num)." users connected to ".$_configuration['root_web']." last $last_connect_minutes'\n";
140141
$cut_point = 7;
141142
if (substr($_configuration['root_web'], 0, 5) == 'https') {
142143
$cut_point = 8;
143144
}
144145
$connections[str_replace('.', '_', substr($_configuration['root_web'], $cut_point, -1))] = $num;
145146
$match_count += $num;
146-
mysqli_close($dbh);
147-
} else {
148-
//echo "$bd/$dir$sub:could not open configuration.php or database:\n";
149147
}
150148
}
151149
}

‎get_live_exam_users_munin.php‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -104,48 +104,51 @@ function get_connections($bd, $sub, $last_connect_minutes)
104104
//check the existence of configuration.php
105105
$config_file = '';
106106
if (is_file($bd.'/'.$dir.$sub.'/app/config/configuration.php')) {
107-
// Chamilo 1.10
107+
// Chamilo 1.10+
108108
$config_file = $bd.'/'.$dir.$sub.'/app/config/configuration.php';
109109
} elseif (is_file($bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php')) {
110110
// Chamilo 1.9
111111
$config_file = $bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php';
112112
}
113113
if (!empty($config_file)) {
114+
$_configuration = [];
114115
$inc = include_once($config_file);
115-
$dbh = mysqli_connect($_configuration['db_host'], $_configuration['db_user'],
116-
$_configuration['db_password']);
116+
$dsn = 'mysql:dbname='.$_configuration['main_database'].';host='.$_configuration['db_host'];
117+
try {
118+
$dbh = new PDO($dsn, $_configuration['db_user'], $_configuration['db_password']);
119+
} catch (PDOException $e) {
120+
die('Failed to connect to database: '.$e->getMessage());
121+
}
117122
if ($inc !== false && $dbh !== false) {
118-
$db = $_configuration['main_database'];
119123
$sql = "SELECT CONCAT(UTC_DATE(),' ',UTC_TIME())";
120-
$res = mysqli_query($dbh, $sql);
121-
$row = mysqli_fetch_row($res);
124+
$res = $dbh->query($sql);
125+
$row = $res->fetch();
122126
$current_date = $row[0];
127+
$track_online_table = 'track_e_exercices';
128+
// Make sure the right table is selected (exercices in 1.9.* and exercises after)
129+
$vc = version_compare($_configuration['software_version'], '1.10.0');
130+
if ($vc >= 0) {
131+
$track_online_table = 'track_e_exercises';
132+
}
123133
//$current_date=date('Y-m-d H:i:s',time());
124-
$track_online_table = $db.'.track_e_exercices';
125134
$query = "SELECT count(distinct(exe_user_id)) ".
126135
" FROM ".$track_online_table.
127136
" WHERE DATE_ADD(exe_date, ".
128137
"INTERVAL $last_connect_minutes MINUTE) >= '".$current_date."' ";
129138
//"INTERVAL $last_connect_minutes MINUTE) >= NOW() ";
130-
//echo $query."\n";
131-
$res = mysqli_query($dbh, $query);
139+
$res = $dbh->query($query);
132140
if ($res === false) {
133141
$num = 0;
134-
//echo " There was a query error for the following portal\n";
135142
} else {
136-
$row = mysqli_fetch_row($res);
143+
$row = $res->fetch();
137144
$num = $row[0];
138145
}
139-
//echo sprintf("[%7d]",$num)." users connected to ".$_configuration['root_web']." last $last_connect_minutes'\n";
140146
$cut_point = 7;
141147
if (substr($_configuration['root_web'], 0, 5) == 'https') {
142148
$cut_point = 8;
143149
}
144150
$connections[str_replace('.', '_', substr($_configuration['root_web'], $cut_point, -1))] = $num;
145151
$match_count += $num;
146-
mysqli_close($dbh);
147-
} else {
148-
//echo "$bd/$dir$sub:could not open configuration.php or database:\n";
149152
}
150153
}
151154
}

‎get_registered_courses_munin.php‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,41 +96,38 @@ function get_courses($bd, $sub)
9696
//check the existence of configuration.php
9797
$config_file = '';
9898
if (is_file($bd.'/'.$dir.$sub.'/app/config/configuration.php')) {
99-
// Chamilo 1.10
99+
// Chamilo 1.10+
100100
$config_file = $bd.'/'.$dir.$sub.'/app/config/configuration.php';
101101
} elseif (is_file($bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php')) {
102102
// Chamilo 1.9
103103
$config_file = $bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php';
104104
}
105105
if (!empty($config_file)) {
106+
$_configuration = [];
106107
$inc = include_once($config_file);
107-
$dbh = mysql_connect($_configuration['db_host'], $_configuration['db_user'],
108-
$_configuration['db_password']);
108+
$dsn = 'mysql:dbname='.$_configuration['main_database'].';host='.$_configuration['db_host'];
109+
try {
110+
$dbh = new PDO($dsn, $_configuration['db_user'], $_configuration['db_password']);
111+
} catch (PDOException $e) {
112+
die('Failed to connect to database: '.$e->getMessage());
113+
}
109114
if ($inc !== false && $dbh !== false) {
110-
$db = $_configuration['main_database'];
111-
$current_date = date('Y-m-d H:i:s', time());
112-
$user_table = $db.'.course';
115+
$user_table = 'course';
113116
$query = "SELECT count(code) ".
114117
" FROM ".$user_table;
115-
//echo $query."\n";
116-
$res = mysql_query($query);
118+
$res = $dbh->query($query);
117119
if ($res === false) {
118120
$num = 0;
119-
//echo " There was a query error for the following portal\n";
120121
} else {
121-
$row = mysql_fetch_row($res);
122+
$row = $res->fetch();
122123
$num = $row[0];
123124
}
124-
//echo sprintf("[%7d]",$num)." users connected to ".$_configuration['root_web']." last $last_connect_minutes'\n";
125125
$cut_point = 7;
126126
if (substr($_configuration['root_web'], 0, 5) == 'https') {
127127
$cut_point = 8;
128128
}
129129
$connections[str_replace('.', '_', substr($_configuration['root_web'], $cut_point, -1))] = $num;
130130
$match_count += $num;
131-
mysql_close($dbh);
132-
} else {
133-
//echo "$bd/$dir$sub:could not open configuration.php or database:\n";
134131
}
135132
}
136133
}

‎get_registered_sessions_munin.php‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,29 +96,31 @@ function get_sessions($bd, $sub)
9696
//check the existence of configuration.php
9797
$config_file = '';
9898
if (is_file($bd.'/'.$dir.$sub.'/app/config/configuration.php')) {
99-
// Chamilo 1.10
99+
// Chamilo 1.10+
100100
$config_file = $bd.'/'.$dir.$sub.'/app/config/configuration.php';
101101
} elseif (is_file($bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php')) {
102102
// Chamilo 1.9
103103
$config_file = $bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php';
104104
}
105105
if (!empty($config_file)) {
106+
$_configuration = [];
106107
$inc = include_once($config_file);
107-
$dbh = mysql_connect($_configuration['db_host'], $_configuration['db_user'],
108-
$_configuration['db_password']);
108+
$dsn = 'mysql:dbname='.$_configuration['main_database'].';host='.$_configuration['db_host'];
109+
try {
110+
$dbh = new PDO($dsn, $_configuration['db_user'], $_configuration['db_password']);
111+
} catch (PDOException $e) {
112+
die('Failed to connect to database: '.$e->getMessage());
113+
}
109114
if ($inc !== false && $dbh !== false) {
110-
$db = $_configuration['main_database'];
111-
$current_date = date('Y-m-d H:i:s', time());
112-
$user_table = $db.'.session';
115+
$user_table = 'session';
113116
$query = "SELECT count(id) ".
114117
" FROM ".$user_table;
115-
//echo $query."\n";
116-
$res = mysql_query($query);
118+
$res = $dbh->query($query);
117119
if ($res === false) {
118120
$num = 0;
119121
//echo " There was a query error for the following portal\n";
120122
} else {
121-
$row = mysql_fetch_row($res);
123+
$row = $res->fetch();
122124
$num = $row[0];
123125
}
124126
$cut_point = 7;
@@ -127,7 +129,6 @@ function get_sessions($bd, $sub)
127129
}
128130
$connections[str_replace('.', '_', substr($_configuration['root_web'], $cut_point, -1))] = $num;
129131
$match_count += $num;
130-
mysql_close($dbh);
131132
} else {
132133
//echo "$bd/$dir$sub:could not open configuration.php or database:\n";
133134
}

‎get_registered_users_munin.php‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,40 +96,36 @@ function get_registrations($bd, $sub)
9696
//check the existence of configuration.php
9797
$config_file = '';
9898
if (is_file($bd.'/'.$dir.$sub.'/app/config/configuration.php')) {
99-
// Chamilo 1.10
99+
// Chamilo 1.10+
100100
$config_file = $bd.'/'.$dir.$sub.'/app/config/configuration.php';
101101
} elseif (is_file($bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php')) {
102102
// Chamilo 1.9
103103
$config_file = $bd.'/'.$dir.$sub.'/main/inc/conf/configuration.php';
104104
}
105105
if (!empty($config_file)) {
106+
$_configuration = [];
106107
$inc = include_once($config_file);
107-
$dbh = mysqli_connect($_configuration['db_host'], $_configuration['db_user'],
108-
$_configuration['db_password']);
108+
$dsn = 'mysql:dbname='.$_configuration['main_database'].';host='.$_configuration['db_host'];
109+
try {
110+
$dbh = new PDO($dsn, $_configuration['db_user'], $_configuration['db_password']);
111+
} catch (PDOException $e) {
112+
die('Failed to connect to database: '.$e->getMessage());
113+
}
109114
if ($inc !== false && $dbh !== false) {
110-
$db = $_configuration['main_database'];
111-
$current_date = date('Y-m-d H:i:s', time());
112-
$user_table = $db.'.user';
113-
$query = "SELECT count(user_id) ".
114-
" FROM ".$user_table;
115-
//echo $query."\n";
116-
$res = mysqli_query($dbh, $query);
115+
$query = "SELECT count(user_id) FROM user";
116+
$res = $dbh->query($query);
117117
if ($res === false) {
118118
$num = 0;
119119
} else {
120-
$row = mysqli_fetch_row($res);
120+
$row = $res->fetch();
121121
$num = $row[0];
122122
}
123-
//echo sprintf("[%7d]",$num)." users connected to ".$_configuration['root_web']." last $last_connect_minutes'\n";
124123
$cut_point = 7;
125124
if (substr($_configuration['root_web'], 0, 5) == 'https') {
126125
$cut_point = 8;
127126
}
128127
$connections[str_replace('.', '_', substr($_configuration['root_web'], $cut_point, -1))] = $num;
129128
$match_count += $num;
130-
mysqli_close($dbh);
131-
} else {
132-
//echo "$bd/$dir$sub:could not open configuration.php or database:\n";
133129
}
134130
}
135131
}

0 commit comments

Comments
 (0)