Fixing PHP warnings & notices avoided

skala
Julio Montoya 15 years ago
parent 93e8c0af46
commit 16af2a5a15
  1. 5
      main/document/create_document.php
  2. 12
      main/gradebook/gradebook_display_certificate.php
  3. 8
      main/gradebook/lib/gradebook_functions.inc.php
  4. 2
      main/gradebook/lib/gradebook_functions_users.inc.php
  5. 8
      main/gradebook/lib/scoredisplay.class.php

@ -664,8 +664,9 @@ if ($form->validate()) {
//api_display_tool_title($nameTools);
// actions
if (isset($_REQUEST['certificate'])) {
$all_information_by_create_certificate=DocumentManager::get_all_info_to_certificate(api_get_user_id());
$str_info='';
$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id());
$str_info = '';
foreach ($all_information_by_create_certificate[0] as $info_value) {
$str_info.=$info_value.'<br/>';
}

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
$language_file = 'gradebook';
//$cidReset = true;
require_once '../inc/global.inc.php';
require_once 'lib/gradebook_functions.inc.php';
require_once 'lib/be.inc.php';
@ -49,6 +49,7 @@ echo Display::tag('h3', get_lang('GradebookListOfStudentsCertificates'));
//@todo replace all this code with something like get_total_weight()
$cats = Category :: load ($cat_id, null, null, null, null, null, false);
if (!empty($cats)) {
//with this fix the teacher only can view 1 gradebook
@ -61,11 +62,12 @@ echo Display::tag('h3', get_lang('GradebookListOfStudentsCertificates'));
$total_weight = $cats[0]->get_weight();
$allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
$allcat = $cats[0]->get_subcategories($stud_id, api_get_course_id(), api_get_session_id());
$alleval = $cats[0]->get_evaluations($stud_id);
$alllink = $cats[0]->get_links($stud_id);
$datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
$total_resource_weight = 0;
if (!empty($datagen)) {
$data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
@ -83,11 +85,13 @@ echo Display::tag('h3', get_lang('GradebookListOfStudentsCertificates'));
if ($total_resource_weight != $total_weight) {
Display::display_warning_message(get_lang('SumOfActivitiesWeightMustBeEqualToTotalWeight'));
}
}
}
$certificate_list = get_list_users_certificates($cat_id);
if (count($certificate_list)==0) {
echo get_lang('NoResultsAvailable');
echo Display::display_warning_message(get_lang('NoResultsAvailable'));
} else {
foreach ($certificate_list as $index=>$value) {
?>

@ -514,14 +514,14 @@ function get_certificate_by_user_id ($cat_id,$user_id) {
function get_list_users_certificates ($cat_id=null) {
$table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$sql='SELECT DISTINCT u.user_id,u.lastname,u.firstname,u.username FROM '.$table_user.' u INNER JOIN '.$table_certificate.' gc
ON u.user_id=gc.user_id ';
$sql = 'SELECT DISTINCT u.user_id, u.lastname, u.firstname, u.username
FROM '.$table_user.' u INNER JOIN '.$table_certificate.' gc ON u.user_id=gc.user_id ';
if (!is_null($cat_id) && $cat_id>0) {
$sql.=' WHERE cat_id='.Database::escape_string($cat_id);
}
$sql.=' ORDER BY u.firstname';
$rs=Database::query($sql);
$list_users=array();
$rs = Database::query($sql);
$list_users = array();
while ($row=Database::fetch_array($rs)) {
$list_users[]=$row;
}

@ -132,6 +132,6 @@ function get_user_info_from_id($userid) {
$user_table= Database :: get_main_table(TABLE_MAIN_USER);
$sql= 'SELECT * FROM ' . $user_table . ' WHERE user_id=' . intval($userid);
$res= Database::query($sql);
$user= Database::fetch_array($res,ASSOC);
$user= Database::fetch_array($res, 'ASSOC');
return $user;
}

@ -342,9 +342,11 @@ class ScoreDisplay
}
}
} else {
foreach ($this->custom_display_conv as $displayitem) {
if ($scaledscore < $displayitem['score'] || $displayitem['score'] == 1) {
return $displayitem['display'];
if (!empty($this->custom_display_conv)) {
foreach ($this->custom_display_conv as $displayitem) {
if ($scaledscore < $displayitem['score'] || $displayitem['score'] == 1) {
return $displayitem['display'];
}
}
}
}

Loading…
Cancel
Save