';
diff --git a/main/chat/chat_functions.lib.php b/main/chat/chat_functions.lib.php
index 0bfa63af50..ceeb2f16d5 100755
--- a/main/chat/chat_functions.lib.php
+++ b/main/chat/chat_functions.lib.php
@@ -30,19 +30,19 @@
function exit_of_chat ($user_id) {
$list_course=array();
$list_course=CourseManager::get_courses_list_by_user_id($user_id);
-
+
$group_id = intval($_SESSION['id_group']);
$session_id = intval($_SESSION['id_session']);
$extra_condition = '';
if (!empty($group_id)) $extra_condition = " AND to_group_id = '$group_id'";
else $extra_condition = api_get_session_condition($session_id);
-
+
foreach($list_course as $courses) {
$response=user_connected_in_chat($user_id,$courses['db_name']);
if ($response===true) {
$tbl_chat_connected = Database::get_course_chat_connected_table($courses['db_name']);
$sql='DELETE FROM '.$tbl_chat_connected.' WHERE user_id='.$user_id.$extra_condition;
- Database::query($sql,__FILE__,__LINE__);
+ Database::query($sql);
}
}
@@ -55,15 +55,15 @@ function exit_of_chat ($user_id) {
*/
function user_connected_in_chat ($user_id,$database_name) {
$tbl_chat_connected = Database::get_course_chat_connected_table($database_name);
-
+
$group_id = intval($_SESSION['id_group']);
$session_id = intval($_SESSION['id_session']);
$extra_condition = '';
if (!empty($group_id)) $extra_condition = " AND to_group_id = '$group_id'";
else $extra_condition = api_get_session_condition($session_id);
-
+
$sql='SELECT COUNT(*) AS count FROM '.$tbl_chat_connected .' c WHERE user_id='.$user_id.$extra_condition;
- $result = Database::query($sql,__FILE__,__LINE__);
+ $result = Database::query($sql);
$count = Database::fetch_array($result,'ASSOC');
if (1==$count['count']) {
return true;
@@ -76,9 +76,9 @@ function user_connected_in_chat ($user_id,$database_name) {
* @return void
*/
function disconnect_user_of_chat($database_name='') {
-
+
$list_info_user_in_chat = array();
-
+
if (!empty($database_name)) {
$list_info_user_in_chat = users_list_in_chat($database_name);
} else {
@@ -91,7 +91,7 @@ function disconnect_user_of_chat($database_name='') {
$cdate_s = date('s',time());
$cd_count_time_seconds=$cdate_h*3600 + $cdate_m*60 + $cdate_s;
-
+
if (is_array($list_info_user_in_chat) && count($list_info_user_in_chat) > 0 ) {
foreach ($list_info_user_in_chat as $list_info_user) {
$date_db_date = date('Y-m-d',strtotime($list_info_user['last_connection']));
@@ -102,19 +102,19 @@ function disconnect_user_of_chat($database_name='') {
if ($cd_date==$date_db_date) {
if (($cd_count_time_seconds - $date_count_time_seconds)>5) {
- $tbl_chat_connected = Database::get_course_chat_connected_table();
+ $tbl_chat_connected = Database::get_course_chat_connected_table();
if (!empty($database_name)) {
$tbl_chat_connected = Database::get_course_chat_connected_table($database_name);
}
-
+
$sql='DELETE FROM '.$tbl_chat_connected.' WHERE user_id='.$list_info_user['user_id'];
//return $sql;
- Database::query($sql,__FILE__,__LINE__);
+ Database::query($sql);
}
}
}
}
-}
+}
/**
* @param void
@@ -127,9 +127,9 @@ function users_list_in_chat ($database_name = '') {
$session_id = intval($_SESSION['id_session']);
$extra_condition = '';
if (!empty($group_id)) $extra_condition = " WHERE to_group_id = '$group_id'";
- else $extra_condition = api_get_session_condition($session_id,false);
- $sql='SELECT user_id,last_connection FROM '.$tbl_chat_connected.$extra_condition;
- $result=Database::query($sql,__FILE__,__LINE__);
+ else $extra_condition = api_get_session_condition($session_id,false);
+ $sql='SELECT user_id,last_connection FROM '.$tbl_chat_connected.$extra_condition;
+ $result=Database::query($sql);
while ($row = Database::fetch_array($result,'ASSOC')) {
$list_users_in_chat[]=$row;
}
diff --git a/main/chat/chat_hidden.php b/main/chat/chat_hidden.php
index 9e80241348..9e758827b5 100755
--- a/main/chat/chat_hidden.php
+++ b/main/chat/chat_hidden.php
@@ -44,7 +44,7 @@ $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_chat_connected = Database::get_course_chat_connected_table();
$query="SELECT username FROM $tbl_user WHERE user_id='".$_user['user_id']."'";
-$result=Database::query($query,__FILE__,__LINE__);
+$result=Database::query($query);
list($pseudoUser)=Database::fetch_row($result);
@@ -76,8 +76,8 @@ $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
if (!empty($group_id)) {
$group_info = GroupManager :: get_group_properties($group_id);
$chatPath=$documentPath.$group_info['directory'].'/chat_files/';
-} else {
- $chatPath=$documentPath.'/chat_files/';
+} else {
+ $chatPath=$documentPath.'/chat_files/';
}
// get chat file
@@ -87,7 +87,7 @@ if (!empty($group_id)) {
} else if (!empty($session_id)) {
$basename_chat = 'messages-'.$dateNow.'_sid-'.$session_id;
} else {
- $basename_chat = 'messages-'.$dateNow;
+ $basename_chat = 'messages-'.$dateNow;
}
$chat_size_old=intval($_POST['chat_size_old']);
@@ -104,10 +104,10 @@ if (Database::num_rows($result)==0) {
$query="UPDATE $tbl_chat_connected set last_connection='".$current_time."' WHERE user_id='".$_user['user_id']."' AND session_id='$session_id' AND to_group_id='$group_id'";
}
-Database::query($query,__FILE__,__LINE__);
+Database::query($query);
$query="SELECT COUNT(user_id) FROM $tbl_chat_connected WHERE last_connection>'".date('Y-m-d H:i:s',time()-60*5)."' $extra_condition";
-$result=Database::query($query,__FILE__,__LINE__);
+$result=Database::query($query);
$connected_old=intval($_POST['connected_old']);
list($connected_new) = Database::fetch_row($result);
@@ -143,12 +143,12 @@ if ($_SESSION["origin"] == 'whoisonline') { //check if our target has denied ou
$talk_to=$_SESSION["target"];
$track_user_table = Database::get_main_table(TABLE_MAIN_USER);
$sql="select chatcall_text from $track_user_table where ( user_id = $talk_to )";
- $result=Database::query($sql,__FILE__,__LINE__);
+ $result=Database::query($sql);
$row=Database::fetch_array($result);
if ($row['chatcall_text'] == 'DENIED') {
echo "";
$sql="update $track_user_table set chatcall_user_id = '', chatcall_date = '', chatcall_text='' where (user_id = $talk_to)";
- $result=Database::query($sql,__FILE__,__LINE__);
+ $result=Database::query($sql);
}
}
diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php
index f9c0fbe52b..0a22c4074f 100755
--- a/main/chat/chat_message.php
+++ b/main/chat/chat_message.php
@@ -110,7 +110,7 @@ if (!empty($course) && !empty($_user['user_id']))
==============================================================================
*/
$query="SELECT lastname, firstname, username FROM $tbl_user WHERE user_id='".$_user['user_id']."'";
- $result=Database::query($query,__FILE__,__LINE__);
+ $result=Database::query($query);
list($pseudoUser)=Database::fetch_row($result);
@@ -145,7 +145,7 @@ if (!empty($course) && !empty($_user['user_id']))
$doc_id = add_document($_course,$basepath_chat,'folder',0,'chat_files');
$sql = "INSERT INTO $TABLEITEMPROPERTY (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility)
VALUES ('document',1,NOW(),NOW(),$doc_id,'FolderCreated',1,$group_id,NULL,0)";
- Database::query($sql,__FILE__,__LINE__);
+ Database::query($sql);
}
}
}
diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php
index 87c27e1b21..6ea18b0a0d 100755
--- a/main/chat/chat_whoisonline.php
+++ b/main/chat/chat_whoisonline.php
@@ -59,8 +59,8 @@ if (!empty($course))
$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_chat_connected = Database::get_course_table(CHAT_CONNECTED_TABLE,$_course['dbName']);
- $query="SELECT username FROM $tbl_user WHERE user_id='".$_user['user_id']."'";
- $result=Database::query($query,__FILE__,__LINE__);
+ $query="SELECT username FROM $tbl_user WHERE user_id='".$_user['user_id']."'";
+ $result=Database::query($query);
list($pseudoUser)=Database::fetch_array($result);
@@ -73,15 +73,15 @@ if (!empty($course))
if(empty($session_id))
{
- $query="SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,t3.status FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_course_user t3 WHERE t1.user_id=t2.user_id AND t3.user_id=t2.user_id AND t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
- $result=Database::query($query,__FILE__,__LINE__);
- $Users=Database::store_result($result);
+ $query="SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,t3.status FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_course_user t3 WHERE t1.user_id=t2.user_id AND t3.user_id=t2.user_id AND t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
+ $result=Database::query($query);
+ $Users=Database::store_result($result);
}
else
{
// select learners
$query="SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3 WHERE t1.user_id=t2.user_id AND t3.id_user=t2.user_id AND t3.id_session = '".$session_id."' AND t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
- $result=Database::query($query,__FILE__,__LINE__);
+ $result=Database::query($query);
while($learner = Database::fetch_array($result))
{
$Users[$learner['user_id']] = $learner;
@@ -89,23 +89,23 @@ if (!empty($course))
// select session coach
$query="SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session t3 WHERE t1.user_id=t2.user_id AND t3.id_coach=t2.user_id AND t3.id = '".$session_id."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
- $result=Database::query($query,__FILE__,__LINE__);
+ $result=Database::query($query);
if($coach = Database::fetch_array($result))
$Users[$coach['user_id']] = $coach;
// select session course coach
- $query="SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri
- FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3
- WHERE t1.user_id=t2.user_id
- AND t3.id_user=t2.user_id AND t3.status=2
- AND t3.id_session = '".$session_id."'
- AND t3.course_code = '".$_course['sysCode']."'
+ $query="SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri
+ FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3
+ WHERE t1.user_id=t2.user_id
+ AND t3.id_user=t2.user_id AND t3.status=2
+ AND t3.id_session = '".$session_id."'
+ AND t3.course_code = '".$_course['sysCode']."'
AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username";
- $result=Database::query($query,__FILE__,__LINE__);
+ $result=Database::query($query);
$course_coachs = array();
while ($coachs = Database::fetch_array($result)) {
- //$course_coachs[] = $coachs['user_id'];
+ //$course_coachs[] = $coachs['user_id'];
$Users[$coachs['user_id']] = $coachs;
}
@@ -121,7 +121,7 @@ if (!empty($course))
0
{
- Database::query("UPDATE $tool_table SET visibility=0 WHERE id='".$_GET["id"]."'",__FILE__,__LINE__);
+ Database::query("UPDATE $tool_table SET visibility=0 WHERE id='".$_GET["id"]."'");
Display::display_confirmation_message(get_lang('ToolIsNowHidden'));
}
@@ -76,7 +76,7 @@ if (api_is_allowed_to_edit(null,true)) {
*/
elseif ($_GET["restore"]) // visibility 0,2 -> 1
{
- Database::query("UPDATE $tool_table SET visibility=1 WHERE id='".$_GET["id"]."'",__FILE__,__LINE__);
+ Database::query("UPDATE $tool_table SET visibility=1 WHERE id='".$_GET["id"]."'");
Display::display_confirmation_message(get_lang('ToolIsNowVisible'));
}
}
@@ -106,7 +106,7 @@ if (api_is_platform_admin())
elseif (isset($_GET["delete"]) && $_GET["delete"])
{
- Database::query("DELETE FROM $tool_table WHERE id='$id' AND added_tool=1",__FILE__,__LINE__);
+ Database::query("DELETE FROM $tool_table WHERE id='$id' AND added_tool=1");
}
}
@@ -153,9 +153,9 @@ if (api_is_allowed_to_edit(null,true) && !api_is_coach()) {
"
\n",get_lang("InLnk"),"
",
"\n",
"\n";
-
+
CourseHome::show_tool_2column(TOOL_PUBLIC_BUT_HIDDEN);
-
+
echo "";
echo "