chamilo / chamilo-lms

main/exercise/hotspot_save.inc.php

Indentation +16 added lines, -16 removed lines

@@ -15,24 +15,24 @@
 $answerId 	= intval($_GET['answerId']);
 
 if ($_GET['type'] == "square" || $_GET['type'] == "circle") {
-	$hotspot_type = $_GET['type'];
-	$hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height'];
+    $hotspot_type = $_GET['type'];
+    $hotspot_coordinates = $_GET['x'].";".$_GET['y']."|".$_GET['width']."|".$_GET['height'];
 }
 if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") {
-	$hotspot_type = $_GET['type'];
-	$tmp_coord = explode(",",$_GET['co']);
-	$i = 0;
-	$hotspot_coordinates = "";
-	foreach ($tmp_coord as $coord) {
-		if ($i%2 == 0) {
-			$delimiter = ";";
-		} else {
-			$delimiter = "|";
-		}
-		$hotspot_coordinates .= $coord.$delimiter;
-		$i++;
-	}
-	$hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
+    $hotspot_type = $_GET['type'];
+    $tmp_coord = explode(",",$_GET['co']);
+    $i = 0;
+    $hotspot_coordinates = "";
+    foreach ($tmp_coord as $coord) {
+        if ($i%2 == 0) {
+            $delimiter = ";";
+        } else {
+            $delimiter = "|";
+        }
+        $hotspot_coordinates .= $coord.$delimiter;
+        $i++;
+    }
+    $hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
 }
 $course_id = api_get_course_int_id();
 $sql = "UPDATE $TBL_ANSWER SET

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 
 $TBL_ANSWER = Database::get_course_table(TABLE_QUIZ_ANSWER);
 $questionId = intval($_GET['questionId']);
-$answerId 	= intval($_GET['answerId']);
+$answerId = intval($_GET['answerId']);
 
 if ($_GET['type'] == "square" || $_GET['type'] == "circle") {
 	$hotspot_type = $_GET['type'];
@@ -20,11 +20,11 @@ 
 }
 if ($_GET['type'] == "poly" || $_GET['type'] == "delineation" || $_GET['type'] == "oar") {
 	$hotspot_type = $_GET['type'];
-	$tmp_coord = explode(",",$_GET['co']);
+	$tmp_coord = explode(",", $_GET['co']);
 	$i = 0;
 	$hotspot_coordinates = "";
 	foreach ($tmp_coord as $coord) {
-		if ($i%2 == 0) {
+		if ($i % 2 == 0) {
 			$delimiter = ";";
 		} else {
 			$delimiter = "|";
@@ -32,7 +32,7 @@ 
 		$hotspot_coordinates .= $coord.$delimiter;
 		$i++;
 	}
-	$hotspot_coordinates = api_substr($hotspot_coordinates,0,-2);
+	$hotspot_coordinates = api_substr($hotspot_coordinates, 0, -2);
 }
 $course_id = api_get_course_int_id();
 $sql = "UPDATE $TBL_ANSWER SET

main/exercise/unique_answer_no_option.class.php

Braces +13 added lines, -10 removed lines

@@ -146,15 +146,17 @@ 
                     $list_dest = $item_list[2];
                     $url = $item_list[3];
 
-                    if ($try == 0)
-                        $try_result = 0;
-                    else
-                        $try_result = 1;
+                    if ($try == 0) {
+                                            $try_result = 0;
+                    } else {
+                                            $try_result = 1;
+                    }
 
-                    if ($url == 0)
-                        $url_result = '';
-                    else
-                        $url_result = $url;
+                    if ($url == 0) {
+                                            $url_result = '';
+                    } else {
+                                            $url_result = $url;
+                    }
 
                     $temp_scenario['url' . $i] = $url_result;
                     $temp_scenario['try' . $i] = $try_result;
@@ -343,8 +345,9 @@ 
                 }
         	}
 
- 			if (empty($try))
- 				$try=0;
+ 			if (empty($try)) {
+ 			 				$try=0;
+ 			}
 
  			if (empty($lp)) {
  				$lp=0;

Indentation +61 added lines, -61 removed lines

@@ -14,20 +14,20 @@ 
  */
 class UniqueAnswerNoOption extends Question
 {
-	public static $typePicture = 'mcuao.png';
-	public static $explanationLangVar = 'UniqueAnswerNoOption';
+    public static $typePicture = 'mcuao.png';
+    public static $explanationLangVar = 'UniqueAnswerNoOption';
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
+    /**
+     * Constructor
+     */
+    public function __construct()
     {
-		parent::__construct();
-		$this -> type = UNIQUE_ANSWER_NO_OPTION;
-		$this -> isContent = $this-> getIsContent();
-	}
+        parent::__construct();
+        $this -> type = UNIQUE_ANSWER_NO_OPTION;
+        $this -> isContent = $this-> getIsContent();
+    }
 
-	/**
+    /**
      * function which redifines Question::createAnswersForm
      * @param the formvalidator instance
      * @param the answers number to display
@@ -283,37 +283,37 @@ 
     }
 
     /**
-	 * 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)
+     * 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;
-		$correct = $form -> getSubmitValue('correct');
-		$objAnswer = new Answer($this->id);
-		$nb_answers = $form -> getSubmitValue('nb_answers');
-		$minus = 1;
-		if ($form -> getSubmitValue('new_question')) {
-		    $minus = 0;
-		}
-
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
+        $questionWeighting = $nbrGoodAnswers = 0;
+        $correct = $form -> getSubmitValue('correct');
+        $objAnswer = new Answer($this->id);
+        $nb_answers = $form -> getSubmitValue('nb_answers');
+        $minus = 1;
+        if ($form -> getSubmitValue('new_question')) {
+            $minus = 0;
+        }
+
+        for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
+            $position   = trim($form -> getSubmitValue('position['.$i.']'));
+            $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
             $scenario   = $form -> getSubmitValue('scenario');
 
-           	//$list_destination = $form -> getSubmitValue('destination'.$i);
-           	//$destination_str = $form -> getSubmitValue('destination'.$i);
+                //$list_destination = $form -> getSubmitValue('destination'.$i);
+                //$destination_str = $form -> getSubmitValue('destination'.$i);
 
- 		    $try           = $scenario['try'.$i];
+                $try           = $scenario['try'.$i];
             $lp            = $scenario['lp'.$i];
- 			$destination   = $scenario['destination'.$i];
- 			$url           = trim($scenario['url'.$i]);
+                $destination   = $scenario['destination'.$i];
+                $url           = trim($scenario['url'.$i]);
 
- 			/*
+                /*
  			How we are going to parse the destination value
 
 			here we parse the destination value which is a string
@@ -326,41 +326,41 @@ 
 			selected_questions= ids of questions
 			url= an url
 			*/
-			/*
+            /*
  			$destination_str='';
  			foreach ($list_destination as $destination_id)
  			{
  				$destination_str.=$destination_id.';';
  			}*/
 
-        	$goodAnswer= ($correct == $i) ? true : false;
+            $goodAnswer= ($correct == $i) ? true : false;
 
-        	if ($goodAnswer) {
-        		$nbrGoodAnswers++;
-        		$weighting = abs($weighting);
-        		if($weighting > 0) {
+            if ($goodAnswer) {
+                $nbrGoodAnswers++;
+                $weighting = abs($weighting);
+                if($weighting > 0) {
                     $questionWeighting += $weighting;
                 }
-        	}
+            }
 
- 			if (empty($try))
- 				$try=0;
+                if (empty($try))
+                    $try=0;
 
- 			if (empty($lp)) {
- 				$lp=0;
- 			}
+                if (empty($lp)) {
+                    $lp=0;
+                }
 
- 			if (empty($destination)) {
- 				$destination=0;
- 			}
+                if (empty($destination)) {
+                    $destination=0;
+                }
 
- 			if ($url=='') {
- 				$url=0;
- 			}
+                if ($url=='') {
+                    $url=0;
+                }
 
- 			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+                //1@@1;2;@@2;4;4;@@http://www.chamilo.org
+            $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
+            $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
         }
 
         //Create 666 answer
@@ -373,18 +373,18 @@ 
 
         $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
 
-    	// saves the answers into the data base
+        // saves the answers into the data base
         $objAnswer -> save();
 
         // 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>
@@ -392,5 +392,5 @@ 
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

Spacing +52 added lines, -52 removed lines

@@ -39,7 +39,7 @@ 
 
         $editor_config = array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '125');
         //this line define how many question by default appear when creating a choice question
-        $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 3;  // The previous default value was 2. See task #1759.
+        $nb_answers = isset($_POST['nb_answers']) ? (int) $_POST['nb_answers'] : 3; // The previous default value was 2. See task #1759.
         $nb_answers += (isset($_POST['lessAnswers']) ? -1 : (isset($_POST['moreAnswers']) ? 1 : 0));
 
         /*
@@ -55,20 +55,20 @@ 
         if ($obj_ex->selectFeedbackType() == 1) {
             $editor_config['Width'] = '250';
             $editor_config['Height'] = '110';
-            $comment_title = '<th width="50%" >' . get_lang('Comment') . '</th>';
-            $feedback_title = '<th width="50%" >' . get_lang('Scenario') . '</th>';
+            $comment_title = '<th width="50%" >'.get_lang('Comment').'</th>';
+            $feedback_title = '<th width="50%" >'.get_lang('Scenario').'</th>';
         } else {
-            $comment_title = '<th width="50%">' . get_lang('Comment') . '</th>';
+            $comment_title = '<th width="50%">'.get_lang('Comment').'</th>';
         }
 
         $html = '<table class="table table-striped table-hover">';
         $html .= '<thead>';
         $html .= '<tr>';
-        $html .= '<th>' . get_lang('Number') . '</th>';
-        $html .= '<th>' . get_lang('True') . '</th>';
-        $html .= '<th width="50%">' . get_lang('Answer') . '</th>';
-        $html .= $comment_title . $feedback_title;
-        $html .= '<th>' . get_lang('Weighting') . '</th>';
+        $html .= '<th>'.get_lang('Number').'</th>';
+        $html .= '<th>'.get_lang('True').'</th>';
+        $html .= '<th width="50%">'.get_lang('Answer').'</th>';
+        $html .= $comment_title.$feedback_title;
+        $html .= '<th>'.get_lang('Weighting').'</th>';
         $html .= '</tr>';
         $html .= '</thead>';
         $html .= '<tbody>';
@@ -135,9 +135,9 @@ 
                         $weight_result = '0';
                     }
 
-                    $defaults['answer[' . $i . ']'] = $answer_result;
-                    $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                    $defaults['weighting[' . $i . ']'] = $weight_result;
+                    $defaults['answer['.$i.']'] = $answer_result;
+                    $defaults['comment['.$i.']'] = $answer->comment[$i];
+                    $defaults['weighting['.$i.']'] = $weight_result;
 
                     $item_list = explode('@@', $answer->destination[$i]);
 
@@ -156,10 +156,10 @@ 
                     else
                         $url_result = $url;
 
-                    $temp_scenario['url' . $i] = $url_result;
-                    $temp_scenario['try' . $i] = $try_result;
-                    $temp_scenario['lp' . $i] = $lp;
-                    $temp_scenario['destination' . $i] = $list_dest;
+                    $temp_scenario['url'.$i] = $url_result;
+                    $temp_scenario['try'.$i] = $try_result;
+                    $temp_scenario['lp'.$i] = $lp;
+                    $temp_scenario['destination'.$i] = $list_dest;
                 }
             }
 
@@ -172,30 +172,30 @@ 
             );
             $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('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
-            $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), $editor_config);
+            $form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
 
-            $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), $editor_config);
-            $form->addElement('text', 'weighting[' . $i . ']', null, array('style' => 'width: 60px;', 'value' => '0'));
+            $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
+            $form->addElement('text', 'weighting['.$i.']', null, array('style' => 'width: 60px;', 'value' => '0'));
             $form->addElement('html', '</tr>');
             $i++;
         }
@@ -210,8 +210,8 @@ 
         $form->addHtml('<tr>');
 
         $defaults["counter[$i]"] = '-';
-        $defaults['answer[' . $i . ']'] = get_lang('DontKnow');
-        $defaults['weighting[' . $i . ']'] = '0';
+        $defaults['answer['.$i.']'] = get_lang('DontKnow');
+        $defaults['weighting['.$i.']'] = '0';
         $defaults['scenario'] = $temp_scenario;
         $renderer = & $form->defaultRenderer();
 
@@ -221,32 +221,32 @@ 
         );
         $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.']'
         );
 
         $form
-            ->addElement('text', 'counter[' . $i . ']', null)
+            ->addElement('text', 'counter['.$i.']', null)
             ->freeze();
 
-        $form->addElement('hidden', 'position[' . $i . ']', '666');
+        $form->addElement('hidden', 'position['.$i.']', '666');
 
         $form->addElement('radio', 'correct', null, null, $i, ['class' => 'checkbox', 'disabled' => true]);
-        $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), $editor_config);
+        $form->addElement('html_editor', 'answer['.$i.']', null, array(), $editor_config);
 
-        $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
-        $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), $editor_config);
+        $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addElement('html_editor', 'comment['.$i.']', null, array(), $editor_config);
 
         //$form->addElement('select', 'destination'.$i, get_lang('SelectQuestion').' : ',$select_question,'multiple');
 
@@ -302,9 +302,9 @@ 
 		    $minus = 0;
 		}
 
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
+		for ($i = 1; $i <= $nb_answers - $minus; $i++) {
+		    $position = trim($form -> getSubmitValue('position['.$i.']'));
+        	$answer = trim($form -> getSubmitValue('answer['.$i.']'));
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
             $scenario   = $form -> getSubmitValue('scenario');
@@ -312,8 +312,8 @@ 
            	//$list_destination = $form -> getSubmitValue('destination'.$i);
            	//$destination_str = $form -> getSubmitValue('destination'.$i);
 
- 		    $try           = $scenario['try'.$i];
-            $lp            = $scenario['lp'.$i];
+ 		    $try = $scenario['try'.$i];
+            $lp = $scenario['lp'.$i];
  			$destination   = $scenario['destination'.$i];
  			$url           = trim($scenario['url'.$i]);
 
@@ -337,34 +337,34 @@ 
  				$destination_str.=$destination_id.';';
  			}*/
 
-        	$goodAnswer= ($correct == $i) ? true : false;
+        	$goodAnswer = ($correct == $i) ? true : false;
 
         	if ($goodAnswer) {
         		$nbrGoodAnswers++;
         		$weighting = abs($weighting);
-        		if($weighting > 0) {
+        		if ($weighting > 0) {
                     $questionWeighting += $weighting;
                 }
         	}
 
  			if (empty($try))
- 				$try=0;
+ 				$try = 0;
 
  			if (empty($lp)) {
- 				$lp=0;
+ 				$lp = 0;
  			}
 
  			if (empty($destination)) {
- 				$destination=0;
+ 				$destination = 0;
  			}
 
- 			if ($url=='') {
- 				$url=0;
+ 			if ($url == '') {
+ 				$url = 0;
  			}
 
  			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+			$dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
+        	$objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i, NULL, NULL, $dest);
         }
 
         //Create 666 answer
@@ -372,10 +372,10 @@ 
         $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
         $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
         $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
-        $goodAnswer= ($correct == $i) ? true : false;
+        $goodAnswer = ($correct == $i) ? true : false;
         $dest       = '';
 
-        $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+        $objAnswer -> createAnswer($answer, $goodAnswer, $comment, $weighting, $i, NULL, NULL, $dest);
 
     	// saves the answers into the data base
         $objAnswer -> save();
@@ -388,7 +388,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/hotspot_admin.inc.php

Indentation +4 added lines, -4 removed lines

@@ -907,10 +907,10 @@
                                         <?php } else { ?>
                                             <input class="form-control" type="text" name="weighting[<?php echo $i; ?>]" value="<?php echo (isset($weighting[$i]) ? $weighting[$i] : 10); ?>" />
                                                    <?php
-                                               }
-                                           }
-                                           if ($answerType == HOT_SPOT) {
-                                               ?>
+                                                }
+                                            }
+                                            if ($answerType == HOT_SPOT) {
+                                                ?>
                                         <input class="form-control" type="text" name="weighting[<?php echo $i; ?>]" value="<?php echo (isset($weighting[$i]) ? $weighting[$i] : 10); ?>" />
                                         <input type="hidden" name="hotspot_coordinates[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_coordinates[$i]) ? '0;0|0|0' : $hotspot_coordinates[$i]); ?>" />
                                         <input type="hidden" name="hotspot_type[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_type[$i]) ? 'square' : $hotspot_type[$i]); ?>" />

Braces +29 added lines, -11 removed lines

@@ -679,12 +679,15 @@ 
                                     $option1 = $option2 = $option3 = '';
                                     for ($k = 1; $k <= 100; $k++) {
                                         $selected1 = $selected2 = $selected3 = '';
-                                        if ($k == $threadhold1[$i])
-                                            $selected1 = 'selected="selected"';
-                                        if ($k == $threadhold2[$i])
-                                            $selected2 = 'selected="selected"';
-                                        if ($k == $threadhold3[$i])
-                                            $selected3 = 'selected="selected"';
+                                        if ($k == $threadhold1[$i]) {
+                                                                                    $selected1 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold2[$i]) {
+                                                                                    $selected2 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold3[$i]) {
+                                                                                    $selected3 = 'selected="selected"';
+                                        }
                                         $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>';
                                         $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>';
                                         $option3.='<option ' . $selected3 . '>' . $k . ' %</option>';
@@ -731,7 +734,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -784,7 +790,10 @@ 
                                                             <div class="checkbox">
                                                                 <p>
                                                                     <label>
-                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                                         <?php echo get_lang('TryAgain'); ?>
                                                                     </label>
                                                                 </p>
@@ -823,7 +832,10 @@ 
                                             <th ><?php echo get_lang('OAR'); ?>*</th>
                                             <?php if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { ?>
                                                 <th colspan="2" ><?php echo get_lang('Comment'); ?></th>
-                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) echo get_lang('Scenario'); ?></th>
+                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) {
+    echo get_lang('Scenario');
+}
+?></th>
                                             <?php } else { ?>
                                                 <th colspan="3" ><?php echo get_lang('Comment'); ?></th>
                                             <?php } ?>
@@ -849,7 +861,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -998,7 +1013,10 @@ 
                                         <div class="checkbox">
                                             <p>
                                                 <label>
-                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) echo'checked'; ?> />
+                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) {
+    echo'checked';
+}
+?> />
                                                     <?php echo get_lang('TryAgain'); ?>
                                                 </label>
                                             </p>

Spacing +49 added lines, -49 removed lines

@@ -26,7 +26,7 @@ 
 
 if ($modifyIn) {
     if ($debug > 0) {
-        echo '$modifyIn was set' . "<br />\n";
+        echo '$modifyIn was set'."<br />\n";
     }
     // if the user has chosen to modify the question only in the current exercise
     if ($modifyIn == 'thisExercise') {
@@ -65,7 +65,7 @@ 
     unset($buttonBack);
 }
 
-$hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercise/admin.php?' . api_get_cidreq() . '&exerciseId=' . $exerciseId;
+$hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$exerciseId;
 
 // the answer form has been submitted
 $submitAnswers = isset($_POST['submitAnswers']) ? true : false;
@@ -75,13 +75,13 @@ 
 if ($submitAnswers || $buttonBack) {
     if ($answerType == HOT_SPOT) {
         if ($debug > 0) {
-            echo '$submitAnswers or $buttonBack was set' . "<br />\n";
+            echo '$submitAnswers or $buttonBack was set'."<br />\n";
         }
 
         $questionWeighting = $nbrGoodAnswers = 0;
         for ($i = 1; $i <= $nbrAnswers; $i++) {
             if ($debug > 0) {
-                echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
             }
 
             $reponse[$i] = trim($reponse[$i]);
@@ -115,7 +115,7 @@ 
         if (empty($msgErr)) {
             for ($i = 1; $i <= $nbrAnswers; $i++) {
                 if ($debug > 0) {
-                    echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                    echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
                 }
 
                 $reponse[$i] = trim($reponse[$i]);
@@ -123,7 +123,7 @@ 
                 $weighting[$i] = ($weighting[$i]); //it can be float
 
                 if ($weighting[$i]) {
-                    $questionWeighting+=$weighting[$i];
+                    $questionWeighting += $weighting[$i];
                 }
 
                 // creates answer
@@ -146,15 +146,15 @@ 
 
             $editQuestion = $questionId;
             unset($modifyAnswers);
-            echo '<script type="text/javascript">window.location.href="' . $hotspot_admin_url . '&message=ItemUpdated"</script>';
+            echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
         }
 
         if ($debug > 0) {
-            echo '$modifyIn was set - end' . "<br />\n";
+            echo '$modifyIn was set - end'."<br />\n";
         }
     } else {
         if ($debug > 0) {
-            echo '$submitAnswers or $buttonBack was set' . "<br />\n";
+            echo '$submitAnswers or $buttonBack was set'."<br />\n";
         }
 
         $questionWeighting = $nbrGoodAnswers = 0;
@@ -169,7 +169,7 @@ 
 
         for ($i = 1; $i <= $nbrAnswers; $i++) {
             if ($debug > 0) {
-                echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
             }
 
             $reponse[$i] = trim($reponse[$i]);
@@ -194,7 +194,7 @@ 
                 $threadhold3_str = intval($threadhold3[$i]);
             }
 
-            $threadhold_total = $threadhold1_str . ';' . $threadhold2_str . ';' . $threadhold3_str;
+            $threadhold_total = $threadhold1_str.';'.$threadhold2_str.';'.$threadhold3_str;
 
             if (isset($try[$i]) && $try[$i] == 'on') {
                 $try_str = 1;
@@ -220,7 +220,7 @@ 
                 $question_str = $select_question[$i];
             }
 
-            $destination[$i] = $threadhold_total . '@@' . $try_str . '@@' . $lp_str . '@@' . $question_str . '@@' . $url_str;
+            $destination[$i] = $threadhold_total.'@@'.$try_str.'@@'.$lp_str.'@@'.$question_str.'@@'.$url_str;
 
             // checks if field is empty
             if (empty($reponse[$i]) && $reponse[$i] != '0') {
@@ -278,12 +278,12 @@ 
             $question_str = $selectQuestionNoError;
         }
 
-        $destination_noerror = $threadhold_total . '@@' . $try_str . '@@' . $lp_str . '@@' . $question_str . '@@' . $url_str;
+        $destination_noerror = $threadhold_total.'@@'.$try_str.'@@'.$lp_str.'@@'.$question_str.'@@'.$url_str;
 
         if (empty($msgErr)) {
             for ($i = 1; $i <= $nbrAnswers; $i++) {
                 if ($debug > 0) {
-                    echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+                    echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
                 }
 
                 $reponse[$i] = trim($reponse[$i]);
@@ -291,7 +291,7 @@ 
                 $weighting[$i] = ($weighting[$i]); //it can be float
 
                 if ($weighting[$i]) {
-                    $questionWeighting+=$weighting[$i];
+                    $questionWeighting += $weighting[$i];
                 }
 
                 // creates answer
@@ -326,14 +326,14 @@ 
 
             $editQuestion = $questionId;
             unset($modifyAnswers);
-            echo '<script type="text/javascript">window.location.href="' . $hotspot_admin_url . '&message=ItemUpdated"</script>';
+            echo '<script type="text/javascript">window.location.href="'.$hotspot_admin_url.'&message=ItemUpdated"</script>';
         }
     }
 }
 
 if ($modifyAnswers) {
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 0) . '$modifyAnswers is set' . "<br />\n";
+        echo str_repeat('&nbsp;', 0).'$modifyAnswers is set'."<br />\n";
     }
 
     // construction of the Answer object
@@ -341,7 +341,7 @@ 
     Session::write('objAnswer', $objAnswer);
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 2) . '$answerType is HOT_SPOT' . "<br />\n";
+        echo str_repeat('&nbsp;', 2).'$answerType is HOT_SPOT'."<br />\n";
     }
 
     if ($answerType == HOT_SPOT_DELINEATION) {
@@ -523,11 +523,11 @@ 
     }
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 2) . '$usedInSeveralExercises is untrue' . "<br />\n";
+        echo str_repeat('&nbsp;', 2).'$usedInSeveralExercises is untrue'."<br />\n";
     }
 
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 4) . '$answerType is HOT_SPOT' . "<br />\n";
+        echo str_repeat('&nbsp;', 4).'$answerType is HOT_SPOT'."<br />\n";
     }
 
     if ($answerType == HOT_SPOT_DELINEATION) {
@@ -567,14 +567,14 @@ 
 
     Display::tag(
         'h3',
-        get_lang('Question') . ": " . $questionName . Display::return_icon('info3.gif', strip_tags(get_lang('HotspotChoose')))
+        get_lang('Question').": ".$questionName.Display::return_icon('info3.gif', strip_tags(get_lang('HotspotChoose')))
     );
 
     if (!empty($msgErr)) {
         Display::display_normal_message($msgErr); //main API
     }
 
-    $hotspot_admin_url = api_get_path(WEB_CODE_PATH) . 'exercise/admin.php?' . api_get_cidreq() . '&hotspotadmin=' . $modifyAnswers . '&exerciseId=' . $exerciseId . '&' . api_get_cidreq();
+    $hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&hotspotadmin='.$modifyAnswers.'&exerciseId='.$exerciseId.'&'.api_get_cidreq();
     ?>
     <form method="post" action="<?php echo $hotspot_admin_url; ?>" class="form-horizontal" id="frm_exercise" name="frm_exercise">
         <div class="form-group">
@@ -611,7 +611,7 @@ 
                                 <th><?php echo get_lang('Comment'); ?></th>
                                 <?php
                                 if ($answerType == HOT_SPOT_DELINEATION) {
-                                    echo '<th >' . get_lang('Scenario') . '</th>';
+                                    echo '<th >'.get_lang('Scenario').'</th>';
                                 }
                             } else { ?>
                                 <th colspan="2">
@@ -640,36 +640,36 @@ 
                                         $isSelected = true;
                                         $selected = 'selected="selected"';
                                     }
-                                    $option_lp.='<option value="' . $id . '" ' . $selected . '>' . $details['lp_name'] . '</option>';
+                                    $option_lp .= '<option value="'.$id.'" '.$selected.'>'.$details['lp_name'].'</option>';
                                 }
 
                                 if ($isSelected) {
-                                    $option_lp = '<option value="0">' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                                    $option_lp = '<option value="0">'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                                 } else {
-                                    $option_lp = '<option value="0" selected="selected" >' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                                    $option_lp = '<option value="0" selected="selected" >'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                                 }
 
                                 // Feedback SELECT
                                 $question_list = $objExercise->selectQuestionList();
                                 $option_feed = '';
-                                $option_feed.='<option value="0">' . get_lang('SelectTargetQuestion') . '</option>';
+                                $option_feed .= '<option value="0">'.get_lang('SelectTargetQuestion').'</option>';
 
                                 foreach ($question_list as $key => $questionid) {
                                     $selected = '';
                                     $question = Question::read($questionid);
-                                    $val = 'Q' . $key . ' :' . substrwords($question->selectTitle(), ICON_SIZE_SMALL);
+                                    $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL);
 
                                     if (isset($select_question[$i]) && $questionid == $select_question[$i]) {
                                         $selected = 'selected="selected"';
                                     }
 
-                                    $option_feed.='<option value="' . $questionid . '" ' . $selected . ' >' . $val . '</option>';
+                                    $option_feed .= '<option value="'.$questionid.'" '.$selected.' >'.$val.'</option>';
                                 }
 
                                 if (isset($select_question[$i]) && $select_question[$i] == -1) {
-                                    $option_feed .= '<option value="-1" selected="selected" >' . get_lang('ExitTest') . '</option>';
+                                    $option_feed .= '<option value="-1" selected="selected" >'.get_lang('ExitTest').'</option>';
                                 } else {
-                                    $option_feed .= '<option value="-1">' . get_lang('ExitTest') . '</option>';
+                                    $option_feed .= '<option value="-1">'.get_lang('ExitTest').'</option>';
                                 }
 
                                 //-------- IF it is a delineation
@@ -683,9 +683,9 @@ 
                                             $selected2 = 'selected="selected"';
                                         if ($k == $threadhold3[$i])
                                             $selected3 = 'selected="selected"';
-                                        $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>';
-                                        $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>';
-                                        $option3.='<option ' . $selected3 . '>' . $k . ' %</option>';
+                                        $option1 .= '<option '.$selected1.' >'.$k.' % </option>';
+                                        $option2 .= '<option '.$selected2.' >'.$k.' % </option>';
+                                        $option3 .= '<option '.$selected3.'>'.$k.' %</option>';
                                     }
                                     ?>
                                     <tr>
@@ -729,7 +729,7 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -782,7 +782,7 @@ 
                                                             <div class="checkbox">
                                                                 <p>
                                                                     <label>
-                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
                                                                         <?php echo get_lang('TryAgain'); ?>
                                                                     </label>
                                                                 </p>
@@ -847,7 +847,7 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try['.$i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -887,12 +887,12 @@ 
                                         <input class="form-control" type="text" name="reponse[<?php echo $i; ?>]" value="<?php echo Security::remove_XSS($responseValue); ?>" />
                                     </td>
                                     <?php
-                                    $form = new FormValidator('form_' . $i);
+                                    $form = new FormValidator('form_'.$i);
                                     $config = array(
                                         'ToolbarSet' => 'TestProposedAnswer',
                                         'cols-size' => [0, 12, 0]
                                     );
-                                    $form->addHtmlEditor('comment[' . $i . ']', null, false, false, $config);
+                                    $form->addHtmlEditor('comment['.$i.']', null, false, false, $config);
                                     $renderer = $form->defaultRenderer();
                                     $form_template = '{content}';
                                     $renderer->setFormTemplate($form_template);
@@ -901,7 +901,7 @@ 
                                         {element}';
                                     $renderer->setElementTemplate($element_template);
 
-                                    $form->setDefaults(array('comment[' . $i . ']' => $commentValue));
+                                    $form->setDefaults(array('comment['.$i.']' => $commentValue));
                                     $return = $form->return_form();
                                     ?>
                                     <td colspan="2" align="left" ><?php echo $return; ?></td>
@@ -938,35 +938,35 @@ 
                                 $selected = 'selected="selected"';
                                 $isSelected = true;
                             }
-                            $option_lp.='<option value="' . $id . '" ' . $selected . '>' . $details['lp_name'] . '</option>';
+                            $option_lp .= '<option value="'.$id.'" '.$selected.'>'.$details['lp_name'].'</option>';
                         }
 
                         if ($isSelected) {
-                            $option_lp = '<option value="0">' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                            $option_lp = '<option value="0">'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                         } else {
-                            $option_lp = '<option value="0" selected="selected" >' . get_lang('SelectTargetLP') . '</option>' . $option_lp;
+                            $option_lp = '<option value="0" selected="selected" >'.get_lang('SelectTargetLP').'</option>'.$option_lp;
                         }
 
                         // Feedback SELECT
                         $question_list = $objExercise->selectQuestionList();
                         $option_feed = '';
-                        $option_feed.='<option value="0">' . get_lang('SelectTargetQuestion') . '</option>';
+                        $option_feed .= '<option value="0">'.get_lang('SelectTargetQuestion').'</option>';
                         $details = isset($details) ? $details : null;
                         $id = isset($id) ? $id : 0;
                         $selectQuestionNoError = isset($selectQuestionNoError) ? $selectQuestionNoError : null;
                         foreach ($question_list as $key => $questionid) {
                             $selected = '';
                             $question = Question::read($questionid);
-                            $val = 'Q' . $key . ' :' . substrwords($question->selectTitle(), ICON_SIZE_SMALL);
+                            $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL);
                             if ($questionid == $selectQuestionNoError) {
                                 $selected = 'selected="selected"';
                             }
-                            $option_feed.='<option value="' . $questionid . '" ' . $selected . ' >' . $val . '</option>';
+                            $option_feed .= '<option value="'.$questionid.'" '.$selected.' >'.$val.'</option>';
                         }
                         if ($selectQuestionNoError == -1) {
-                            $option_feed.='<option value="-1" selected="selected" >' . get_lang('ExitTest') . '</option>';
+                            $option_feed .= '<option value="-1" selected="selected" >'.get_lang('ExitTest').'</option>';
                         } else {
-                            $option_feed.='<option value="-1">' . get_lang('ExitTest') . '</option>';
+                            $option_feed .= '<option value="-1">'.get_lang('ExitTest').'</option>';
                         }
 
                         if ($answerType == HOT_SPOT_DELINEATION) {
@@ -1057,6 +1057,6 @@ 
     </script>
     <?php
     if ($debug > 0) {
-        echo str_repeat('&nbsp;', 0) . '$modifyAnswers was set - end' . "<br />\n";
+        echo str_repeat('&nbsp;', 0).'$modifyAnswers was set - end'."<br />\n";
     }
 }

main/exercise/feedback.php

Indentation +26 added lines, -26 removed lines

@@ -13,14 +13,14 @@ 
 $nameTools=get_lang('ExerciseManagement');
 
 if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array (
-			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
-			'name' => get_lang('ToolGradebook')
-		);
+    $interbreadcrumb[]= array (
+            'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
+            'name' => get_lang('ToolGradebook')
+        );
 }
 
 $interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises'));
@@ -31,24 +31,24 @@ 
   <?php echo "Add Feedback"; ?>
 </h4>
 <?php
-	$id = $_REQUEST['question'];
-	$objQuestionTmp = Question::read($id);
-	echo "<tr><td><b>".get_lang('Question')." : </b>";
-	echo $objQuestionTmp->selectTitle();
-	echo "</td></tr>";
-	echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>";
-	$objAnswerTmp=new Answer($id);
-	$num = $objAnswerTmp->selectNbrAnswers();
-	$objAnswerTmp->read();
-	for($i=1;$i<=$num;$i++)
-	{
-	echo "<tr><td width='10%'> ";
-	$ans =  $objAnswerTmp->answer[$i];
+    $id = $_REQUEST['question'];
+    $objQuestionTmp = Question::read($id);
+    echo "<tr><td><b>".get_lang('Question')." : </b>";
+    echo $objQuestionTmp->selectTitle();
+    echo "</td></tr>";
+    echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>";
+    $objAnswerTmp=new Answer($id);
+    $num = $objAnswerTmp->selectNbrAnswers();
+    $objAnswerTmp->read();
+    for($i=1;$i<=$num;$i++)
+    {
+    echo "<tr><td width='10%'> ";
+    $ans =  $objAnswerTmp->answer[$i];
 
-	$form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
-	$obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
-	$renderer =& $obj_registration_form->defaultRenderer();
-	$renderer->setCustomElementTemplate(
+    $form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
+    $obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
+    $renderer =& $obj_registration_form->defaultRenderer();
+    $renderer->setCustomElementTemplate(
 '<tr>
 	<td align="left" style="" valign="top" width=30%>{label}
 		<!-- BEGIN required --><span style="color: #ff0000">*</span><!-- END required -->
@@ -57,10 +57,10 @@ 
 		<!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 	</td>
 </tr>');
-	$form->addHtmlEditor('Feedback', $i.'.'.$ans, false, false, array('ToolbarSet' => 'TestAnswerFeedback', 'Width' => '600', 'Height' => '200'));
-	$form->display();
-	echo "</td>";
-	}?>
+    $form->addHtmlEditor('Feedback', $i.'.'.$ans, false, false, array('ToolbarSet' => 'TestAnswerFeedback', 'Width' => '600', 'Height' => '200'));
+    $form->display();
+    echo "</td>";
+    }?>
 	<form name="frm" action="javascript: void(0);" method="post">
 	 Click Ok to finish <input  type="submit" value="Ok" />
 	</form>

Spacing +13 added lines, -13 removed lines

@@ -8,23 +8,23 @@ 
 * 	@version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $
 */
 require_once __DIR__.'/../inc/global.inc.php';
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
-$nameTools=get_lang('ExerciseManagement');
+$nameTools = get_lang('ExerciseManagement');
 
-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/'.$_SESSION['gradebook_dest'],
 			'name' => get_lang('ToolGradebook')
 		);
 }
 
-$interbreadcrumb[]=array("url" => "exercise.php","name" => get_lang('Exercises'));
-Display::display_header($nameTools,"Exercises");
+$interbreadcrumb[] = array("url" => "exercise.php", "name" => get_lang('Exercises'));
+Display::display_header($nameTools, "Exercises");
 ?>
 <table border="0" align="center" cellpadding="2" cellspacing="2" width="100%">
 <h4>
@@ -37,17 +37,17 @@ 
 	echo $objQuestionTmp->selectTitle();
 	echo "</td></tr>";
 	echo " <br><tr><td><b><br>".get_lang('Answer')." : </b></td></tr>";
-	$objAnswerTmp=new Answer($id);
+	$objAnswerTmp = new Answer($id);
 	$num = $objAnswerTmp->selectNbrAnswers();
 	$objAnswerTmp->read();
-	for($i=1;$i<=$num;$i++)
+	for ($i = 1; $i <= $num; $i++)
 	{
 	echo "<tr><td width='10%'> ";
-	$ans =  $objAnswerTmp->answer[$i];
+	$ans = $objAnswerTmp->answer[$i];
 
-	$form = new FormValidator('feedbackform','post',api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
+	$form = new FormValidator('feedbackform', 'post', api_get_self()."?".api_get_cidreq()."&modifyQuestion=".$modifyQuestion."&newQuestion=".$newQuestion);
 	$obj_registration_form = new HTML_QuickForm('frmRegistration', 'POST');
-	$renderer =& $obj_registration_form->defaultRenderer();
+	$renderer = & $obj_registration_form->defaultRenderer();
 	$renderer->setCustomElementTemplate(
 '<tr>
 	<td align="left" style="" valign="top" width=30%>{label}

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 __DIR__.'/../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

@@ -40,7 +40,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::read('objExercise');
@@ -50,11 +50,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>';
@@ -84,10 +84,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');
@@ -103,38 +103,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>');
         }
 
@@ -179,7 +179,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.']'));
@@ -191,10 +191,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
@@ -208,7 +208,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/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>';