Explorar o código

Minor - format code, fixing PHP warnings.

Julio Montoya %!s(int64=11) %!d(string=hai) anos
pai
achega
0044672026

+ 1 - 1
main/exercice/exercice.php

@@ -752,7 +752,7 @@ if (!empty($exercise_list)) {
                                         $attempt_text = sprintf(get_lang('ExerciseWasActivatedFromXToY'), api_convert_and_format_date($row['start_time']), api_convert_and_format_date($row['end_time']));
                                     }
                                 }
-                                            
+
                             } else {
                                 //$attempt_text = get_lang('ExamNotAvailableAtThisTime');
                                 if ($row['start_time'] != '0000-00-00 00:00:00') {

+ 10 - 9
main/exercice/exercise.lib.php

@@ -888,8 +888,8 @@ function get_count_exam_hotpotatoes_results($in_hotpot_path) {
 }
 
 //function get_exam_results_hotpotatoes_data($from, $number_of_items, $column, $direction, $exercise_id, $extra_where_conditions = null, $get_count = false) {
-function get_exam_results_hotpotatoes_data($in_from, $in_number_of_items, $in_column, $in_direction, $in_hotpot_path, $in_get_count = false, $where_condition = null) {
-
+function get_exam_results_hotpotatoes_data($in_from, $in_number_of_items, $in_column, $in_direction, $in_hotpot_path, $in_get_count = false, $where_condition = null)
+{
     $tab_res = array();
     $course_code = api_get_course_id();
     // by default in_column = 1 If parameters given, it is the name of the column witch is the bdd field name
@@ -900,7 +900,8 @@ function get_exam_results_hotpotatoes_data($in_from, $in_number_of_items, $in_co
     $TBL_TRACK_HOTPOTATOES      = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
     $TBL_USER                   = Database :: get_main_table(TABLE_MAIN_USER);
 
-    $sql = "SELECT * FROM $TBL_TRACK_HOTPOTATOES thp JOIN $TBL_USER u ON thp.exe_user_id = u.user_id WHERE thp.exe_cours_id = '$course_code' AND exe_name LIKE '$in_hotpot_path%'";
+    $sql = "SELECT * FROM $TBL_TRACK_HOTPOTATOES thp JOIN $TBL_USER u ON thp.exe_user_id = u.user_id
+            WHERE thp.exe_cours_id = '$course_code' AND exe_name LIKE '$in_hotpot_path%'";
 
     // just count how many answers
     if ($in_get_count) {
@@ -1447,8 +1448,8 @@ function convert_score($score, $weight) {
  * @param   boolean Check publications dates
  * @param   string  Search exercise name
  * @param   boolean Search exercises in all sessions
- * @param   int     0 = only inactive exercises 
- *                  1 = only active exercises, 
+ * @param   int     0 = only inactive exercises
+ *                  1 = only active exercises,
  *                  2 = all exercises
  * @return  array   array with exercise data
  */
@@ -1475,7 +1476,7 @@ function get_all_exercises($course_info = null, $session_id = 0, $check_publicat
     }
 
     $needle_where   = (!empty($search_exercise)) ? " AND title LIKE '?' "       : '';
-    $needle         = (!empty($search_exercise)) ? "%" . $search_exercise . "%" : ''; 
+    $needle         = (!empty($search_exercise)) ? "%" . $search_exercise . "%" : '';
 
     //Show courses by active status
     $active_sql = '';
@@ -1484,10 +1485,10 @@ function get_all_exercises($course_info = null, $session_id = 0, $check_publicat
     }
 
 
-    if ($search_all_sessions == true) 
+    if ($search_all_sessions == true)
     {
         $conditions = array('where'=>array($active_sql . ' c_id = ? '. $needle_where . $time_conditions => array($course_id, $needle)), 'order'=>'title');
-    } else 
+    } else
     {
         if ($session_id == 0) {
             $conditions = array('where'=>array($active_sql . ' session_id = ? AND c_id = ? '. $needle_where . $time_conditions => array($session_id, $course_id, $needle)), 'order'=>'title');
@@ -1500,7 +1501,7 @@ function get_all_exercises($course_info = null, $session_id = 0, $check_publicat
 /**
  * Get exercise information by id
  * @param int Exercise Id
- * @return array Exercise info 
+ * @return array Exercise info
  */
 function get_exercise_by_id($exerciseId = 0) {
     $TBL_EXERCICES = Database :: get_course_table(TABLE_QUIZ_TEST);

+ 38 - 162
main/exercice/hotpotatoes_exercise_report.php

@@ -3,7 +3,7 @@
 /**
  *	Exercise list: This script shows the list of exercises for administrators and students.
  *	@package chamilo.exercise
- *	@author hubert.borderiou 
+ *	@author hubert.borderiou
  *
  */
 /**
@@ -24,7 +24,6 @@ $htmlHeadXtra[] = api_get_jqgrid_js();
 // Access control
 api_protect_course_script(true, false, true);
 
-
 // including additional libraries
 require_once 'exercise.class.php';
 require_once 'exercise.lib.php';
@@ -54,9 +53,6 @@ $course_id            = api_get_course_int_id();
 $hotpotatoes_path     = isset($_REQUEST['path']) ? $_REQUEST['path'] : null;
 $filter_user          = isset($_REQUEST['filter_by_user']) ? intval($_REQUEST['filter_by_user']) : null;
 
-$locked = api_resource_is_locked_by_gradebook($exercise_id, LINK_EXERCISE);
-
-
 if (empty($hotpotatoes_path)) {
     api_not_allowed();
 }
@@ -69,8 +65,7 @@ if (!empty($_REQUEST['path'])) {
     $parameters['path'] = Security::remove_XSS($_REQUEST['path']);
 }
 
-
-
+$origin = isset($origin) ? $origin : null;
 
 if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') {
     if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) {
@@ -78,145 +73,20 @@ if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') {
         if (isset($_REQUEST['extra_data']) && $_REQUEST['extra_data'] == 1) {
             $load_extra_data = true;
         }
-        
+
         require_once 'hotpotatoes_exercise_result.class.php';
-        // @todo make xls export work
-//        switch ($_GET['export_format']) {
-//            case 'xls' :
-//                $export = new ExerciseResult();
-//                $export->exportCompleteReportXLS($documentPath, null, $load_extra_data, null, $_GET['exerciseId'], $_GET['hotpotato_name']);
-//                exit;
-//                break;
-//            case 'csv' :
-//            default :
-                $export = new HotpotatoesExerciseResult();
-                $export->exportCompleteReportCSV($documentPath, $hotpotatoes_path);
-                exit;
-//                break;
-//        }
+        $export = new HotpotatoesExerciseResult();
+        $export->exportCompleteReportCSV($documentPath, $hotpotatoes_path);
+        exit;
     } else {
         api_not_allowed(true);
     }
 }
-
-//Send student email @todo move this code in a class, library
-//if ($_REQUEST['comments'] == 'update' && ($is_allowedToEdit || $is_tutor) && $_GET['exeid']== strval(intval($_GET['exeid']))) {
-//    $id         = intval($_GET['exeid']); //filtered by post-condition
-//    $track_exercise_info = get_exercise_track_exercise_info($id);
-//    if (empty($track_exercise_info)) {
-//        api_not_allowed();
-//    }
-//    $test              = $track_exercise_info['title'];
-//    $student_id        = $track_exercise_info['exe_user_id'];
-//
-//    $session_id        = $track_exercise_info['session_id'];
-//    $lp_id             = $track_exercise_info['orig_lp_id'];
-//    //$lp_item_id        = $track_exercise_info['orig_lp_item_id'];
-//    $lp_item_view_id   = $track_exercise_info['orig_lp_item_view_id'];
-//
-//    // Teacher data
-//    $teacher_info      = api_get_user_info(api_get_user_id());
-//    $user_info         = api_get_user_info($student_id);
-//    $student_email     = $user_info['mail'];
-//    $from              = $teacher_info['mail'];
-//    $from_name         = api_get_person_name($teacher_info['firstname'], $teacher_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
-//
-//    $url               = api_get_path(WEB_CODE_PATH) . 'exercice/exercise_report.php?' . api_get_cidreq() . '&id_session='.$session_id.'&exerciseId='.$exercise_id;
-//
-//    $my_post_info      = array();
-//    $post_content_id   = array();
-//    $comments_exist    = false;
-//
-//    foreach ($_POST as $key_index => $key_value) {
-//        $my_post_info  = explode('_',$key_index);
-//        $post_content_id[]=$my_post_info[1];
-//        if ($my_post_info[0]=='comments') {
-//            $comments_exist=true;
-//        }
-//    }
-//
-//    $loop_in_track=($comments_exist===true) ? (count($_POST)/2) : count($_POST);
-//
-//    $array_content_id_exe=array();
-//    if ($comments_exist===true) {
-//        $array_content_id_exe = array_slice($post_content_id,$loop_in_track);
-//    } else {
-//        $array_content_id_exe = $post_content_id;
-//    }
-//
-//    for ($i=0;$i<$loop_in_track;$i++) {
-//        $my_marks           = Database::escape_string($_POST['marks_'.$array_content_id_exe[$i]]);
-//        $contain_comments   = Database::escape_string($_POST['comments_'.$array_content_id_exe[$i]]);
-//        if (isset($contain_comments)) {
-//            $my_comments    = Database::escape_string($_POST['comments_'.$array_content_id_exe[$i]]);
-//        } else {
-//            $my_comments    = '';
-//        }
-//        $my_questionid = intval($array_content_id_exe[$i]);
-//        $sql = "SELECT question from $TBL_QUESTIONS WHERE c_id = $course_id AND id = '$my_questionid'";
-//        $result =Database::query($sql);
-//        Database::result($result,0,"question");
-//
-//        $query = "UPDATE $TBL_TRACK_ATTEMPT SET marks = '$my_marks',teacher_comment = '$my_comments' WHERE question_id = ".$my_questionid." AND exe_id=".$id;
-//        Database::query($query);
-//
-//        //Saving results in the track recording table
-//        $recording_changes = 'INSERT INTO '.$TBL_TRACK_ATTEMPT_RECORDING.' (exe_id, question_id, marks, insert_date, author, teacher_comment)
-//                              VALUES ('."'$id','".$my_questionid."','$my_marks','".api_get_utc_datetime()."','".api_get_user_id()."'".',"'.$my_comments.'")';
-//        Database::query($recording_changes);
-//    }
-//
-//    $qry = 'SELECT DISTINCT question_id, marks FROM ' . $TBL_TRACK_ATTEMPT . ' WHERE exe_id = '.$id .' GROUP BY question_id';
-//    $res = Database::query($qry);
-//    $tot = 0;
-//    while ($row = Database :: fetch_array($res, 'ASSOC')) {
-//        $tot += $row['marks'];
-//    }
-//
-//    $totquery = "UPDATE $TBL_TRACK_EXERCICES SET exe_result = '".floatval($tot)."' WHERE exe_id = ".$id;
-//    Database::query($totquery);
-//
-//    //@todo move this somewhere else
-//    $subject = get_lang('ExamSheetVCC');
-//
-//    $message  = '<p>'.get_lang('DearStudentEmailIntroduction') . '</p><p>'.get_lang('AttemptVCC');
-//    $message .= '<h3>'.get_lang('CourseName'). '</h3><p>'.Security::remove_XSS($course_info['name']).'';
-//    $message .= '<h3>'.get_lang('Exercise') . '</h3><p>'.Security::remove_XSS($test);
-//
-//    //Only for exercises not in a LP
-//    if ($lp_id == 0) {
-//        $message .= '<p>'.get_lang('ClickLinkToViewComment') . ' <a href="#url#">#url#</a><br />';
-//    }
-//
-//    $message .= '<p>'.get_lang('Regards').'</p>';
-//    $message .= $from_name;
-//
-//    $message = str_replace("#test#", Security::remove_XSS($test), $message);
-//    $message = str_replace("#url#", $url, $message);
-//
-//    @api_mail_html($student_email, $student_email, $subject, $message, $from_name, $from, array('charset'=>api_get_system_encoding()));
-//
-//    //Updating LP score here
-//    if (in_array($origin, array ('tracking_course','user_course','correct_exercise_in_lp'))) {
-//        $sql_update_score = "UPDATE $TBL_LP_ITEM_VIEW SET score = '" . floatval($tot) . "' WHERE c_id = ".$course_id." AND id = " .$lp_item_view_id;
-//        Database::query($sql_update_score);
-//        if ($origin == 'tracking_course') {
-//            //Redirect to the course detail in lp
-//            header('location: exercice.php?course=' . Security :: remove_XSS($_GET['course']));
-//            exit;
-//        } else {
-//            //Redirect to the reporting
-//            header('location: ../mySpace/myStudents.php?origin=' . $origin . '&student=' . $student_id . '&details=true&course=' . $course_id.'&session_id='.$session_id);
-//            exit;
-//        }
-//    }
-//}
-
-
+$actions = null;
 if ($is_allowedToEdit && $origin != 'learnpath') {
     // the form
     if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) {
-        $actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+        //$actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
         $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&path='.Security::remove_XSS($hotpotatoes_path).' ">'.Display::return_icon('save.png',   get_lang('Export'),'',ICON_SIZE_MEDIUM).'</a>';
     }
 } else {
@@ -238,13 +108,13 @@ if ($is_allowedToEdit && $origin != 'learnpath') {
 
 if ($is_allowedToEdit || $is_tutor) {
     $nameTools = get_lang('StudentScore');
-    $interbreadcrumb[] = array("url" => "exercice.php?gradebook=$gradebook","name" => get_lang('Exercices'));
+    $interbreadcrumb[] = array("url" => "exercice.php","name" => get_lang('Exercices'));
     $objExerciseTmp = new Exercise();
-    if ($objExerciseTmp->read($exercise_id)) {
+    /*if ($objExerciseTmp->read($exercise_id)) {
         $interbreadcrumb[] = array("url" => "admin.php?exerciseId=".$exercise_id, "name" => $objExerciseTmp->name);
-    }
+    }*/
 } else {
-    $interbreadcrumb[] = array("url" => "exercice.php?gradebook=$gradebook","name" => get_lang('Exercices'));
+    $interbreadcrumb[] = array("url" => "exercice.php","name" => get_lang('Exercices'));
     $objExerciseTmp = new Exercise();
     if ($objExerciseTmp->read($exercise_id)) {
         $nameTools = get_lang('Results').': '.$objExerciseTmp->name;
@@ -320,28 +190,34 @@ if (!empty($group_parameters)) {
 }
 
 if ($is_allowedToEdit || $is_tutor) {
-
-	//The order is important you need to check the the $column variable in the model.ajax.php file
-	$columns        = array(get_lang('FirstName'), get_lang('LastName'), get_lang('LoginName'),
-                        get_lang('Group'), get_lang('StartDate'),  get_lang('Score'),  get_lang('Actions'));
+	// The order is important you need to check the the $column variable in the model.ajax.php file
+	$columns = array(
+        get_lang('FirstName'),
+        get_lang('LastName'),
+        get_lang('LoginName'),
+        get_lang('Group'),
+        get_lang('StartDate'),
+        get_lang('Score'),
+        get_lang('Actions')
+    );
 
   //Column config
   // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
 	$column_model   = array(
-                        array('name'=>'firstname',      'index'=>'firstname',		'width'=>'50',   'align'=>'left', 'search' => 'false'),
-                        array('name'=>'lastname',		    'index'=>'lastname',		'width'=>'50',   'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'),
-                        array('name'=>'login',          'hidden'=>'true',       'index'=>'username',        'width'=>'40',   'align'=>'left', 'search' => 'false'),
-                        array('name'=>'group_name',		  'index'=>'group_id',    'width'=>'40',   'align'=>'left', 'search' => 'false'),
-            						array('name'=>'exe_date',		    'index'=>'exe_date',		'width'=>'60',   'align'=>'left', 'search' => 'false'),
-            						array('name'=>'score',			    'index'=>'exe_result',	'width'=>'50',   'align'=>'left', 'search' => 'false'),
-            						array('name'=>'actions',        'index'=>'actions',     'width'=>'60',  'align'=>'left', 'search' => 'false')
-                       );
+        array('name'=>'firstname',      'index'=>'firstname',		'width'=>'50',   'align'=>'left', 'search' => 'false'),
+        array('name'=>'lastname',		    'index'=>'lastname',		'width'=>'50',   'align'=>'left', 'formatter'=>'action_formatter', 'search' => 'false'),
+        array('name'=>'login',          'hidden'=>'true',       'index'=>'username',        'width'=>'40',   'align'=>'left', 'search' => 'false'),
+        array('name'=>'group_name',		  'index'=>'group_id',    'width'=>'40',   'align'=>'left', 'search' => 'false'),
+        array('name'=>'exe_date',		    'index'=>'exe_date',		'width'=>'60',   'align'=>'left', 'search' => 'false'),
+        array('name'=>'score',			    'index'=>'exe_result',	'width'=>'50',   'align'=>'left', 'search' => 'false'),
+        array('name'=>'actions',        'index'=>'actions',     'width'=>'60',  'align'=>'left', 'search' => 'false')
+    );
 
     $action_links = '
     // add username as title in lastname filed - ref 4226
     function action_formatter(cellvalue, options, rowObject) {
         // rowObject is firstname,lastname,login,... get the third word
-        var loginx = "'.api_htmlentities(sprintf(get_lang("LoginX"),":::"), ENT_QUOTES).'";
+        var loginx = "'.api_htmlentities(sprintf(get_lang("LoginX"), ":::"), ENT_QUOTES).'";
         var tabLoginx = loginx.split(/:::/);
         // tabLoginx[0] is before and tabLoginx[1] is after :::
         // may be empty string but is defined
@@ -349,15 +225,15 @@ if ($is_allowedToEdit || $is_tutor) {
     }';
 } else {
     //The order is important you need to check the the $column variable in the model.ajax.php file
-	$columns        = array(get_lang('StartDate'),  get_lang('Score'),  get_lang('Actions'));
+	$columns = array(get_lang('StartDate'), get_lang('Score'), get_lang('Actions'));
 
   //Column config
   // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
-	$column_model   = array(
-                        array('name'=>'exe_date',		    'index'=>'exe_date',		'width'=>'60',   'align'=>'left', 'search' => 'false'),
-            			array('name'=>'score',			    'index'=>'exe_result',	'width'=>'50',   'align'=>'left', 'search' => 'false'),
-            			array('name'=>'actions',        'index'=>'actions',     'width'=>'60',  'align'=>'left', 'search' => 'false')
-                       );
+	$column_model  = array(
+        array('name'=>'exe_date',		    'index'=>'exe_date',		'width'=>'60',   'align'=>'left', 'search' => 'false'),
+        array('name'=>'score',			    'index'=>'exe_result',	'width'=>'50',   'align'=>'left', 'search' => 'false'),
+        array('name'=>'actions',        'index'=>'actions',     'width'=>'60',  'align'=>'left', 'search' => 'false')
+    );
 }
 
 //Autowidth
@@ -448,4 +324,4 @@ $(function() {
 <?php
 
 echo Display::grid_html('results');
-Display :: display_footer();
+Display :: display_footer();

+ 4 - 4
main/exercice/showinframes.php

@@ -17,10 +17,10 @@ $doc_url = str_replace(array('../', '\\', '\\0', '..'), array('', '', '', ''), u
 $cid                = api_get_course_id();
 $document_path      = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 $document_web_path  = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document';
-$origin             = $_REQUEST['origin'];
-$learnpath_id       = $_REQUEST['learnpath_id'];
-$learnpath_item_id  = $_REQUEST['learnpath_item_id'];
-$time               = $_REQUEST['time'];
+$origin             = isset($_REQUEST['origin']) ? $_REQUEST['origin'] : null;
+$learnpath_id       = isset($_REQUEST['learnpath_id']) ? $_REQUEST['learnpath_id'] : null;
+$learnpath_item_id  = isset($_REQUEST['learnpath_item_id']) ? $_REQUEST['learnpath_item_id'] : null;
+$time               = isset($_REQUEST['time']) ? $_REQUEST['time'] : null;
 
 $user_id = api_get_user_id();
 $full_file_path = $document_path.$doc_url;

+ 6 - 6
main/inc/ajax/model.ajax.php

@@ -539,12 +539,12 @@ switch ($action) {
         }
         $result = get_exam_results_data($start, $limit, $sidx, $sord, $exercise_id, $where_condition);
 		break;
-	case 'get_hotpotatoes_exercise_results':
-		$course = api_get_course_info();
-		$documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
-		$columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
-		$result = get_exam_results_hotpotatoes_data($start, $limit, $sidx, $sord, $hotpot_path, $where_condition); //get_exam_results_data($start, $limit, $sidx, $sord, $exercise_id, $where_condition);
-		break;
+    case 'get_hotpotatoes_exercise_results':
+        $course = api_get_course_info();
+        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
+        $result = get_exam_results_hotpotatoes_data($start, $limit, $sidx, $sord, $hotpot_path, $where_condition); //get_exam_results_data($start, $limit, $sidx, $sord, $exercise_id, $where_condition);
+        break;
     case 'get_sessions_tracking':
         if (api_is_drh()) {
             $sessions = SessionManager::get_sessions_followed_by_drh(api_get_user_id(), $start, $limit);