chamilo / chamilo-lms

main/exercise/hotspot_lang_conversion.php

Indentation +23 added lines, -23 removed lines

@@ -14,19 +14,19 @@ 
 $hotspot_lang_file = api_get_path(SYS_LANG_PATH);
 
 if(isset($_GET['lang'])) {
-	//$search = array('../','\\0','\\');
-	$lang = urldecode($_GET['lang']);
-	if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) {
-		//$lang = str_replace($search,$replace,urldecode($_GET['lang']));
-		if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php'))
-			$hotspot_lang_file .= $lang . '/hotspot.inc.php';
-		else
-			$hotspot_lang_file .= 'english/hotspot.inc.php';
-	} else {
-		$hotspot_lang_file .= 'english/hotspot.inc.php';
-	}
+    //$search = array('../','\\0','\\');
+    $lang = urldecode($_GET['lang']);
+    if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) {
+        //$lang = str_replace($search,$replace,urldecode($_GET['lang']));
+        if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php'))
+            $hotspot_lang_file .= $lang . '/hotspot.inc.php';
+        else
+            $hotspot_lang_file .= 'english/hotspot.inc.php';
+    } else {
+        $hotspot_lang_file .= 'english/hotspot.inc.php';
+    }
 } else {
-	$hotspot_lang_file .= 'english/hotspot.inc.php';
+    $hotspot_lang_file .= 'english/hotspot.inc.php';
 }
 
 $file = file($hotspot_lang_file);
@@ -35,23 +35,23 @@ 
 
 foreach($file as $value)
 {
-	$explode = explode('=', $value);
+    $explode = explode('=', $value);
 
-	if(count($explode) > 1)
-	{
-		$explode[0] = trim($explode[0]);
-		$explode[0] = '&' . substr($explode[0], 1, strlen($explode[0]));
+    if(count($explode) > 1)
+    {
+        $explode[0] = trim($explode[0]);
+        $explode[0] = '&' . substr($explode[0], 1, strlen($explode[0]));
 
-		$explode[1] = trim($explode[1]);
-		$explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1);
-		$explode[1] = str_replace('"', '', $explode[1]);
+        $explode[1] = trim($explode[1]);
+        $explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1);
+        $explode[1] = str_replace('"', '', $explode[1]);
 
-		$temp[] = $explode[0] . '=' . $explode[1];
-	}
+        $temp[] = $explode[0] . '=' . $explode[1];
+    }
 }
 
 foreach($temp as $value)
 {
-	echo $value . ' ';
+    echo $value . ' ';
 }
 ?>

Spacing +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@ 
 
 $hotspot_lang_file = api_get_path(SYS_LANG_PATH);
 
-if(isset($_GET['lang'])) {
+if (isset($_GET['lang'])) {
 	//$search = array('../','\\0','\\');
 	$lang = urldecode($_GET['lang']);
 	if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) {
 		//$lang = str_replace($search,$replace,urldecode($_GET['lang']));
-		if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php'))
-			$hotspot_lang_file .= $lang . '/hotspot.inc.php';
+		if (file_exists($hotspot_lang_file.$lang.'/hotspot.inc.php'))
+			$hotspot_lang_file .= $lang.'/hotspot.inc.php';
 		else
 			$hotspot_lang_file .= 'english/hotspot.inc.php';
 	} else {
@@ -33,25 +33,25 @@ 
 
 $temp = array();
 
-foreach($file as $value)
+foreach ($file as $value)
 {
 	$explode = explode('=', $value);
 
-	if(count($explode) > 1)
+	if (count($explode) > 1)
 	{
 		$explode[0] = trim($explode[0]);
-		$explode[0] = '&' . substr($explode[0], 1, strlen($explode[0]));
+		$explode[0] = '&'.substr($explode[0], 1, strlen($explode[0]));
 
 		$explode[1] = trim($explode[1]);
 		$explode[1] = substr($explode[1], 0, strlen($explode[1]) - 1);
 		$explode[1] = str_replace('"', '', $explode[1]);
 
-		$temp[] = $explode[0] . '=' . $explode[1];
+		$temp[] = $explode[0].'='.$explode[1];
 	}
 }
 
-foreach($temp as $value)
+foreach ($temp as $value)
 {
-	echo $value . ' ';
+	echo $value.' ';
 }
 ?>

Braces +5 added lines, -4 removed lines

@@ -18,10 +18,11 @@
 	$lang = urldecode($_GET['lang']);
 	if (preg_match('/^[a-zA-Z0-9\._-]+$/', $lang)) {
 		//$lang = str_replace($search,$replace,urldecode($_GET['lang']));
-		if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php'))
-			$hotspot_lang_file .= $lang . '/hotspot.inc.php';
-		else
-			$hotspot_lang_file .= 'english/hotspot.inc.php';
+		if(file_exists($hotspot_lang_file . $lang . '/hotspot.inc.php')) {
+					$hotspot_lang_file .= $lang . '/hotspot.inc.php';
+		} else {
+					$hotspot_lang_file .= 'english/hotspot.inc.php';
+		}
 	} else {
 		$hotspot_lang_file .= 'english/hotspot.inc.php';
 	}

main/exercise/question_create.php

Indentation +6 added lines, -6 removed lines

@@ -51,17 +51,17 @@
 $result = Database::query($sql);
 $exercises['-'] = '-'.get_lang('SelectExercise').'-';
 while ($row = Database :: fetch_array($result)) {
-	$exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
+    $exercises[$row['id']] = cut($row['title'], EXERCISE_MAX_NAME_SIZE);
 }
 $form->addElement('select', 'exercise', get_lang('Exercise'), $exercises);
 
 // generate default content
 $form->addElement(
-	'checkbox',
-	'is_content',
-	null,
-	get_lang('GenerateDefaultContent'),
-	array('checked' => true)
+    'checkbox',
+    'is_content',
+    null,
+    get_lang('GenerateDefaultContent'),
+    array('checked' => true)
 );
 
 // the submit button

Spacing +7 added lines, -7 removed lines

@@ -8,21 +8,21 @@ 
 require_once '../inc/global.inc.php';
 
 // the section (tabs)
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 // notice for unauthorized people.
 api_protect_course_script(true);
 
 // breadcrumbs
-$interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises'));
+$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
 
 // Tool name
-$nameTools=get_lang('AddQuestionToExercise');
+$nameTools = get_lang('AddQuestionToExercise');
 
 // The form
-$form = new FormValidator('add_question','post',api_get_self().'?'.api_get_cidreq());
+$form = new FormValidator('add_question', 'post', api_get_self().'?'.api_get_cidreq());
 // form title
-$form->addElement('header','',get_lang('AddQuestionToExercise'));
+$form->addElement('header', '', get_lang('AddQuestionToExercise'));
 
 $question_list = Question::get_question_type_list();
 $question_list_options = array();
@@ -38,7 +38,7 @@ 
 );
 
 //session id
-$session_id  = api_get_session_id();
+$session_id = api_get_session_id();
 
 // the exercises
 $tbl_exercises = Database :: get_course_table(TABLE_QUIZ_TEST);
@@ -98,7 +98,7 @@ 
     Display::display_header($nameTools);
 
     echo '<div class="actions">';
-    echo '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    echo '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     echo '</div>';
 
     // displaying the form

main/exercise/hotpotatoes.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 }
 // The breadcrumbs.
 $interbreadcrumb[] = array(
-    'url' => api_get_path(WEB_CODE_PATH) . '.exercise/exercise.php?' . api_get_cidreq(),
+    'url' => api_get_path(WEB_CODE_PATH).'.exercise/exercise.php?'.api_get_cidreq(),
     'name' => get_lang('Exercises')
 );
 
@@ -153,7 +153,7 @@ 
                 $_course,
                 $_FILES['userFile'],
                 $document_sys_path,
-                $uploadPath . '/' . $fld,
+                $uploadPath.'/'.$fld,
                 api_get_user_id(),
                 null,
                 null,
@@ -165,7 +165,7 @@ 
                     $imgparams = $_POST['imgparams'];
                     $checked = CheckImageName($imgparams, $filename);
                     if ($checked) {
-                        $imgcount = $imgcount-1;
+                        $imgcount = $imgcount - 1;
                     } else {
                         $dialogBox .= $filename.' '.get_lang('NameNotEqual');
                         my_delete($document_sys_path.$uploadPath.'/'.$fld.'/'.$filename);

main/exercise/multiple_answer.class.php

Indentation +11 added lines, -11 removed lines

@@ -166,12 +166,12 @@ 
     }
 
 
-	/**
-	 * abstract function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 * @param the answers number to display
-	 */
-	function processAnswersCreation($form)
+    /**
+     * abstract function which creates the form to create / edit the answers of the question
+     * @param the formvalidator instance
+     * @param the answers number to display
+     */
+    function processAnswersCreation($form)
     {
         $questionWeighting = $nbrGoodAnswers = 0;
         $objAnswer  = new Answer($this->id);
@@ -201,12 +201,12 @@ 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
-	function return_header($feedback_type = null, $counter = null, $score = null)
+    function return_header($feedback_type = null, $counter = null, $score = null)
     {
-	    $header = parent::return_header($feedback_type, $counter, $score);
-	    $header .= '<table class="'.$this->question_table_class .'">
+        $header = parent::return_header($feedback_type, $counter, $score);
+        $header .= '<table class="'.$this->question_table_class .'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
@@ -214,7 +214,7 @@ 
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 
 
 }

Spacing +24 added lines, -24 removed lines

@@ -38,7 +38,7 @@ 
             'Height' => '125'
         );
 
-        $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4;  // The previous default value was 2. See task #1759.
+        $nb_answers = isset($_POST['nb_answers']) ? $_POST['nb_answers'] : 4; // The previous default value was 2. See task #1759.
         $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
 
         $obj_ex = $_SESSION['objExercise'];
@@ -48,11 +48,11 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="10">' . get_lang('Number') . '</th>
-                    <th width="10">' . get_lang('True') . '</th>
-                    <th width="50%">' . get_lang('Answer') . '</th>
-                    <th width="50%">' . get_lang('Comment') . '</th>
-                    <th width="10">' . get_lang('Weighting') . '</th>
+                    <th width="10">' . get_lang('Number').'</th>
+                    <th width="10">' . get_lang('True').'</th>
+                    <th width="50%">' . get_lang('Answer').'</th>
+                    <th width="50%">' . get_lang('Comment').'</th>
+                    <th width="10">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -82,10 +82,10 @@ 
             $form->addHtml('<tr>');
 
             if (is_object($answer)) {
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['weighting[' . $i . ']'] = float_format($answer->weighting[$i], 1);
-                $defaults['correct[' . $i . ']'] = $answer->correct[$i];
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['weighting['.$i.']'] = float_format($answer->weighting[$i], 1);
+                $defaults['correct['.$i.']'] = $answer->correct[$i];
             } else {
                 $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2');
                 $defaults['comment[1]'] = get_lang('DefaultMultipleComment2');
@@ -101,38 +101,38 @@ 
 
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'correct[' . $i . ']'
+                'correct['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'counter[' . $i . ']'
+                'counter['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'answer[' . $i . ']'
+                'answer['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'comment[' . $i . ']'
+                'comment['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'weighting[' . $i . ']'
+                'weighting['.$i.']'
             );
 
-            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');
+            $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
             $answer_number->freeze();
 
-            $form->addElement('checkbox', 'correct[' . $i . ']', null, null,
+            $form->addElement('checkbox', 'correct['.$i.']', null, null,
                 'class="checkbox" style="margin-left: 0em;"');
-            $boxes_names[] = 'correct[' . $i . ']';
+            $boxes_names[] = 'correct['.$i.']';
 
             $form->addHtmlEditor("answer[$i]", null, null, true, $editorConfig);
-            $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
+            $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
             $form->addHtmlEditor("comment[$i]", null, null, true, $editorConfig);
 
-            $form->addElement('text', 'weighting[' . $i . ']', null, array('style' => "width: 60px;", 'value' => '0'));
+            $form->addElement('text', 'weighting['.$i.']', null, array('style' => "width: 60px;", 'value' => '0'));
             $form->addHtml('</tr>');
         }
 
@@ -177,7 +177,7 @@ 
         $objAnswer  = new Answer($this->id);
         $nb_answers = $form->getSubmitValue('nb_answers');
 
-        for($i=1 ; $i <= $nb_answers ; $i++) {
+        for ($i = 1; $i <= $nb_answers; $i++) {
             $answer = trim(str_replace(['<p>', '</p>'], '', $form -> getSubmitValue('answer['.$i.']')));
             $comment = trim(str_replace(['<p>', '</p>'], '', $form -> getSubmitValue('comment['.$i.']')));
             $weighting = trim($form -> getSubmitValue('weighting['.$i.']'));
@@ -189,10 +189,10 @@ 
                 $weighting = abs($weighting);
                 $weighting = -$weighting;
             }
-            if($weighting > 0) {
+            if ($weighting > 0) {
                 $questionWeighting += $weighting;
             }
-            $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i);
+            $objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i);
         }
 
         // saves the answers into the data base
@@ -206,7 +206,7 @@ 
 	function return_header($feedback_type = null, $counter = null, $score = null)
     {
 	    $header = parent::return_header($feedback_type, $counter, $score);
-	    $header .= '<table class="'.$this->question_table_class .'">
+	    $header .= '<table class="'.$this->question_table_class.'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>

main/exercise/question_pool.php

Indentation +121 added lines, -121 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -48,7 +48,7 @@ 
 }
 
 $nameTools = get_lang('QuestionPool');
-$interbreadcrumb[] = array("url" => "exercise.php","name" => get_lang('Exercises'));
+$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
 
 if (!empty($objExercise)) {
     $interbreadcrumb[] = array(
@@ -73,7 +73,7 @@ 
 
         if ($old_question_obj) {
             $old_question_obj->updateTitle(
-                $old_question_obj->selectTitle() . ' - ' . get_lang('Copy')
+                $old_question_obj->selectTitle().' - '.get_lang('Copy')
             );
             //Duplicating the source question, in the current course
             $new_id = $old_question_obj->duplicate($current_course);
@@ -107,7 +107,7 @@ 
         }
         // destruction of the Question object
         unset($objQuestionTmp);
-    } elseif($recup && $fromExercise) {
+    } elseif ($recup && $fromExercise) {
         // gets an existing question and copies it into a new exercise
         $objQuestionTmp = Question :: read($recup);
         // if the question exists
@@ -139,7 +139,7 @@ 
                 $old_question_obj = Question::read($old_question_id, $origin_course_id);
                 if ($old_question_obj) {
                     $old_question_obj->updateTitle(
-                        $old_question_obj->selectTitle() . ' - ' . get_lang('Copy')
+                        $old_question_obj->selectTitle().' - '.get_lang('Copy')
                     );
 
                     //Duplicating the source question, in the current course
@@ -167,16 +167,16 @@ 
                 }
             }
         }
-        Session::write('objExercise',$objExercise);
+        Session::write('objExercise', $objExercise);
     }
 }
 
-if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+if (isset($_SESSION['gradebook'])) {
+	$gradebook = $_SESSION['gradebook'];
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
+if (!empty($gradebook) && $gradebook == 'view') {
+	$interbreadcrumb[] = array('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']), 'name' => get_lang('ToolGradebook'));
 }
 
 // if admin of course
@@ -216,11 +216,11 @@ 
 }
 if (isset($fromExercise) && $fromExercise > 0) {
     echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$fromExercise.'">'.
-            Display::return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
     $titleAdd = get_lang('AddQuestionToTest');
 } else {
     echo '<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>';
     echo "<a href='admin.php?exerciseId=0'>".Display::return_icon('add_question.gif', get_lang('NewQu'), '', ICON_SIZE_MEDIUM)."</a>";
     $titleAdd = get_lang('ManageAllQuestions');
 }
@@ -249,7 +249,7 @@ 
 foreach ($sessionList as $item) {
     $session_select_list[$item['session_id']] = $item['session_name'];
 }
-$select_session_html =  Display::select('session_id', $session_select_list, $session_id, $tabAttrParam);
+$select_session_html = Display::select('session_id', $session_select_list, $session_id, $tabAttrParam);
 echo Display::form_row($labelFormRow, $select_session_html);
 
 // Course list, get course list of session, or for course where user is admin
@@ -290,7 +290,7 @@ 
 	$course_select_list[$courseItemId] .= $courseInfo['title'];
 }
 
-$select_course_html =  Display::select(
+$select_course_html = Display::select(
     'selected_course',
     $course_select_list,
     $selected_course,
@@ -346,9 +346,9 @@ 
 $my_exercise_list['0']  = get_lang('AllExercises');
 $my_exercise_list['-1'] = get_lang('OrphanQuestions');
 if (is_array($exercise_list)) {
-    foreach($exercise_list as $row) {
+    foreach ($exercise_list as $row) {
         $my_exercise_list[$row['id']] = "";
-        if ($row['id'] ==  $fromExercise && $selected_course == api_get_course_int_id()) {
+        if ($row['id'] == $fromExercise && $selected_course == api_get_course_int_id()) {
             $my_exercise_list[$row['id']] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
         }
         $my_exercise_list[$row['id']] .= $row['title'];
@@ -358,7 +358,7 @@ 
 if ($exercise_id_changed == 1) {
 	reset_menu_lvl_type();
 }
-$select_exercise_html =  Display::select(
+$select_exercise_html = Display::select(
     'exerciseId',
     $my_exercise_list,
     $exerciseId,
@@ -391,7 +391,7 @@ 
 $question_list = Question::get_question_type_list();
 
 $new_question_list = array();
-$new_question_list['-1']  = get_lang('All');
+$new_question_list['-1'] = get_lang('All');
 if (!empty($_course)) {
     $objExercise = new Exercise();
     $objExercise->read($fromExercise);
@@ -464,7 +464,7 @@ 
             ORDER BY question_order";
 
     $result = Database::query($sql);
-    while($row = Database::fetch_array($result, 'ASSOC')) {
+    while ($row = Database::fetch_array($result, 'ASSOC')) {
         $mainQuestionList[] = $row;
     }
 } elseif ($exerciseId == -1) {
@@ -477,11 +477,11 @@ 
 		        crc.c_id = $selected_course AND
 		        crc.category_id = $courseCategoryId";
 	}
-	if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
+	if (isset($exerciseLevel) && $exerciseLevel != -1) {
 		$level_where = ' AND level='.$exerciseLevel;
 	}
 	$answer_where = '';
-	if (isset($answerType) && $answerType >0 -1 ) {
+	if (isset($answerType) && $answerType > 0 - 1) {
 		$answer_where = ' AND type='.$answerType;
 	}
 
@@ -521,7 +521,7 @@ 
                     $level_where $answer_where
              )";
     $result = Database::query($sql);
-    while($row = Database::fetch_array($result, 'ASSOC')) {
+    while ($row = Database::fetch_array($result, 'ASSOC')) {
         $mainQuestionList[] = $row;
     }
 } else {

main/exercise/exercise_report.php

Spacing +3 added lines, -3 removed lines

@@ -248,7 +248,7 @@ 
             Display::addFlash(
                 Display::return_message(get_lang('MessageSent'))
             );
-            header('Location: ' . api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId);
+            header('Location: '.api_get_self().'?'.api_get_cidreq().'&exerciseId='.$exerciseId);
             exit;
         }
     }
@@ -278,8 +278,8 @@ 
         api_is_course_tutor() || api_is_course_coach()
     ) {
         $actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">'.Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
-        $actions .='<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>';
-        $actions .='<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display :: return_icon('statistics.png', get_lang('ReportByQuestion'), '', ICON_SIZE_MEDIUM).'</a>';
 
         $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&exerciseId='.intval($_GET['exerciseId']).'" >'.
         Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';

Braces +2 added lines, -1 removed lines

@@ -400,8 +400,9 @@
 $extra .= $form->return_form();
 $extra .= '</div>';
 
-if ($is_allowedToEdit)
+if ($is_allowedToEdit) {
     echo $extra;
+}
 
 echo $actions;
 

main/exercise/exercise_result.php

Spacing +7 added lines, -7 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
@@ -151,7 +151,7 @@ 
         if ($remainingAttempts) {
             $attemptButton = Display::toolbarButton(
                 get_lang('AnotherAttempt'),
-                api_get_path(WEB_CODE_PATH) . 'exercise/overview.php?' . api_get_cidreq() . '&' . http_build_query([
+                api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&'.http_build_query([
                     'exerciseId' => $objExercise->id
                 ]),
                 'pencil-square-o',
@@ -174,7 +174,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);
@@ -205,7 +205,7 @@ 
 } else {
 	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
 	$url = '../newscorm/lp_controller.php?'.api_get_cidreq().'&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');

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'];
@@ -201,19 +201,19 @@ 
         Session::erase('objExercise');
         Session::erase('exe_id');
     }
-	Display::display_footer();
+    Display::display_footer();
 } else {
-	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
-	$url = '../lp/lp_controller.php?'.api_get_cidreq().'&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 = '../lp/lp_controller.php?'.api_get_cidreq().'&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>';
 }

main/exercise/Draggable.php

Spacing +13 added lines, -13 removed lines

@@ -63,13 +63,13 @@ 
                 for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
                     if ($answer->isCorrect($i)) {
                         $nb_matches++;
-                        $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i);
-                        $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1);
+                        $defaults['answer['.$nb_matches.']'] = $answer->selectAnswer($i);
+                        $defaults['weighting['.$nb_matches.']'] = float_format($answer->selectWeighting($i), 1);
                         $answerInfo = $answer->getAnswerByAutoId($answer->correct[$i]);
-                        $defaults['matches[' . $nb_matches . ']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : '';
+                        $defaults['matches['.$nb_matches.']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : '';
                     } else {
                         $nb_options++;
-                        $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i);
+                        $defaults['option['.$nb_options.']'] = $answer->selectAnswer($i);
                     }
                 }
             }
@@ -92,9 +92,9 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="85%">' . get_lang('Answer') . '</th>
-                    <th width="15%">' . get_lang('MatchesTo') . '</th>
-                    <th width="10">' . get_lang('Weighting') . '</th>
+                    <th width="85%">' . get_lang('Answer').'</th>
+                    <th width="15%">' . get_lang('MatchesTo').'</th>
+                    <th width="10">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -189,9 +189,9 @@ 
         for ($i = 1; $i <= $nb_matches; ++$i) {
             $position++;
 
-            $answer = $form->getSubmitValue('answer[' . $i . ']');
-            $matches = $form->getSubmitValue('matches[' . $i . ']');
-            $weighting = $form->getSubmitValue('weighting[' . $i . ']');
+            $answer = $form->getSubmitValue('answer['.$i.']');
+            $matches = $form->getSubmitValue('matches['.$i.']');
+            $weighting = $form->getSubmitValue('weighting['.$i.']');
             $this->weighting += $weighting;
             $objAnswer->createAnswer(
                 $answer,
@@ -216,10 +216,10 @@ 
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="' . $this->question_table_class . '">
+        $header .= '<table class="'.$this->question_table_class.'">
             <tr>
-                <th>' . get_lang('ElementList') . '</th>
-                <th>' . get_lang('Status') . '</th>
+                <th>' . get_lang('ElementList').'</th>
+                <th>' . get_lang('Status').'</th>
             </tr>';
 
         return $header;

main/exercise/qti2.php

Spacing +4 added lines, -4 removed lines

@@ -21,8 +21,8 @@ 
 }
 
 // the breadcrumbs
-$interbreadcrumb[]= array (
-    "url" => api_get_path(WEB_CODE_PATH) . "exercise/exercise.php?".api_get_cidreq(),
+$interbreadcrumb[] = array(
+    "url" => api_get_path(WEB_CODE_PATH)."exercise/exercise.php?".api_get_cidreq(),
     "name" => get_lang('Exercises')
 );
 $is_allowedToEdit = api_is_allowed_to_edit(null, true);
@@ -34,7 +34,7 @@ 
 {
     $name_tools = get_lang('ImportQtiQuiz');
     $form  = '<div class="actions">';
-    $form .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'exercise/exercise.php?show=test&'.api_get_cidreq().'">'.
+    $form .= '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?show=test&'.api_get_cidreq().'">'.
         Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     $form .= '</div>';
     $formValidator = new FormValidator(
@@ -84,7 +84,7 @@ 
         $imported = ch_qti2_import_file($_FILES['userFile']);
 
         if (is_numeric($imported) && !empty($imported)) {
-            header('Location: '.api_get_path(WEB_CODE_PATH) . 'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$imported);
+            header('Location: '.api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$imported);
             exit;
         } else {
             $message = Display::return_message(get_lang($imported));