chamilo / chamilo-lms

main/exercice/question_pool.php

Indentation +121 added lines, -121 removed lines

@@ -172,11 +172,11 @@ 
 }
 
 if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
 }
 
 // if admin of course
@@ -227,8 +227,8 @@ 
 echo '</div>';
 
 if ($displayMessage != "") {
-	Display::display_confirmation_message($displayMessage);
-	$displayMessage = "";
+    Display::display_confirmation_message($displayMessage);
+    $displayMessage = "";
 }
 
 // Form
@@ -236,7 +236,7 @@ 
 // Title
 echo '<legend>'.$nameTools.' - '.$titleAdd.'</legend>';
 if (isset($type)) {
-	echo '<input type="hidden" name="type" value="1">';
+    echo '<input type="hidden" name="type" value="1">';
 }
 echo '<input type="hidden" name="fromExercise" value="'.$fromExercise.'">';
 
@@ -283,11 +283,11 @@ 
 foreach ($course_list as $item) {
     $courseItemId = $item['real_id'];
     $courseInfo = api_get_course_info_by_id($courseItemId);
-	$course_select_list[$courseItemId] = "";
-	if ($courseItemId == api_get_course_int_id()) {
-		$course_select_list[$courseItemId] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
-	}
-	$course_select_list[$courseItemId] .= $courseInfo['title'];
+    $course_select_list[$courseItemId] = "";
+    if ($courseItemId == api_get_course_int_id()) {
+        $course_select_list[$courseItemId] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
+    }
+    $course_select_list[$courseItemId] .= $courseInfo['title'];
 }
 
 $select_course_html =  Display::select(
@@ -304,11 +304,11 @@ 
     // no course selected, reset menu test / difficult� / type de reponse
     reset_menu_exo_lvl_type();
 } else {
-	$course_info = api_get_course_info_by_id($selected_course);
+    $course_info = api_get_course_info_by_id($selected_course);
 }
 // If course has changed, reset the menu default
 if ($course_id_changed) {
-	reset_menu_exo_lvl_type();
+    reset_menu_exo_lvl_type();
 }
 
 $course_id = $course_info['real_id'];
@@ -356,7 +356,7 @@ 
 }
 
 if ($exercise_id_changed == 1) {
-	reset_menu_lvl_type();
+    reset_menu_lvl_type();
 }
 $select_exercise_html =  Display::select(
     'exerciseId',
@@ -434,19 +434,19 @@ 
 // if we have selected an exercise in the list-box 'Filter'
 
 if ($exerciseId > 0) {
-	$where = '';
-	$from = '';
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
-		$from = ", $TBL_COURSE_REL_CATEGORY crc ";
-		$where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
-	}
-	if (isset($exerciseLevel) && $exerciseLevel != -1) {
-		$where .= ' AND level='.$exerciseLevel;
-	}
-	if (isset($answerType) && $answerType > 0) {
-		$where .= ' AND type='.$answerType;
-	}
-	$sql = "SELECT DISTINCT
+    $where = '';
+    $from = '';
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
+        $from = ", $TBL_COURSE_REL_CATEGORY crc ";
+        $where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
+    }
+    if (isset($exerciseLevel) && $exerciseLevel != -1) {
+        $where .= ' AND level='.$exerciseLevel;
+    }
+    if (isset($answerType) && $answerType > 0) {
+        $where .= ' AND type='.$answerType;
+    }
+    $sql = "SELECT DISTINCT
 	            id,
 	            question,
 	            type,
@@ -468,22 +468,22 @@ 
         $mainQuestionList[] = $row;
     }
 } elseif ($exerciseId == -1) {
-	// If we have selected the option 'Orphan questions' in the list-box 'Filter'
-	$level_where = '';
-	$from = '';
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
-		$from = " INNER JOIN  $TBL_COURSE_REL_CATEGORY crc ON crc.question_id=q.id AND crc.c_id= q.c_id ";
-		$level_where .= " AND
+    // If we have selected the option 'Orphan questions' in the list-box 'Filter'
+    $level_where = '';
+    $from = '';
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
+        $from = " INNER JOIN  $TBL_COURSE_REL_CATEGORY crc ON crc.question_id=q.id AND crc.c_id= q.c_id ";
+        $level_where .= " AND
 		        crc.c_id = $selected_course AND
 		        crc.category_id = $courseCategoryId";
-	}
-	if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
-		$level_where = ' AND level='.$exerciseLevel;
-	}
-	$answer_where = '';
-	if (isset($answerType) && $answerType >0 -1 ) {
-		$answer_where = ' AND type='.$answerType;
-	}
+    }
+    if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
+        $level_where = ' AND level='.$exerciseLevel;
+    }
+    $answer_where = '';
+    if (isset($answerType) && $answerType >0 -1 ) {
+        $answer_where = ' AND type='.$answerType;
+    }
 
     // @todo fix this query with the new id field
     $sql = " (
@@ -525,24 +525,24 @@ 
         $mainQuestionList[] = $row;
     }
 } else {
-	// All tests for selected course
+    // All tests for selected course
     // If we have not selected any option in the list-box 'Filter'
-	$filter = '';
-	$from = '';
+    $filter = '';
+    $from = '';
 
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
-		$from = ", $TBL_COURSE_REL_CATEGORY crc ";
-		$filter .= " AND
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
+        $from = ", $TBL_COURSE_REL_CATEGORY crc ";
+        $filter .= " AND
 		            crc.c_id = $selected_course AND
 		            crc.question_id = qu.id AND
 		            crc.category_id = $courseCategoryId";
-	}
-	if (isset($exerciseLevel) && $exerciseLevel != -1) {
-		$filter .= ' AND level='.$exerciseLevel.' ';
-	}
-	if (isset($answerType) && $answerType > 0) {
-		$filter .= ' AND qu.type='.$answerType.' ';
-	}
+    }
+    if (isset($exerciseLevel) && $exerciseLevel != -1) {
+        $filter .= ' AND level='.$exerciseLevel.' ';
+    }
+    if (isset($answerType) && $answerType > 0) {
+        $filter .= ' AND qu.type='.$answerType.' ';
+    }
 
     if (!empty($session_id) && $session_id != '-1') {
         $mainQuestionList = array();
@@ -644,7 +644,7 @@ 
             $mainQuestionList[] = $row;
         }
     }
-	// forces the value to 0
+    // forces the value to 0
     $exerciseId = 0;
 }
 
@@ -670,33 +670,33 @@ 
 //
 if ($fromExercise <= 0) {
     // NOT IN A TEST - IN THE COURSE
-	if ($selected_course == api_get_course_int_id()) {
-		$actionLabel = get_lang('Modify');
-		$actionIcon1 = "edit";
-		$actionIcon2 = "delete";
+    if ($selected_course == api_get_course_int_id()) {
+        $actionLabel = get_lang('Modify');
+        $actionIcon1 = "edit";
+        $actionIcon2 = "delete";
         // We are in the course, question title can be a link to the question edit page
-		$questionTagA = 1;
+        $questionTagA = 1;
     } else { // NOT IN A TEST - NOT IN THE COURSE
-		$actionLabel = get_lang('Reuse');
-		$actionIcon1 = get_lang('MustBeInATest');
-		$actionIcon2 = "";
+        $actionLabel = get_lang('Reuse');
+        $actionIcon1 = get_lang('MustBeInATest');
+        $actionIcon2 = "";
         // We are not in this course, to messy if we link to the question in another course
-		$questionTagA = 0;
-	}
+        $questionTagA = 0;
+    }
 } else {
     // IN A TEST - IN THE COURSE
-	if ($selected_course == api_get_course_int_id()) {
-		$actionLabel = get_lang('Reuse');
-		$actionIcon1 = "add";
-		$actionIcon2 = "";
-		$questionTagA = 1;
+    if ($selected_course == api_get_course_int_id()) {
+        $actionLabel = get_lang('Reuse');
+        $actionIcon1 = "add";
+        $actionIcon2 = "";
+        $questionTagA = 1;
     } else {
         // IN A TEST - NOT IN THE COURSE
-		$actionLabel = get_lang('Reuse');
-		$actionIcon1 = "clone";
-		$actionIcon2 = "";
-		$questionTagA = 0;
-	}
+        $actionLabel = get_lang('Reuse');
+        $actionIcon1 = "clone";
+        $actionIcon2 = "";
+        $questionTagA = 0;
+    }
 }
 // Display table
 $header = array(
@@ -789,7 +789,7 @@ 
 );
 
 if (!$nbrQuestions) {
-	echo get_lang('NoQuestion');
+    echo get_lang('NoQuestion');
 }
 
 Display::display_footer();
@@ -801,9 +801,9 @@ 
 */
 function reset_menu_lvl_type()
 {
-	global $exerciseLevel, $answerType;
-	$answerType = -1;
-	$exerciseLevel = -1;
+    global $exerciseLevel, $answerType;
+    $answerType = -1;
+    $exerciseLevel = -1;
 }
 
 /**
@@ -813,10 +813,10 @@ 
 */
 function reset_menu_exo_lvl_type()
 {
-	global $exerciseId, $courseCategoryId;
-	reset_menu_lvl_type();
-	$exerciseId = 0;
-	$courseCategoryId = 0;
+    global $exerciseId, $courseCategoryId;
+    reset_menu_lvl_type();
+    $exerciseId = 0;
+    $courseCategoryId = 0;
 }
 
 /**
@@ -838,17 +838,17 @@ 
     $in_questionname,
     $sessionId
 ) {
-	$res = $in_questionname;
+    $res = $in_questionname;
     $sessionIcon = null;
-	if ($in_addA) {
+    if ($in_addA) {
         if (!empty($sessionId) && $sessionId != -1) {
             $sessionIcon = ' '.Display::return_icon('star.png', get_lang('Session'));
         }
-		$res = "<a href='admin.php?".api_get_cidreq()."&editQuestion=$in_questionid&type=$in_questiontype&fromExercise=$in_fromex'>".
+        $res = "<a href='admin.php?".api_get_cidreq()."&editQuestion=$in_questionid&type=$in_questiontype&fromExercise=$in_fromex'>".
             $res.$sessionIcon.
             "</a>";
-	}
-	return $res;
+    }
+    return $res;
 }
 
 /**
@@ -878,16 +878,16 @@ 
     $in_session_id,
     $in_exercise_id
 ) {
-	$res = "";
-	$getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
-	switch ($in_action) {
-		case "delete" :
-			$res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&delete=$in_questionid' onclick='return confirm_your_choice()'>";
-			$res .= Display::return_icon("delete.png", get_lang('Delete'));
-			$res .= "</a>";
-			break;
-		case "edit" :
-			$res = get_a_tag_for_question(
+    $res = "";
+    $getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
+    switch ($in_action) {
+        case "delete" :
+            $res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&delete=$in_questionid' onclick='return confirm_your_choice()'>";
+            $res .= Display::return_icon("delete.png", get_lang('Delete'));
+            $res .= "</a>";
+            break;
+        case "edit" :
+            $res = get_a_tag_for_question(
                 1,
                 $from_exercise,
                 $in_questionid,
@@ -895,33 +895,33 @@ 
                 Display::return_icon("edit.png", get_lang('Modify')),
                 $in_session_id
             );
-			break;
-		case "add":
-			// add if question is not already in test
-			$myObjEx = new Exercise();
-			$myObjEx->read($from_exercise);
-			if (!$myObjEx->isInList($in_questionid)) {
-				$res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&recup=$in_questionid&fromExercise=$from_exercise'>";
-				$res .= Display::return_icon("view_more_stats.gif", get_lang('InsertALinkToThisQuestionInTheExercise'));
-				$res .= "</a>";
+            break;
+        case "add":
+            // add if question is not already in test
+            $myObjEx = new Exercise();
+            $myObjEx->read($from_exercise);
+            if (!$myObjEx->isInList($in_questionid)) {
+                $res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&recup=$in_questionid&fromExercise=$from_exercise'>";
+                $res .= Display::return_icon("view_more_stats.gif", get_lang('InsertALinkToThisQuestionInTheExercise'));
+                $res .= "</a>";
             } else {
-				$res = "-";
-			}
-			unset($myObjEx);
-			break;
-		case "clone":
+                $res = "-";
+            }
+            unset($myObjEx);
+            break;
+        case "clone":
             $url = api_get_self()."?".api_get_cidreq().$getParams."&question_copy=$in_questionid&course_id=$in_selected_course&fromExercise=$from_exercise";
             $res = Display::url(
                 Display::return_icon('cd.gif', get_lang('ReUseACopyInCurrentTest')),
                 $url
             );
-			break;
-		default :
-			$res = $in_action;
-			break;
-	}
+            break;
+        default :
+            $res = $in_action;
+            break;
+    }
 
-	return $res;
+    return $res;
 }
 
 /**
@@ -930,14 +930,14 @@ 
  */
 function get_question_type_for_question($in_selectedcourse, $in_questionid)
 {
-	$myObjQuestion = Question::read($in_questionid, $in_selectedcourse);
+    $myObjQuestion = Question::read($in_questionid, $in_selectedcourse);
     $questionType = null;
     if (!empty($myObjQuestion)) {
         list($typeImg, $typeExpl) = $myObjQuestion->get_type_icon_html();
         $questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), 32), array());
         unset($myObjQuestion);
     }
-	return $questionType;
+    return $questionType;
 }
 
 /**
@@ -946,6 +946,6 @@ 
  */
 function get_question_categorie_for_question($in_courseid, $in_questionid)
 {
-	$cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
-	return $cat;
+    $cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
+    return $cat;
 }

main/gradebook/gradebook_display_certificate.php

Indentation +9 added lines, -9 removed lines

@@ -162,17 +162,17 @@
 
     if ($form->validate()) {
         $officialCode = $form->getSubmitValue('filter');
-         if ($officialCode == 'all') {
+            if ($officialCode == 'all') {
             $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
         } else {
-             $userList = UserManager::getUsersByOfficialCode($officialCode);
-             if (!empty($userList)) {
-                 $certificate_list = GradebookUtils::get_list_users_certificates(
-                     $cat_id,
-                     $userList
-                 );
-             }
-         }
+                $userList = UserManager::getUsersByOfficialCode($officialCode);
+                if (!empty($userList)) {
+                    $certificate_list = GradebookUtils::get_list_users_certificates(
+                        $cat_id,
+                        $userList
+                    );
+                }
+            }
     } else {
         $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
     }

main/gradebook/gradebook_add_user.php

Indentation +35 added lines, -35 removed lines

@@ -18,53 +18,53 @@
 $newstudents = $evaluation[0]->get_not_subscribed_students();
 
 if (count($newstudents) == '0') {
-	header('Location: gradebook_view_result.php?nouser=&selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
-	exit;
+    header('Location: gradebook_view_result.php?nouser=&selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
+    exit;
 }
 $add_user_form= new EvalForm(EvalForm :: TYPE_ADD_USERS_TO_EVAL,
-							 $evaluation[0],
-							 null,
-							 'add_users_to_evaluation',
-							 null,
-							 api_get_self() . '?selecteval=' . Security::remove_XSS($_GET['selecteval']),
-							 Security::remove_XSS($_GET['firstletter']),
-							 $newstudents);
+                                $evaluation[0],
+                                null,
+                                'add_users_to_evaluation',
+                                null,
+                                api_get_self() . '?selecteval=' . Security::remove_XSS($_GET['selecteval']),
+                                Security::remove_XSS($_GET['firstletter']),
+                                $newstudents);
 
 if ( isset($_POST['submit_button']) ) {
-	$users= is_array($_POST['add_users']) ? $_POST['add_users'] : array ();
-	foreach ($users as $key => $value){
-		$users[$key]= intval($value);
-	}
+    $users= is_array($_POST['add_users']) ? $_POST['add_users'] : array ();
+    foreach ($users as $key => $value){
+        $users[$key]= intval($value);
+    }
 
-	if (count($users) == 0) {
-		header('Location: ' . api_get_self() . '?erroroneuser=&selecteval=' .Security::remove_XSS($_GET['selecteval']));
-		exit;
-	} else {
-		foreach ($users as $user_id) {
-			$result= new Result();
-			$result->set_user_id($user_id);
-			$result->set_evaluation_id($_GET['selecteval']);
-			$result->add();
-			}
-		}
-	header('Location: gradebook_view_result.php?adduser=&selecteval=' .Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
-	exit;
-	} elseif ($_POST['firstLetterUser']) {
-		$firstletter= $_POST['firstLetterUser'];
-		if (!empty ($firstletter)) {
-			header('Location: ' . api_get_self() . '?firstletter=' . Security::remove_XSS($firstletter) . '&selecteval=' . Security::remove_XSS($_GET['selecteval']));
-			exit;
-		}
+    if (count($users) == 0) {
+        header('Location: ' . api_get_self() . '?erroroneuser=&selecteval=' .Security::remove_XSS($_GET['selecteval']));
+        exit;
+    } else {
+        foreach ($users as $user_id) {
+            $result= new Result();
+            $result->set_user_id($user_id);
+            $result->set_evaluation_id($_GET['selecteval']);
+            $result->add();
+            }
+        }
+    header('Location: gradebook_view_result.php?adduser=&selecteval=' .Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq());
+    exit;
+    } elseif ($_POST['firstLetterUser']) {
+        $firstletter= $_POST['firstLetterUser'];
+        if (!empty ($firstletter)) {
+            header('Location: ' . api_get_self() . '?firstletter=' . Security::remove_XSS($firstletter) . '&selecteval=' . Security::remove_XSS($_GET['selecteval']));
+            exit;
+        }
 }
 
 $interbreadcrumb[]= array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('Gradebook'));
 $interbreadcrumb[]= array(
-	'url' => 'gradebook_view_result.php?selecteval=' .Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
-	'name' => get_lang('ViewResult')
+    'url' => 'gradebook_view_result.php?selecteval=' .Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
+    'name' => get_lang('ViewResult')
 );
 Display :: display_header(get_lang('AddUserToEval'));
 if (isset ($_GET['erroroneuser'])){
-	Display :: display_warning_message(get_lang('AtLeastOneUser'),false);
+    Display :: display_warning_message(get_lang('AtLeastOneUser'),false);
 }
 DisplayGradebook :: display_header_result($evaluation[0], null, 0,0);
 echo '<div class="main">';

main/gradebook/gradebook.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Script
- * @package chamilo.gradebook
- */
+     * Script
+     * @package chamilo.gradebook
+     */
 // $cidReset : This is the main difference with gradebook.php, here we say,
 // basically, that we are inside a course, and many things depend from that
 $cidReset= true;

main/gradebook/lib/user_data_generator.class.php

Indentation +346 added lines, -346 removed lines

@@ -10,28 +10,28 @@ 
  */
 class UserDataGenerator
 {
-	// Sorting types constants
-	const UDG_SORT_TYPE = 1;
-	const UDG_SORT_NAME = 2;
-	const UDG_SORT_COURSE = 4;
-	const UDG_SORT_CATEGORY = 8;
-	const UDG_SORT_AVERAGE = 16;
-	const UDG_SORT_SCORE = 32;
-	const UDG_SORT_MASK = 64;
-
-	const UDG_SORT_ASC = 128;
-	const UDG_SORT_DESC = 256;
-
-	private $items;
-	private $userid;
-
-	private $coursecodecache;
-	private $categorycache;
-	private $scorecache;
-	private $avgcache;
-
-	public function UserDataGenerator($userid, $evals = array(), $links = array())
-	{
+    // Sorting types constants
+    const UDG_SORT_TYPE = 1;
+    const UDG_SORT_NAME = 2;
+    const UDG_SORT_COURSE = 4;
+    const UDG_SORT_CATEGORY = 8;
+    const UDG_SORT_AVERAGE = 16;
+    const UDG_SORT_SCORE = 32;
+    const UDG_SORT_MASK = 64;
+
+    const UDG_SORT_ASC = 128;
+    const UDG_SORT_DESC = 256;
+
+    private $items;
+    private $userid;
+
+    private $coursecodecache;
+    private $categorycache;
+    private $scorecache;
+    private $avgcache;
+
+    public function UserDataGenerator($userid, $evals = array(), $links = array())
+    {
         $this->userid = $userid;
         $evals_filtered = array();
         $result = array();
@@ -62,330 +62,330 @@ 
         $this->avgcache = null;
     }
 
-	/**
-	 * Get total number of items (rows)
-	 */
-	public function get_total_items_count()
-	{
-		return count($this->items);
-	}
-
-	/**
-	 * Get actual array data
-	 * @return array 2-dimensional array - each array contains the elements:
-	 * 0: eval/link object
-	 * 1: item name
-	 * 2: course name
-	 * 3: category name
-	 * 4: average score
-	 * 5: student's score
-	 * 6: student's score as custom display (only if custom scoring enabled)
-	 */
-	public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false)
-	{
-		// do some checks on count, redefine if invalid value
-		if (!isset($count)) {
-			$count = count ($this->items) - $start;
-		}
-		if ($count < 0) {
-			$count = 0;
-		}
-		$allitems = $this->items;
-
-		// sort users array
-		if ($sorting & self :: UDG_SORT_TYPE) {
-			usort($allitems, array('UserDataGenerator', 'sort_by_type'));
-		}elseif ($sorting & self :: UDG_SORT_NAME) {
-			usort($allitems, array('UserDataGenerator', 'sort_by_name'));
-		} elseif ($sorting & self :: UDG_SORT_COURSE) {
-			usort($allitems, array('UserDataGenerator', 'sort_by_course'));
-		} elseif ($sorting & self :: UDG_SORT_CATEGORY) {
-			usort($allitems, array('UserDataGenerator', 'sort_by_category'));
-		} elseif ($sorting & self :: UDG_SORT_AVERAGE) {
-			// if user sorts on average scores, first calculate them and cache them
-			foreach ($allitems as $item) {
-				$this->avgcache[$item->get_item_type() . $item->get_id()]= $item->calc_score();
-			}
-			usort($allitems, array('UserDataGenerator', 'sort_by_average'));
-		} elseif ($sorting & self :: UDG_SORT_SCORE) {
-			// if user sorts on student's scores, first calculate them and cache them
-			foreach ($allitems as $item) {
-				$this->scorecache[$item->get_item_type() . $item->get_id()]
-					= $item->calc_score($this->userid);
-			}
-			usort($allitems, array('UserDataGenerator', 'sort_by_score'));
-		} elseif ($sorting & self :: UDG_SORT_MASK) {
-			// if user sorts on student's masks, first calculate scores and cache them
-			foreach ($allitems as $item) {
-				$this->scorecache[$item->get_item_type() . $item->get_id()]
-					= $item->calc_score($this->userid);
-			}
-			usort($allitems, array('UserDataGenerator', 'sort_by_mask'));
-		}
-
-		if ($sorting & self :: UDG_SORT_DESC) {
-			$allitems = array_reverse($allitems);
-		}
-		// select the items we have to display
-		$visibleitems = array_slice($allitems, $start, $count);
-
-		// fill score cache if not done yet
-		if (!isset ($this->scorecache)) {
-			foreach ($visibleitems as $item) {
-				$this->scorecache[$item->get_item_type() . $item->get_id()]
-					= $item->calc_score($this->userid);
-			}
-
-		}
-		// generate the data to display
-		$scoredisplay = ScoreDisplay :: instance();
-		$data = array();
-		foreach ($visibleitems as $item) {
-			$row = array ();
-			$row[] = $item;
-			$row[] = $item->get_name();
-			$row[] = $this->build_course_name($item);
-			$row[] = $this->build_category_name($item);
-			$row[] = $this->build_average_column($item, $ignore_score_color);
-			$row[] = $this->build_result_column($item, $ignore_score_color);
-			if ($scoredisplay->is_custom())
-				$row[] = $this->build_mask_column($item, $ignore_score_color);
-			$data[] = $row;
-		}
-		return $data;
-	}
-
-	/**
-	 * @param $item1
-	 * @param $item2
-	 * @return int
-	 */
-	function sort_by_type($item1, $item2)
-	{
-		if ($item1->get_item_type() == $item2->get_item_type()) {
-			return $this->sort_by_name($item1,$item2);
-		} else {
-			return ($item1->get_item_type() < $item2->get_item_type() ? -1 : 1);
-		}
-	}
-
-	/**
-	 * @param $item1
-	 * @param $item2
-	 * @return int
-	 */
-	function sort_by_course($item1, $item2)
-	{
-		$name1 = api_strtolower($this->get_course_name_from_code_cached($item1->get_course_code()));
-		$name2 = api_strtolower($this->get_course_name_from_code_cached($item2->get_course_code()));
-		return api_strnatcmp($name1, $name2);
-	}
-
-	/**
-	 * @param $item1
-	 * @param $item2
-	 * @return int
-	 */
-	function sort_by_category($item1, $item2)
-	{
-		$cat1 = $this->get_category_cached($item1->get_category_id());
-		$cat2 = $this->get_category_cached($item2->get_category_id());
-		$name1 = api_strtolower($this->get_category_name_to_display($cat1));
-		$name2 = api_strtolower($this->get_category_name_to_display($cat2));
-
-		return api_strnatcmp($name1, $name2);
-	}
-
-	/**
-	 * @param $item1
-	 * @param $item2
-	 * @return int
-	 */
-	function sort_by_name($item1, $item2)
-	{
-		return api_strnatcmp($item1->get_name(),$item2->get_name());
-	}
-
-	/**
-	 * @param $item1
-	 * @param $item2
-	 * @return int
-	 */
-	function sort_by_average($item1, $item2)
-	{
-		$score1 = $this->avgcache[$item1->get_item_type() . $item1->get_id()];
-		$score2 = $this->avgcache[$item2->get_item_type() . $item2->get_id()];
-
-		return $this->compare_scores($score1, $score2);
-	}
-
-	/**
-	 * @param $item1
-	 * @param $item2
-	 * @return int
-	 */
-	function sort_by_score($item1, $item2)
-	{
-		$score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
-		$score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
-
-		return $this->compare_scores($score1, $score2);
-	}
-
-	/**
-	 * @param $item1
-	 * @param $item2
-	 * @return int
-	 */
-	function sort_by_mask($item1, $item2)
-	{
-		$score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
-		$score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
-
-		return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
-	}
-
-	/**
-	 * @param $score1
-	 * @param $score2
-	 * @return int
-	 */
-	function compare_scores($score1, $score2)
-	{
-		if (!isset($score1)) {
-			return (isset($score2) ? 1 : 0);
-		} elseif (!isset($score2)) {
-			return -1;
-		} elseif (($score1[0]/$score1[1]) == ($score2[0]/$score2[1])) {
-			return 0;
-		} else {
-			return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
-		}
-	}
-
-	/**
-	 * @param $item
-	 * @return mixed
-	 */
-	private function build_course_name($item)
-	{
-		return $this->get_course_name_from_code_cached($item->get_course_code());
-	}
-
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_category_name($item)
-	{
-		$cat = $this->get_category_cached($item->get_category_id());
-
-		return $this->get_category_name_to_display($cat);
-	}
-
-	/**
-	 * @param $item
-	 * @param $ignore_score_color
-	 * @return string
-	 */
-	private function build_average_column($item, $ignore_score_color)
-	{
-		if (isset($this->avgcache)) {
-			$avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()];
-		} else {
-			$avgscore = $item->calc_score();
-		}
-
-		$scoredisplay = ScoreDisplay :: instance();
-		$displaytype = SCORE_AVERAGE;
-		/*if ($ignore_score_color)
+    /**
+     * Get total number of items (rows)
+     */
+    public function get_total_items_count()
+    {
+        return count($this->items);
+    }
+
+    /**
+     * Get actual array data
+     * @return array 2-dimensional array - each array contains the elements:
+     * 0: eval/link object
+     * 1: item name
+     * 2: course name
+     * 3: category name
+     * 4: average score
+     * 5: student's score
+     * 6: student's score as custom display (only if custom scoring enabled)
+     */
+    public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false)
+    {
+        // do some checks on count, redefine if invalid value
+        if (!isset($count)) {
+            $count = count ($this->items) - $start;
+        }
+        if ($count < 0) {
+            $count = 0;
+        }
+        $allitems = $this->items;
+
+        // sort users array
+        if ($sorting & self :: UDG_SORT_TYPE) {
+            usort($allitems, array('UserDataGenerator', 'sort_by_type'));
+        }elseif ($sorting & self :: UDG_SORT_NAME) {
+            usort($allitems, array('UserDataGenerator', 'sort_by_name'));
+        } elseif ($sorting & self :: UDG_SORT_COURSE) {
+            usort($allitems, array('UserDataGenerator', 'sort_by_course'));
+        } elseif ($sorting & self :: UDG_SORT_CATEGORY) {
+            usort($allitems, array('UserDataGenerator', 'sort_by_category'));
+        } elseif ($sorting & self :: UDG_SORT_AVERAGE) {
+            // if user sorts on average scores, first calculate them and cache them
+            foreach ($allitems as $item) {
+                $this->avgcache[$item->get_item_type() . $item->get_id()]= $item->calc_score();
+            }
+            usort($allitems, array('UserDataGenerator', 'sort_by_average'));
+        } elseif ($sorting & self :: UDG_SORT_SCORE) {
+            // if user sorts on student's scores, first calculate them and cache them
+            foreach ($allitems as $item) {
+                $this->scorecache[$item->get_item_type() . $item->get_id()]
+                    = $item->calc_score($this->userid);
+            }
+            usort($allitems, array('UserDataGenerator', 'sort_by_score'));
+        } elseif ($sorting & self :: UDG_SORT_MASK) {
+            // if user sorts on student's masks, first calculate scores and cache them
+            foreach ($allitems as $item) {
+                $this->scorecache[$item->get_item_type() . $item->get_id()]
+                    = $item->calc_score($this->userid);
+            }
+            usort($allitems, array('UserDataGenerator', 'sort_by_mask'));
+        }
+
+        if ($sorting & self :: UDG_SORT_DESC) {
+            $allitems = array_reverse($allitems);
+        }
+        // select the items we have to display
+        $visibleitems = array_slice($allitems, $start, $count);
+
+        // fill score cache if not done yet
+        if (!isset ($this->scorecache)) {
+            foreach ($visibleitems as $item) {
+                $this->scorecache[$item->get_item_type() . $item->get_id()]
+                    = $item->calc_score($this->userid);
+            }
+
+        }
+        // generate the data to display
+        $scoredisplay = ScoreDisplay :: instance();
+        $data = array();
+        foreach ($visibleitems as $item) {
+            $row = array ();
+            $row[] = $item;
+            $row[] = $item->get_name();
+            $row[] = $this->build_course_name($item);
+            $row[] = $this->build_category_name($item);
+            $row[] = $this->build_average_column($item, $ignore_score_color);
+            $row[] = $this->build_result_column($item, $ignore_score_color);
+            if ($scoredisplay->is_custom())
+                $row[] = $this->build_mask_column($item, $ignore_score_color);
+            $data[] = $row;
+        }
+        return $data;
+    }
+
+    /**
+     * @param $item1
+     * @param $item2
+     * @return int
+     */
+    function sort_by_type($item1, $item2)
+    {
+        if ($item1->get_item_type() == $item2->get_item_type()) {
+            return $this->sort_by_name($item1,$item2);
+        } else {
+            return ($item1->get_item_type() < $item2->get_item_type() ? -1 : 1);
+        }
+    }
+
+    /**
+     * @param $item1
+     * @param $item2
+     * @return int
+     */
+    function sort_by_course($item1, $item2)
+    {
+        $name1 = api_strtolower($this->get_course_name_from_code_cached($item1->get_course_code()));
+        $name2 = api_strtolower($this->get_course_name_from_code_cached($item2->get_course_code()));
+        return api_strnatcmp($name1, $name2);
+    }
+
+    /**
+     * @param $item1
+     * @param $item2
+     * @return int
+     */
+    function sort_by_category($item1, $item2)
+    {
+        $cat1 = $this->get_category_cached($item1->get_category_id());
+        $cat2 = $this->get_category_cached($item2->get_category_id());
+        $name1 = api_strtolower($this->get_category_name_to_display($cat1));
+        $name2 = api_strtolower($this->get_category_name_to_display($cat2));
+
+        return api_strnatcmp($name1, $name2);
+    }
+
+    /**
+     * @param $item1
+     * @param $item2
+     * @return int
+     */
+    function sort_by_name($item1, $item2)
+    {
+        return api_strnatcmp($item1->get_name(),$item2->get_name());
+    }
+
+    /**
+     * @param $item1
+     * @param $item2
+     * @return int
+     */
+    function sort_by_average($item1, $item2)
+    {
+        $score1 = $this->avgcache[$item1->get_item_type() . $item1->get_id()];
+        $score2 = $this->avgcache[$item2->get_item_type() . $item2->get_id()];
+
+        return $this->compare_scores($score1, $score2);
+    }
+
+    /**
+     * @param $item1
+     * @param $item2
+     * @return int
+     */
+    function sort_by_score($item1, $item2)
+    {
+        $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
+        $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
+
+        return $this->compare_scores($score1, $score2);
+    }
+
+    /**
+     * @param $item1
+     * @param $item2
+     * @return int
+     */
+    function sort_by_mask($item1, $item2)
+    {
+        $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
+        $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
+
+        return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
+    }
+
+    /**
+     * @param $score1
+     * @param $score2
+     * @return int
+     */
+    function compare_scores($score1, $score2)
+    {
+        if (!isset($score1)) {
+            return (isset($score2) ? 1 : 0);
+        } elseif (!isset($score2)) {
+            return -1;
+        } elseif (($score1[0]/$score1[1]) == ($score2[0]/$score2[1])) {
+            return 0;
+        } else {
+            return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
+        }
+    }
+
+    /**
+     * @param $item
+     * @return mixed
+     */
+    private function build_course_name($item)
+    {
+        return $this->get_course_name_from_code_cached($item->get_course_code());
+    }
+
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_category_name($item)
+    {
+        $cat = $this->get_category_cached($item->get_category_id());
+
+        return $this->get_category_name_to_display($cat);
+    }
+
+    /**
+     * @param $item
+     * @param $ignore_score_color
+     * @return string
+     */
+    private function build_average_column($item, $ignore_score_color)
+    {
+        if (isset($this->avgcache)) {
+            $avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()];
+        } else {
+            $avgscore = $item->calc_score();
+        }
+
+        $scoredisplay = ScoreDisplay :: instance();
+        $displaytype = SCORE_AVERAGE;
+        /*if ($ignore_score_color)
 			$displaytype |= SCORE_IGNORE_SPLIT;
         */
-		return $scoredisplay->display_score($avgscore, $displaytype);
-	}
-
-	/**
-	 * @param $item
-	 * @param $ignore_score_color
-	 * @return string
-	 */
-	private function build_result_column($item, $ignore_score_color)
-	{
-		$studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
-		$scoredisplay = ScoreDisplay :: instance();
-		$displaytype = SCORE_DIV_PERCENT;
-		if ($ignore_score_color) {
-			$displaytype |= SCORE_IGNORE_SPLIT;
-		}
-
-		return $scoredisplay->display_score($studscore, $displaytype, SCORE_ONLY_DEFAULT);
-	}
-
-	/**
-	 * @param $item
-	 * @param $ignore_score_color
-	 * @return string
-	 */
-	private function build_mask_column($item, $ignore_score_color)
-	{
-		$studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
-		$scoredisplay = ScoreDisplay :: instance();
-		$displaytype = SCORE_DIV_PERCENT;
-		if ($ignore_score_color) {
-			$displaytype |= SCORE_IGNORE_SPLIT;
-		}
-		return $scoredisplay->display_score($studscore, $displaytype, SCORE_ONLY_CUSTOM);
-	}
-
-	/**
-	 * @param $coursecode
-	 * @return mixed
-	 */
-	private function get_course_name_from_code_cached($coursecode)
-	{
-		if (isset ($this->coursecodecache)
-			&& isset ($this->coursecodecache[$coursecode])) {
-			return $this->coursecodecache[$coursecode];
-		} else {
-			$name = CourseManager::getCourseNameFromCode($coursecode);
-			$this->coursecodecache[$coursecode] = $name;
-			return $name;
-		}
-	}
-
-	/**
-	 * @param $category_id
-	 * @return null
-	 */
-	private function get_category_cached($category_id)
-	{
-		if (isset ($this->categorycache)
-			&& isset ($this->categorycache[$category_id])) {
-			return $this->categorycache[$category_id];
-		}else {
-			$cat = Category::load($category_id);
-			if (isset($cat)){
-				$this->categorycache[$category_id] = $cat[0];
-				return $cat[0];
-			}else
-				return null;
-		}
-	}
-
-	/**
-	 * @param $cat
-	 * @return string
-	 */
-	private function get_category_name_to_display($cat)
-	{
-		if (isset($cat)) {
-			if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null){
-				return '';
-			} else {
-				return $cat->get_name();
-			}
-		} else {
-			return '';
-		}
-	}
+        return $scoredisplay->display_score($avgscore, $displaytype);
+    }
+
+    /**
+     * @param $item
+     * @param $ignore_score_color
+     * @return string
+     */
+    private function build_result_column($item, $ignore_score_color)
+    {
+        $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
+        $scoredisplay = ScoreDisplay :: instance();
+        $displaytype = SCORE_DIV_PERCENT;
+        if ($ignore_score_color) {
+            $displaytype |= SCORE_IGNORE_SPLIT;
+        }
+
+        return $scoredisplay->display_score($studscore, $displaytype, SCORE_ONLY_DEFAULT);
+    }
+
+    /**
+     * @param $item
+     * @param $ignore_score_color
+     * @return string
+     */
+    private function build_mask_column($item, $ignore_score_color)
+    {
+        $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
+        $scoredisplay = ScoreDisplay :: instance();
+        $displaytype = SCORE_DIV_PERCENT;
+        if ($ignore_score_color) {
+            $displaytype |= SCORE_IGNORE_SPLIT;
+        }
+        return $scoredisplay->display_score($studscore, $displaytype, SCORE_ONLY_CUSTOM);
+    }
+
+    /**
+     * @param $coursecode
+     * @return mixed
+     */
+    private function get_course_name_from_code_cached($coursecode)
+    {
+        if (isset ($this->coursecodecache)
+            && isset ($this->coursecodecache[$coursecode])) {
+            return $this->coursecodecache[$coursecode];
+        } else {
+            $name = CourseManager::getCourseNameFromCode($coursecode);
+            $this->coursecodecache[$coursecode] = $name;
+            return $name;
+        }
+    }
+
+    /**
+     * @param $category_id
+     * @return null
+     */
+    private function get_category_cached($category_id)
+    {
+        if (isset ($this->categorycache)
+            && isset ($this->categorycache[$category_id])) {
+            return $this->categorycache[$category_id];
+        }else {
+            $cat = Category::load($category_id);
+            if (isset($cat)){
+                $this->categorycache[$category_id] = $cat[0];
+                return $cat[0];
+            }else
+                return null;
+        }
+    }
+
+    /**
+     * @param $cat
+     * @return string
+     */
+    private function get_category_name_to_display($cat)
+    {
+        if (isset($cat)) {
+            if ($cat->get_parent_id() == '0' || $cat->get_parent_id() == null){
+                return '';
+            } else {
+                return $cat->get_name();
+            }
+        } else {
+            return '';
+        }
+    }
 }

main/gradebook/lib/fe/userform.class.php

Indentation +63 added lines, -63 removed lines

@@ -9,71 +9,71 @@
  */
 class UserForm extends FormValidator
 {
-	const TYPE_USER_INFO= 1;
-	const TYPE_SIMPLE_SEARCH = 3;
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1 = user_info
-	 * @param user array
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
-	public function UserForm($form_type, $user, $form_name, $method= 'post', $action= null)
-	{
-		parent :: __construct($form_name, $method, $action);
-		$this->form_type= $form_type;
-		if (isset ($user)) {
-			$this->user_info= $user;
-		}
-		if (isset ($result_object)) {
-			$this->result_object= $result_object;
-		}
-		if ($this->form_type == self :: TYPE_USER_INFO) {
-			$this->build_user_info_form();
-		}
-		elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
-			$this->build_simple_search();
-		}
-		$this->setDefaults();
-	}
+    const TYPE_USER_INFO= 1;
+    const TYPE_SIMPLE_SEARCH = 3;
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1 = user_info
+     * @param user array
+     * @param string form name
+     * @param method
+     * @param action
+     */
+    public function UserForm($form_type, $user, $form_name, $method= 'post', $action= null)
+    {
+        parent :: __construct($form_name, $method, $action);
+        $this->form_type= $form_type;
+        if (isset ($user)) {
+            $this->user_info= $user;
+        }
+        if (isset ($result_object)) {
+            $this->result_object= $result_object;
+        }
+        if ($this->form_type == self :: TYPE_USER_INFO) {
+            $this->build_user_info_form();
+        }
+        elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
+            $this->build_simple_search();
+        }
+        $this->setDefaults();
+    }
 
-	protected function build_simple_search()
-	{
-		if (isset($_GET['search']) && (!empty($_GET['search']))) {
-			$this->setDefaults(array(
-				'keyword' => Security::remove_XSS($_GET['search'])
-			));
-		}
-		$renderer =& $this->defaultRenderer();
-		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('text','keyword','');
-		$this->addButtonSearch(get_lang('Search'), 'submit');
-	}
+    protected function build_simple_search()
+    {
+        if (isset($_GET['search']) && (!empty($_GET['search']))) {
+            $this->setDefaults(array(
+                'keyword' => Security::remove_XSS($_GET['search'])
+            ));
+        }
+        $renderer =& $this->defaultRenderer();
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
+        $this->addElement('text','keyword','');
+        $this->addButtonSearch(get_lang('Search'), 'submit');
+    }
 
-	protected function build_user_info_form()
-	{
-		if (api_is_western_name_order()) {
-			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
-			$this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
-		} else {
-			$this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
-			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
-		}
-		$this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
-		$this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
-		$this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
-		$this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
-		$this->addButtonSave(get_lang('Back'), 'submit');
-	}
+    protected function build_user_info_form()
+    {
+        if (api_is_western_name_order()) {
+            $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
+            $this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
+        } else {
+            $this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
+            $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
+        }
+        $this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
+        $this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
+        $this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
+        $this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
+        $this->addButtonSave(get_lang('Back'), 'submit');
+    }
 
-	function display()
-	{
-		parent :: display();
-	}
+    function display()
+    {
+        parent :: display();
+    }
 
-	function setDefaults($defaults= array(), $filter = null)
-	{
-		parent :: setDefaults($defaults, $filter);
-	}
+    function setDefaults($defaults= array(), $filter = null)
+    {
+        parent :: setDefaults($defaults, $filter);
+    }
 }

main/gradebook/lib/fe/displaygradebook.php

Indentation +1 added lines, -1 removed lines

@@ -558,7 +558,7 @@
                     $my_api_cidreq = 'cidReq=' . $my_category['course_code'];
                 }
                 if ($show_add_link && !$message_resource) {
-                   $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
+                    $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
                         Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>';
                     $cats = Category :: load($selectcat);
 

main/gradebook/lib/fe/linkform.class.php

Indentation +117 added lines, -117 removed lines

@@ -10,133 +10,133 @@
  */
 class LinkForm extends FormValidator
 {
-	const TYPE_CREATE = 1;
-	const TYPE_MOVE = 2;
-	/** @var Category */
-	private $category_object;
-	private $link_object;
-	private $extra;
+    const TYPE_CREATE = 1;
+    const TYPE_MOVE = 2;
+    /** @var Category */
+    private $category_object;
+    private $link_object;
+    private $extra;
 
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1=choose link
-	 * @param obj cat_obj the category object
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
-	public function LinkForm(
-		$form_type,
-		$category_object,
-		$link_object,
-		$form_name,
-		$method = 'post',
-		$action = null,
-		$extra = null
-	) {
-		parent :: __construct($form_name, $method, $action);
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1=choose link
+     * @param obj cat_obj the category object
+     * @param string form name
+     * @param method
+     * @param action
+     */
+    public function LinkForm(
+        $form_type,
+        $category_object,
+        $link_object,
+        $form_name,
+        $method = 'post',
+        $action = null,
+        $extra = null
+    ) {
+        parent :: __construct($form_name, $method, $action);
 
-		if (isset ($category_object)) {
-			$this->category_object = $category_object;
-		} else {
-			if (isset($link_object)) {
-				$this->link_object = $link_object;
-			}
-		}
+        if (isset ($category_object)) {
+            $this->category_object = $category_object;
+        } else {
+            if (isset($link_object)) {
+                $this->link_object = $link_object;
+            }
+        }
 
-		if (isset ($extra)) {
-			$this->extra = $extra;
-		}
-		if ($form_type == self :: TYPE_CREATE) {
-			$this->build_create();
-		} elseif ($form_type == self :: TYPE_MOVE) {
-			$this->build_move();
-		}
-	}
+        if (isset ($extra)) {
+            $this->extra = $extra;
+        }
+        if ($form_type == self :: TYPE_CREATE) {
+            $this->build_create();
+        } elseif ($form_type == self :: TYPE_MOVE) {
+            $this->build_move();
+        }
+    }
 
-	protected function build_move()
-	{
-		$renderer =& $this->defaultRenderer();
-		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
-		$this->addElement('static',null,null,get_lang('MoveTo').' : ');
-		$select = $this->addElement('select','move_cat',null,null);
-		$line = '';
-		foreach ($this->link_object->get_target_categories() as $cat) {
-			for ($i=0;$i<$cat[2];$i++) {
-				$line .= '&mdash;';
-			}
-			$select->addoption($line.' '.$cat[1],$cat[0]);
-			$line = '';
-		}
-		$this->addElement('submit', null, get_lang('Ok'));
-	}
+    protected function build_move()
+    {
+        $renderer =& $this->defaultRenderer();
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
+        $this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
+        $this->addElement('static',null,null,get_lang('MoveTo').' : ');
+        $select = $this->addElement('select','move_cat',null,null);
+        $line = '';
+        foreach ($this->link_object->get_target_categories() as $cat) {
+            for ($i=0;$i<$cat[2];$i++) {
+                $line .= '&mdash;';
+            }
+            $select->addoption($line.' '.$cat[1],$cat[0]);
+            $line = '';
+        }
+        $this->addElement('submit', null, get_lang('Ok'));
+    }
 
-	/**
-	 * Builds the form
-	 */
-	protected function build_create()
-	{
-		$this->addElement('header', get_lang('MakeLink'));
-		$select = $this->addElement(
-			'select',
-			'select_link',
-			get_lang('ChooseLink'),
-			null,
-			array('onchange' => 'document.create_link.submit()')
-		);
+    /**
+     * Builds the form
+     */
+    protected function build_create()
+    {
+        $this->addElement('header', get_lang('MakeLink'));
+        $select = $this->addElement(
+            'select',
+            'select_link',
+            get_lang('ChooseLink'),
+            null,
+            array('onchange' => 'document.create_link.submit()')
+        );
 
-		$linkTypes = LinkFactory::get_all_types();
+        $linkTypes = LinkFactory::get_all_types();
 
-		$select->addoption('['.get_lang('ChooseLink').']', 0);
+        $select->addoption('['.get_lang('ChooseLink').']', 0);
 
-		$courseCode = $this->category_object->get_course_code();
+        $courseCode = $this->category_object->get_course_code();
 
-		foreach ($linkTypes as $linkType) {
-			// The hot potatoe link will be added "inside" the exercise option.
-			if ($linkType == LINK_HOTPOTATOES) {
-				continue;
-			}
-			$link = $this->createLink($linkType, $courseCode);
-			// disable this element if the link works with a dropdownlist
-			// and if there are no links left
-			if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
-				$select->addoption($link->get_type_name(), $linkType, 'disabled');
-			} else {
-				if ($link->get_type() == LINK_EXERCISE) {
-					// Adding exercise
-					$select->addoption($link->get_type_name(), $linkType);
-					// Adding hot potatoes
-					$linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
-					$select->addoption(
-						'&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
-						LINK_HOTPOTATOES
-					);
-				} else {
-					$select->addoption($link->get_type_name(), $linkType);
-				}
-			}
-		}
+        foreach ($linkTypes as $linkType) {
+            // The hot potatoe link will be added "inside" the exercise option.
+            if ($linkType == LINK_HOTPOTATOES) {
+                continue;
+            }
+            $link = $this->createLink($linkType, $courseCode);
+            // disable this element if the link works with a dropdownlist
+            // and if there are no links left
+            if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
+                $select->addoption($link->get_type_name(), $linkType, 'disabled');
+            } else {
+                if ($link->get_type() == LINK_EXERCISE) {
+                    // Adding exercise
+                    $select->addoption($link->get_type_name(), $linkType);
+                    // Adding hot potatoes
+                    $linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
+                    $select->addoption(
+                        '&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
+                        LINK_HOTPOTATOES
+                    );
+                } else {
+                    $select->addoption($link->get_type_name(), $linkType);
+                }
+            }
+        }
 
-		if (isset($this->extra)) {
-			$this->setDefaults(array('select_link' => $this->extra));
-		}
-	}
+        if (isset($this->extra)) {
+            $this->setDefaults(array('select_link' => $this->extra));
+        }
+    }
 
-	/**
-	 * @param $link
-	 * @param $courseCode
-	 * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink
-	 */
-	private function createLink($link, $courseCode)
-	{
-		$link = LinkFactory::create($link);
-		if (!empty($courseCode)) {
-			$link->set_course_code($courseCode);
-		} elseif(!empty($_GET['course_code'])) {
-			$link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
-		}
+    /**
+     * @param $link
+     * @param $courseCode
+     * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink
+     */
+    private function createLink($link, $courseCode)
+    {
+        $link = LinkFactory::create($link);
+        if (!empty($courseCode)) {
+            $link->set_course_code($courseCode);
+        } elseif(!empty($_GET['course_code'])) {
+            $link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
+        }
 
-		return $link;
-	}
+        return $link;
+    }
 }

main/gradebook/lib/fe/resulttable.class.php

Indentation +149 added lines, -149 removed lines

@@ -10,162 +10,162 @@
  */
 class ResultTable extends SortableTable
 {
-	private $datagen;
-	private $evaluation;
-	private $allresults;
-	private $iscourse;
-
-	/**
-	 * Constructor
-	 */
+    private $datagen;
+    private $evaluation;
+    private $allresults;
+    private $iscourse;
+
+    /**
+     * Constructor
+     */
     public function ResultTable ($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
-	{
-    	parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
-
-		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
-
-		$this->evaluation = $evaluation;
-		$this->iscourse = $iscourse;
-		$this->forprint = $forprint;
-
-		if (isset ($addparams))  {
-			$this->set_additional_parameters($addparams);
-		}
-		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
-		if ($this->iscourse == '1') {
-			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
-					'delete' => get_lang('Delete')
-			));
-		}
-		if (api_is_western_name_order()) {
-			$this->set_header($column++, get_lang('FirstName'));
-			$this->set_header($column++, get_lang('LastName'));
-		} else {
-			$this->set_header($column++, get_lang('LastName'));
-			$this->set_header($column++, get_lang('FirstName'));
-		}
-		$this->set_header($column++, get_lang('Score'));
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
-		}
+    {
+        parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+
+        $this->datagen = new ResultsDataGenerator($evaluation, $results, true);
+
+        $this->evaluation = $evaluation;
+        $this->iscourse = $iscourse;
+        $this->forprint = $forprint;
+
+        if (isset ($addparams))  {
+            $this->set_additional_parameters($addparams);
+        }
+        $scoredisplay = ScoreDisplay :: instance();
+        $column= 0;
+        if ($this->iscourse == '1') {
+            $this->set_header($column++, '', false);
+            $this->set_form_actions(array (
+                    'delete' => get_lang('Delete')
+            ));
+        }
+        if (api_is_western_name_order()) {
+            $this->set_header($column++, get_lang('FirstName'));
+            $this->set_header($column++, get_lang('LastName'));
+        } else {
+            $this->set_header($column++, get_lang('LastName'));
+            $this->set_header($column++, get_lang('FirstName'));
+        }
+        $this->set_header($column++, get_lang('Score'));
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+        if (!$this->forprint) {
+            $this->set_header($column++, get_lang('Modify'),false);
+        }
     }
 
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	function get_total_number_of_items () {
-		return $this->datagen->get_total_results_count();
-	}
-
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	function get_table_data ($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
-
-		$is_western_name_order = api_is_western_name_order();
-		$scoredisplay = ScoreDisplay :: instance();
-
-		// determine sorting type
-		$col_adjust = $this->iscourse == '1' ? 1 : 0;
-
-		switch ($this->column) {
-			// first name or last name
-			case (0 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				}
-				break;
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    function get_total_number_of_items () {
+        return $this->datagen->get_total_results_count();
+    }
+
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    function get_table_data ($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
+
+        $is_western_name_order = api_is_western_name_order();
+        $scoredisplay = ScoreDisplay :: instance();
+
+        // determine sorting type
+        $col_adjust = $this->iscourse == '1' ? 1 : 0;
+
+        switch ($this->column) {
             // first name or last name
-			case (1 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				}
-				break;
+            case (0 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                }
+                break;
+            // first name or last name
+            case (1 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                }
+                break;
             //Score
-			case (2 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
-				break;
-			case (3 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_MASK;
-				break;
-		}
-
-		if ($this->direction == 'DESC') {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
-		} else {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
-		}
-
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $item) {
-			$row = array ();
-			if ($this->iscourse == '1') {
-				 $row[] = $item['result_id'];
-			}
-			if ($is_western_name_order) {
-				$row[] = $item['firstname'];
-				$row[] = $item['lastname'];
-			} else {
-				$row[] = $item['lastname'];
-				$row[] = $item['firstname'];
-			}
-
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+            case (2 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
+                break;
+            case (3 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_MASK;
+                break;
+        }
+
+        if ($this->direction == 'DESC') {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
+        } else {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_ASC;
+        }
+
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $item) {
+            $row = array ();
+            if ($this->iscourse == '1') {
+                    $row[] = $item['result_id'];
+            }
+            if ($is_western_name_order) {
+                $row[] = $item['firstname'];
+                $row[] = $item['lastname'];
+            } else {
+                $row[] = $item['lastname'];
+                $row[] = $item['firstname'];
+            }
+
+            $row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
-			if ($scoredisplay->is_custom()) {
-				$row[] = $item['display'];
-			}
-			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
-			}
-			$sortable_data[] = $row;
-		}
-
-		return $sortable_data;
-	}
-
-	private function build_edit_column ($item)
-	{
-		$status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
-		$locked_status = $this->evaluation->get_locked();
-		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
-			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
-		}
-		if ($this->evaluation->get_course_code() == null) {
-			$edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">
+            if ($scoredisplay->is_custom()) {
+                $row[] = $item['display'];
+            }
+            if (!$this->forprint) {
+                $row[] = $this->build_edit_column ($item);
+            }
+            $sortable_data[] = $row;
+        }
+
+        return $sortable_data;
+    }
+
+    private function build_edit_column ($item)
+    {
+        $status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+        $locked_status = $this->evaluation->get_locked();
+        if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
+            //api_is_course_admin()
+            $edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
+            $edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+        }
+        if ($this->evaluation->get_course_code() == null) {
+            $edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">
 			<img src="../img/delete.gif" border="0" title="' . get_lang('Delete') . '" alt="" /></a>';
-		    $edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">
+            $edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">
 		    <img src="../img/statistics.gif" width="17px" border="0" title="' . get_lang('Statistics') . '" alt="" /></a>';
-		}
-		// Evaluation's origin is a link
-		if ($this->evaluation->get_category_id() < 0) {
-			$link = LinkFactory :: get_evaluation_link ($this->evaluation->get_id());
-
-			$doc_url = $link->get_view_url($item['id']);
-
-			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">'
-								.'<img src="'. api_get_path(WEB_CODE_PATH) . 'img/link.gif" border="0" title="' . get_lang('OpenDocument') . '" alt="" />'
-								.'</a>';
-			}
-		}
-		return $edit_column;
-	}
+        }
+        // Evaluation's origin is a link
+        if ($this->evaluation->get_category_id() < 0) {
+            $link = LinkFactory :: get_evaluation_link ($this->evaluation->get_id());
+
+            $doc_url = $link->get_view_url($item['id']);
+
+            if ($doc_url != null) {
+                $edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">'
+                                .'<img src="'. api_get_path(WEB_CODE_PATH) . 'img/link.gif" border="0" title="' . get_lang('OpenDocument') . '" alt="" />'
+                                .'</a>';
+            }
+        }
+        return $edit_column;
+    }
 }