chamilo / chamilo-lms

main/exercice/unique_answer.class.php

Spacing +54 added lines, -54 removed lines

@@ -59,21 +59,21 @@ 
 
         if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
             //Scenario
-            $comment_title = '<th width="20%">' . get_lang('Comment') . '</th>';
-            $feedback_title = '<th width="20%">' . get_lang('Scenario') . '</th>';
+            $comment_title = '<th width="20%">'.get_lang('Comment').'</th>';
+            $feedback_title = '<th width="20%">'.get_lang('Scenario').'</th>';
         } else {
-            $comment_title = '<th width="40%">' . get_lang('Comment') . '</th>';
+            $comment_title = '<th width="40%">'.get_lang('Comment').'</th>';
         }
 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr style="text-align: center;">
-                    <th width="5%">' . get_lang('Number') . '</th>
-                    <th width="5%"> ' . get_lang('True') . '</th>
-                    <th width="40%">' . get_lang('Answer') . '</th>
-                        ' . $comment_title . '
-                        ' . $feedback_title . '
-                    <th width="10%">' . get_lang('Weighting') . '</th>
+                    <th width="5%">' . get_lang('Number').'</th>
+                    <th width="5%"> ' . get_lang('True').'</th>
+                    <th width="40%">' . get_lang('Answer').'</th>
+                        ' . $comment_title.'
+                        ' . $feedback_title.'
+                    <th width="10%">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -103,7 +103,7 @@ 
                     continue;
                 }
                 $question = Question::read($questionid);
-                $select_question[$questionid] = 'Q' . $key . ' :' . cut(
+                $select_question[$questionid] = 'Q'.$key.' :'.cut(
                     $question->selectTitle(), 20
                 );
             }
@@ -134,9 +134,9 @@ 
                 if ($answer->correct[$i]) {
                     $correct = $i;
                 }
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['weighting[' . $i . ']'] = float_format(
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['weighting['.$i.']'] = float_format(
                     $answer->weighting[$i],
                     1
                 );
@@ -159,18 +159,18 @@ 
                     $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;
             } else {
                 $defaults['answer[1]'] = get_lang('DefaultUniqueAnswer1');
                 $defaults['weighting[1]'] = 10;
                 $defaults['answer[2]'] = get_lang('DefaultUniqueAnswer2');
                 $defaults['weighting[2]'] = 0;
 
-                $temp_scenario['destination' . $i] = array('0');
-                $temp_scenario['lp' . $i] = array('0');
+                $temp_scenario['destination'.$i] = array('0');
+                $temp_scenario['lp'.$i] = array('0');
             }
             $defaults['scenario'] = $temp_scenario;
 
@@ -182,62 +182,62 @@ 
             );
             $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 . '"'
+                'text', 'counter['.$i.']', null, ' value = "'.$i.'"'
             );
             $answer_number->freeze();
             $form->addElement(
                 'radio', 'correct', null, null, $i, 'class="checkbox"'
             );
 
-            $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editor_config);
+            $form->addHtmlEditor('answer['.$i.']', null, null, true, $editor_config);
 
             $form->addRule(
-                'answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'
+                'answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'
             );
 
             if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config);
                 // Direct feedback
                 //Adding extra feedback fields
                 $group = array();
-                $group['try' . $i] = $form->createElement(
+                $group['try'.$i] = $form->createElement(
                     'checkbox',
-                    'try' . $i,
+                    'try'.$i,
                     null,
                     get_lang('TryAgain')
                 );
-                $group['lp' . $i] = $form->createElement(
+                $group['lp'.$i] = $form->createElement(
                     'select',
-                    'lp' . $i,
-                    get_lang('SeeTheory') . ': ',
+                    'lp'.$i,
+                    get_lang('SeeTheory').': ',
                     $select_lp_id
                 );
-                $group['destination' . $i] = $form->createElement(
+                $group['destination'.$i] = $form->createElement(
                     'select',
-                    'destination' . $i,
-                    get_lang('GoToQuestion') . ': ',
+                    'destination'.$i,
+                    get_lang('GoToQuestion').': ',
                     $select_question
                 );
-                $group['url' . $i] = $form->createElement(
+                $group['url'.$i] = $form->createElement(
                     'text',
-                    'url' . $i,
-                    get_lang('Other') . ': ',
+                    'url'.$i,
+                    get_lang('Other').': ',
                     array(
                         'class' => 'col-md-2',
                         'placeholder' => get_lang('Other')
@@ -250,9 +250,9 @@ 
                     'scenario'
                 );
             } else {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config);
             }
-            $form->addText('weighting[' . $i . ']', null, null, array('value' => '0'));
+            $form->addText('weighting['.$i.']', null, null, array('value' => '0'));
             $form->addHtml('</tr>');
         }
 
@@ -306,19 +306,19 @@ 
         $nb_answers = $form->getSubmitValue('nb_answers');
 
         for ($i = 1; $i <= $nb_answers; $i++) {
-            $answer = trim($form->getSubmitValue('answer[' . $i . ']'));
-            $comment = trim($form->getSubmitValue('comment[' . $i . ']'));
-            $weighting = trim($form->getSubmitValue('weighting[' . $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);
 
-            $try = $scenario['try' . $i];
-            $lp = $scenario['lp' . $i];
-            $destination = $scenario['destination' . $i];
-            $url = trim($scenario['url' . $i]);
+            $try = $scenario['try'.$i];
+            $lp = $scenario['lp'.$i];
+            $destination = $scenario['destination'.$i];
+            $url = trim($scenario['url'.$i]);
 
             /*
             How we are going to parse the destination value
@@ -366,7 +366,7 @@ 
             }
 
             //1@@1;2;@@2;4;4;@@http://www.chamilo.org
-            $dest = $try . '@@' . $lp . '@@' . $destination . '@@' . $url;
+            $dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
             $objAnswer->createAnswer(
                 $answer,
                 $goodAnswer,
@@ -400,12 +400,12 @@ 
         $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>
-				<th>' . get_lang("Answer") . '</th>';
-        $header .= '<th>' . get_lang("Comment") . '</th>';
+				<th>' . get_lang("Choice").'</th>
+				<th>' . get_lang("ExpectedChoice").'</th>
+				<th>' . get_lang("Answer").'</th>';
+        $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
 
         return $header;
@@ -469,7 +469,7 @@ 
         if ($correct) {
             $sql = "UPDATE $tbl_quiz_question
                     SET ponderation = (ponderation + $score)
-                    WHERE c_id = $course_id AND id = " . $question_id;
+                    WHERE c_id = $course_id AND id = ".$question_id;
             Database::query($sql);
         }
     }

main/exercice/hotspot_actionscript.as.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 session_cache_limiter("none");
 
 require '../inc/global.inc.php';
-require api_get_path(LIBRARY_PATH) . 'geometry.lib.php';
+require api_get_path(LIBRARY_PATH).'geometry.lib.php';
 
 // set vars
 $questionId    = intval($_GET['modifyAnswers']);
@@ -29,7 +29,7 @@ 
 $course_id = api_get_course_int_id();
 
 // Query db for answers
-if ($answer_type==HOT_SPOT_DELINEATION) {
+if ($answer_type == HOT_SPOT_DELINEATION) {
 	$sql = "SELECT id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." AND hotspot_type = 'delineation' ORDER BY id";
 } else {
@@ -75,7 +75,7 @@ 
     $hotSpot['answer'] = $hotspot['answer'];
 
 	// Square or rectancle
-	if ($hotspot['hotspot_type'] == 'square' )
+	if ($hotspot['hotspot_type'] == 'square')
 	{
         $hotSpot['type'] = 'square';
 	}

main/exercice/Hpdownload.php

Spacing +35 added lines, -35 removed lines

@@ -12,12 +12,12 @@ 
 session_cache_limiter('public');
 
 require_once '../inc/global.inc.php';
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 $tbl_document = Database::get_course_table(TABLE_DOCUMENT);
 
-$doc_url=str_replace(array('../','\\..','\\0','..\\'),array('','','',''),urldecode($_GET['doc_url']));
-$filename=basename($doc_url);
+$doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($_GET['doc_url']));
+$filename = basename($doc_url);
 
 // launch event
 //Event::event_download($doc_url);
@@ -29,7 +29,7 @@ 
 	$full_file_name = $course_path.Security::remove_XSS($doc_url);
 }
 
-if(!is_file($full_file_name)) {
+if (!is_file($full_file_name)) {
 	exit;
 }
 
@@ -37,26 +37,26 @@ 
     exit;
 }
 
-$extension=explode('.',$filename);
-$extension=strtolower($extension[sizeof($extension)-1]);
-
-switch($extension) {
-	case 'gz':		$content_type='application/x-gzip';			break;
-	case 'zip':		$content_type='application/zip';			break;
-	case 'pdf':		$content_type='application/pdf';			break;
-	case 'png':		$content_type='image/png';					break;
-	case 'gif':		$content_type='image/gif';					break;
-	case 'jpg':		$content_type='image/jpeg';					break;
-	case 'txt':		$content_type='text/plain';					break;
-	case 'htm':		$content_type='text/html';					break;
-	case 'html':	$content_type='text/html';					break;
-	default:		$content_type='application/octet-stream';	break;
+$extension = explode('.', $filename);
+$extension = strtolower($extension[sizeof($extension) - 1]);
+
+switch ($extension) {
+	case 'gz':		$content_type = 'application/x-gzip'; break;
+	case 'zip':		$content_type = 'application/zip'; break;
+	case 'pdf':		$content_type = 'application/pdf'; break;
+	case 'png':		$content_type = 'image/png'; break;
+	case 'gif':		$content_type = 'image/gif'; break;
+	case 'jpg':		$content_type = 'image/jpeg'; break;
+	case 'txt':		$content_type = 'text/plain'; break;
+	case 'htm':		$content_type = 'text/html'; break;
+	case 'html':	$content_type = 'text/html'; break;
+	default:		$content_type = 'application/octet-stream'; break;
 }
 
 header('Content-disposition: filename='.$filename);
 header('Content-Type: '.$content_type);
-header('Expires: '.gmdate('D, d M Y H:i:s',time()+10).' GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s',time()+10).' GMT');
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT');
 
 /*
 	Dynamic parsing section
@@ -70,16 +70,16 @@ 
 if ($content_type == 'text/html') {
 	$directory_name = dirname($full_file_name);
 
-	$dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
+	$dir = str_replace(array('\\', $_configuration['root_sys']."courses/".$_course['path'].'/document'), array('/', ''), $directory_name);
 
-	if($dir[strlen($dir)-1] != '/') {
-		$dir.='/';
+	if ($dir[strlen($dir) - 1] != '/') {
+		$dir .= '/';
 	}
 
 
 	//Parse whole file at one
 	$fp = fopen($full_file_name, "r");
-	$file_content = fread ($fp, filesize ($full_file_name));
+	$file_content = fread($fp, filesize($full_file_name));
 	fclose($fp);
 	//$file_content = api_replace_parameter($dir, $file_content, "src");
 	//$file_content = api_replace_parameter($dir, $file_content, "href");
@@ -98,9 +98,9 @@ 
 
 
     $exercisePath = api_get_self();
-  	$exfile = explode('/',$exercisePath);
-  	$exfile = $exfile[sizeof($exfile)-1];
-  	$exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
+  	$exfile = explode('/', $exercisePath);
+  	$exfile = $exfile[sizeof($exfile) - 1];
+  	$exercisePath = substr($exercisePath, 0, strpos($exercisePath, $exfile));
   	$exercisePath = $exercisePath;
 
 		$content = $file_content;
@@ -125,16 +125,16 @@ 
 "// Must be included \n".
 "function Finish(){\n".
 " mySaveScore();";
-		$newcontent = str_replace($mit,$js_content,$content);
+		$newcontent = str_replace($mit, $js_content, $content);
 
-		$prehref="javascript:void(0);";
-		$posthref=$_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+		$prehref = "javascript:void(0);";
+		$posthref = $_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
+		$newcontent = str_replace($prehref, $posthref, $newcontent);
 
 
-		$prehref="class=\"GridNum\" onclick=";
-		$posthref="class=\"GridNum\" onMouseover=";
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+		$prehref = "class=\"GridNum\" onclick=";
+		$posthref = "class=\"GridNum\" onMouseover=";
+		$newcontent = str_replace($prehref, $posthref, $newcontent);
 
 
 		header('Content-length: '.strlen($newcontent));
@@ -146,7 +146,7 @@ 
 
 //normal case, all non-html files
 //header('Content-length: '.filesize($full_file_name));
-$fp=fopen($full_file_name,'rb');
+$fp = fopen($full_file_name, 'rb');
 fpassthru($fp);
 fclose($fp);
 ?>

main/exercice/hotpotatoes_exercise_result.class.php

Spacing +55 added lines, -55 removed lines

@@ -23,13 +23,13 @@ 
     {
 		$return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
-        $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
+        $TBL_TRACK_HOTPOTATOES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
         $cid             = api_get_course_id();
         $course_id       = api_get_course_int_id();
         //$user_id         = intval($user_id);
         $user_id = null;
-        $session_id_and  = ' AND te.session_id = ' . api_get_session_id() . ' ';
+        $session_id_and  = ' AND te.session_id = '.api_get_session_id().' ';
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
@@ -37,7 +37,7 @@ 
         }
 
         if (empty($user_id)) {
-            $sql="SELECT firstname as userpart1, lastname as userpart2 ,
+            $sql = "SELECT firstname as userpart1, lastname as userpart2 ,
                     email,
                     tth.exe_name,
                     tth.exe_result,
@@ -49,13 +49,13 @@ 
                             tth.exe_name = '$hotpotato_name'
                     ORDER BY tth.c_id ASC, tth.exe_date ASC";
         } else {
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
+            $user_id_and = ' AND te.exe_user_id = '.api_get_user_id().' ';
             // get only this user's results
 
             $sql = "SELECT '', exe_name, exe_result , exe_weighting, exe_date
                     FROM $TBL_TRACK_HOTPOTATOES
                     WHERE
-                        exe_user_id = '" . $user_id . "' AND
+                        exe_user_id = '".$user_id."' AND
                         c_id = $course_id AND
                         tth.exe_name = '$hotpotato_name'
                     ORDER BY c_id ASC, exe_date ASC";
@@ -64,13 +64,13 @@ 
         $results = array();
 
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $results[] = $rowx;
         }
 
         $hpresults = array();
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $hpresults[] = $rowx;
         }
 
@@ -89,19 +89,19 @@ 
 
         // Print the Result of Hotpotatoes Tests
         if (is_array($hpresults)) {
-            for($i = 0; $i < sizeof($hpresults); $i++) {
+            for ($i = 0; $i < sizeof($hpresults); $i++) {
                 $return[$i] = array();
                 $title = GetQuizName($hpresults[$i]['exe_name'], $document_path);
-                if ($title =='') {
+                if ($title == '') {
                     $title = basename($hpresults[$i]['exe_name']);
                 }
-                if(empty($user_id)) {
+                if (empty($user_id)) {
                 $return[$i]['email'] = $hpresults[$i]['email'];
                     $return[$i]['first_name'] = $hpresults[$i]['userpart1'];
                     $return[$i]['last_name'] = $hpresults[$i]['userpart2'];
                 }
                 $return[$i]['title'] = $title;
-                $return[$i]['exe_date']  = $hpresults[$i]['exe_date'];
+                $return[$i]['exe_date'] = $hpresults[$i]['exe_date'];
 
                 $return[$i]['result'] = $hpresults[$i]['exe_result'];
                 $return[$i]['max'] = $hpresults[$i]['exe_weighting'];
@@ -120,7 +120,7 @@ 
 	 * @param	boolean		Whether to include user fields or not
 	 * @return	boolean		False on error
 	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
     {
 		global $charset;
 		$this->getExercisesReporting($document_path, $hotpotato_name);
@@ -131,17 +131,17 @@ 
 		$data = '';
 
         if (api_is_western_name_order()) {
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
         } else {
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
         }
@@ -163,16 +163,16 @@ 
 		$data .= "\n";
 
 		//results
-		foreach($this->results as $row) {
+		foreach ($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+              $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
-            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
 			/*if ($export_user_fields) {
 				//show user fields data, if any, for this user
@@ -182,10 +182,10 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
+			$data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+			$data .= str_replace("\r\n", '  ', $row['exe_date']).';';
+			$data .= str_replace("\r\n", '  ', $row['result']).';';
+			$data .= str_replace("\r\n", '  ', $row['max']).';';
 			$data .= "\n";
 		}
 
@@ -207,7 +207,7 @@ 
 		header('Content-Description: '.$filename);
 		header('Content-transfer-encoding: binary');
 		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+		echo "\xEF\xBB\xBF"; // force utf-8 header of csv file
 		echo $data;
 		return true;
 	}
@@ -249,25 +249,25 @@ 
 		}
 
 		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+		    $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Email'));
 		    $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+    			$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
     			$column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
             } else {
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
                 $column++;
             }
 		}
 
 		if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
 
 			//show the fields names for user fields
 			foreach ($extra_user_fields as $field) {
@@ -276,63 +276,63 @@ 
 			}
 		}
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('EndDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
 		$column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
 		$line++;
 
 		foreach ($this->results as $row) {
 			$column = 0;
 
             if ($with_column_user) {
-                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
 
                 if (api_is_western_name_order()) {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
                 } else {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
 			}
 
 			if ($export_user_fields) {
 				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
+				foreach ($user_fields_values as $value) {
+					$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
 					$column++;
 				}
 			}
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+			$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['end_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['duration']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['result']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['max']);
 			$column++;
-            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
+            $worksheet->SetCellValueByColumnAndRow($line, $column, $row['status']);
 			$line++;
 		}
 

main/exercice/hotspot_actionscript_admin.as.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 
 api_protect_course_script(false);
 
-$isAllowedToEdit = api_is_allowed_to_edit(null,true);
+$isAllowedToEdit = api_is_allowed_to_edit(null, true);
 
 if (!$isAllowedToEdit) {
     api_not_allowed(true);
@@ -22,7 +22,7 @@ 
 $objQuestion = Question::read($questionId);
 $_course = api_get_course_info();
 
-$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 $picturePath = $documentPath.'/images';
 $pictureName = $objQuestion->selectPicture();
@@ -65,13 +65,13 @@ 
 $answers = $_SESSION['tmp_answers'];
 $nbrAnswers = count($answers['answer']);
 
-for ($i=1;$i <= $nbrAnswers; $i++) {
+for ($i = 1; $i <= $nbrAnswers; $i++) {
     $hotSpot = [];
     $hotSpot['id'] = null;
-    $hotSpot['answer']= $answers['answer'][$i];
+    $hotSpot['answer'] = $answers['answer'][$i];
 
     if ($answer_type == HOT_SPOT_DELINEATION) {
-        if ($i==1) {
+        if ($i == 1) {
             $hotSpot['type'] = 'delineation';
         } else {
             $hotSpot['type'] = 'oar';

main/exercice/exercice.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 // directly to exercise.php. This redirection is enabled for 1.10.x (2015-04-21)
 // The final goal of this file is to be removed in a few years time, if
 // considered realistically not harmful
-require __DIR__ . '/exercise.php';
+require __DIR__.'/exercise.php';

main/exercice/result.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	api_not_allowed($show_headers);
 }
 
-$is_allowedToEdit = api_is_allowed_to_edit(null,true) || $is_courseTutor;
+$is_allowedToEdit = api_is_allowed_to_edit(null, true) || $is_courseTutor;
 
 //Getting results from the exe_id. This variable also contain all the information about the exercise
 $track_exercise_info = ExerciseLib::get_exercise_track_exercise_info($id);
@@ -53,8 +53,8 @@ 
     }
 }
 
-$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">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
 
 if ($show_headers) {
     $interbreadcrumb[] = array(

main/exercice/evalmathnotation.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 get_lang('MultiplicationStar')."\n".
 get_lang('DivisionSlash')."\n".
 get_lang('ExponentiationCircumflex')."\n".
-get_lang('ModuloPercentage') . "\n" .
+get_lang('ModuloPercentage')."\n".
 "\n".
 get_lang('SquareRootSqrt')."\n".
 get_lang('AbsoluteValueAbs')."\n".

main/exercice/multiple_answer.class.php

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>