'.get_lang('EditCategory').'';
- $modify_icons .= ' 
'.get_lang('DeleteAll').'';
+ $modify_icons= ''.get_lang('EditCategory').'';
+ $modify_icons .= ' '.get_lang('DeleteAll').'';
$modify_icons .= ' 
'.get_lang('Visible').'';
$opt_cat_descrip1 = strip_tags($opt_cat_descrip);
echo '
'.$op_cat_weight.' '.' '.$opt_cat_cert_min.' '.$opt_cat_descrip.' . 'img/dokeos.gif)
'.get_lang('Certificates').' '.get_lang('langTotal').': '.$scoretotal_display;
-
+
echo '';
echo $certificates;
echo '
';
-
+
}
} //end hack
-
+
DisplayGradebook :: display_header_gradebook($cats[0], 0, $category_id, $is_course_admin, $is_platform_admin, $simple_search_form, false, true);
}
diff --git a/main/gradebook/lib/be/abstractlink.class.php b/main/gradebook/lib/be/abstractlink.class.php
index 2c7bbd0a06..27882beb68 100755
--- a/main/gradebook/lib/be/abstractlink.class.php
+++ b/main/gradebook/lib/be/abstractlink.class.php
@@ -188,7 +188,7 @@ abstract class AbstractLink implements GradebookItem
$paramcount ++;
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$links = AbstractLink::create_objects_from_sql_result($result);
return $links;
}
@@ -224,7 +224,7 @@ abstract class AbstractLink implements GradebookItem
if (isset($this->type) && isset($this->ref_id) && isset($this->user_id) && isset($this->course_code) && isset($this->category) && isset($this->weight) && isset($this->visible)) {
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$sql_testing="select count(*) from ".$tbl_grade_links." where ref_id=".$this->get_ref_id()." AND category_id = ".$this->category." AND type = ".$this->type." ;";
- $result_testing=Database::query($sql_testing,__FILE__,__LINE__);
+ $result_testing=Database::query($sql_testing);
$row_testing=Database::fetch_array($result_testing);
if ($row_testing[0]==0) {
@@ -240,7 +240,7 @@ abstract class AbstractLink implements GradebookItem
.','.$this->is_visible();
if (isset($this->link_date)) {$sql .= ','.'"'.$date_current=strtotime(date('Y-m-d H:i:s',time())).'"';}
$sql .= ")";
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
$this->set_id(Database::insert_id());
}
} else {
@@ -271,7 +271,7 @@ abstract class AbstractLink implements GradebookItem
.', visible = '.$this->is_visible()
.' WHERE id = '.$this->id;
AbstractLink::add_link_log($this->id);
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
public function add_link_log($idevaluation) {
@@ -290,7 +290,7 @@ abstract class AbstractLink implements GradebookItem
}
//error_log($name_log);
$sql="INSERT INTO ".$tbl_grade_linkeval_log."(id_linkeval_log,name,description,date_log,weight,visible,type,user_id_log)VALUES('".Database::escape_string($arreval['id'])."','".Database::escape_string($name_log)."','".Database::escape_string($description_log)."','".Database::escape_string($current_date_server)."','".Database::escape_string($arreval['weight'])."','".Database::escape_string($arreval['visible'])."','Link',".api_get_user_id().")";
- Database::query($sql,__FILE__,__LINE__);
+ Database::query($sql);
}
/**
@@ -302,7 +302,7 @@ abstract class AbstractLink implements GradebookItem
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$sql = 'DELETE FROM '.$tbl_grade_links.' WHERE id = '.$this->id;
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
diff --git a/main/gradebook/lib/be/attendancelink.class.php b/main/gradebook/lib/be/attendancelink.class.php
index b31df3e12a..8c49f74a89 100755
--- a/main/gradebook/lib/be/attendancelink.class.php
+++ b/main/gradebook/lib/be/attendancelink.class.php
@@ -42,11 +42,11 @@ class AttendanceLink extends AbstractLink
}
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
- $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
- FROM '.$this->get_attendance_table().' att
+ $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
+ FROM '.$this->get_attendance_table().' att
WHERE att.id NOT IN (SELECT ref_id FROM '.$tbl_grade_links.' WHERE type = '.LINK_ATTENDANCE.' AND course_code = "'.$this->get_course_code().'")
AND att.session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
@@ -58,7 +58,7 @@ class AttendanceLink extends AbstractLink
}
return $cats;
}
-
+
/**
* Generate an array of all attendances available.
* @return array 2-dimensional array - every element contains 2 subelements (id, name)
@@ -66,11 +66,11 @@ class AttendanceLink extends AbstractLink
public function get_all_links() {
if (empty($this->course_code)) {
die('Error in get_not_created_links() : course code not set');
- }
+ }
$tbl_attendance = $this->get_attendance_table();
$session_id = api_get_session_id();
$sql = 'SELECT att.id, att.name, att.attendance_qualify_title FROM '.$tbl_attendance.' att WHERE att.active = 1 AND att.session_id = '.$session_id.'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
while ($data=Database::fetch_array($result)) {
if (isset($data['attendance_qualify_title']) && $data['attendance_qualify_title'] != ''){
$cats[] = array ($data['id'], $data['attendance_qualify_title']);
@@ -90,7 +90,7 @@ class AttendanceLink extends AbstractLink
$course_info = api_get_course_info($this->course_code);
$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT,$course_info['dbName']);
$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result." WHERE attendance_id = '".$this->get_ref_id()."'";
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number = Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -98,22 +98,22 @@ class AttendanceLink extends AbstractLink
public function calc_score($stud_id = null) {
$course_info = Database :: get_course_info($this->get_course_code());
$database_name = (empty($course_info['db_name']))?$course_info['dbName']:$course_info['db_name'];
-
+
if ($database_name!="") {
$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT, $database_name);
$session_id = api_get_session_id();
-
+
// get attendance qualify max
$sql = 'SELECT att.attendance_qualify_max FROM '.$this->get_attendance_table().' att WHERE att.id = '.$this->get_ref_id().' AND att.session_id='.$session_id.'';
- $query = Database::query($sql,__FILE__,__LINE__);
+ $query = Database::query($sql);
$attendance = Database::fetch_array($query);
-
+
// get results
$sql = 'SELECT * FROM '.$tbl_attendance_result.' WHERE attendance_id = '.$this->get_ref_id();
if (isset($stud_id)) {
$sql .= ' AND user_id = '.$stud_id;
}
- $scores = Database::query($sql, __FILE__, __LINE__);
+ $scores = Database::query($sql);
// for 1 student
if (isset($stud_id))
{
@@ -209,7 +209,7 @@ class AttendanceLink extends AbstractLink
$session_id = api_get_session_id();
$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
WHERE att.id = '.$this->get_ref_id().' AND att.session_id='.$session_id.'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number = Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -223,16 +223,16 @@ class AttendanceLink extends AbstractLink
$tbl_name = $this->get_attendance_table();
$session_id = api_get_session_id();
if ($tbl_name != '') {
- $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+ $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
WHERE att.id = '.$this->get_ref_id().' AND att.session_id = '.$session_id.' ';
- $result = Database::query($sql,__FILE__,__LINE__);
+ $result = Database::query($sql);
$row = Database::fetch_array($result,'ASSOC');
$attendance_id = $row['id'];
$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&cidReq='.$this->get_course_code();
return $url;
}
}
-
+
private function get_attendance_data() {
$tbl_name = $this->get_attendance_table();
$session_id = api_get_session_id();
@@ -240,7 +240,7 @@ class AttendanceLink extends AbstractLink
return false;
} elseif (!isset($this->attendance_data)) {
$sql = 'SELECT * FROM '.$this->get_attendance_table().' att WHERE att.id = '.$this->get_ref_id().' AND att.session_id='.$session_id.'';
- $query = Database::query($sql,__FILE__,__LINE__);
+ $query = Database::query($sql);
$this->attendance_data = Database::fetch_array($query);
}
return $this->attendance_data;
diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php
index 0926eb4038..662abba2f6 100755
--- a/main/gradebook/lib/be/category.class.php
+++ b/main/gradebook/lib/be/category.class.php
@@ -211,7 +211,7 @@ class Category implements GradebookItem
$sql .= ' visible = '.$visible;
$paramcount ++;
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$allcat = Category::create_category_objects_from_sql_result($result);
return $allcat;
}
@@ -288,7 +288,7 @@ class Category implements GradebookItem
}
$sql .= ')';
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
$this->set_id(Database::insert_id());
} else {
die('Error in Category add: required field empty');
@@ -330,7 +330,7 @@ class Category implements GradebookItem
.', visible = '.$this->is_visible()
.' WHERE id = '.$this->id;
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
/**
@@ -339,7 +339,7 @@ class Category implements GradebookItem
public function delete() {
$tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'DELETE FROM '.$tbl_grade_categories.' WHERE id = '.$this->id;
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
/**
* Not delete this category from the database,when visible=3 is category eliminated
@@ -347,7 +347,7 @@ class Category implements GradebookItem
public function update_category_delete($course_id){
$tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'UPDATE '.$tbl_grade_categories.' SET visible=3 WHERE course_code ="'.$course_id.'"';
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
/**
* Show message resource delete
@@ -355,7 +355,7 @@ class Category implements GradebookItem
public function show_message_resource_delete($course_id) {
$tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'SELECT count(*) AS num from '.$tbl_grade_categories.' WHERE course_code ="'.$course_id.'" AND visible=3';
- $res=Database::query($sql, __FILE__, __LINE__);
+ $res=Database::query($sql);
$option=Database::fetch_array($res,'ASSOC');
if ($option['num']>=1) {
return ' ( '.get_lang('ResourceDeleted').' )';
@@ -373,7 +373,7 @@ class Category implements GradebookItem
} else {
$tbl_category=Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql='SELECT name,description,user_id,course_code,parent_id,weight,visible,certif_min_score,session_id FROM '.$tbl_category.' c WHERE c.id='.$selectcat;
- $result=Database::query($sql,__FILE__,__LINE__);
+ $result=Database::query($sql);
$row=Database::fetch_array($result,'ASSOC');
return $row;
}
@@ -418,7 +418,7 @@ class Category implements GradebookItem
$sql.= ' AND parent_id = '.$parent;
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -595,7 +595,7 @@ class Category implements GradebookItem
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats = Category::create_category_objects_from_sql_result($result);
// course independent categories
@@ -637,7 +637,7 @@ class Category implements GradebookItem
.' WHERE user_id = '.$user_id
.')';
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats = Category::create_category_objects_from_sql_result($result);
// course independent categories
if (isset($course_code)) {
@@ -832,7 +832,7 @@ class Category implements GradebookItem
.' WHERE parent_id = 0'
// .' AND user_id = '.$user_id
.' AND course_code IS NOT null)';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
@@ -858,7 +858,7 @@ class Category implements GradebookItem
$sql .= ' AND cu.user_id = '.$user_id;
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
diff --git a/main/gradebook/lib/be/dropboxlink.class.php b/main/gradebook/lib/be/dropboxlink.class.php
index 4814bf57be..c8a48227a2 100755
--- a/main/gradebook/lib/be/dropboxlink.class.php
+++ b/main/gradebook/lib/be/dropboxlink.class.php
@@ -54,7 +54,7 @@ class DropboxLink extends EvalLink
.' WHERE uploader_id = '.$stud_id
." AND title = '".Database::escape_string($eval->get_name())."'";
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
if ($fileurl = Database::fetch_row($result)) {
$course_info = Database :: get_course_info($this->get_course_code());
diff --git a/main/gradebook/lib/be/evaluation.class.php b/main/gradebook/lib/be/evaluation.class.php
index 02561d7315..d7579434fe 100755
--- a/main/gradebook/lib/be/evaluation.class.php
+++ b/main/gradebook/lib/be/evaluation.class.php
@@ -175,7 +175,7 @@ class Evaluation implements GradebookItem
$paramcount ++;
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
return $alleval;
}
@@ -240,7 +240,7 @@ class Evaluation implements GradebookItem
$sql .= ','.strtotime(date('Y-m-d H:i:s',time()));
//}
$sql .= ")";
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
$this->set_id(Database::insert_id());
}
else {
@@ -257,11 +257,11 @@ class Evaluation implements GradebookItem
$arreval=get_object_vars($dateobject[0]);
if (!empty($arreval['id'])) {
$sql_eval='SELECT weight from '.$tbl_grade_evaluations.' WHERE id='.$arreval['id'];
- $rs=Database::query($sql_eval,__FILE__,__LINE__);
+ $rs=Database::query($sql_eval);
$row_old_weight=Database::fetch_array($rs,'ASSOC');
$current_date=strtotime(date('Y-m-d H:i:s',time()));
$sql="INSERT INTO ".$tbl_grade_linkeval_log."(id_linkeval_log,name,description,date_log,weight,visible,type,user_id_log)VALUES('".Database::escape_string($arreval['id'])."','".Database::escape_string($arreval['name'])."','".Database::escape_string($arreval['description'])."','".Database::escape_string($current_date)."','".Database::escape_string($row_old_weight['weight'])."','".Database::escape_string($arreval['visible'])."','evaluation',".api_get_user_id().")";
- Database::query($sql,__FILE__,__LINE__);
+ Database::query($sql);
}
}
}
@@ -304,7 +304,7 @@ class Evaluation implements GradebookItem
//recorded history
$eval_log=new Evaluation();
$eval_log->add_evaluation_log($this->id);
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
@@ -314,7 +314,7 @@ class Evaluation implements GradebookItem
public function delete() {
$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
$sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.$this->id;
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
// OTHER FUNCTIONS
@@ -357,7 +357,7 @@ class Evaluation implements GradebookItem
} else {
$sql.= ' AND category_id = '.$parent;
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -370,7 +370,7 @@ class Evaluation implements GradebookItem
$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
$sql='SELECT count(id) AS number FROM '.$tbl_grade_results
.' WHERE evaluation_id = '.$this->id;
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
@@ -386,7 +386,7 @@ class Evaluation implements GradebookItem
$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
$sql="SELECT count(id) AS number FROM ".$tbl_grade_results
." WHERE evaluation_id = ".$this->id." AND user_id = ".$stud_id;
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -399,7 +399,7 @@ class Evaluation implements GradebookItem
public function delete_results() {
$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
$sql = 'DELETE FROM '.$tbl_grade_results.' WHERE evaluation_id = '.$this->id;
- Database::query($sql, __FILE__, __LINE__);
+ Database::query($sql);
}
@@ -537,7 +537,7 @@ class Evaluation implements GradebookItem
$sql .= ' AND category_id >= 0';
}
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
return $alleval;
}
@@ -560,7 +560,7 @@ class Evaluation implements GradebookItem
.' )'
.' ORDER BY lastname';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$db_users = Database::store_result($result);
return $db_users;
}
diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php
index f1ee513bb5..31c8e407bb 100755
--- a/main/gradebook/lib/be/exerciselink.class.php
+++ b/main/gradebook/lib/be/exerciselink.class.php
@@ -64,7 +64,7 @@ class ExerciseLink extends AbstractLink
." AND course_code = '".$this->get_course_code()."'"
.') AND exe.session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
$cats[] = array ($data['id'], $data['title']);
@@ -82,7 +82,7 @@ class ExerciseLink extends AbstractLink
$course_info = api_get_course_info($this->course_code);
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK,$course_info['dbName']);
$sql = 'SELECT id,title from '.$this->get_exercise_table().' WHERE active=1 AND session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
@@ -99,7 +99,7 @@ class ExerciseLink extends AbstractLink
$sql = 'SELECT count(exe_id) AS number FROM '.$tbl_stats
." WHERE exe_cours_id = '".$this->get_course_code()."'"
.' AND exe_exo_id = '.$this->get_ref_id();
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -124,7 +124,7 @@ class ExerciseLink extends AbstractLink
}
$sql .= ' ORDER BY exe_id DESC';
- $scores = Database::query($sql, __FILE__, __LINE__);
+ $scores = Database::query($sql);
if (isset($stud_id)) {
// for 1 student
@@ -202,7 +202,7 @@ class ExerciseLink extends AbstractLink
public function is_valid_link() {
$sql = 'SELECT count(id) from '.$this->get_exercise_table()
.' WHERE id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -256,7 +256,7 @@ class ExerciseLink extends AbstractLink
} elseif (!isset($this->exercise_data)) {
$sql = 'SELECT * from '.$this->get_exercise_table()
.' WHERE id = '.$this->get_ref_id().' AND session_id ='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$this->exercise_data=Database::fetch_array($result);
}
return $this->exercise_data;
diff --git a/main/gradebook/lib/be/forumthreadlink.class.php b/main/gradebook/lib/be/forumthreadlink.class.php
index ec0b46c54e..47c668022e 100755
--- a/main/gradebook/lib/be/forumthreadlink.class.php
+++ b/main/gradebook/lib/be/forumthreadlink.class.php
@@ -64,14 +64,14 @@ class ForumThreadLink extends AbstractLink
}
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
- $sql = 'SELECT thread_id,thread_title,thread_title_qualify from '.$this->get_forum_thread_table()
+ $sql = 'SELECT thread_id,thread_title,thread_title_qualify from '.$this->get_forum_thread_table()
.' forum_thread WHERE thread_id NOT IN'
.' (SELECT ref_id FROM '.$tbl_grade_links
.' WHERE type = '.LINK_FORUM_THREAD
." AND course_code = '".$this->get_course_code()."'"
.') AND forum_thread.session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
@@ -95,7 +95,7 @@ class ForumThreadLink extends AbstractLink
$tbl_grade_links = Database :: get_course_table(TABLE_FORUM_THREAD,$course_info['dbName']);
$tbl_item_property=Database :: get_course_table(TABLE_ITEM_PROPERTY,$course_info['dbName']);
$sql = 'SELECT tl.thread_id,tl.thread_title,tl.thread_title_qualify FROM '.$tbl_grade_links.' tl ,'.$tbl_item_property.' ip WHERE tl.thread_id=ip.ref AND ip.tool="forum_thread" AND ip.visibility<>2 AND tl.session_id='.api_get_session_id().' GROUP BY ip.ref ';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
while ($data=Database::fetch_array($result)) {
if ( isset($data['thread_title_qualify']) and $data['thread_title_qualify']!=""){
@@ -116,7 +116,7 @@ class ForumThreadLink extends AbstractLink
$course_info = api_get_course_info($this->course_code);
$tbl_grade_links = Database :: get_course_table(TABLE_FORUM_POST,$course_info['dbName']);
$sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links." WHERE thread_id = '".$this->get_ref_id()."'";
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -128,7 +128,7 @@ class ForumThreadLink extends AbstractLink
$thread_qualify = Database :: get_course_table(TABLE_FORUM_THREAD_QUALIFY, $database_name);
$sql = 'SELECT thread_qualify_max FROM '.Database :: get_course_table(TABLE_FORUM_THREAD, $database_name)." WHERE thread_id = '".$this->get_ref_id()."' AND session_id=".api_get_session_id()."";
- $query = Database::query($sql,__FILE__,__LINE__);
+ $query = Database::query($sql);
$assignment = Database::fetch_array($query);
$sql = 'SELECT * FROM '.$thread_qualify.' WHERE thread_id = '.$this->get_ref_id();
@@ -140,7 +140,7 @@ class ForumThreadLink extends AbstractLink
// order by id, that way the student's first attempt is accessed first
$sql .= ' ORDER BY qualify_time DESC';
- $scores = Database::query($sql, __FILE__, __LINE__);
+ $scores = Database::query($sql);
// for 1 student
if (isset($stud_id))
@@ -240,7 +240,7 @@ class ForumThreadLink extends AbstractLink
public function is_valid_link() {
$sql = 'SELECT count(id) from '.$this->get_forum_thread_table()
.' WHERE thread_id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result);
return ($number[0] != 0);
}
@@ -254,7 +254,7 @@ class ForumThreadLink extends AbstractLink
$tbl_name=$this->get_forum_thread_table();
if ($tbl_name!="") {
$sql = 'SELECT * FROM '.$this->get_forum_thread_table()." WHERE thread_id = '".$this->get_ref_id()."' AND session_id = ".api_get_session_id()."";
- $result = Database::query($sql,__FILE__,__LINE__);
+ $result = Database::query($sql);
$row = Database::fetch_array($result,'ASSOC');
$forum_id=$row['forum_id'];
@@ -269,7 +269,7 @@ class ForumThreadLink extends AbstractLink
return false;
}elseif (!isset($this->exercise_data)) {
$sql = 'SELECT * FROM '.$this->get_forum_thread_table()." WHERE thread_id = '".$this->get_ref_id()."' AND session_id=".api_get_session_id()."";
- $query = Database::query($sql,__FILE__,__LINE__);
+ $query = Database::query($sql);
$this->exercise_data = Database::fetch_array($query);
}
return $this->exercise_data;
diff --git a/main/gradebook/lib/be/learnpathlink.class.php b/main/gradebook/lib/be/learnpathlink.class.php
index f5f93760ec..b1c4e5a356 100755
--- a/main/gradebook/lib/be/learnpathlink.class.php
+++ b/main/gradebook/lib/be/learnpathlink.class.php
@@ -65,7 +65,7 @@ class LearnpathLink extends AbstractLink
." AND course_code = '".$this->get_course_code()."'"
.') AND lp.session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result))
@@ -87,7 +87,7 @@ class LearnpathLink extends AbstractLink
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK,$course_info['dbName']);
$sql = 'SELECT id,name FROM '.$this->get_learnpath_table().' WHERE session_id = '.api_get_session_id().' ';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result))
@@ -107,7 +107,7 @@ class LearnpathLink extends AbstractLink
$tbl_stats = Database::get_course_table(TABLE_LP_VIEW,$course_info['dbName']);
$sql = 'SELECT count(id) AS number FROM '.$tbl_stats
." WHERE lp_id = '".$this->get_ref_id()."'";
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_array($result,'NUM');
return ($number[0] != 0);
}
@@ -134,7 +134,7 @@ class LearnpathLink extends AbstractLink
// order by id, that way the student's first attempt is accessed first
$sql .= ' ORDER BY view_count DESC';
- $scores = Database::query($sql, __FILE__, __LINE__);
+ $scores = Database::query($sql);
// for 1 student
if (isset($stud_id))
{
@@ -215,7 +215,7 @@ class LearnpathLink extends AbstractLink
{
$sql = 'SELECT count(id) FROM '.$this->get_learnpath_table()
.' WHERE id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$number=Database::fetch_row($result,'NUM');
return ($number[0] != 0);
}
@@ -272,7 +272,7 @@ class LearnpathLink extends AbstractLink
} elseif (!isset($this->learnpath_data)) {
$sql = 'SELECT * from '.$this->get_learnpath_table()
.' WHERE id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
- $result = Database::query($sql, __FILE__, __LINE__);
+ $result = Database::query($sql);
$this->learnpath_data=Database::fetch_array($result);
}
return $this->learnpath_data;
diff --git a/main/gradebook/lib/be/result.class.php b/main/gradebook/lib/be/result.class.php
index 2fb404fd5c..11604200bc 100755
--- a/main/gradebook/lib/be/result.class.php
+++ b/main/gradebook/lib/be/result.class.php
@@ -101,18 +101,18 @@ class Result
if (is_null($id ) && is_null($user_id) && !is_null($evaluation_id)) {
$sql_verified_if_exist_evaluation='SELECT COUNT(*) AS count FROM '.$tbl_grade_results.' WHERE evaluation_id="'.Database::escape_string($evaluation_id).'";';
- $res_verified_if_exist_evaluation=Database::query($sql_verified_if_exist_evaluation,__FILE__,__LINE__);
+ $res_verified_if_exist_evaluation=Database::query($sql_verified_if_exist_evaluation);
$info_verified_if_exist_evaluation=Database::result($res_verified_if_exist_evaluation,0,0);
if ($info_verified_if_exist_evaluation!=0) {
$sql_course_rel_user= '';
if (api_get_session_id()) {
- $sql_course_rel_user = 'SELECT course_code,id_user,status FROM '.$tbl_session_rel_course_user.' WHERE status=0 AND course_code="'.api_get_course_id().' AND id_session='.api_get_session_id().'"';
+ $sql_course_rel_user = 'SELECT course_code,id_user,status FROM '.$tbl_session_rel_course_user.' WHERE status=0 AND course_code="'.api_get_course_id().' AND id_session='.api_get_session_id().'"';
} else {
- $sql_course_rel_user = 'SELECT course_code,user_id,status FROM '.$tbl_course_rel_course.' WHERE status="5" AND course_code="'.api_get_course_id().'"; ';
+ $sql_course_rel_user = 'SELECT course_code,user_id,status FROM '.$tbl_course_rel_course.' WHERE status="5" AND course_code="'.api_get_course_id().'"; ';
}
- $res_course_rel_user=Database::query($sql_course_rel_user,__FILE__,__LINE__);
+ $res_course_rel_user=Database::query($sql_course_rel_user);
$list_user_course_list=array();
while ($row_course_rel_user=Database::fetch_array($res_course_rel_user)) {
@@ -123,11 +123,11 @@ class Result
for ($i=0;$i"; } - + if ( $current_group['chat_state'] == TOOL_PUBLIC ) { //link to the chat area of this group if(api_get_course_setting('allow_open_chat_window')==true) { - $tools .= ""; + $tools .= ""; } else { @@ -381,7 +381,7 @@ function get_number_of_group_users() $sql = "SELECT count(id) AS number_of_users FROM ".$table_group_user." WHERE group_id='".Database::escape_string($current_group['id'])."'"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); $return = Database::fetch_array($result,'ASSOC'); return $return['number_of_users']; } @@ -466,7 +466,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction) } $return = array (); - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); while ($row = Database::fetch_row($result)) { $return[] = $row;