chamilo / chamilo-lms

main/exercice/exercise_result.php

Indentation +15 added lines, -15 removed lines

@@ -59,7 +59,7 @@ 
 
 $gradebook = '';
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 if (!empty($gradebook) && $gradebook=='view') {
     $interbreadcrumb[] = array(
@@ -79,8 +79,8 @@ 
 $htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
 
 if ($origin != 'learnpath') {
-	// So we are not in learnpath tool
-	Display::display_header($nameTools, get_lang('Exercise'));
+    // So we are not in learnpath tool
+    Display::display_header($nameTools, get_lang('Exercise'));
 } else {
     $htmlHeadXtra[] = "
     <style>
@@ -94,19 +94,19 @@ 
 
 // I'm in a preview mode as course admin. Display the action menu.
 if (api_is_course_admin() && $origin != 'learnpath') {
-	echo '<div class="actions">';
-	echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
+    echo '<div class="actions">';
+    echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('back.png', get_lang('GoBackToQuestionList'), array(), 32).'</a>';
-	echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
+    echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('edit.png', get_lang('ModifyExercise'), array(), 32).'</a>';
-	echo '</div>';
+    echo '</div>';
 }
 
 $feedback_type = $objExercise->feedback_type;
 $exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
 
 if (!empty($exercise_stat_info['data_tracking'])) {
-	$question_list = explode(',', $exercise_stat_info['data_tracking']);
+    $question_list = explode(',', $exercise_stat_info['data_tracking']);
 }
 
 $learnpath_id = $exercise_stat_info['orig_lp_id'];
@@ -180,19 +180,19 @@ 
         Session::erase('exe_id');
     }
 
-	Display::display_footer();
+    Display::display_footer();
 } else {
-	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
-	$url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
-	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
+    $lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
+    $url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
+    $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
 
     if (api_is_allowed_to_session_edit()) {
         Session::erase('objExercise');
         Session::erase('exe_id');
     }
 
-	// Record the results in the learning path, using the SCORM interface (API)
-	echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
+    // Record the results in the learning path, using the SCORM interface (API)
+    echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
     echo '<script type="text/javascript">'.$href.'</script>';
-	echo '</body></html>';
+    echo '</body></html>';
 }

Spacing +6 added lines, -6 removed lines

@@ -59,9 +59,9 @@ 
 
 $gradebook = '';
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	$_SESSION['gradebook'];
+	$gradebook = $_SESSION['gradebook'];
 }
-if (!empty($gradebook) && $gradebook=='view') {
+if (!empty($gradebook) && $gradebook == 'view') {
     $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook'),
@@ -75,8 +75,8 @@ 
     "name" => get_lang('Exercises'),
 );
 
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
-$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
 
 if ($origin != 'learnpath') {
 	// So we are not in learnpath tool
@@ -154,7 +154,7 @@ 
 
 $max_score = $objExercise->get_max_score();
 
-Display::display_normal_message(get_lang('Saved').'<br />',false);
+Display::display_normal_message(get_lang('Saved').'<br />', false);
 
 // Display and save questions
 ExerciseLib::display_question_list_by_attempt($objExercise, $exe_id, true);
@@ -186,7 +186,7 @@ 
 } else {
 	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
 	$url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
-	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
+	$href = ($lp_mode == 'fullscreen') ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'"';
 
     if (api_is_allowed_to_session_edit()) {
         Session::erase('objExercise');

main/exercice/exercise_result.class.php

Indentation +157 added lines, -157 removed lines

@@ -9,7 +9,7 @@ 
 */
 class ExerciseResult
 {
-	private $results = array();
+    private $results = array();
     public $includeAllUsers = false;
     public $onlyBestAttempts = false;
 
@@ -46,7 +46,7 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		$return = array();
+        $return = array();
 
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
         $TBL_TABLE_LP_MAIN = Database::get_course_table(TABLE_LP_MAIN);
@@ -66,9 +66,9 @@ 
             $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
-		if (empty($user_id)) {
+        if (empty($user_id)) {
             $user_id_and = null;
-			$sql = "SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
+            $sql = "SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
 			            official_code,
                         ce.title as extitle,
                         te.exe_result as exresult ,
@@ -91,9 +91,9 @@ 
                     te.status != 'incomplete' AND
                     te.c_id = ce.c_id $user_id_and  $session_id_and AND
                     ce.active <>-1";
-		} else {
+        } else {
             $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
-			// get only this user's results
+            // get only this user's results
             $sql="SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
                     official_code,
                     ce.title as extitle,
@@ -119,12 +119,12 @@ 
                         te.c_id = ce.c_id $user_id_and $session_id_and AND
                         ce.active <>-1 AND
                     ORDER BY userpart2, te.c_id ASC, ce.title ASC, te.exe_date DESC";
-		}
+        }
 
-		$results = array();
-		$resx = Database::query($sql);
+        $results = array();
+        $resx = Database::query($sql);
         $bestAttemptPerUser = array();
-		while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
             if ($this->onlyBestAttempts) {
                 if (!isset($bestAttemptPerUser[$rowx['excruid']])) {
                     $bestAttemptPerUser[$rowx['excruid']] = $rowx;
@@ -136,7 +136,7 @@ 
             } else {
                 $results[] = $rowx;
             }
-		}
+        }
 
         if ($this->onlyBestAttempts) {
             $results = $bestAttemptPerUser;
@@ -190,8 +190,8 @@ 
                     continue;
                 }
 
-				$return[$i] = array();
-				if (empty($user_id)) {
+                $return[$i] = array();
+                if (empty($user_id)) {
                     $return[$i]['official_code']   = $result['official_code'];
                     if (api_is_western_name_order()) {
                         $return[$i]['first_name']   = $results[$i]['userpart1'];
@@ -200,15 +200,15 @@ 
                         $return[$i]['first_name']   = $results[$i]['userpart2'];
                         $return[$i]['last_name']    = $results[$i]['userpart1'];
                     }
-					$return[$i]['user_id']      = $results[$i]['excruid'];
-					$return[$i]['email']        = $results[$i]['exemail'];
-				}
-				$return[$i]['title'] = $result['extitle'];
-				$return[$i]['start_date'] = api_get_local_time($result['exstart']);
+                    $return[$i]['user_id']      = $results[$i]['excruid'];
+                    $return[$i]['email']        = $results[$i]['exemail'];
+                }
+                $return[$i]['title'] = $result['extitle'];
+                $return[$i]['start_date'] = api_get_local_time($result['exstart']);
                 $return[$i]['end_date'] = api_get_local_time($result['exdate']);
                 $return[$i]['duration'] = $result['duration'];
-				$return[$i]['result'] = $result['exresult'];
-				$return[$i]['max'] = $result['exweight'];
+                $return[$i]['result'] = $result['exresult'];
+                $return[$i]['max'] = $result['exweight'];
                 $return[$i]['status'] = $revised ? get_lang('Validated') : get_lang('NotValidated');
                 $return[$i]['lp_id'] = $result['orig_lp_id'];
                 $return[$i]['lp_name'] = $result['lp_name'];
@@ -221,8 +221,8 @@ 
 
                 $userWithResults[$result['excruid']] = 1;
                 $i++;
-			}
-		}
+            }
+        }
 
         if ($this->includeAllUsers) {
             $latestId = count($return);
@@ -265,18 +265,18 @@ 
             }
         }
 
-		$this->results = $return;
+        $this->results = $return;
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportCSV(
         $document_path = '',
         $user_id = null,
@@ -285,14 +285,14 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if(!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if(!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
@@ -316,28 +316,28 @@ 
         $data .= get_lang('Email').';';
         $data .= get_lang('Groups').';';
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
-			$num = count($extra_user_fields);
-			foreach($extra_user_fields as $field) {
-				$data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
-			}
-		}
-
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+            $num = count($extra_user_fields);
+            foreach($extra_user_fields as $field) {
+                $data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
+            }
+        }
+
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
         $data .= get_lang('EndDate').';';
         $data .= get_lang('Duration'). ' ('.get_lang('MinMinutes').') ;';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
         $data .= get_lang('Status').';';
         $data .= get_lang('ToolLearnpath').';';
         $data .= get_lang('UserIsCurrentlySubscribed').';';
-		$data .= "\n";
+        $data .= "\n";
 
-		//results
-		foreach ($this->results as $row) {
+        //results
+        foreach ($this->results as $row) {
 
             if (api_is_western_name_order()) {
                 $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
@@ -354,51 +354,51 @@ 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
             $data .= str_replace("\r\n",'  ',implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
+                }
+            }
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['start_date']).';';
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['start_date']).';';
             $data .= str_replace("\r\n",'  ',$row['end_date']).';';
             $data .= str_replace("\r\n",'  ',$row['duration']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
             $data .= str_replace("\r\n",'  ',$row['status']).';';
             $data .= str_replace("\r\n",'  ',$row['lp_name']).';';
             $data .= str_replace("\r\n",'  ',$row['is_user_subscribed']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -407,35 +407,35 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
         $officialCodeInList = api_get_setting('show_official_code_exercise_result_list');
 
-		if ($with_column_user) {
+        if ($with_column_user) {
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
-    			$column++;
+                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
+                $column++;
                 $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
                 $column++;
             } else {
@@ -451,43 +451,43 @@ 
             }
 
             $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Email'));
-		    $column++;
-		}
+            $column++;
+        }
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Groups'));
-	    $column++;
-
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
-
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
-
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
+        $column++;
+
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $column++;
+            }
+        }
+
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('EndDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
-		$column++;
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ToolLearnpath'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('UserIsCurrentlySubscribed'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 if (api_is_western_name_order()) {
@@ -509,22 +509,22 @@ 
 
                 $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
-			}
+            }
 
             $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), ENT_QUOTES, $charset));
             $column++;
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
-
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
+
+            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
             $column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['end_date']);
@@ -540,14 +540,14 @@ 
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['lp_name']);
             $column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['is_user_subscribed']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +50 added lines, -50 removed lines

@@ -59,7 +59,7 @@ 
         $course_id = api_get_course_int_id();
         $user_id = intval($user_id);
         $sessionId = api_get_session_id();
-        $session_id_and = ' AND te.session_id = ' . $sessionId . ' ';
+        $session_id_and = ' AND te.session_id = '.$sessionId.' ';
         $exercise_id = intval($exercise_id);
 
         if (!empty($exercise_id)) {
@@ -92,9 +92,9 @@ 
                     te.c_id = ce.c_id $user_id_and  $session_id_and AND
                     ce.active <>-1";
 		} else {
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
+            $user_id_and = ' AND te.exe_user_id = '.api_get_user_id().' ';
 			// get only this user's results
-            $sql="SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
+            $sql = "SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
                     official_code,
                     ce.title as extitle,
                     te.exe_result as exresult,
@@ -124,7 +124,7 @@ 
 		$results = array();
 		$resx = Database::query($sql);
         $bestAttemptPerUser = array();
-		while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+		while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             if ($this->onlyBestAttempts) {
                 if (!isset($bestAttemptPerUser[$rowx['excruid']])) {
                     $bestAttemptPerUser[$rowx['excruid']] = $rowx;
@@ -192,7 +192,7 @@ 
 
 				$return[$i] = array();
 				if (empty($user_id)) {
-                    $return[$i]['official_code']   = $result['official_code'];
+                    $return[$i]['official_code'] = $result['official_code'];
                     if (api_is_western_name_order()) {
                         $return[$i]['first_name']   = $results[$i]['userpart1'];
                         $return[$i]['last_name']    = $results[$i]['userpart2'];
@@ -236,7 +236,7 @@ 
                         $isWestern = api_is_western_name_order();
 
                         if (empty($user_id)) {
-                            $return[$i]['official_code']   = $student['official_code'];
+                            $return[$i]['official_code'] = $student['official_code'];
                             if ($isWestern) {
                                 $return[$i]['first_name']   = $student['firstname'];
                                 $return[$i]['last_name']    = $student['lastname'];
@@ -289,22 +289,22 @@ 
 		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
 
 		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if(!empty($user_id)) {
+		if (!empty($user_id)) {
 			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
 		}
 		$data = '';
         if (api_is_western_name_order()) {
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
         } else {
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
         }
@@ -318,17 +318,17 @@ 
 
 		if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
 			$num = count($extra_user_fields);
-			foreach($extra_user_fields as $field) {
-				$data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
+			foreach ($extra_user_fields as $field) {
+				$data .= '"'.str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
 			}
 		}
 
 		$data .= get_lang('Title').';';
 		$data .= get_lang('StartDate').';';
         $data .= get_lang('EndDate').';';
-        $data .= get_lang('Duration'). ' ('.get_lang('MinMinutes').') ;';
+        $data .= get_lang('Duration').' ('.get_lang('MinMinutes').') ;';
 		$data .= get_lang('Score').';';
 		$data .= get_lang('Total').';';
         $data .= get_lang('Status').';';
@@ -340,37 +340,37 @@ 
 		foreach ($this->results as $row) {
 
             if (api_is_western_name_order()) {
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             if ($officialCodeInList) {
                 $data .= $row['official_code'].';';
             }
 
-            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
-            $data .= str_replace("\r\n",'  ',implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
+            $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n", '  ', implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
 
 			if ($export_user_fields) {
 				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
+				foreach ($user_fields_values as $value) {
+					$data .= '"'.str_replace('"', '""', api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
 				}
 			}
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['start_date']).';';
-            $data .= str_replace("\r\n",'  ',$row['end_date']).';';
-            $data .= str_replace("\r\n",'  ',$row['duration']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-            $data .= str_replace("\r\n",'  ',$row['status']).';';
-            $data .= str_replace("\r\n",'  ',$row['lp_name']).';';
-            $data .= str_replace("\r\n",'  ',$row['is_user_subscribed']).';';
+			$data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+			$data .= str_replace("\r\n", '  ', $row['start_date']).';';
+            $data .= str_replace("\r\n", '  ', $row['end_date']).';';
+            $data .= str_replace("\r\n", '  ', $row['duration']).';';
+			$data .= str_replace("\r\n", '  ', $row['result']).';';
+			$data .= str_replace("\r\n", '  ', $row['max']).';';
+            $data .= str_replace("\r\n", '  ', $row['status']).';';
+            $data .= str_replace("\r\n", '  ', $row['lp_name']).';';
+            $data .= str_replace("\r\n", '  ', $row['is_user_subscribed']).';';
 			$data .= "\n";
 		}
 
@@ -434,14 +434,14 @@ 
 
 		if ($with_column_user) {
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
+    			$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
     			$column++;
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
             } else {
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
                 $column++;
             }
 
@@ -458,11 +458,11 @@ 
 
 		if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
 
 			//show the fields names for user fields
 			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
 				$column++;
 			}
 		}
@@ -491,39 +491,39 @@ 
 
             if ($with_column_user) {
                 if (api_is_western_name_order()) {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
                 } else {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
 
                 if ($officialCodeInList === 'true') {
-                    $worksheet->SetCellValueByColumnAndRow($line, $column,api_html_entity_decode(strip_tags($row['official_code']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['official_code']), ENT_QUOTES, $charset));
                     $column++;
                 }
 
-                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
 			}
 
-            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), ENT_QUOTES, $charset));
+            $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), ENT_QUOTES, $charset));
             $column++;
 
 			if ($export_user_fields) {
 				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
+				foreach ($user_fields_values as $value) {
+					$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
 					$column++;
 				}
 			}
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+			$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
 			$column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
             $column++;

main/exercice/addlimits.php

Spacing +9 added lines, -9 removed lines

@@ -51,24 +51,24 @@ 
     $objExercise = $_SESSION['objExercise'];
 }
 $exercise_id = intval($_GET['exercise_id']);
-$is_allowedToEdit=$is_courseAdmin;
+$is_allowedToEdit = $is_courseAdmin;
 
-if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+if (isset($_SESSION['gradebook'])) {
+	$gradebook = $_SESSION['gradebook'];
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array (
+if (!empty($gradebook) && $gradebook == 'view') {
+	$interbreadcrumb[] = array(
 			'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
 			'name' => get_lang('ToolGradebook')
 		);
 }
-$nameTools=get_lang('Exercises');
+$nameTools = get_lang('Exercises');
 $interbreadcrumb[] = array(
     "url" => "exercise.php",
     "name" => get_lang('Exercises'),
 );
-Display::display_header($nameTools,"Exercises");
+Display::display_header($nameTools, "Exercises");
 
 if (isset($_POST['ok'])) {
 	$message = get_lang('TestLimitsAdded');
@@ -140,7 +140,7 @@ 
  */
 if (isset($_POST['ok'])) {
 	$exercise_id = intval($_POST['exe_id']);
-	if ($_POST['limit']==1) {
+	if ($_POST['limit'] == 1) {
 		$minutes = intval($_POST['minutes']);
 		$query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= $minutes WHERE id= $exercise_id";
 		Database::query($query);
@@ -149,7 +149,7 @@ 
 		Database::query($query);
 	}
 
-	if ($_POST['attempt']==1) {
+	if ($_POST['attempt'] == 1) {
 		$attempts = intval($_POST['attempts']);
 		$query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = $attempts WHERE id= $exercise_id";
 		Database::query($query);

Indentation +24 added lines, -24 removed lines

@@ -54,14 +54,14 @@ 
 $is_allowedToEdit=$is_courseAdmin;
 
 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')
+        );
 }
 $nameTools=get_lang('Exercises');
 $interbreadcrumb[] = array(
@@ -71,8 +71,8 @@ 
 Display::display_header($nameTools,"Exercises");
 
 if (isset($_POST['ok'])) {
-	$message = get_lang('TestLimitsAdded');
-	Display::display_normal_message($message);
+    $message = get_lang('TestLimitsAdded');
+    Display::display_normal_message($message);
 }
 ?>
 <script type="text/javascript">
@@ -139,22 +139,22 @@ 
  * @todo shouldn't this be moved to the part above (around line 111: action handling)
  */
 if (isset($_POST['ok'])) {
-	$exercise_id = intval($_POST['exe_id']);
-	if ($_POST['limit']==1) {
-		$minutes = intval($_POST['minutes']);
-		$query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= $minutes WHERE id= $exercise_id";
-		Database::query($query);
-	} else {
-		$query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= 0 WHERE id= $exercise_id";
-		Database::query($query);
-	}
+    $exercise_id = intval($_POST['exe_id']);
+    if ($_POST['limit']==1) {
+        $minutes = intval($_POST['minutes']);
+        $query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= $minutes WHERE id= $exercise_id";
+        Database::query($query);
+    } else {
+        $query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= 0 WHERE id= $exercise_id";
+        Database::query($query);
+    }
 
-	if ($_POST['attempt']==1) {
-		$attempts = intval($_POST['attempts']);
-		$query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = $attempts WHERE id= $exercise_id";
-		Database::query($query);
-	} else {
-		$query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = 0 WHERE id= $exercise_id";
-		Database::query($query);
-	}
+    if ($_POST['attempt']==1) {
+        $attempts = intval($_POST['attempts']);
+        $query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = $attempts WHERE id= $exercise_id";
+        Database::query($query);
+    } else {
+        $query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = 0 WHERE id= $exercise_id";
+        Database::query($query);
+    }
 }

main/exercice/upload_exercise.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 require_once '../inc/global.inc.php';
 
-require_once api_get_path(LIBRARY_PATH) . 'pear/excelreader/reader.php';
+require_once api_get_path(LIBRARY_PATH).'pear/excelreader/reader.php';
 
 // Security check
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -59,14 +59,14 @@ 
 function lp_upload_quiz_actions()
 {
     $return = '<a href="exercise.php?'.api_get_cidReq().'">'.
-        Display::return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     return $return;
 }
 
 function lp_upload_quiz_secondary_actions()
 {
-    $return = '<a href="exercise_report.php?' . api_get_cidreq() . '">' .
-        Display :: return_icon('reporting32.png', get_lang('Tracking')) . get_lang('Tracking') . '</a>';
+    $return = '<a href="exercise_report.php?'.api_get_cidreq().'">'.
+        Display :: return_icon('reporting32.png', get_lang('Tracking')).get_lang('Tracking').'</a>';
     return $return;
 }
 
@@ -104,7 +104,7 @@ 
     $table->setHeaderContents(0, 1, '#');
 
     $row = 1;
-    foreach ($tableList as $key => $label ) {
+    foreach ($tableList as $key => $label) {
         $table->setCellContents($row, 0, $label);
         $table->setCellContents($row, 1, $key);
         $row++;
@@ -443,7 +443,7 @@ 
                                     $comment = $feedback_true_list[$i][2];
                                 } else {
                                     $comment = $feedback_false_list[$i][2];
-                                    $floatVal = (float)$answer_data[3];
+                                    $floatVal = (float) $answer_data[3];
                                     if (is_numeric($floatVal)) {
                                         $score = $answer_data[3];
                                     }

main/exercice/export/exercise_import.php

Spacing +8 added lines, -8 removed lines

@@ -39,22 +39,22 @@ 
 // EXECUTE COMMAND
 //----------------------------------
 
-$cmd = (isset($_REQUEST['cmd'])? $_REQUEST['cmd'] : 'show_import');
+$cmd = (isset($_REQUEST['cmd']) ? $_REQUEST['cmd'] : 'show_import');
 
 switch ($cmd) {
     case 'show_import' :
     {
         $display = '<p>'
-        .            get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.') . '<br>'
+        .            get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.').'<br>'
         .            '</p>'
         .            '<form enctype="multipart/form-data" action="" method="post">'
         .            '<input name="cmd" type="hidden" value="import" />'
         .            '<input name="uploadedExercise" type="file" /><br><br>'
-        .            get_lang('Import exercise') . ' : '
-        .            '<input value="' . get_lang('Ok') . '" type="submit" /> '
-        .            claro_html_button( $_SERVER['PHP_SELF'], get_lang('Cancel'))
+        .            get_lang('Import exercise').' : '
+        .            '<input value="'.get_lang('Ok').'" type="submit" /> '
+        .            claro_html_button($_SERVER['PHP_SELF'], get_lang('Cancel'))
         .            '<br><br>'
-        .            '<small>' . get_lang('Max file size') . ' :  2&nbsp;MB</small>'
+        .            '<small>'.get_lang('Max file size').' :  2&nbsp;MB</small>'
         .            '</form>';
     }
     break;
@@ -85,7 +85,7 @@ 
 // DISPLAY
 //----------------------------------
 
-include api_get_path(INCLUDE_PATH) . '/header.inc.php';
+include api_get_path(INCLUDE_PATH).'/header.inc.php';
 
 //display title
 
@@ -114,5 +114,5 @@ 
 
 //footer display
 
-include api_get_path(INCLUDE_PATH) . '/footer.inc.php';
+include api_get_path(INCLUDE_PATH).'/footer.inc.php';
 ?>

Indentation +4 added lines, -4 removed lines

@@ -93,10 +93,10 @@
 // Tool introduction
 // TODO: These settings to be checked when it is possible.
 Display::display_introduction_section(TOOL_QUIZ, array(
-		'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
-		'CreateDocumentDir' => '../../../courses/'.api_get_course_path().'/document/',
-		'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
-	)
+        'CreateDocumentWebDir' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
+        'CreateDocumentDir' => '../../../courses/'.api_get_course_path().'/document/',
+        'BaseHref' => api_get_path(WEB_COURSE_PATH).api_get_course_path().'/'
+    )
 );
 
 

main/exercice/export/qti2/qti2_export.php

Spacing +23 added lines, -23 removed lines

@@ -8,7 +8,7 @@ 
 /**
  * Code
  */
-require dirname(__FILE__) . '/qti2_classes.php';
+require dirname(__FILE__).'/qti2_classes.php';
 /**
  * Classes
 */
@@ -38,7 +38,7 @@ 
      {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
-        $this->questionIdent = "QST_" . $question->id ;
+        $this->questionIdent = "QST_".$question->id;
      }
 
      /**
@@ -73,7 +73,7 @@ 
       */
      function start_item_body()
      {
-        return '  <itemBody>' . "\n";
+        return '  <itemBody>'."\n";
      }
 
      /**
@@ -92,7 +92,7 @@ 
 
       function add_response_processing()
       {
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
+          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>'."\n";
       }
 
      /**
@@ -108,7 +108,7 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . "\n";
+            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'."\n";
         }
         //TODO understand why answer might be a non-object sometimes
         if (!is_object($this->answer)) {
@@ -164,7 +164,7 @@ 
 
     function start_section()
     {
-        $out = '<section ident="EXO_' . $this->exercise->selectId() . '" title="' .cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())) . '">' . "\n";
+        $out = '<section ident="EXO_'.$this->exercise->selectId().'" title="'.cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())).'">'."\n";
         return $out;
     }
 
@@ -180,7 +180,7 @@ 
             // return exercise duration in ISO8601 format.
             $minutes = floor($max_time / 60);
             $seconds = $max_time % 60;
-            return '<duration>PT' . $minutes . 'M' . $seconds . "S</duration>\n";
+            return '<duration>PT'.$minutes.'M'.$seconds."S</duration>\n";
         } else {
             return '';
         }
@@ -193,7 +193,7 @@ 
     function export_presentation()
     {
         $out = "<presentation_material><flow_mat><material>\n"
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
+             . "  <mattext><![CDATA[".formatExerciseQtiDescription($this->exercise->selectDescription())."]]></mattext>\n"
              . "</material></flow_mat></presentation_material>\n";
         return $out;
     }
@@ -207,14 +207,14 @@ 
     {
         $out = '';
         if ($n = $this->exercise->getShuffle()) {
-            $out.= "<selection_ordering>"
+            $out .= "<selection_ordering>"
                  . "  <selection>\n"
-                 . "    <selection_number>" . $n . "</selection_number>\n"
+                 . "    <selection_number>".$n."</selection_number>\n"
                  . "  </selection>\n"
                  . '  <order order_type="Random" />'
                  . "\n</selection_ordering>\n";
         } else {
-            $out.= '<selection_ordering sequence_type="Normal">' . "\n"
+            $out .= '<selection_ordering sequence_type="Normal">'."\n"
                  . "  <selection />\n"
                  . "</selection_ordering>\n";
         }
@@ -246,8 +246,8 @@ 
     {
         $head = $foot = "";
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -308,7 +308,7 @@ 
      {
         $this->question = $question;
         $this->answer = $question->answer;
-        $this->questionIdent = "QST_" . $question->selectId() ;
+        $this->questionIdent = "QST_".$question->selectId();
      }
 
      /**
@@ -320,7 +320,7 @@ 
       */
       function start_item()
       {
-        return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
+        return '<item title="'.cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())).'" ident="'.$this->questionIdent.'">'."\n";
       }
 
       /**
@@ -343,8 +343,8 @@ 
       */
      function start_presentation()
      {
-        return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
+        return '<presentation label="'.$this->questionIdent.'"><flow>'."\n"
+             . '<material><mattext>'.formatExerciseQtiDescription($this->question->selectDescription())."</mattext></material>\n";
      }
 
      /**
@@ -364,7 +364,7 @@ 
       */
      function start_processing()
      {
-        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
+        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>'."\n";
      }
 
      /**
@@ -392,8 +392,8 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -447,9 +447,9 @@ 
     $question->type = $qst->type;
     $question->question = $qst->question;
     $question->description = $qst->description;
-	$question->weighting=$qst->weighting;
-	$question->position=$qst->position;
-	$question->picture=$qst->picture;
+	$question->weighting = $qst->weighting;
+	$question->position = $qst->position;
+	$question->picture = $qst->picture;
     $ims = new ImsAssessmentItem($question);
 
     return $ims->export($standalone);

Indentation +159 added lines, -159 removed lines

@@ -34,21 +34,21 @@ 
      *
      * @param Ims2Question $question Ims2Question object we want to export.
      */
-     function ImsAssessmentItem($question)
-     {
+        function ImsAssessmentItem($question)
+        {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
         $this->questionIdent = "QST_" . $question->id ;
-     }
-
-     /**
-      * Start the XML flow.
-      *
-      * This opens the <item> block, with correct attributes.
-      *
-      */
-      function start_item()
-      {
+        }
+
+        /**
+         * Start the XML flow.
+         *
+         * This opens the <item> block, with correct attributes.
+         *
+         */
+        function start_item()
+        {
         $string = '<assessmentItem xmlns="http://www.imsglobal.org/xsd/imsqti_v2p1"
                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                     xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqti_v2p1 imsqti_v2p1.xsd"
@@ -56,55 +56,55 @@ 
                     title="'.htmlspecialchars(formatExerciseQtiTitle($this->question->selectTitle())).'">'."\n";
 
         return $string;
-      }
-
-      /**
-       * End the XML flow, closing the </item> tag.
-       *
-       */
-      function end_item()
-      {
+        }
+
+        /**
+         * End the XML flow, closing the </item> tag.
+         *
+         */
+        function end_item()
+        {
         return "</assessmentItem>\n";
-      }
-
-     /**
-      * Start the itemBody
-      *
-      */
-     function start_item_body()
-     {
+        }
+
+        /**
+         * Start the itemBody
+         *
+         */
+        function start_item_body()
+        {
         return '  <itemBody>' . "\n";
-     }
-
-     /**
-      * End the itemBody part.
-      *
-      */
-     function end_item_body()
-     {
+        }
+
+        /**
+         * End the itemBody part.
+         *
+         */
+        function end_item_body()
+        {
         return "  </itemBody>\n";
-     }
-
-     /**
-      * add the response processing template used.
-      *
-      */
-
-      function add_response_processing()
-      {
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
-      }
-
-     /**
-      * Export the question as an IMS/QTI Item.
-      *
-      * This is a default behaviour, some classes may want to override this.
-      *
-      * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return string string, the XML flow for an Item.
-      */
-     function export($standalone = false)
-     {
+        }
+
+        /**
+         * add the response processing template used.
+         *
+         */
+
+        function add_response_processing()
+        {
+            return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
+        }
+
+        /**
+         * Export the question as an IMS/QTI Item.
+         *
+         * This is a default behaviour, some classes may want to override this.
+         *
+         * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+         * @return string string, the XML flow for an Item.
+         */
+        function export($standalone = false)
+        {
         $head = $foot = "";
 
         if ($standalone) {
@@ -131,7 +131,7 @@ 
             .$foot;
 
         return $res;
-     }
+        }
 }
 
 /**
@@ -193,8 +193,8 @@ 
     function export_presentation()
     {
         $out = "<presentation_material><flow_mat><material>\n"
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
-             . "</material></flow_mat></presentation_material>\n";
+                . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
+                . "</material></flow_mat></presentation_material>\n";
         return $out;
     }
 
@@ -208,15 +208,15 @@ 
         $out = '';
         if ($n = $this->exercise->getShuffle()) {
             $out.= "<selection_ordering>"
-                 . "  <selection>\n"
-                 . "    <selection_number>" . $n . "</selection_number>\n"
-                 . "  </selection>\n"
-                 . '  <order order_type="Random" />'
-                 . "\n</selection_ordering>\n";
+                    . "  <selection>\n"
+                    . "    <selection_number>" . $n . "</selection_number>\n"
+                    . "  </selection>\n"
+                    . '  <order order_type="Random" />'
+                    . "\n</selection_ordering>\n";
         } else {
             $out.= '<selection_ordering sequence_type="Normal">' . "\n"
-                 . "  <selection />\n"
-                 . "</selection_ordering>\n";
+                    . "  <selection />\n"
+                    . "</selection_ordering>\n";
         }
 
         return $out;
@@ -230,7 +230,7 @@ 
     {
         $out = "";
         foreach ($this->exercise->selectQuestionList() as $q) {
-        	$out .= export_question_qti($q, false);
+            $out .= export_question_qti($q, false);
         }
         return $out;
     }
@@ -247,18 +247,18 @@ 
         $head = $foot = "";
         if ($standalone) {
             $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
-                  . "<questestinterop>\n";
+                    . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+                    . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
         $out = $head
-             . $this->start_section()
-             . $this->export_duration()
-             . $this->export_presentation()
-             . $this->export_ordering()
-             . $this->export_questions()
-             . $this->end_section()
-             . $foot;
+                . $this->start_section()
+                . $this->export_duration()
+                . $this->export_presentation()
+                . $this->export_ordering()
+                . $this->export_questions()
+                . $this->end_section()
+                . $foot;
 
         return $out;
     }
@@ -304,97 +304,97 @@ 
      * @param $question The Question object we want to export.
      * @author Anamd Tihon
      */
-     function ImsItem($question)
-     {
+        function ImsItem($question)
+        {
         $this->question = $question;
         $this->answer = $question->answer;
         $this->questionIdent = "QST_" . $question->selectId() ;
-     }
-
-     /**
-      * Start the XML flow.
-      *
-      * This opens the <item> block, with correct attributes.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-      function start_item()
-      {
+        }
+
+        /**
+         * Start the XML flow.
+         *
+         * This opens the <item> block, with correct attributes.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_item()
+        {
         return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
-      }
-
-      /**
-       * End the XML flow, closing the </item> tag.
-       *
-       * @author Amand Tihon <amand@alrj.org>
-       */
-      function end_item()
-      {
+        }
+
+        /**
+         * End the XML flow, closing the </item> tag.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_item()
+        {
         return "</item>\n";
-      }
-
-     /**
-      * Create the opening, with the question itself.
-      *
-      * This means it opens the <presentation> but doesn't close it, as this is the role of end_presentation().
-      * In between, the export_responses from the subclass should have been called.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function start_presentation()
-     {
+        }
+
+        /**
+         * Create the opening, with the question itself.
+         *
+         * This means it opens the <presentation> but doesn't close it, as this is the role of end_presentation().
+         * In between, the export_responses from the subclass should have been called.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_presentation()
+        {
         return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
-     }
-
-     /**
-      * End the </presentation> part, opened by export_header.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function end_presentation()
-     {
+                . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
+        }
+
+        /**
+         * End the </presentation> part, opened by export_header.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_presentation()
+        {
         return "</flow></presentation>\n";
-     }
-
-     /**
-      * Start the response processing, and declare the default variable, SCORE, at 0 in the outcomes.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function start_processing()
-     {
+        }
+
+        /**
+         * Start the response processing, and declare the default variable, SCORE, at 0 in the outcomes.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function start_processing()
+        {
         return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
-     }
-
-     /**
-      * End the response processing part.
-      *
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function end_processing()
-     {
+        }
+
+        /**
+         * End the response processing part.
+         *
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function end_processing()
+        {
         return "</resprocessing>\n";
-     }
-
-     /**
-      * Export the question as an IMS/QTI Item.
-      *
-      * This is a default behaviour, some classes may want to override this.
-      *
-      * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-      * @return string string, the XML flow for an Item.
-      * @author Amand Tihon <amand@alrj.org>
-      */
-     function export($standalone = False)
-     {
+        }
+
+        /**
+         * Export the question as an IMS/QTI Item.
+         *
+         * This is a default behaviour, some classes may want to override this.
+         *
+         * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+         * @return string string, the XML flow for an Item.
+         * @author Amand Tihon <amand@alrj.org>
+         */
+        function export($standalone = False)
+        {
         global $charset;
         $head = $foot = "";
 
         if ($standalone) {
             $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
-                  . "<questestinterop>\n";
+                    . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+                    . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
 
@@ -409,7 +409,7 @@ 
             . $this->answer->imsExportFeedback($this->questionIdent)
             . $this->end_item()
             . $foot;
-     }
+        }
 }
 
 /**
@@ -447,9 +447,9 @@ 
     $question->type = $qst->type;
     $question->question = $qst->question;
     $question->description = $qst->description;
-	$question->weighting=$qst->weighting;
-	$question->position=$qst->position;
-	$question->picture=$qst->picture;
+    $question->weighting=$qst->weighting;
+    $question->position=$qst->position;
+    $question->picture=$qst->picture;
     $ims = new ImsAssessmentItem($question);
 
     return $ims->export($standalone);

main/exercice/export/qti2/qti2_classes.php

Spacing +58 added lines, -58 removed lines

@@ -14,7 +14,7 @@ 
      */
     public function setAnswer()
     {
-        switch($this->type) {
+        switch ($this->type) {
             case MCUA:
                 $answer = new ImsAnswerMultipleChoice($this->id);
 
@@ -77,21 +77,21 @@ 
     {
         // @todo getAnswersList() converts the answers using api_html_entity_decode()
 		$this->answerList = $this->getAnswersList(true);
-        $out  = '    <choiceInteraction responseIdentifier="' . $questionIdent . '" >' . "\n";
-        $out .= '      <prompt><![CDATA['.formatExerciseQtiTitle($questionStatment) . ']]></prompt>'. "\n";
+        $out  = '    <choiceInteraction responseIdentifier="'.$questionIdent.'" >'."\n";
+        $out .= '      <prompt><![CDATA['.formatExerciseQtiTitle($questionStatment).']]></prompt>'."\n";
 		if (is_array($this->answerList)) {
 	        foreach ($this->answerList as $current_answer) {
-	            $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
+	            $out .= '<simpleChoice identifier="answer_'.$current_answer['id'].'" fixed="false">
                          <![CDATA['.formatExerciseQtiTitle($current_answer['answer']).']]>';
 	            if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
-	                $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
+	                $out .= '<feedbackInline identifier="answer_'.$current_answer['id'].'">
 	                         <![CDATA['.formatExerciseQtiTitle($current_answer['comment']).']]>
 	                         </feedbackInline>';
 	            }
-	            $out .= '</simpleChoice>'. "\n";
+	            $out .= '</simpleChoice>'."\n";
 	        }
 		}
-        $out .= '    </choiceInteraction>'. "\n";
+        $out .= '    </choiceInteraction>'."\n";
 
         return $out;
     }
@@ -106,32 +106,32 @@ 
 		$type = $this->getQuestionType();
         if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
 
-        $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
+        $out = '  <responseDeclaration identifier="'.$questionIdent.'" cardinality="'.$cardinality.'" baseType="identifier">'."\n";
 
         // Match the correct answers.
 
-        $out .= '    <correctResponse>'. "\n";
+        $out .= '    <correctResponse>'."\n";
 		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
+	        foreach ($this->answerList as $current_answer) {
 	            if ($current_answer['correct']) {
-	                $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
+	                $out .= '      <value>answer_'.$current_answer['id'].'</value>'."\n";
 	            }
 	        }
 		}
-        $out .= '    </correctResponse>'. "\n";
+        $out .= '    </correctResponse>'."\n";
 
         //Add the grading
 
-        $out .= '    <mapping>'. "\n";
+        $out .= '    <mapping>'."\n";
 		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
+	        foreach ($this->answerList as $current_answer) {
 	            if (isset($current_answer['grade'])) {
-	                $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
+	                $out .= ' <mapEntry mapKey="answer_'.$current_answer['id'].'" mappedValue="'.$current_answer['grade'].'" />'."\n";
 	            }
 	        }
 		}
-        $out .= '    </mapping>'. "\n";
-        $out .= '  </responseDeclaration>'. "\n";
+        $out .= '    </mapping>'."\n";
+        $out .= '  </responseDeclaration>'."\n";
 
         return $out;
     }
@@ -158,7 +158,7 @@ 
                 $key = $answer['id'];
                 $answer = $answer['answer'];
                 $len = api_strlen($answer);
-                $text = str_replace('['.$answer.']','<textEntryInteraction responseIdentifier="fill_'.$key.'" expectedLength="'.api_strlen($answer).'"/>', $text);
+                $text = str_replace('['.$answer.']', '<textEntryInteraction responseIdentifier="fill_'.$key.'" expectedLength="'.api_strlen($answer).'"/>', $text);
             }
         }
         $out = $text;
@@ -178,17 +178,17 @@ 
 	        foreach ($this->answerList as $answer) {
 	        	$answerKey = $answer['id'];
 	        	$answer = $answer['answer'];
-	            $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
-	            $out .= '    <correctResponse>'. "\n";
-                $out .= '      <value><![CDATA['.formatExerciseQtiTitle($answer).']]></value>'. "\n";
-	            $out .= '    </correctResponse>'. "\n";
+	            $out .= '  <responseDeclaration identifier="fill_'.$answerKey.'" cardinality="single" baseType="identifier">'."\n";
+	            $out .= '    <correctResponse>'."\n";
+                $out .= '      <value><![CDATA['.formatExerciseQtiTitle($answer).']]></value>'."\n";
+	            $out .= '    </correctResponse>'."\n";
 	            if (isset($this->gradeList[$answerKey])) {
-	                $out .= '    <mapping>'. "\n";
-	                $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
-	                $out .= '    </mapping>'. "\n";
+	                $out .= '    <mapping>'."\n";
+	                $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'."\n";
+	                $out .= '    </mapping>'."\n";
 	            }
 
-	            $out .= '  </responseDeclaration>'. "\n";
+	            $out .= '  </responseDeclaration>'."\n";
 	        }
 		}
 
@@ -212,12 +212,12 @@ 
 
         $out = "";
 
-        $out .= '<matchInteraction responseIdentifier="' . $questionIdent . '" maxAssociations="'. $maxAssociation .'">'. "\n";
+        $out .= '<matchInteraction responseIdentifier="'.$questionIdent.'" maxAssociations="'.$maxAssociation.'">'."\n";
         $out .= $questionStatment;
 
         //add left column
 
-        $out .= '  <simpleMatchSet>'. "\n";
+        $out .= '  <simpleMatchSet>'."\n";
 		if (is_array($this->leftList)) {
 	        foreach ($this->leftList as $leftKey=>$leftElement) {
 	            $out .= '
@@ -227,24 +227,24 @@ 
 	        }
     	}
 
-        $out .= '  </simpleMatchSet>'. "\n";
+        $out .= '  </simpleMatchSet>'."\n";
 
         //add right column
 
-        $out .= '  <simpleMatchSet>'. "\n";
+        $out .= '  <simpleMatchSet>'."\n";
 
         $i = 0;
 
 		if (is_array($this->rightList)) {
-	        foreach($this->rightList as $rightKey=>$rightElement) {
+	        foreach ($this->rightList as $rightKey=>$rightElement) {
 	            $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
 	                    <![CDATA['.formatExerciseQtiTitle($rightElement['answer']).']]>
 	                    </simpleAssociableChoice>'. "\n";
 	            $i++;
 	        }
 		}
-        $out .= '  </simpleMatchSet>'. "\n";
-        $out .= '</matchInteraction>'. "\n";
+        $out .= '  </simpleMatchSet>'."\n";
+        $out .= '</matchInteraction>'."\n";
 
         return $out;
     }
@@ -255,32 +255,32 @@ 
     public function imsExportResponsesDeclaration($questionIdent)
     {
 		$this->answerList = $this->getAnswersList(true);
-        $out =  '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="single" baseType="identifier">' . "\n";
-        $out .= '    <correctResponse>' . "\n";
+        $out = '  <responseDeclaration identifier="'.$questionIdent.'" cardinality="single" baseType="identifier">'."\n";
+        $out .= '    <correctResponse>'."\n";
 
         $gradeArray = array();
 		if (is_array($this->leftList)) {
 	        foreach ($this->leftList as $leftKey=>$leftElement) {
-	            $i=0;
+	            $i = 0;
 	            foreach ($this->rightList as $rightKey=>$rightElement) {
 	                if (($leftElement['match'] == $rightElement['code'])) {
-	                    $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
+	                    $out .= '      <value>left_'.$leftKey.' right_'.$i.'</value>'."\n";
 
-	                    $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
+	                    $gradeArray['left_'.$leftKey.' right_'.$i] = $leftElement['grade'];
 	                }
 	                $i++;
 	            }
 	        }
 		}
-        $out .= '    </correctResponse>'. "\n";
-        $out .= '    <mapping>' . "\n";
+        $out .= '    </correctResponse>'."\n";
+        $out .= '    <mapping>'."\n";
         if (is_array($gradeArray)) {
 	        foreach ($gradeArray as $gradeKey=>$grade) {
-	            $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
+	            $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>'."\n";
 	        }
         }
-        $out .= '    </mapping>' . "\n";
-        $out .= '  </responseDeclaration>'. "\n";
+        $out .= '    </mapping>'."\n";
+        $out .= '  </responseDeclaration>'."\n";
 
         return $out;
     }
@@ -296,12 +296,12 @@ 
      * TODO update this to match hot spots instead of copying matching
      * Export the question part as a matrix-choice, with only one possible answer per line.
      */
-    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
+    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc = '', $questionMedia = '')
     {
 		$this->answerList = $this->getAnswersList(true);
 		$questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
 		$mimetype = mime_content_type($questionMedia);
-		if(empty($mimetype)){
+		if (empty($mimetype)) {
 			$mimetype = 'image/jpeg';
 		}
 
@@ -317,26 +317,26 @@ 
 	        	//coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
 	        	$coords = '';
 	        	$type = 'default';
-	        	switch($answer['hotspot_type']){
+	        	switch ($answer['hotspot_type']) {
 	        		case 'square':
 	        			$type = 'rect';
 						$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
+						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/', $answer['hotspot_coord'], $res);
+						$coords = $res[1].','.$res[2].','.((int) $res[1] + (int) $res[3]).",".((int) $res[2] + (int) $res[4]);
 	        			break;
 	        		case 'circle':
 	        			$type = 'circle';
 			 			$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
+						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/', $answer['hotspot_coord'], $res);
+						$coords = $res[1].','.$res[2].','.sqrt(pow(($res[1] - $res[3]), 2) + pow(($res[2] - $res[4])));
 	        			break;
 	        		case 'poly':
 	        			$type = 'poly';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+						$coords = str_replace(array(';', '|'), array(',', ','), $answer['hotspot_coord']);
 	        			break;
 	        		 case 'delineation' :
 	        			$type = 'delineation';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+						$coords = str_replace(array(';', '|'), array(',', ','), $answer['hotspot_coord']);
 	        			break;
 	        	}
 	            $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
@@ -356,18 +356,18 @@ 
 		$this->answerList = $this->getAnswersList(true);
 		$this->gradeList = $this->getGradesList();
         $out = '';
-        $out .= '  <responseDeclaration identifier="hotspot_'.$questionIdent.'" cardinality="ordered" baseType="identifier">' . "\n";
-        $out .= '    <correctResponse>'. "\n";
+        $out .= '  <responseDeclaration identifier="hotspot_'.$questionIdent.'" cardinality="ordered" baseType="identifier">'."\n";
+        $out .= '    <correctResponse>'."\n";
 
 		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $answerKey=>$answer)  {
+	        foreach ($this->answerList as $answerKey=>$answer) {
 	        	$answerKey = $answer['id'];
 	        	$answer = $answer['answer'];
 	            $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
 	        }
 		}
-        $out .= '    </correctResponse>'. "\n";
-        $out .= '  </responseDeclaration>'. "\n";
+        $out .= '    </correctResponse>'."\n";
+        $out .= '  </responseDeclaration>'."\n";
 
        return $out;
     }
@@ -383,7 +383,7 @@ 
      * TODO implement
      * Export the question part as a matrix-choice, with only one possible answer per line.
      */
-    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
+    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc = '', $questionMedia = '')
 	{
 		return '';
 	}

Braces +5 added lines, -1 removed lines

@@ -104,7 +104,11 @@
     {
 		$this->answerList = $this->getAnswersList(true);
 		$type = $this->getQuestionType();
-        if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
+        if ($type == MCMA) {
+            $cardinality = 'multiple';
+        } else {
+            $cardinality = 'single';
+        }
 
         $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
 

Indentation +135 added lines, -135 removed lines

@@ -55,12 +55,12 @@ 
 
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
 
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 /**
@@ -76,21 +76,21 @@ 
     public function imsExportResponses($questionIdent, $questionStatment)
     {
         // @todo getAnswersList() converts the answers using api_html_entity_decode()
-		$this->answerList = $this->getAnswersList(true);
+        $this->answerList = $this->getAnswersList(true);
         $out  = '    <choiceInteraction responseIdentifier="' . $questionIdent . '" >' . "\n";
         $out .= '      <prompt><![CDATA['.formatExerciseQtiTitle($questionStatment) . ']]></prompt>'. "\n";
-		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $current_answer) {
-	            $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
+        if (is_array($this->answerList)) {
+            foreach ($this->answerList as $current_answer) {
+                $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
                          <![CDATA['.formatExerciseQtiTitle($current_answer['answer']).']]>';
-	            if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
-	                $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
+                if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
+                    $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
 	                         <![CDATA['.formatExerciseQtiTitle($current_answer['comment']).']]>
 	                         </feedbackInline>';
-	            }
-	            $out .= '</simpleChoice>'. "\n";
-	        }
-		}
+                }
+                $out .= '</simpleChoice>'. "\n";
+            }
+        }
         $out .= '    </choiceInteraction>'. "\n";
 
         return $out;
@@ -102,8 +102,8 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$type = $this->getQuestionType();
+        $this->answerList = $this->getAnswersList(true);
+        $type = $this->getQuestionType();
         if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
 
         $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
@@ -111,25 +111,25 @@ 
         // Match the correct answers.
 
         $out .= '    <correctResponse>'. "\n";
-		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
-	            if ($current_answer['correct']) {
-	                $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
-	            }
-	        }
-		}
+        if (is_array($this->answerList)) {
+            foreach($this->answerList as $current_answer) {
+                if ($current_answer['correct']) {
+                    $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
+                }
+            }
+        }
         $out .= '    </correctResponse>'. "\n";
 
         //Add the grading
 
         $out .= '    <mapping>'. "\n";
-		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
-	            if (isset($current_answer['grade'])) {
-	                $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
-	            }
-	        }
-		}
+        if (is_array($this->answerList)) {
+            foreach($this->answerList as $current_answer) {
+                if (isset($current_answer['grade'])) {
+                    $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
+                }
+            }
+        }
         $out .= '    </mapping>'. "\n";
         $out .= '  </responseDeclaration>'. "\n";
 
@@ -150,7 +150,7 @@ 
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
-		$this->answerList = $this->getAnswersList(true);
+        $this->answerList = $this->getAnswersList(true);
         $text = '';
         $text .= $this->answerText;
         if (is_array($this->answerList)) {
@@ -171,28 +171,28 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$this->gradeList = $this->getGradesList();
+        $this->answerList = $this->getAnswersList(true);
+        $this->gradeList = $this->getGradesList();
         $out = '';
-		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $answer) {
-	        	$answerKey = $answer['id'];
-	        	$answer = $answer['answer'];
-	            $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
-	            $out .= '    <correctResponse>'. "\n";
+        if (is_array($this->answerList)) {
+            foreach ($this->answerList as $answer) {
+                $answerKey = $answer['id'];
+                $answer = $answer['answer'];
+                $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
+                $out .= '    <correctResponse>'. "\n";
                 $out .= '      <value><![CDATA['.formatExerciseQtiTitle($answer).']]></value>'. "\n";
-	            $out .= '    </correctResponse>'. "\n";
-	            if (isset($this->gradeList[$answerKey])) {
-	                $out .= '    <mapping>'. "\n";
-	                $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
-	                $out .= '    </mapping>'. "\n";
-	            }
-
-	            $out .= '  </responseDeclaration>'. "\n";
-	        }
-		}
-
-       return $out;
+                $out .= '    </correctResponse>'. "\n";
+                if (isset($this->gradeList[$answerKey])) {
+                    $out .= '    <mapping>'. "\n";
+                    $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
+                    $out .= '    </mapping>'. "\n";
+                }
+
+                $out .= '  </responseDeclaration>'. "\n";
+            }
+        }
+
+        return $out;
     }
 }
 
@@ -207,8 +207,8 @@ 
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$maxAssociation = max(count($this->leftList), count($this->rightList));
+        $this->answerList = $this->getAnswersList(true);
+        $maxAssociation = max(count($this->leftList), count($this->rightList));
 
         $out = "";
 
@@ -218,14 +218,14 @@ 
         //add left column
 
         $out .= '  <simpleMatchSet>'. "\n";
-		if (is_array($this->leftList)) {
-	        foreach ($this->leftList as $leftKey=>$leftElement) {
-	            $out .= '
+        if (is_array($this->leftList)) {
+            foreach ($this->leftList as $leftKey=>$leftElement) {
+                $out .= '
 	            <simpleAssociableChoice identifier="left_'.$leftKey.'" >
 	                <![CDATA['.formatExerciseQtiTitle($leftElement['answer']).']]>
 	            </simpleAssociableChoice>'. "\n";
-	        }
-    	}
+            }
+        }
 
         $out .= '  </simpleMatchSet>'. "\n";
 
@@ -235,14 +235,14 @@ 
 
         $i = 0;
 
-		if (is_array($this->rightList)) {
-	        foreach($this->rightList as $rightKey=>$rightElement) {
-	            $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
+        if (is_array($this->rightList)) {
+            foreach($this->rightList as $rightKey=>$rightElement) {
+                $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
 	                    <![CDATA['.formatExerciseQtiTitle($rightElement['answer']).']]>
 	                    </simpleAssociableChoice>'. "\n";
-	            $i++;
-	        }
-		}
+                $i++;
+            }
+        }
         $out .= '  </simpleMatchSet>'. "\n";
         $out .= '</matchInteraction>'. "\n";
 
@@ -254,30 +254,30 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
+        $this->answerList = $this->getAnswersList(true);
         $out =  '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="single" baseType="identifier">' . "\n";
         $out .= '    <correctResponse>' . "\n";
 
         $gradeArray = array();
-		if (is_array($this->leftList)) {
-	        foreach ($this->leftList as $leftKey=>$leftElement) {
-	            $i=0;
-	            foreach ($this->rightList as $rightKey=>$rightElement) {
-	                if (($leftElement['match'] == $rightElement['code'])) {
-	                    $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
-
-	                    $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
-	                }
-	                $i++;
-	            }
-	        }
-		}
+        if (is_array($this->leftList)) {
+            foreach ($this->leftList as $leftKey=>$leftElement) {
+                $i=0;
+                foreach ($this->rightList as $rightKey=>$rightElement) {
+                    if (($leftElement['match'] == $rightElement['code'])) {
+                        $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
+
+                        $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
+                    }
+                    $i++;
+                }
+            }
+        }
         $out .= '    </correctResponse>'. "\n";
         $out .= '    <mapping>' . "\n";
         if (is_array($gradeArray)) {
-	        foreach ($gradeArray as $gradeKey=>$grade) {
-	            $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
-	        }
+            foreach ($gradeArray as $gradeKey=>$grade) {
+                $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
+            }
         }
         $out .= '    </mapping>' . "\n";
         $out .= '  </responseDeclaration>'. "\n";
@@ -298,49 +298,49 @@ 
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
     {
-		$this->answerList = $this->getAnswersList(true);
-		$questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
-		$mimetype = mime_content_type($questionMedia);
-		if(empty($mimetype)){
-			$mimetype = 'image/jpeg';
-		}
-
-		$text = '      <p>'.$questionStatment.'</p>'."\n";
-		$text .= '      <graphicOrderInteraction responseIdentifier="hotspot_'.$questionIdent.'">'."\n";
-		$text .= '        <prompt>'.$questionDesc.'</prompt>'."\n";
-		$text .= '        <object type="'.$mimetype.'" width="250" height="230" data="'.$questionMedia.'">-</object>'."\n";
+        $this->answerList = $this->getAnswersList(true);
+        $questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
+        $mimetype = mime_content_type($questionMedia);
+        if(empty($mimetype)){
+            $mimetype = 'image/jpeg';
+        }
+
+        $text = '      <p>'.$questionStatment.'</p>'."\n";
+        $text .= '      <graphicOrderInteraction responseIdentifier="hotspot_'.$questionIdent.'">'."\n";
+        $text .= '        <prompt>'.$questionDesc.'</prompt>'."\n";
+        $text .= '        <object type="'.$mimetype.'" width="250" height="230" data="'.$questionMedia.'">-</object>'."\n";
         if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $key=>$answer) {
-	        	$key = $answer['id'];
-	        	$answerTxt = $answer['answer'];
-	        	$len = api_strlen($answerTxt);
-	        	//coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
-	        	$coords = '';
-	        	$type = 'default';
-	        	switch($answer['hotspot_type']){
-	        		case 'square':
-	        			$type = 'rect';
-						$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
-	        			break;
-	        		case 'circle':
-	        			$type = 'circle';
-			 			$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
-	        			break;
-	        		case 'poly':
-	        			$type = 'poly';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
-	        			break;
-	        		 case 'delineation' :
-	        			$type = 'delineation';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
-	        			break;
-	        	}
-	            $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
-	        }
+            foreach ($this->answerList as $key=>$answer) {
+                $key = $answer['id'];
+                $answerTxt = $answer['answer'];
+                $len = api_strlen($answerTxt);
+                //coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
+                $coords = '';
+                $type = 'default';
+                switch($answer['hotspot_type']){
+                    case 'square':
+                        $type = 'rect';
+                        $res = array();
+                        $coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
+                        $coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
+                        break;
+                    case 'circle':
+                        $type = 'circle';
+                            $res = array();
+                        $coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
+                        $coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
+                        break;
+                    case 'poly':
+                        $type = 'poly';
+                        $coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+                        break;
+                        case 'delineation' :
+                        $type = 'delineation';
+                        $coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+                        break;
+                }
+                $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
+            }
         }
         $text .= '      </graphicOrderInteraction>'."\n";
         $out = $text;
@@ -353,23 +353,23 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$this->gradeList = $this->getGradesList();
+        $this->answerList = $this->getAnswersList(true);
+        $this->gradeList = $this->getGradesList();
         $out = '';
         $out .= '  <responseDeclaration identifier="hotspot_'.$questionIdent.'" cardinality="ordered" baseType="identifier">' . "\n";
         $out .= '    <correctResponse>'. "\n";
 
-		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $answerKey=>$answer)  {
-	        	$answerKey = $answer['id'];
-	        	$answer = $answer['answer'];
-	            $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
-	        }
-		}
+        if (is_array($this->answerList)) {
+            foreach ($this->answerList as $answerKey=>$answer)  {
+                $answerKey = $answer['id'];
+                $answer = $answer['answer'];
+                $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
+            }
+        }
         $out .= '    </correctResponse>'. "\n";
         $out .= '  </responseDeclaration>'. "\n";
 
-       return $out;
+        return $out;
     }
 }
 
@@ -384,14 +384,14 @@ 
      * Export the question part as a matrix-choice, with only one possible answer per line.
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
-	{
-		return '';
-	}
+    {
+        return '';
+    }
     /**
      *
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-    	return '';
+        return '';
     }
 }

Doc Comments +5 added lines

@@ -72,6 +72,7 @@ 
     /**
      * Return the XML flow for the possible answers.
      *
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
@@ -147,6 +148,7 @@ 
      * Export the text with missing words.
      *
      *
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
@@ -204,6 +206,7 @@ 
 {
     /**
      * Export the question part as a matrix-choice, with only one possible answer per line.
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
@@ -295,6 +298,7 @@ 
     /**
      * TODO update this to match hot spots instead of copying matching
      * Export the question part as a matrix-choice, with only one possible answer per line.
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
     {
@@ -382,6 +386,7 @@ 
     /**
      * TODO implement
      * Export the question part as a matrix-choice, with only one possible answer per line.
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
 	{

main/exercice/export/exercise_import.inc.php

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
     }
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -74,7 +74,7 @@ 
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
 
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'qti2';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'qti2';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -118,14 +118,14 @@ 
     // parse every subdirectory to search xml question files
     while (false !== ($file = readdir($exerciseHandle))) {
 
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
 
             // Find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.xml$/i', $questionFile)) {
                     $result = parse_file($baseWorkDir, $file, $questionFile);
-                    $filePath = $baseWorkDir . $file;
+                    $filePath = $baseWorkDir.$file;
                     $file_found = true;
                 }
             }
@@ -133,7 +133,7 @@ 
 
             // Else ignore file
             $result = parse_file($baseWorkDir, '', $file);
-            $filePath = $baseWorkDir . '/' . $file;
+            $filePath = $baseWorkDir.'/'.$file;
             $file_found = true;
         }
     }
@@ -200,7 +200,7 @@ 
         }
 
         // delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         return $last_exercise_id;
     }
 
@@ -228,8 +228,8 @@ 
     global $record_item_body;
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!($fp = fopen($questionFilePath, 'r'))) {
         Display:: display_error_message(get_lang('Error opening question\'s XML file'));
@@ -326,10 +326,10 @@ 
     if ($record_item_body) {
 
         if ((!in_array($current_element, $non_HTML_tag_to_avoid))) {
-            $current_question_item_body .= "<" . $name;
+            $current_question_item_body .= "<".$name;
 
             foreach ($attributes as $attribute_name => $attribute_value) {
-                $current_question_item_body .= " " . $attribute_name . "=\"" . $attribute_value . "\"";
+                $current_question_item_body .= " ".$attribute_name."=\"".$attribute_value."\"";
             }
             $current_question_item_body .= ">";
         } else {
@@ -338,11 +338,11 @@ 
 
             if ($current_element == 'INLINECHOICEINTERACTION') {
 
-                $current_question_item_body .= "**claroline_start**" . $attributes['RESPONSEIDENTIFIER'] . "**claroline_end**";
+                $current_question_item_body .= "**claroline_start**".$attributes['RESPONSEIDENTIFIER']."**claroline_end**";
             }
             if ($current_element == 'TEXTENTRYINTERACTION') {
                 $correct_answer_value = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
-                $current_question_item_body .= "[" . $correct_answer_value . "]";
+                $current_question_item_body .= "[".$correct_answer_value."]";
 
             }
             if ($current_element == 'BR') {
@@ -457,7 +457,7 @@ 
     //treat the record of the full content of itembody tag :
 
     if ($record_item_body && (!in_array($current_element, $non_HTML_tag_to_avoid))) {
-        $current_question_item_body .= "</" . $name . ">";
+        $current_question_item_body .= "</".$name.">";
     }
 
     switch ($name) {
@@ -515,14 +515,14 @@ 
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= '' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= ''.trim($data);
             }
             break;
         case 'FEEDBACKINLINE':
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' ' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' '.trim($data);
             }
             break;
         case 'SIMPLEASSOCIABLECHOICE':
@@ -546,8 +546,8 @@ 
             $answer_identifier = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
             if ($current_inlinechoice_id == $answer_identifier) {
                 $current_question_item_body = str_replace(
-                    "**claroline_start**" . $current_answer_id . "**claroline_end**",
-                    "[" . $data . "]",
+                    "**claroline_start**".$current_answer_id."**claroline_end**",
+                    "[".$data."]",
                     $current_question_item_body
                 );
             } else {

main/exercice/export/aiken/aiken_import.inc.php

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
         $dir .= '/';
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -38,10 +38,10 @@ 
 function aiken_display_form($msg = '') {
     $name_tools = get_lang('ImportAikenQuiz');
     $form  = '<div class="actions">';
-    $form .= '<a href="exercise.php?show=test">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    $form .= '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     $form .= '</div>';
     $form .= $msg;
-    $form_validator  = new FormValidator('aiken_upload', 'post',api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data') );
+    $form_validator = new FormValidator('aiken_upload', 'post', api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data'));
     $form_validator->addElement('header', $name_tools);
     $form_validator->addElement('text', 'total_weight', get_lang('TotalWeight'));
     $form_validator->addElement('file', 'userFile', get_lang('DownloadFile'));
@@ -89,7 +89,7 @@ 
     global $record_item_body;
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'aiken';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'aiken';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -130,9 +130,9 @@ 
 
     // Parse every subdirectory to search txt question files
     while (false !== ($file = readdir($exerciseHandle))) {
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
             //find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.txt$/i', $questionFile)) {
                     $result = aiken_parse_file(
@@ -154,7 +154,7 @@ 
         $result = 'NoTxtFileFoundInTheZip';
     }
 
-    if ($result !== true ) {
+    if ($result !== true) {
         return $result;
     }
 
@@ -215,7 +215,7 @@ 
         }
 
         // Delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         $operation = $last_exercise_id;
     }
 
@@ -235,8 +235,8 @@ 
 function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) {
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!is_file($questionFilePath)) {
         return 'FileNotFound';
@@ -248,13 +248,13 @@ 
     $answers_array = array();
     $new_question = true;
     foreach ($data as $line => $info) {
-        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/',$info)) {
+        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/', $info)) {
             // double empty line
             continue;
         }
         $new_question = false;
         //make sure it is transformed from iso-8859-1 to utf-8 if in that form
-        if (!mb_check_encoding($info,'utf-8') && mb_check_encoding($info,'iso-8859-1')) {
+        if (!mb_check_encoding($info, 'utf-8') && mb_check_encoding($info, 'iso-8859-1')) {
             $info = utf8_encode($info);
         }
         $exercise_info['question'][$question_index]['type'] = 'MCUA';
@@ -286,7 +286,7 @@ 
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
-        } elseif (preg_match('/^(\r)?\n/',$info)) {
+        } elseif (preg_match('/^(\r)?\n/', $info)) {
             //moving to next question (tolerate \r\n or just \n)
             if (empty($exercise_info['question'][$question_index]['correct_answers'])) {
                 error_log('Aiken: Error in question index '.$question_index.': no correct answer defined');
@@ -306,7 +306,7 @@ 
                     $exercise_info['question'][$question_index]['title'] = $info;
                 } else {
                     //Question itself (use a 100-chars long title and a larger description)
-                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)) . '...';
+                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)).'...';
                     $exercise_info['question'][$question_index]['description'] = $info;
                 }
             } else {
@@ -316,7 +316,7 @@ 
     }
     $total_questions = count($exercise_info['question']);
     $total_weight = (!empty($_POST['total_weight'])) ? intval($_POST['total_weight']) : 20;
-    foreach  ($exercise_info['question'] as $key => $question) {
+    foreach ($exercise_info['question'] as $key => $question) {
         $exercise_info['question'][$key]['weighting'][current(array_keys($exercise_info['question'][$key]['weighting']))] = $total_weight / $total_questions;
     }
     return true;

Braces +5 added lines, -3 removed lines

@@ -10,8 +10,9 @@ 
 /**
  * Security check
  */
-if (count(get_included_files()) == 1)
+if (count(get_included_files()) == 1) {
     die('---');
+}
 
 /**
  * Creates a temporary directory
@@ -21,8 +22,9 @@ 
  * @return string
  */
 function tempdir($dir, $prefix = 'tmp', $mode = 0777) {
-    if (substr($dir, -1) != '/')
-        $dir .= '/';
+    if (substr($dir, -1) != '/') {
+            $dir .= '/';
+    }
 
     do {
         $path = $dir . $prefix . mt_rand(0, 9999999);

Indentation +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
             $correct_answer_index = array_search($matches[1], $answers_array);
             $exercise_info['question'][$question_index]['title'] = $matches[1];
         } elseif (preg_match('/^TAGS:\s?([A-Z])\s?/', $info, $matches)) {
-             //TAGS for chamilo >= 1.10
+                //TAGS for chamilo >= 1.10
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)