Feature #347 - Gradebook, Groups: Removing the parameters __FILE__ and __LINE__ in the Database::query() calls.

skala
Ivan Tcholakov 15 years ago
parent e43010ba9e
commit c3cc53cb69
  1. 20
      main/gradebook/gradebook_edit_all.php
  2. 10
      main/gradebook/gradebook_edit_link.php
  3. 4
      main/gradebook/gradebook_result.class.php
  4. 38
      main/gradebook/index.php
  5. 12
      main/gradebook/lib/be/abstractlink.class.php
  6. 34
      main/gradebook/lib/be/attendancelink.class.php
  7. 24
      main/gradebook/lib/be/category.class.php
  8. 2
      main/gradebook/lib/be/dropboxlink.class.php
  9. 24
      main/gradebook/lib/be/evaluation.class.php
  10. 12
      main/gradebook/lib/be/exerciselink.class.php
  11. 18
      main/gradebook/lib/be/forumthreadlink.class.php
  12. 12
      main/gradebook/lib/be/learnpathlink.class.php
  13. 22
      main/gradebook/lib/be/result.class.php
  14. 18
      main/gradebook/lib/be/studentpublicationlink.class.php
  15. 10
      main/gradebook/lib/gradebook_functions.inc.php
  16. 20
      main/gradebook/lib/gradebook_functions_users.inc.php
  17. 12
      main/gradebook/lib/scoredisplay.class.php
  18. 6
      main/group/group.php
  19. 4
      main/group/group_category.php
  20. 14
      main/group/group_space.php

@ -134,23 +134,23 @@ if($submitted==1) {
$category_id = (int)$_GET['selectcat'];
$output='';
$sql='SELECT * FROM '.$table_link.' WHERE category_id = '.$category_id;
$result = Database::query($sql,__FILE__,__LINE__);
$result = Database::query($sql);
while($row = Database ::fetch_array($result)) {
//update only if value changed
if(isset($_POST['link'][$row['id']]) && $_POST['link'][$row['id']] != $row['weight']) {
AbstractLink::add_link_log($row['id']);
Database::query('UPDATE '.$table_link.' SET weight = '."'".trim($_POST['link'][$row['id']])."'".' WHERE id = '.$row['id'],__FILE__,__LINE__);
Database::query('UPDATE '.$table_link.' SET weight = '."'".trim($_POST['link'][$row['id']])."'".' WHERE id = '.$row['id']);
$row['weight'] = trim($_POST['link'][$row['id']]);
//Update weight for attendance
$sql = 'SELECT ref_id FROM '.$table_link.' WHERE id = '.intval($row['id']).' AND type='.LINK_ATTENDANCE;
$rs_attendance = Database::query($sql, __FILE__, __LINE__);
$rs_attendance = Database::query($sql);
if (Database::num_rows($rs_attendance) > 0) {
$row_attendance = Database::fetch_array($rs_attendance);
$row_attendance = Database::fetch_array($rs_attendance);
$upd_attendance = 'UPDATE '.$tbl_attendance.' SET attendance_weight ='.floatval($_POST['link'][$row['id']]).' WHERE id = '.intval($row_attendance['ref_id']);
Database::query($upd_attendance, __FILE__, __LINE__);
}
Database::query($upd_attendance);
}
//Update weight into forum thread
$sql_t='UPDATE '.$tbl_forum_thread.' SET thread_weight='.floatval($_POST['link'][$row['id']]).' WHERE thread_id= (SELECT ref_id FROM '.$table_link.' WHERE id='.intval($row['id']).' AND type='.LINK_FORUM_THREAD.');';
Database::query($sql_t);
@ -170,13 +170,13 @@ $result = Database::query($sql,__FILE__,__LINE__);
$output.= '<tr><td> [ '.$table_evaluated[$row['type']][3].' ] '.$resource_name.'</td><td><input type="hidden" name="link_'.$row['id'].'" value="'.$resource_name.'" /><input size="10" type="text" name="link['.$row['id'].']" value="'.$row['weight'].'"/></td></tr>';
}
$sql = Database::query('SELECT * FROM '.$table_evaluation.' WHERE category_id = '.$category_id,__FILE__,__LINE__);
$sql = Database::query('SELECT * FROM '.$table_evaluation.' WHERE category_id = '.$category_id);
while($row = Database ::fetch_array($sql)) {
//update only if value changed
if(isset($_POST['evaluation'][$row['id']]) && $_POST['evaluation'][$row['id']] != $row['weight']) {
Evaluation::add_evaluation_log($row['id']);
Database::query('UPDATE '.$table_evaluation.' SET weight = '."'".trim($_POST['evaluation'][$row['id']])."'".' WHERE id = '.$row['id'],__FILE__,__LINE__);
Database::query('UPDATE '.$table_evaluation.' SET weight = '."'".trim($_POST['evaluation'][$row['id']])."'".' WHERE id = '.$row['id']);
$row['weight'] = trim($_POST['evaluation'][$row['id']]);
}
$type_evaluated = isset($row['type']) ? $table_evaluated[$type_evaluated][3] : null;

@ -55,15 +55,15 @@ if ($form->validate()) {
$link->set_date(strtotime($values['date']));
$link->set_visible(empty ($values['visible']) ? 0 : 1);
$link->save();
//Update weight for attendance
$sql = 'SELECT ref_id FROM '.$tbl_grade_links.' WHERE id = '.intval($_GET['editlink']).' AND type='.LINK_ATTENDANCE;
$rs_attendance = Database::query($sql, __FILE__, __LINE__);
$rs_attendance = Database::query($sql);
if (Database::num_rows($rs_attendance) > 0) {
$row_attendance = Database::fetch_array($rs_attendance);
$attendance_id = $row_attendance['ref_id'];
$attendance_id = $row_attendance['ref_id'];
$upd_attendance = 'UPDATE '.$tbl_attendance.' SET attendance_weight ='.floatval($values['weight']).' WHERE id = '.intval($attendance_id);
Database::query($upd_attendance, __FILE__, __LINE__);
Database::query($upd_attendance);
}
//Update weight into forum thread
@ -71,7 +71,7 @@ if ($form->validate()) {
Database::query($sql_t);
//Update weight into student publication(work)
$sql_t='UPDATE '.$tbl_work.' SET weight='.$values['weight'].' WHERE id=(SELECT ref_id FROM '.$tbl_grade_links.' where id='.Security::remove_XSS($_GET['editlink']).' and type=3);';
Database::query($sql_t);
Database::query($sql_t);
header('Location: '.$_SESSION['gradebook_dest'].'?linkedited=&selectcat=' . $link->get_category_id());
exit;
}

@ -64,7 +64,7 @@ class GradeBookResult
$sql.= ' WHERE active=1';
}
$sql .= ' ORDER BY title';
$result=Database::query($sql,__FILE__,__LINE__);
$result=Database::query($sql);
// if the exercise has been found
while($row=Database::fetch_array($result,'ASSOC')) {
@ -86,7 +86,7 @@ class GradeBookResult
" FROM $TBL_EXERCISE_QUESTION eq, $TBL_QUESTIONS q " .
" WHERE eq.question_id=q.id AND eq.exercice_id='$e_id' " .
" ORDER BY q.position";
$result=Database::query($sql,__FILE__,__LINE__);
$result=Database::query($sql);
// fills the array with the question ID for this exercise
// the key of the array is the question position

@ -35,7 +35,7 @@ $_SESSION['gradebook_dest'] = 'index.php';
if (isset($_GET['cidReq'])) {
$this_section = SECTION_COURSES;
} else {
$this_section = SECTION_MYGRADEBOOK;
$this_section = SECTION_MYGRADEBOOK;
}
require_once 'lib/be.inc.php';
@ -340,10 +340,10 @@ if (isset ($_GET['deletelink'])) {
if ($link[0] != null) {
// clean forum qualify
$sql='UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify="" WHERE thread_id=(SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.$get_delete_link.' AND type = '.LINK_FORUM_THREAD.');';
Database::query($sql, __FILE__, __LINE__);
// clean attendance
Database::query($sql);
// clean attendance
$sql='UPDATE '.$tbl_attendance.' SET attendance_qualify_max=0, attendance_weight = 0, attendance_qualify_title="" WHERE id=(SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.$get_delete_link.' AND type = '.LINK_ATTENDANCE.');';
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
$link[0]->delete();
}
unset ($link);
@ -622,7 +622,7 @@ if (isset ($_GET['studentoverview'])) {
}
$category = Category :: load($category); //hack replace $category = Category :: load ($_GET['cat_id']); to get de course name in certificates
if ($category[0]->is_certificate_available($user_id)) {
$user= get_user_info_from_id($user_id);
$scoredisplay = ScoreDisplay :: instance();
@ -678,15 +678,15 @@ if (isset ($_GET['studentoverview'])) {
if ($_in_course === true) {
// When *inside* a course, we want to make sure there is one (and only
// one) category for this course or for this session.
//hack for delete a gradebook from inside course
$clean_deletecat=Security::remove_XSS($_GET['deletecat']);
if (!empty($clean_deletecat))
if (!empty($clean_deletecat))
{
exit;
}
}
//end hack
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
if (empty($cats)) {
// There is no category for this course+session, so create one
@ -764,19 +764,19 @@ if ($category != '0') {
$course_id=Database::get_course_by_category($category_id);
$show_message=$cat->show_message_resource_delete($course_id);
if ($show_message=='') {
//hack for inside courses menu cat
//hack for inside courses menu cat
if (api_is_allowed_to_edit()) {
$op_cat_weight= '<strong>'.get_lang('Weight').'</strong>'.': '.((intval($cats[0]->get_weight())>0) ? $cats[0]->get_weight() : 0);
$op_cat_weight= '<strong>'.get_lang('Weight').'</strong>'.': '.((intval($cats[0]->get_weight())>0) ? $cats[0]->get_weight() : 0);
$opt_cat_cert_min= '<strong>'.get_lang('CertificateMinScore').'</strong>'.': '.(intval($cats[0]->get_certificate_min_score()>0) ? $cats[0]->get_certificate_min_score() : 0);
$opt_cat_descrip= '<strong>'.get_lang('GradebookDescriptionLog').'</strong>'.': '.(($cats[0]->get_description() == "" || is_null($cats[0]->get_description())) ? get_lang('None') : $cats[0]->get_description());
$opt_cat_descrip= '<strong>'.get_lang('GradebookDescriptionLog').'</strong>'.': '.(($cats[0]->get_description() == "" || is_null($cats[0]->get_description())) ? get_lang('None') : $cats[0]->get_description());
$visibility_icon= ($cats[0]->is_visible() == 0) ? 'invisible' : 'visible';
$visibility_command= ($cats[0]->is_visible() == 0) ? 'set_visible' : 'set_invisible';
echo '<div class="actions" align="right">';
$modify_icons= '<a href="gradebook_edit_cat.php?editcat=' . $cats[0]->get_id() . ' &amp;cidReq='.$cats[0]->get_course_code().'"><img src="../img/edit.gif" border="0" title="' . get_lang('EditCategory') . '" alt="'.get_lang('EditCategory').'" />'.get_lang('EditCategory').'</a>';
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletecat=' . $cats[0]->get_id() . '&amp;selectcat=0&amp;cidReq='.$cats[0]->get_course_code().'" onclick="return confirmation();"><img src="../img/delete.gif" border="0" title="' . get_lang('DeleteAll') . '" alt="'.get_lang('DeleteAll').'" />'.get_lang('DeleteAll').'</a>';
$modify_icons= '<a href="gradebook_edit_cat.php?editcat=' . $cats[0]->get_id() . ' &amp;cidReq='.$cats[0]->get_course_code().'"><img src="../img/edit.gif" border="0" title="' . get_lang('EditCategory') . '" alt="'.get_lang('EditCategory').'" />'.get_lang('EditCategory').'</a>';
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletecat=' . $cats[0]->get_id() . '&amp;selectcat=0&amp;cidReq='.$cats[0]->get_course_code().'" onclick="return confirmation();"><img src="../img/delete.gif" border="0" title="' . get_lang('DeleteAll') . '" alt="'.get_lang('DeleteAll').'" />'.get_lang('DeleteAll').'</a>';
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblecat=' . $cats[0]->get_id() . '&amp;' . $visibility_command . '=&amp;selectcat=0 "><img src="../img/' . $visibility_icon . '.gif" border="0" title="' . get_lang('Visible') . '" alt="'.get_lang('Visible').'" />'.get_lang('Visible').'</a>';
$opt_cat_descrip1 = strip_tags($opt_cat_descrip);
echo '<div align="left" style="float:left"><img src="../img/info3.gif" border="0" title="' . $opt_cat_descrip1 . '" alt="'.$opt_cat_descrip1.'" /> '.$op_cat_weight.' '.'&nbsp;&nbsp;'.$opt_cat_cert_min.'&nbsp;&nbsp;'.$opt_cat_descrip.'</div>';
@ -805,19 +805,19 @@ if ($category != '0') {
$cattotal = Category :: load($category_id);
$scoretotal= $cattotal[0]->calc_score(api_get_user_id());
$scoretotal_display = (isset($scoretotal)? round($scoretotal[0],2).'/'.round($scoretotal[1],2).'('.round(($scoretotal[0] / $scoretotal[1]) * 100,2) . ' %)': '-');
//show certificate
$certificate_min_score=$cats[0]->get_certificate_min_score();
if (isset($certificate_min_score) && (int)$item_value >= (int)$certificate_min_score) {
$certificates = '<a href="'.api_get_path(WEB_CODE_PATH) .'gradebook/'.$_SESSION['gradebook_dest'].'?export_certificate=yes&cat_id='.$cats[0]->get_course_code().'"><img src="'.api_get_path(WEB_CODE_PATH) . 'img/dokeos.gif" />'.get_lang('Certificates').'</a>&nbsp;'.get_lang('langTotal').': '.$scoretotal_display;
echo '<div class="actions" align="right">';
echo $certificates;
echo '</div>';
}
} //end hack
DisplayGradebook :: display_header_gradebook($cats[0], 0, $category_id, $is_course_admin, $is_platform_admin, $simple_search_form, false, true);
}

@ -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);
}

@ -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;

@ -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 '&nbsp;&nbsp;<span class="resource-deleted">(&nbsp;'.get_lang('ResourceDeleted').'&nbsp;)</span>';
@ -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)) {

@ -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());

@ -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;
}

@ -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;

@ -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;

@ -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;

@ -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<count($list_user_course_list);$i++) {
$sql_verified='SELECT COUNT(*) AS count FROM '.$tbl_grade_results.' WHERE user_id="'.(int)($list_user_course_list[$i]['user_id']).'" AND evaluation_id="'.Database::escape_string($evaluation_id).'";';
//$my_status_in_course=CourseManager::get_user_in_course_status($list_user_course_list[$i]['user_id'], api_get_course_id());
$res_verified=Database::query($sql_verified,__FILE__,__LINE__);
$res_verified=Database::query($sql_verified);
$info_verified=Database::result($res_verified,0,0);
if ($info_verified==0) {
$sql_insert='INSERT INTO '.$tbl_grade_results.'(user_id,evaluation_id,date,score) values ("'.Database::escape_string($list_user_course_list[$i]['user_id']).'","'.Database::escape_string($evaluation_id).'","'.$current_date.'",0);';
$res_insert=Database::query($sql_insert,__FILE__,__LINE__);
$res_insert=Database::query($sql_insert);
}
}
$list_user_course_list=array();
@ -155,7 +155,7 @@ class Result
$sql .= ' evaluation_id = '.Database::escape_string($evaluation_id);
$paramcount ++;
}
$result = Database::query($sql, __FILE__, __LINE__);
$result = Database::query($sql);
$allres=array();
while ($data=Database::fetch_array($result)) {
$res= new Result();
@ -189,7 +189,7 @@ class Result
}
$sql .= ')';
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
} else {
die('Error in Result add: required field empty');
}
@ -221,7 +221,7 @@ class Result
}
$sql .= ')';
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
} else {
die('Error in Result add: required field empty');
}
@ -243,7 +243,7 @@ class Result
}
$sql .= ' WHERE id = '.$this->id;
// no need to update creation date
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
}
/**
@ -252,6 +252,6 @@ class Result
public function delete() {
$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
$sql = 'DELETE FROM '.$tbl_grade_results.' WHERE id = '.$this->id;
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
}
}

@ -60,7 +60,7 @@ class StudentPublicationLink extends AbstractLink
.' AND prop.ref = pub.id'
." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
$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());
@ -105,7 +105,7 @@ class StudentPublicationLink extends AbstractLink
." AND course_code = '".$this->get_course_code()."'"
.') AND pub.session_id='.api_get_session_id().'';
$result = Database::query($sql, __FILE__, __LINE__);
$result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
@ -125,7 +125,7 @@ class StudentPublicationLink extends AbstractLink
$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION,$course_info['dbName']);
$sql = "SELECT id,url FROM $tbl_grade_links WHERE has_properties != '' AND filetype='folder' AND session_id = ".api_get_session_id()."";
$result = Database::query($sql, __FILE__, __LINE__);
$result = Database::query($sql);
while ($data=Database::fetch_array($result)) {
$cats[] = array ($data['id'], $data['url']);
@ -141,7 +141,7 @@ class StudentPublicationLink extends AbstractLink
$course_info = api_get_course_info($this->course_code);
$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION,$course_info['dbName']);
$sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links." WHERE parent_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);
}
@ -155,7 +155,7 @@ class StudentPublicationLink extends AbstractLink
return false;
}
$sql = 'SELECT * FROM '.$tbl_stats." WHERE 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);
if(count($assignment)==0) {
@ -166,13 +166,13 @@ class StudentPublicationLink extends AbstractLink
$sql = 'SELECT * FROM '.$tbl_stats.' WHERE parent_id ="'.$v_assigment_id.'" AND session_id='.api_get_session_id().'';
if (isset($stud_id)){
$sql1='SELECT firstname, lastname FROM '.Database::get_main_table(TABLE_MAIN_USER)." WHERE user_id = '".((int)$stud_id)."'";
$query = Database::query($sql1,__FILE__,__LINE__);
$query = Database::query($sql1);
$student = Database::fetch_array($query);
$sql .= ' AND author = '."'".Database::escape_string(api_get_person_name($student['firstname'], $student['lastname'], null, null, $course_info['course_language']))."'";
}
// order by id, that way the student's first attempt is accessed first
$sql .= ' ORDER BY id';
$scores = Database::query($sql, __FILE__, __LINE__);
$scores = Database::query($sql);
// for 1 student
if (isset($stud_id)) {
@ -270,7 +270,7 @@ class StudentPublicationLink extends AbstractLink
return false;
} elseif (!isset($this->exercise_data)) {
$sql = 'SELECT * FROM '.$this->get_studpub_table()." WHERE 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;
@ -287,7 +287,7 @@ class StudentPublicationLink extends AbstractLink
public function is_valid_link() {
$sql = 'SELECT count(id) from '.$this->get_studpub_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);
}

@ -65,7 +65,7 @@ function add_resource_to_course_gradebook($course_code, $resource_type, $resourc
$sql .= " AND (session_id IS NULL OR session_id = 0) ";
}
$sql .= " ORDER BY id";
$res = Database::query($sql,__FILE__,__LINE__);
$res = Database::query($sql);
if (Database::num_rows($res)<1){
//there is no unique category for this course+session combination,
// => create one
@ -141,7 +141,7 @@ function block_students() {
function get_course_name_from_code($code) {
$tbl_main_categories= Database :: get_main_table(TABLE_MAIN_COURSE);
$sql= 'SELECT title,code FROM ' . $tbl_main_categories . 'WHERE code = "' . $code . '"';
$result= Database::query($sql,__FILE__,__LINE__);
$result= Database::query($sql);
if ($col= Database::fetch_array($result)) {
return $col['title'];
}
@ -278,14 +278,14 @@ function is_resource_in_course_gradebook($course_code, $resource_type, $resource
$sql .= " AND (session_id IS NULL OR session_id = 0) ";
}
$sql .= " ORDER BY id";
$res = Database::query($sql,__FILE__,__LINE__);
$res = Database::query($sql);
if (Database::num_rows($res)<1) {
return false;
}
$row = Database::fetch_array($res);
$category = $row['id'];
$sql = "SELECT * FROM $l l WHERE l.category_id = $category AND type = ".(int) $resource_type." and ref_id = ".(int) $resource_id;
$res = Database::query($sql,__FILE__,__LINE__);
$res = Database::query($sql);
if (Database::num_rows($res)<1) {
return false;
}
@ -303,7 +303,7 @@ function remove_resource_from_course_gradebook($link_id) {
// TODO find the corresponding category (the first one for this course, ordered by ID)
$l = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$sql = "DELETE FROM $l WHERE id = ".(int)$link_id;
$res = Database::query($sql,__FILE__,__LINE__);
$res = Database::query($sql);
return true;
}
/**

@ -36,9 +36,9 @@ function get_users_in_course($course_id) {
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname ASC' : ' ORDER BY lastname, firstname ASC';
$current_session = api_get_session_id();
if (!empty($current_session)) {
$sql = "SELECT user.user_id,lastname,firstname
FROM $tbl_session_course_user as scru, $tbl_user as user
@ -51,12 +51,12 @@ function get_users_in_course($course_id) {
.' WHERE course_rel_user.user_id=user.user_id'
.' AND course_rel_user.status='.STUDENT
." AND course_rel_user.course_code='".$course_id."'"
.$order_clause;
.$order_clause;
}
$result = Database::query($sql, __FILE__, __LINE__);
$result = Database::query($sql);
return get_user_array_from_sql_result($result);
}
@ -95,7 +95,7 @@ function get_all_users ($evals = array(), $links = array()) {
.' FROM '.$tbl_res.' as res, '.$tbl_user.' as user'
.' WHERE res.evaluation_id = '.$eval->get_id()
.' AND res.user_id = user.user_id';
$result = Database::query($sql, __FILE__, __LINE__);
$result = Database::query($sql);
$users = array_merge($users,get_user_array_from_sql_result($result));
}
}
@ -136,7 +136,7 @@ function find_students($mask= '') {
$sql .= ' AND user.user_id = cru.user_id' . ' AND cru.course_code in' . ' (SELECT course_code' . ' FROM ' . $tbl_cru . ' WHERE user_id = ' . api_get_user_id() . ' AND status = ' . COURSEMANAGER . ')';
}
$sql .= ' ORDER BY lastname';
$result= Database::query($sql, __FILE__, __LINE__);
$result= Database::query($sql);
$db_users= Database::store_result($result);
return $db_users;
}
@ -149,7 +149,7 @@ function find_students($mask= '') {
function get_user_info_from_id($userid) {
$user_table= Database :: get_main_table(TABLE_MAIN_USER);
$sql= 'SELECT * FROM ' . $user_table . ' WHERE user_id=' . $userid;
$res= Database::query($sql, __FILE__, __LINE__);
$res= Database::query($sql);
$user= Database::fetch_array($res,ASSOC);
return $user;
}

@ -190,7 +190,7 @@ class ScoreDisplay
// remove previous settings
$tbl_display = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_SCORE_DISPLAY);
$sql = 'TRUNCATE TABLE '.$tbl_display;
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
// add new settings
$sql = 'INSERT INTO '.$tbl_display.' (id, score, display) VALUES ';
@ -202,7 +202,7 @@ class ScoreDisplay
$sql .= "(NULL, '".$display['score']."', '".Database::escape_string($display['display'])."')";
$count++;
}
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
}
/**
@ -302,7 +302,7 @@ class ScoreDisplay
$sql = "SELECT selected_value FROM ".$tbl_setting
." WHERE category = 'Gradebook' AND variable = '".$property."'";
$result = Database::query($sql, __FILE__, __LINE__);
$result = Database::query($sql);
if ($data = Database::fetch_row($result)) {
return $data[0];
@ -312,7 +312,7 @@ class ScoreDisplay
$sql = "INSERT INTO ".$tbl_setting
." (variable, selected_value, category)"
." VALUES ('".$property."', '".$default."','Gradebook')";
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
// ...and return default value
return $default;
}
@ -328,7 +328,7 @@ class ScoreDisplay
$sql = 'UPDATE '.$tbl_setting
." SET selected_value = '".$value."' "
." WHERE variable = '".$property."' AND category='Gradebook'";
Database::query($sql, __FILE__, __LINE__);
Database::query($sql);
}
@ -340,7 +340,7 @@ class ScoreDisplay
$tbl_display = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_SCORE_DISPLAY);
$sql = 'SELECT * FROM '.$tbl_display.' ORDER BY score';
//echo $sql;
$result = Database::query($sql, __FILE__, __LINE__);
$result = Database::query($sql);
return Database::store_result($result);
}

@ -76,7 +76,7 @@ if( api_get_setting('allow_group_categories') == 'false')
{
$cat_table = Database::get_course_table(TABLE_GROUP_CATEGORY);
$sql = "SELECT * FROM $cat_table WHERE id = '".DEFAULT_GROUP_CATEGORY."'";
$res = Database::query($sql,__FILE__,__LINE__);
$res = Database::query($sql);
$num = Database::num_rows($res);
if($num == 0)
{
@ -272,10 +272,10 @@ foreach ($group_cats as $index => $category)
$user_is_tutor = GroupManager :: is_tutor($_user['user_id']);
$group_data = array ();
foreach ($group_list as $index => $this_group) {
//validacion when belongs to a session
$session_img = api_get_session_image($this_group['session_id'], $_user['status']);
// all the tutors of this group
$tutorsids_of_group=GroupManager::get_subscribed_tutors($this_group['id'],true);

@ -103,8 +103,8 @@ else
{
//Checks if the field was created in the table Category. It creates it if is neccesary
$table_category = Database :: get_course_table(TABLE_GROUP_CATEGORY);
if (Database::query("SELECT wiki_state FROM $table_category",__FILE__,__LINE__) == FALSE) {
Database::query("ALTER TABLE $table_category ADD `wiki_state` tinyint(3) UNSIGNED NOT NULL default '1';",__FILE__,__LINE__);
if (Database::query("SELECT wiki_state FROM $table_category") == FALSE) {
Database::query("ALTER TABLE $table_category ADD `wiki_state` tinyint(3) UNSIGNED NOT NULL default '1';");
}

@ -214,20 +214,20 @@ if (api_is_allowed_to_edit(false,true) OR GroupManager :: is_user_in_group($_SES
//link to the wiki area of this group
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../wiki/index.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('wiki.gif', get_lang("GroupWiki"))."&nbsp;".get_lang("GroupWiki")."</a></div>";
}
if ( $current_group['chat_state'] != TOOL_NOT_AVAILABLE)
{
//link to the chat area of this group
if(api_get_course_setting('allow_open_chat_window')==true)
{
$tools .= "<div style='margin-bottom: 5px;'><a href=\"javascript: void(0);\" onclick=\"window.open('../chat/chat.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."','window_chat_group_".$_SESSION['_cid']."_".$_SESSION['_gid']."','height=380, width=625, left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') \" >".Display::return_icon('chat.gif', get_lang("Chat"))."&nbsp;".get_lang("Chat")."</a></div>";
$tools .= "<div style='margin-bottom: 5px;'><a href=\"javascript: void(0);\" onclick=\"window.open('../chat/chat.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."','window_chat_group_".$_SESSION['_cid']."_".$_SESSION['_gid']."','height=380, width=625, left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') \" >".Display::return_icon('chat.gif', get_lang("Chat"))."&nbsp;".get_lang("Chat")."</a></div>";
}
else
{
$tools .= "<div style='margin-bottom: 5px;'><a href=\"../chat/chat.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('chat.gif', get_lang("Chat"))."&nbsp;".get_lang("Chat")."</a></div>";
}
}
echo '<div class="actions-message" style="margin-bottom:4px;"><b>'.get_lang("Tools").':</b></div>';
if (!empty($tools))
{
@ -276,13 +276,13 @@ if (api_is_allowed_to_edit(false,true) OR GroupManager :: is_user_in_group($_SES
//link to the wiki area of this group
$tools .= "<a href=\"../wiki/index.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('wiki.gif', get_lang('GroupWiki'))."&nbsp;".get_lang('GroupWiki')."</a><br/>";
}
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 .= "<div style='margin-bottom: 5px;'><a href=\"javascript: void(0);\" onclick=\"window.open('../chat/chat.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."','window_chat_group_".$_SESSION['_cid']."_".$_SESSION['_gid']."','height=380, width=625, left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') \" >".Display::return_icon('chat.gif', get_lang("Chat"))."&nbsp;".get_lang("Chat")."</a></div>";
$tools .= "<div style='margin-bottom: 5px;'><a href=\"javascript: void(0);\" onclick=\"window.open('../chat/chat.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."','window_chat_group_".$_SESSION['_cid']."_".$_SESSION['_gid']."','height=380, width=625, left=2, top=2, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') \" >".Display::return_icon('chat.gif', get_lang("Chat"))."&nbsp;".get_lang("Chat")."</a></div>";
}
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;

Loading…
Cancel
Save