From 54bba9b12b3c69cd9e7438d34e0c1e935b7b8e60 Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Tue, 7 Jan 2014 10:22:54 +0100
Subject: [PATCH 1/9] In question authoring, display Comment editor for all
 test configuration - ref #6619

---
 main/exercice/admin.php                       |  7 +++++
 .../exercice/global_multiple_answer.class.php | 17 +++---------
 main/exercice/multiple_answer.class.php       | 17 +++---------
 .../multiple_answer_combination.class.php     | 16 +++--------
 main/exercice/unique_answer.class.php         | 21 +++++++--------
 .../unique_answer_no_option.class.php         | 27 +++++--------------
 6 files changed, 35 insertions(+), 70 deletions(-)

diff --git a/main/exercice/admin.php b/main/exercice/admin.php
index 996157fb7f..5af8cfa82c 100644
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
@@ -513,6 +513,13 @@ if (!$newQuestion && !$modifyQuestion && !$editQuestion && !isset($_GET['hotspot
 	require 'question_list_admin.inc.php';
 }
 
+// if we are in question authoring, display warning to user is feedback not shown at the end of the test -ref #6619
+// this test to displau only message in the question authoring page and not in the question list page too
+// if (is_object($objQuestion) && $objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_EXAM && ($newQuestion || $modifyQuestion || $editQuestion)) {
+if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_EXAM) {
+    Display::display_normal_message(get_lang("TestFeedbackNotShown"));
+}
+
 Session::write('objExercise', $objExercise);
 Session::write('objQuestion', $objQuestion);
 Session::write('objAnswer', $objAnswer);
diff --git a/main/exercice/global_multiple_answer.class.php b/main/exercice/global_multiple_answer.class.php
index d4b97b7251..1083ca62ba 100644
--- a/main/exercice/global_multiple_answer.class.php
+++ b/main/exercice/global_multiple_answer.class.php
@@ -40,10 +40,8 @@ if (!class_exists('GlobalMultipleAnswer')):
 							' . get_lang('Answer') . '
 						</th>';
 
-            // Espace entre l'entete et les r�ponses					
-            if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
-                $html .='<th>' . get_lang('Comment') . '</th>';
-            }
+            // Espace entre l'entete et les reponses
+            $html .='<th>' . get_lang('Comment') . '</th>';
             $html .='</tr>';
             
             
@@ -116,10 +114,7 @@ if (!class_exists('GlobalMultipleAnswer')):
                 $form->addElement('html_editor', 'answer[' . $i . ']', null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
                 $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
 
-                // show comment when feedback is enable
-                if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
-                    $form->addElement('html_editor', 'comment[' . $i . ']', null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
-                }
+                $form->addElement('html_editor', 'comment[' . $i . ']', null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 
                 $form->addElement('html', '</tr>');
             }
@@ -243,11 +238,7 @@ if (!class_exists('GlobalMultipleAnswer')):
 				<th>' . get_lang("Choice") . '</th>
 				<th>' . get_lang("ExpectedChoice") . '</th>
 				<th>' . get_lang("Answer") . '</th>';
-            if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
-                $header .= '<th>' . get_lang("Comment") . '</th>';
-            } else {
-                $header .= '<th>&nbsp;</th>';
-            }
+            $header .= '<th>' . get_lang("Comment") . '</th>';
             $header .= '</tr>';
             return $header;
         }
diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index 1f6059f5b8..12bb91cc14 100644
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -58,11 +58,9 @@ class MultipleAnswer extends Question {
 							'.get_lang('Answer').'
 						</th>';
 				// show column comment when feedback is enable
-				if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM ) {
-                    $html .='<th>
-                                '.get_lang('Comment').'
-                            </th>';
-				}
+                $html .='<th>
+                            '.get_lang('Comment').'
+                        </th>';
 				$html .= '<th width="50px">
 							'.get_lang('Weighting').'
 						</th>
@@ -121,10 +119,7 @@ class MultipleAnswer extends Question {
 			$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 			$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
-			// show comment when feedback is enable
-			if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
 				$form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
-			}
 
 			$form->addElement('text', 'weighting['.$i.']',null, array('class' => "span1", 'value' => '0'));
 			$form -> addElement ('html', '</tr>');
@@ -213,11 +208,7 @@ class MultipleAnswer extends Question {
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
 				<th>'. get_lang("Answer").'</th>';
-				if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { 
-    				$header .= '<th>'.get_lang("Comment").'</th>';
-				} else { 
-					$header .= '<th>&nbsp;</th>';
-				}
+        $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
 	}
diff --git a/main/exercice/multiple_answer_combination.class.php b/main/exercice/multiple_answer_combination.class.php
index 61455021da..e631e7f4ab 100644
--- a/main/exercice/multiple_answer_combination.class.php
+++ b/main/exercice/multiple_answer_combination.class.php
@@ -56,9 +56,7 @@ class MultipleAnswerCombination extends Question {
 							'.get_lang('Answer').'
 						</th>';				
 						// show column comment when feedback is enable						
-						if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM ) {	
-							$html .='<th>'.get_lang('Comment').'</th>';
-						}
+                        $html .='<th>'.get_lang('Comment').'</th>';
 						$html .= '</tr>';
         $form -> addElement ('label', get_lang('Answers').'<br /> <img src="../img/fill_field.png">', $html);
 
@@ -113,10 +111,8 @@ class MultipleAnswerCombination extends Question {
 			$form->addElement('html_editor', 'answer['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 			$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 			
-			if ($obj_ex->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
-				$form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
-			}
-			//only 1 answer the all deal ...			
+            $form->addElement('html_editor', 'comment['.$i.']',null, 'style="vertical-align:middle"', array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+			//only 1 answer the all deal ...
 			//$form->addElement('text', 'weighting['.$i.']',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="10"');
 				
 			$form -> addElement ('html', '</tr>');
@@ -216,11 +212,7 @@ class MultipleAnswerCombination extends Question {
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
 				<th>'. get_lang("Answer").'</i></th>';
-				if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { 
-    				$header .= '<th>'.get_lang("Comment").'</th>';
-				} else { 
-					$header .= '<th>&nbsp;</th>';
-				}
+        $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;	  
 	}
diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index 5fafc74c4f..b6050b0fc1 100644
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -63,15 +63,16 @@ class UniqueAnswer extends Question {
 		$feedback_title='';
 		$comment_title='';
 
-		if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_END) {
-			$comment_title = '<th>'.get_lang('Comment').'</th>';            
-		} elseif ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
+		if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
             //Scenario
 			$editor_config['Width'] = '250';
 			$editor_config['Height'] = '110';
 			$comment_title = '<th width="500px" >'.get_lang('Comment').'</th>';
 			$feedback_title = '<th width="350px" >'.get_lang('Scenario').'</th>';
 		}
+        else {
+            $comment_title = '<th>'.get_lang('Comment').'</th>';
+        }
 
 		$html='<table class="data_table">
                 <tr style="text-align: center;">
@@ -197,10 +198,7 @@ class UniqueAnswer extends Question {
             
             $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
-            if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_END) {
-                // feedback
-                $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
-            } elseif ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {                
+            if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
                 $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
                 // Direct feedback
           
@@ -215,6 +213,9 @@ class UniqueAnswer extends Question {
                 $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}', 'scenario');            
                 
             }
+            else {
+                $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
+            }
             $form->addElement('text', 'weighting['.$i.']', null, array('class' => "span1", 'value' => '0'));                    
             $form->addElement ('html', '</tr>');                
         }
@@ -354,11 +355,7 @@ class UniqueAnswer extends Question {
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
 				<th>'. get_lang("Answer").'</th>';        
-				if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { 
-    				$header .= '<th>'.get_lang("Comment").'</th>';
-				} else { 
-					$header .= '<th>&nbsp;</th>';
-				}
+        $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;	
     }
diff --git a/main/exercice/unique_answer_no_option.class.php b/main/exercice/unique_answer_no_option.class.php
index f2cd81cfd7..5ca94fca57 100644
--- a/main/exercice/unique_answer_no_option.class.php
+++ b/main/exercice/unique_answer_no_option.class.php
@@ -64,14 +64,15 @@ class UniqueAnswerNoOption extends Question {
 		$feedback_title='';
 		$comment_title='';
 
-		if ($obj_ex->selectFeedbackType()==0) {
-			$comment_title = '<th>'.get_lang('Comment').'</th>';
-		} elseif ($obj_ex->selectFeedbackType()==1) {
+		if ($obj_ex->selectFeedbackType()==1) {
 			$editor_config['Width']  = '250';
 			$editor_config['Height'] = '110';
 			$comment_title = '<th width="500" >'.get_lang('Comment').'</th>';
 			$feedback_title = '<th width="350px" >'.get_lang('Scenario').'</th>';
 		}
+        else {
+            $comment_title = '<th>'.get_lang('Comment').'</th>';
+        }
 
 		$html='<table class="data_table">
 					<tr style="text-align: center;">
@@ -196,12 +197,7 @@ class UniqueAnswerNoOption extends Question {
 			$form->addElement('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
 			$form->addElement('html_editor', 'answer['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
 			
-			if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_END) {
-				// feedback
-				$form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
-			} elseif ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {     
-         
-			}
+            $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
 			$form->addElement('text', 'weighting['.$i.']', null, array('class' => "span1", 'value' => '0'));
 			$form->addElement('html', '</tr>');
             $i++;				
@@ -238,12 +234,7 @@ class UniqueAnswerNoOption extends Question {
         $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
 
-        if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_END) {
-            // feedback
-            $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
-        } elseif ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {                    
-
-        }
+        $form->addElement('html_editor', 'comment['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
 
         //$form->addElement('select', 'destination'.$i, get_lang('SelectQuestion').' : ',$select_question,'multiple');
 
@@ -406,11 +397,7 @@ class UniqueAnswerNoOption extends Question {
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
 				<th>'. get_lang("Answer").'</th>';
-				if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { 
-    				$header .= '<th>'.get_lang("Comment").'</th>';
-				} else { 
-					$header .= '<th>&nbsp;</th>';
-				}
+        $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;	
 	}

From 79ca9bc15a7eae7dc9acfab4f582a6d795535b99 Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Tue, 7 Jan 2014 13:36:59 +0100
Subject: [PATCH 2/9] Review Fill the blank test allowed char - ref #6810

---
 main/exercice/exercise.class.php |  10 +--
 main/exercice/exercise.lib.php   | 118 +++++++++++++++++++------------
 2 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index cd8198eab6..0dbf79072d 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -1169,7 +1169,7 @@ class Exercise {
 
                 $defaults['randomAnswers']          = $this->selectRandomAnswers();
                 $defaults['exerciseType']           = $this->selectType();
-                $defaults['exerciseTitle']          = api_html_entity_decode($this->selectTitle());
+                $defaults['exerciseTitle']          = $this->selectTitle();
                 $defaults['exerciseDescription']    = $this->selectDescription();
                 $defaults['exerciseAttempts']       = $this->selectAttempts();
                 $defaults['exerciseFeedbackType']   = $this->selectFeedbackType();
@@ -1212,7 +1212,7 @@ class Exercise {
                 $defaults['pass_percentage'] = '';
             }
         } else {
-            $defaults['exerciseTitle'] = api_html_entity_decode($this->selectTitle());
+            $defaults['exerciseTitle'] = $this->selectTitle();
             $defaults['exerciseDescription'] = $this->selectDescription();
         }
         if (api_get_setting('search_enabled') === 'true') {
@@ -1250,7 +1250,7 @@ class Exercise {
      */
     function processCreation($form, $type = '')
     {
-        $this->updateTitle(api_htmlentities($form->getSubmitValue('exerciseTitle')));
+        $this->updateTitle(htmlentities($form->getSubmitValue('exerciseTitle')));
         $this->updateDescription($form->getSubmitValue('exerciseDescription'));
         $this->updateAttempts($form->getSubmitValue('exerciseAttempts'));
         $this->updateFeedbackType($form->getSubmitValue('exerciseFeedbackType'));
@@ -2367,7 +2367,7 @@ class Exercise {
                                 $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
                             } else {
                                 // adds a tabulation if no word has been typed by the student
-                                $answer .= '&nbsp;&nbsp;&nbsp;';
+                                $answer .= ''; // remove &nbsp; that causes issue
                             }
                         } else {
                             // switchable fill in the blanks
@@ -2388,7 +2388,7 @@ class Exercise {
                                 $answer .= '<font color="red"><s>' . $user_tags[$i] . '</s></font>';
                             } else {
                                 // adds a tabulation if no word has been typed by the student
-                                $answer .= '&nbsp;&nbsp;&nbsp;';
+                                $answer .= '';  // remove &nbsp; that causes issue
                             }
                         }
                         // adds the correct word, followed by ] to close the blank
diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
index 8152ce3a9e..03546f3424 100644
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@@ -403,65 +403,93 @@ function showQuestion($questionId, $only_questions = false, $origin = false, $cu
             	$s.='</tr>';
 
     		} elseif ($answerType == FILL_IN_BLANKS) {
+                /*
+                 * In the FILL_IN_BLANKS test
+                 * you mustn't have [ and ] in the textarea
+                 * you mustn't have :: in the textarea
+                 * the text to find mustn't be empty or contains only spaces
+                 * the text to find mustn't contains HTML tags
+                 * the text to find mustn't contains char "
+                 */
+
     			list($answer) = explode('::', $answer);
 
-                //Correct answer
+                // $correct_answer_list array of array with correct anwsers 0=> [0=>[\p] 1=>[plop]]
     			api_preg_match_all('/\[[^]]+\]/', $answer, $correct_answer_list);
 
-                //Student's answezr
+                // get student answer to display it if student go back to previous fillBlank answer question in a test
     			if (isset($user_choice[0]['answer'])) {
     				api_preg_match_all('/\[[^]]+\]/', $user_choice[0]['answer'], $student_answer_list);
-    				$student_answer_list = $student_answer_list[0];
+                    $student_answer_list_tobecleaned = $student_answer_list[0];
+                    $student_answer_list = array();
+                    // here we got the student answer in a test
+                    // let's clean up the results
+                    /*
+                    Array
+                    (
+                        [0] => Array
+                        (
+                            [0] => [<font color="red"><s>yer</s></font> / <font color="green"><b>ici</b></font>]
+                            [1] => [<font color="red"><s>plop</s></font> / <font color="green"><b>/p</b></font>]
+                        )
+                    )
+                    */
+                    for ($i=0; $i < count($student_answer_list_tobecleaned); $i++) {
+                        $answer_corrected = $student_answer_list_tobecleaned[$i];
+                        /*
+                         * we got if student answer is wrong
+                         * [<font color="red"><s>rrr</s></font> / <font color="green"><b>/p</b></font>]
+                         * or if student answer is good
+                         * [plop / <font color="green"><b>plop</b></font>]
+                         * or if student didn't answer []
+                         */
+                        $answer_corrected = api_preg_replace('| / <font color="green"><b>.*$|', '', $answer_corrected);
+                        /*
+                         * we got [<font color="red"><s>rrr</s></font> or [plop or [
+                         */
+                        $answer_corrected = api_preg_replace('/^\[/', '', $answer_corrected);
+                        /*
+                         * we got <font color="red"><s>rrr</s></font> or plop
+                         * non breakable spaces &nbsp;&nbsp;&nbsp; from /main/exercice/exercise.class.php have been removed l 2391 and l 2370
+                         */
+                        $answer_corrected = api_preg_replace('|^<font color="red"><s>|', '', $answer_corrected);
+                        $answer_corrected = api_preg_replace('|</s></font>$|', '', $answer_corrected);
+                        $answer_corrected = '['.$answer_corrected.']';
+                        /*
+                         * we got [rrr] or [plop] or []
+                         */
+                        $student_answer_list[] = $answer_corrected;
+                    }
     			}
 
-                //If debug
+                // If display preview of answer in test view for exemple, set the student answer to the correct answers
                 if ($debug_mark_answer) {
+                    // contain the rights answers surronded with brackets
     				$student_answer_list = $correct_answer_list[0];
                 }
 
-    			if (!empty($correct_answer_list) && !empty($student_answer_list)) {
-    			    $correct_answer_list = $correct_answer_list[0];
-    			    $i = 0;
-
-    			    foreach ($correct_answer_list as $correct_item) {
-    			        $value = null;
-    			        if (isset($student_answer_list[$i]) && !empty($student_answer_list[$i])) {
-
-    			        	//Cleaning student answer list
-    			            $value = strip_tags($student_answer_list[$i]);
-    			            $value = api_substr($value, 1, api_strlen($value)-2);
-    			            $value = explode('/', $value);
-
-    			            if (!empty($value[0])) {
-    			            	$value = str_replace('&nbsp;', '',  trim($value[0]));
-    			            }
-                            //var_dump($correct_item);
-                            //$correct_item = preg_quote($correct_item);
-                            // to prevent error if there is a / in the text to find
-                            //$correct_item = api_preg_replace('|/|', '\/', $correct_item);
-
-                            $size = strlen($correct_item);
-                            $attributes['class'] = detectInputAppropriateClass($size);
-
-    			            //$answer = api_preg_replace('/'.$correct_item.'/', Display::input('text', "choice[$questionId][]", $value, $attributes), $answer, 1);
-                            $answer = str_replace($correct_item, Display::input('text', "choice[$questionId][]", $value, $attributes), $answer);
-    			        }
-    			        $i++;
-    			    }
-    			} else {
-
-                    foreach ($correct_answer_list[0] as $item) {
-                        $size = strlen($item);
-                        $attributes['class'] = detectInputAppropriateClass($size);
-
-                        //$pattern = '/\['.$item.'+\]/';
-                        //$answer = api_preg_replace($pattern, Display::input('text', "choice[$questionId][]", '', $attributes), $answer);
-                        $answer = str_replace($item, Display::input('text', "choice[$questionId][]", '', $attributes), $answer);
+                // Split the response by bracket
+                // tab_comments is an array with text surrounding the text to find
+                // we add a space before and after the answer_question to be sure to have a block of text before and after [xxx] patterns
+                // so we have n text to find ([xxx]) and n+1 blockc of texts before, beteween and after the text to find
+                $tab_comments = api_preg_split('/\[[^]]+\]/', ' '.$answer.' ');
+
+                if (!empty($correct_answer_list) && !empty($student_answer_list)) {
+                    $answer = "";
+                    $i = 0;
+                    foreach ($student_answer_list as $student_item) {
+                        $student_response = api_substr($student_item, 1, api_strlen($student_item) - 2);  // remove surronding brackets
+                        $answer .= $tab_comments[$i].Display::input('text', "choice[$questionId][]", $student_response);
+                        $i++;
                     }
-                    //$answer = api_preg_replace('/\[[^]]+\]/', Display::input('text', "choice[$questionId][]", '', $attributes), $answer);
-    			}
-
+                    $answer .= $tab_comments[$i];
+                } else {
+                    // display exercice with empty input fields
+                    // every [xxx] are replaced with an empty input field
+                    $answer = api_preg_replace('/\[[^]]+\]/', Display::input('text', "choice[$questionId][]", '', $attributes), $answer);
+                }
     			$s .= $answer;
+
             } elseif ($answerType == MATCHING) {
     			// matching type, showing suggestions and answers
     			// TODO: replace $answerId by $numAnswer

From edb349cae55a812a912fa74e525405cce8546677 Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Tue, 7 Jan 2014 14:02:43 +0100
Subject: [PATCH 3/9] Display hidden tests in Recycle question menu - ref #6819

---
 main/exercice/exercise.lib.php  | 15 ++++++++++-----
 main/exercice/question_pool.php |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
index 03546f3424..e336638ebf 100644
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@@ -1508,23 +1508,28 @@ function get_exercise_by_id($exerciseId = 0) {
     return Database::select('*', $TBL_EXERCICES, $conditions);
 }
 /**
- * Getting all active exercises from a course from a session (if a session_id is provided we will show all the exercises in the course + all exercises in the session)
+ * Getting all exercises (active only or all) from a course from a session (if a session_id is provided we will show all the exercises in the course + all exercises in the session)
  * @param   array   course data
  * @param   int     session id
- * @param		int			course c_id
+ * @param	int		course c_id
+ * @param   boolean only_active_exercices
  * @return  array   array with exercise data
  * modified by Hubert Borderiou
  */
-function get_all_exercises_for_course_id($course_info = null, $session_id = 0, $course_id=0) {
+function get_all_exercises_for_course_id($course_info = null, $session_id = 0, $course_id=0, $only_active_exercices = true) {
+    $sql_active_exercices = "";
+    if (!$only_active_exercices) {
+        $sql_active_exercices = " OR active != 1 ";
+    }
    	$TBL_EXERCICES = Database :: get_course_table(TABLE_QUIZ_TEST);
     if ($session_id == -1) {
     	$session_id  = 0;
     }
     if ($session_id == 0) {
-    	$conditions = array('where'=>array('active = ? AND session_id = ? AND c_id = ?'=>array('1', $session_id, $course_id)), 'order'=>'title');
+    	$conditions = array('where'=>array("(active = ? $sql_active_exercices) AND session_id = ? AND c_id = ?" => array('1', $session_id, $course_id)), 'order'=>'title');
     } else {
         //All exercises
-    	$conditions = array('where'=>array('active = ? AND (session_id = 0 OR session_id = ? ) AND c_id=?' =>array('1', $session_id, $course_id)), 'order'=>'title');
+    	$conditions = array('where'=>array("(active = ? $sql_active_exercices) AND (session_id = 0 OR session_id = ? ) AND c_id=?" => array('1', $session_id, $course_id)), 'order'=>'title');
     }
     return Database::select('*',$TBL_EXERCICES, $conditions);
 }
diff --git a/main/exercice/question_pool.php b/main/exercice/question_pool.php
index 002b250a81..e8736752c0 100644
--- a/main/exercice/question_pool.php
+++ b/main/exercice/question_pool.php
@@ -322,7 +322,7 @@ echo Display::form_row(get_lang("QuestionCategory"), $selectCourseCateogry);
 
 // Get exercice list for this course
 
-$exercise_list         = get_all_exercises_for_course_id($course_info, $session_id, $selected_course);
+$exercise_list         = get_all_exercises_for_course_id($course_info, $session_id, $selected_course, false);
 //Exercise List
 $my_exercise_list = array();
 $my_exercise_list['0']  = get_lang('AllExercises');

From adbd1a60b5caa9449b54768ca21f4655c8ad949c Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Wed, 8 Jan 2014 10:05:28 +0100
Subject: [PATCH 4/9] Coding convention and replace some api_get_course_id()
 with api_get_course_int_id()

---
 index.php                     | 116 +++++++++++++++++-----------------
 main/auth/cas/logincas.php    |  11 ++--
 main/auth/gotocourse.php      |   5 +-
 main/inc/lib/main_api.lib.php |  94 +++++++++++----------------
 main/inc/local.inc.php        |   5 +-
 5 files changed, 105 insertions(+), 126 deletions(-)

diff --git a/index.php b/index.php
index 007411c9cb..3c6601230b 100644
--- a/index.php
+++ b/index.php
@@ -25,21 +25,21 @@ $this_section = SECTION_CAMPUS;
 
 $header_title = null;
 if (!api_is_anonymous()) {
-	$header_title = " ";
+    $header_title = " ";
 }
 
 $htmlHeadXtra[] = api_get_jquery_libraries_js(array('bxslider'));
 $htmlHeadXtra[] ='
 <script type="text/javascript">
-	$(document).ready(function(){
-		$("#slider").bxSlider({
-			infiniteLoop	: true,
-			auto			: true,
-			pager			: true,
-			autoHover		: true,
-			pause			: 10000
-		});
-	});
+    $(document).ready(function(){
+        $("#slider").bxSlider({
+            infiniteLoop : true,
+            auto : true,
+            pager : true,
+            autoHover : true,
+            pause : 10000
+        });
+    });
 </script>';
 
 //set cookie for check if client browser are cookies enabled
@@ -51,7 +51,7 @@ $controller = new IndexManager($header_title);
 $loginFailed = isset($_GET['loginFailed']) ? true : isset($loginFailed);
 
 if (!empty($_GET['logout'])) {
-	$controller->logout();
+    $controller->logout();
 }
 
 /* Table definitions */
@@ -70,16 +70,16 @@ $_setting['display_courses_to_anonymous_users'] = 'true';
  * @todo This piece of code should probably move to local.inc.php where the actual login / logout procedure is handled. The real use of this code block should be seriously considered as well. This form should just use a security token and get done with it.
  */
 if (isset($_GET['submitAuth']) && $_GET['submitAuth'] == 1) {
-        $i = api_get_anonymous_id();
-        event_system(LOG_ATTEMPTED_FORCED_LOGIN, 'tried_hacking_get', $_SERVER['REMOTE_ADDR'].(empty($_POST['login'])?'':'/'.$_POST['login']),null,$i);
-	echo 'Attempted breakin - sysadmins notified.';
-	session_destroy();
-	die();
+    $i = api_get_anonymous_id();
+    event_system(LOG_ATTEMPTED_FORCED_LOGIN, 'tried_hacking_get', $_SERVER['REMOTE_ADDR'].(empty($_POST['login'])?'':'/'.$_POST['login']),null,$i);
+    echo 'Attempted breakin - sysadmins notified.';
+    session_destroy();
+    die();
 }
 
 // Delete session neccesary for legal terms
 if (api_get_setting('allow_terms_conditions') == 'true') {
-	unset($_SESSION['term_and_condition']);
+    unset($_SESSION['term_and_condition']);
 }
 //If we are not logged in and customapages activated
 if (!api_get_user_id() && CustomPages::enabled()) {
@@ -98,38 +98,39 @@ if (!api_get_user_id() && CustomPages::enabled()) {
  */
 
 if (!empty($_POST['submitAuth'])) {
-	// The user has been already authenticated, we are now to find the last login of the user.
-	if (isset ($_user['user_id'])) {
-		$track_login_table      = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-		$sql_last_login = "SELECT UNIX_TIMESTAMP(login_date)
+    // The user has been already authenticated, we are now to find the last login of the user.
+    if (isset ($_user['user_id'])) {
+        $track_login_table      = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+        $sql_last_login = "SELECT UNIX_TIMESTAMP(login_date)
                                 FROM $track_login_table
                                 WHERE login_user_id = '".$_user['user_id']."'
                                 ORDER BY login_date DESC LIMIT 1";
-		$result_last_login = Database::query($sql_last_login);
-		if (!$result_last_login) {
-			if (Database::num_rows($result_last_login) > 0) {
-				$user_last_login_datetime = Database::fetch_array($result_last_login);
-				$user_last_login_datetime = $user_last_login_datetime[0];
-				Session::write('user_last_login_datetime',$user_last_login_datetime);
-			}
-		}
-		Database::free_result($result_last_login);
-
-		//event_login();
-		if (api_is_platform_admin()) {
-			// decode all open event informations and fill the track_c_* tables
-			include api_get_path(LIBRARY_PATH).'stats.lib.inc.php';
-			decodeOpenInfos();
-		}
-	}
-	// End login -- if ($_POST['submitAuth'])
-} else {
-	// Only if login form was not sent because if the form is sent the user was already on the page.
-	event_open();
+        $result_last_login = Database::query($sql_last_login);
+        if (!$result_last_login) {
+            if (Database::num_rows($result_last_login) > 0) {
+                $user_last_login_datetime = Database::fetch_array($result_last_login);
+                $user_last_login_datetime = $user_last_login_datetime[0];
+                Session::write('user_last_login_datetime',$user_last_login_datetime);
+            }
+        }
+        Database::free_result($result_last_login);
+
+        //event_login();
+        if (api_is_platform_admin()) {
+            // decode all open event informations and fill the track_c_* tables
+            include api_get_path(LIBRARY_PATH).'stats.lib.inc.php';
+            decodeOpenInfos();
+        }
+    }
+    // End login -- if ($_POST['submitAuth'])
+}
+else {
+    // Only if login form was not sent because if the form is sent the user was already on the page.
+    event_open();
 }
 
 if (api_get_setting('display_categories_on_homepage') == 'true') {
-	$controller->tpl->assign('course_category_block', $controller->return_courses_in_categories());
+    $controller->tpl->assign('course_category_block', $controller->return_courses_in_categories());
 }
 
 // Facebook connexion, if activated
@@ -141,14 +142,15 @@ $controller->set_login_form();
 
 //@todo move this inside the IndexManager
 if (!api_is_anonymous()) {
-	$controller->tpl->assign('profile_block', $controller->return_profile_block());
+    $controller->tpl->assign('profile_block', $controller->return_profile_block());
     $controller->tpl->assign('user_image_block', $controller->return_user_image_block());    
 
-	if (api_is_platform_admin()) {
-		$controller->tpl->assign('course_block',			$controller->return_course_block());
-	} else {
-		$controller->tpl->assign('teacher_block', 			$controller->return_teacher_link());
-	}
+    if (api_is_platform_admin()) {
+        $controller->tpl->assign('course_block', $controller->return_course_block());
+    }
+    else {
+        $controller->tpl->assign('teacher_block', $controller->return_teacher_link());
+    }
 }
 
 $hot_courses = null;
@@ -163,18 +165,18 @@ if (!isset($_REQUEST['include'])) {
     $announcements_block = $controller->return_announcements();
 }
 
-$controller->tpl->assign('hot_courses',             $hot_courses);
-$controller->tpl->assign('announcements_block', 	$announcements_block);
-$controller->tpl->assign('home_page_block', 		$controller->return_home_page());
+$controller->tpl->assign('hot_courses', $hot_courses);
+$controller->tpl->assign('announcements_block', $announcements_block);
+$controller->tpl->assign('home_page_block', $controller->return_home_page());
 
-$controller->tpl->assign('navigation_course_links', 	$controller->return_navigation_links());
+$controller->tpl->assign('navigation_course_links', $controller->return_navigation_links());
 
-$controller->tpl->assign('notice_block',			$controller->return_notice());
-$controller->tpl->assign('main_navigation_block',	$controller->return_navigation_links());
-$controller->tpl->assign('help_block',              $controller->return_help());
+$controller->tpl->assign('notice_block', $controller->return_notice());
+$controller->tpl->assign('main_navigation_block', $controller->return_navigation_links());
+$controller->tpl->assign('help_block', $controller->return_help());
 
 if (api_is_platform_admin() || api_is_drh()) {
-    $controller->tpl->assign('skills_block',            $controller->return_skills_links());
+    $controller->tpl->assign('skills_block', $controller->return_skills_links());
 }
 
 // direct login to course
diff --git a/main/auth/cas/logincas.php b/main/auth/cas/logincas.php
index 0bc7c331c1..af8cee4841 100644
--- a/main/auth/cas/logincas.php
+++ b/main/auth/cas/logincas.php
@@ -21,10 +21,10 @@ global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
 /*
 If we are not logged and in our browser enter an URL with a name of a course
 e.g. http://www.chamilo.fr/chamilo/courses/COURSTESTOSETE/?id_session=0
-we go to page api_not_allowed :
-> Vous n'etes pas autorise e acceder e cette page.
-> Soit votre connexion a expire, soit vous essayez d'acceder e une page pour laquelle vous ne disposez pas des permissions suffisantes.
-> Veuillez vous identifier e nouveau depuis la page d'accueil
+We go to page api_not_allowed :
+> You are not allowed to see this page.
+> Sorry, you are not allowed to access this page, or maybe your connection has expired.
+> Please click your browser's \"Back\" button or follow the link below to return to the previous page
 If we click on the link to go to homepage, some datas are entered in $_SESSION and if we enter our CAS loggin, we go to api_not_allowad_page again
 and again
 As a result, if we are not logged on, we have to destroy the session variables, before calling CAS page
@@ -45,7 +45,6 @@ if (cas_configured()) {
     }
     phpCAS::forceAuthentication();
     header('Location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login'));
-}
-else {
+} else {
     header('Location: '.api_get_path(WEB_PATH));
 }
diff --git a/main/auth/gotocourse.php b/main/auth/gotocourse.php
index 1eda5b52bd..f9b854c291 100644
--- a/main/auth/gotocourse.php
+++ b/main/auth/gotocourse.php
@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-/*
+/**
  * Author : hubert.borderiou@grenet.fr
  * Allow the user to login to a course after reaching a course URL like
  * http://chamilo.chamilo.org/courses/MYCOURSE/?id_session=0
@@ -48,8 +48,7 @@ if (isset($_GET['firstpage'])) {
     $tpl->assign('content', '<h4>'.get_lang('LoginToGoToThisCourse').'</h4>'.$msg);
     $tpl->display_one_col_template();
 
-}
-else {
+} else {
     api_delete_firstpage_parameter();
     Header('Location: '.api_get_path(WEB_PATH).'index.php');
 }
diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 952bdfd8a8..48ef886da2 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -2406,15 +2406,11 @@ function api_is_course_session_coach($user_id, $course_code, $session_id) {
 
 /**
  * Checks whether the current user is a course or session coach
- * @param int $session_id optional, session id
- * @param string $course_code optional, course code
- * @param int $userId The user ID
+ * @param int - optional, session id
+ * @param string - optional, course code
  * @return boolean True if current user is a course or session coach
  */
-function api_is_coach($session_id = 0, $course_code = null, $userId = null) {
-    if (empty($userId)) {
-        $userId = api_get_user_id();
-    }
+function api_is_coach($session_id = 0, $course_code = null) {
     if (!empty($session_id)) {
         $session_id = intval($session_id);
     } else {
@@ -2438,7 +2434,7 @@ function api_is_coach($session_id = 0, $course_code = null, $userId = null) {
 	if (!empty($course_code)) {
 	    $sql = "SELECT DISTINCT id, name, date_start, date_end
 				FROM $session_table INNER JOIN $session_rel_course_rel_user_table session_rc_ru
-	            ON session_rc_ru.id_user = '".$userId."'
+	            ON session_rc_ru.id_user = '".api_get_user_id()."'
 	            WHERE   session_rc_ru.course_code = '$course_code' AND
                         session_rc_ru.status = 2 AND
                         session_rc_ru.id_session = '$session_id'";
@@ -2449,7 +2445,7 @@ function api_is_coach($session_id = 0, $course_code = null, $userId = null) {
 	if (!empty($session_id)) {
 	    $sql = "SELECT DISTINCT id, name, date_start, date_end
 	         	FROM $session_table
-	         	WHERE session.id_coach =  '".$userId."' AND id = '$session_id'
+	         	WHERE session.id_coach =  '".api_get_user_id()."' AND id = '$session_id'
 				ORDER BY date_start, date_end, name";
 	    $result = Database::query($sql);
 	    if (!empty($sessionIsCoach)) {
@@ -2463,57 +2459,37 @@ function api_is_coach($session_id = 0, $course_code = null, $userId = null) {
 
 /**
  * Checks whether the current user is a session administrator
- * @param int $userId The user ID
  * @return boolean True if current user is a course administrator
  */
-function api_is_session_admin($userId = null) {
-    if (!empty($userId)) {
-        $_user = api_get_user_info($userId);
-    } else {
-        global $_user;
-    }
+function api_is_session_admin() {
+    global $_user;
     return isset($_user['status']) && $_user['status'] == SESSIONADMIN;
 }
 
 /**
  * Checks whether the current user is a human resources manager
- * @param int $userId The user ID
  * @return boolean True if current user is a human resources manager
  */
-function api_is_drh($userId = null) {
-    if (!empty($userId)) {
-        $_user = api_get_user_info($userId);
-    } else {
-        global $_user;
-    }
+function api_is_drh() {
+    global $_user;
     return isset($_user['status']) && $_user['status'] == DRH;
 }
 
 /**
  * Checks whether the current user is a student
- * @param int $userId The user ID
  * @return boolean True if current user is a human resources manager
  */
-function api_is_student($userId = null) {
-    if (!empty($userId)) {
-        $_user = api_get_user_info($userId);
-    } else {
-        global $_user;
-    }
+function api_is_student() {
+    global $_user;
     return isset($_user['status']) && $_user['status'] == STUDENT;
 
 }
 /**
  * Checks whether the current user is a teacher
- * @param int $userId The user ID
  * @return boolean True if current user is a human resources manager
  */
-function api_is_teacher($userId = null) {
-    if (!empty($userId)) {
-        $_user = api_get_user_info($userId);
-    } else {
-        global $_user;
-    }
+function api_is_teacher() {
+    global $_user;
     return isset($_user['status']) && $_user['status'] == COURSEMANAGER;
 }
 
@@ -2953,7 +2929,8 @@ function api_not_found($print_headers = false) {
  * @version 1.0, February 2004
  * @version dokeos 1.8, August 2006
  */
-function api_not_allowed($print_headers = false, $message = null) {
+function api_not_allowed($print_headers = false, $message = null)
+{
     if (api_get_setting('sso_authentication') === 'true') {
         global $osso;
         if ($osso) {
@@ -3004,7 +2981,7 @@ function api_not_allowed($print_headers = false, $message = null) {
         exit;
     }
 
-    if (!empty($_SERVER['REQUEST_URI']) && (!empty($_GET['cidReq']) || $this_section == SECTION_MYPROFILE)) {
+    if (!empty($_SERVER['REQUEST_URI']) && (!empty($_GET['cidReq']) || $this_section == SECTION_MYPROFILE || $this_section == SECTION_PLATFORM_ADMIN)) {
 
         //only display form and return to the previous URL if there was a course ID included
         if ($user_id != 0 && !api_is_anonymous()) {
@@ -3015,7 +2992,7 @@ function api_not_allowed($print_headers = false, $message = null) {
         }
 
         if (!is_null(api_get_course_id())) {
-            api_set_firstpage_parameter(api_get_course_id());
+            api_set_firstpage_parameter(api_get_course_int_id());
         }
 
         // If the user has no user ID, then his session has expired
@@ -3057,12 +3034,11 @@ function api_not_allowed($print_headers = false, $message = null) {
     // Check if the cookies are enabled. If are enabled and if no course ID was included in the requested URL, then the user has either lost his session or is anonymous, so redirect to homepage
     if( !isset($_COOKIE['TestCookie']) && empty($_COOKIE['TestCookie']) ) {
         $msg = Display::return_message(get_lang('NoCookies').'<br /><br /><a href="'.$home_url.'">'.get_lang('BackTo').' '.get_lang('CampusHomepage').'</a><br />', 'error', false);
-    }
-    else {
+    } else {
         // The session is over and we were not in a course,
         // or we try to get directly to a private course without being logged
-        if (!is_null(api_get_course_id())) {
-            api_set_firstpage_parameter(api_get_course_id());
+        if (!is_null(api_get_course_int_id())) {
+            api_set_firstpage_parameter(api_get_course_int_id());
             $action = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
             $action = str_replace('&amp;', '&', $action);
             $form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked'));
@@ -3075,7 +3051,7 @@ function api_not_allowed($print_headers = false, $message = null) {
             $msg .= '<h4>'.get_lang('LoginToGoToThisCourse').'</h4>';
             if (api_is_cas_activated()) {
                 $msg .= Display::return_message(sprintf(get_lang('YouHaveAnInstitutionalAccount'), api_get_setting("Institution")), '', false);
-                $msg .= Display::div("<br/><a href='".get_cas_direct_URL(api_get_course_id())."'>".getCASLogoHTML()." ".sprintf(get_lang('LoginWithYourAccount'), api_get_setting("Institution"))."</a><br/><br/>", array('align'=>'center'));
+                $msg .= Display::div("<br/><a href='".get_cas_direct_URL(api_get_course_int_id())."'>".getCASLogoHTML()." ".sprintf(get_lang('LoginWithYourAccount'), api_get_setting("Institution"))."</a><br/><br/>", array('align'=>'center'));
                 $msg .= Display::return_message(get_lang('YouDontHaveAnInstitutionAccount'));
                 $msg .= "<p style='text-align:center'><a href='#' onclick='$(this).parent().next().toggle()'>".get_lang('LoginWithExternalAccount')."</a></p>";
                 $msg .= "<div style='display:none;'>";
@@ -3087,8 +3063,7 @@ function api_not_allowed($print_headers = false, $message = null) {
                 $msg .= "</div>";
             }
             $msg .= '<hr/><p style="text-align:center"><a href="'.$home_url.'">'.get_lang('ReturnToCourseHomepage').'</a></p>';
-        }
-        else {
+        } else {
             // we were not in a course, return to home page
             $msg = Display::return_message(get_lang('NotAllowed').'<br/><br/><a href="'.$home_url.'">'.get_lang('ReturnToCourseHomepage').'</a><br />', 'error', false);
         }
@@ -6909,32 +6884,37 @@ function api_elog($string, $dump = 0)
 }
 
 
-/*
+/**
  * Set the cookie to go directly to the course code $in_firstpage
  * after login
+ * @param in_firstpage is the course code of the course to go
  */
-function api_set_firstpage_parameter($in_firstpage) {
+function api_set_firstpage_parameter($in_firstpage)
+{
     setcookie("GotoCourse", $in_firstpage);
 }
 
-/*
+/**
  * Delete the cookie to go directly to the course code $in_firstpage
  * after login
  */
-function api_delete_firstpage_parameter() {
+function api_delete_firstpage_parameter()
+{
     setcookie("GotoCourse", "", time() - 3600);
 }
 
-/*
- * Return true if course_code for direct course access after login is set
+/**
+ * @return true if course_code for direct course access after login is set
  */
-function exist_firstpage_parameter() {
+function exist_firstpage_parameter()
+{
     return (isset($_COOKIE['GotoCourse']) && $_COOKIE['GotoCourse'] != "");
 }
 
-/*
- *
+/**
+ * @return return the course_code of the course where user login
  */
-function api_get_firstpage_parameter() {
+function api_get_firstpage_parameter()
+{
     return $_COOKIE['GotoCourse'];
 }
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 07036afde0..9a3d8ebc49 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -1233,15 +1233,14 @@ if (isset($_cid)) {
 
 // direct login to course
 if ((isset($cas_login) && $cas_login && exist_firstpage_parameter())
-    || ($logging_in && exist_firstpage_parameter())){
+    || ($logging_in && exist_firstpage_parameter())) {
     $redir_coursecode = api_get_firstpage_parameter();
     api_delete_firstpage_parameter();    // delete the cookie
     if (CourseManager::course_code_exists($redir_coursecode)) {
         $_SESSION['noredirection'] = false;
         $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH).$redir_coursecode;
     }
-}
-elseif (api_user_is_login() && exist_firstpage_parameter()) {
+} elseif (api_user_is_login() && exist_firstpage_parameter()) {
     $redir_coursecode = api_get_firstpage_parameter();
     api_delete_firstpage_parameter();    // delete the cookie
     if (CourseManager::course_code_exists($redir_coursecode)) {

From 6af43bc26be8b639a1cac30451d72babf69b4358 Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Wed, 8 Jan 2014 10:16:59 +0100
Subject: [PATCH 5/9] Minor correction

---
 main/inc/lib/main_api.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 48ef886da2..e2e9f09a67 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -2992,7 +2992,7 @@ function api_not_allowed($print_headers = false, $message = null)
         }
 
         if (!is_null(api_get_course_id())) {
-            api_set_firstpage_parameter(api_get_course_int_id());
+            api_set_firstpage_parameter(api_get_course_id());
         }
 
         // If the user has no user ID, then his session has expired
@@ -3038,7 +3038,7 @@ function api_not_allowed($print_headers = false, $message = null)
         // The session is over and we were not in a course,
         // or we try to get directly to a private course without being logged
         if (!is_null(api_get_course_int_id())) {
-            api_set_firstpage_parameter(api_get_course_int_id());
+            api_set_firstpage_parameter(api_get_course_id());
             $action = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']);
             $action = str_replace('&amp;', '&', $action);
             $form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked'));

From 3eb08bbace9855c900426ac19fe10c4dd625175c Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Wed, 8 Jan 2014 10:24:30 +0100
Subject: [PATCH 6/9] Coding convention

---
 main/exercice/exercise_admin.php | 294 +++++++++++++++----------------
 1 file changed, 147 insertions(+), 147 deletions(-)

diff --git a/main/exercice/exercise_admin.php b/main/exercice/exercise_admin.php
index 6159795d82..d7cf0b19d9 100644
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
@@ -24,53 +24,53 @@ require_once 'exercise.lib.php';
 $this_section = SECTION_COURSES;
 
 if (!api_is_allowed_to_edit(null,true)) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $htmlHeadXtra[] = '<script>
-		function advanced_parameters() {
-			if(document.getElementById(\'options\').style.display == \'none\') {
-				document.getElementById(\'options\').style.display = \'block\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\' <img style="vertical-align:middle;" src="../img/div_hide.gif" alt="" /> '.addslashes(api_htmlentities(get_lang('AdvancedParameters'))).'\';
-			} else {
-				document.getElementById(\'options\').style.display = \'none\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\' <img style="vertical-align:middle;" src="../img/div_show.gif" alt="" /> '.addslashes(api_htmlentities(get_lang('AdvancedParameters'))).'\';
-			}
-		}
-
-		function FCKeditor_OnComplete( editorInstance ) {
-			   if (document.getElementById ( \'HiddenFCK\' + editorInstance.Name )) {
-			      HideFCKEditorByInstanceName (editorInstance.Name);
-			   }
-		}
-
-		function HideFCKEditorByInstanceName ( editorInstanceName ) {
-			if (document.getElementById ( \'HiddenFCK\' + editorInstanceName ).className == "HideFCKEditor" )
-			{
-			      document.getElementById ( \'HiddenFCK\' + editorInstanceName ).className = "media";
-			}
-		}
-
-		function show_media() {
-			var my_display = document.getElementById(\'HiddenFCKexerciseDescription\').style.display;
-				if(my_display== \'none\' || my_display == \'\') {
-					document.getElementById(\'HiddenFCKexerciseDescription\').style.display = \'block\';
-					document.getElementById(\'media_icon\').innerHTML=\' <img src="../img/looknfeelna.png" alt="" /> '.addslashes(api_htmlentities(get_lang('ExerciseDescription'))).'\';
-				} else {
-					document.getElementById(\'HiddenFCKexerciseDescription\').style.display = \'none\';
-					document.getElementById(\'media_icon\').innerHTML=\' <img src="../img/looknfeel.png" alt="" /> '.addslashes(api_htmlentities(get_lang('ExerciseDescription'))).'\';
-				}
-		}
-
-		function activate_start_date() {
-			if(document.getElementById(\'start_date_div\').style.display == \'none\') {
-				document.getElementById(\'start_date_div\').style.display = \'block\';
-			} else {
-				document.getElementById(\'start_date_div\').style.display = \'none\';
-			}
-		}
-
-		function activate_end_date() {
+        function advanced_parameters() {
+            if(document.getElementById(\'options\').style.display == \'none\') {
+                document.getElementById(\'options\').style.display = \'block\';
+                document.getElementById(\'img_plus_and_minus\').innerHTML=\' <img style="vertical-align:middle;" src="../img/div_hide.gif" alt="" /> '.addslashes(api_htmlentities(get_lang('AdvancedParameters'))).'\';
+            } else {
+                document.getElementById(\'options\').style.display = \'none\';
+                document.getElementById(\'img_plus_and_minus\').innerHTML=\' <img style="vertical-align:middle;" src="../img/div_show.gif" alt="" /> '.addslashes(api_htmlentities(get_lang('AdvancedParameters'))).'\';
+            }
+        }
+
+        function FCKeditor_OnComplete( editorInstance ) {
+               if (document.getElementById ( \'HiddenFCK\' + editorInstance.Name )) {
+                  HideFCKEditorByInstanceName (editorInstance.Name);
+               }
+        }
+
+        function HideFCKEditorByInstanceName ( editorInstanceName ) {
+            if (document.getElementById ( \'HiddenFCK\' + editorInstanceName ).className == "HideFCKEditor" )
+            {
+                  document.getElementById ( \'HiddenFCK\' + editorInstanceName ).className = "media";
+            }
+        }
+
+        function show_media() {
+            var my_display = document.getElementById(\'HiddenFCKexerciseDescription\').style.display;
+                if(my_display== \'none\' || my_display == \'\') {
+                    document.getElementById(\'HiddenFCKexerciseDescription\').style.display = \'block\';
+                    document.getElementById(\'media_icon\').innerHTML=\' <img src="../img/looknfeelna.png" alt="" /> '.addslashes(api_htmlentities(get_lang('ExerciseDescription'))).'\';
+                } else {
+                    document.getElementById(\'HiddenFCKexerciseDescription\').style.display = \'none\';
+                    document.getElementById(\'media_icon\').innerHTML=\' <img src="../img/looknfeel.png" alt="" /> '.addslashes(api_htmlentities(get_lang('ExerciseDescription'))).'\';
+                }
+        }
+
+        function activate_start_date() {
+            if(document.getElementById(\'start_date_div\').style.display == \'none\') {
+                document.getElementById(\'start_date_div\').style.display = \'block\';
+            } else {
+                document.getElementById(\'start_date_div\').style.display = \'none\';
+            }
+        }
+
+        function activate_end_date() {
             if(document.getElementById(\'end_date_div\').style.display == \'none\') {
                 document.getElementById(\'end_date_div\').style.display = \'block\';
             } else {
@@ -79,61 +79,61 @@ $htmlHeadXtra[] = '<script>
         }
 
 
-		function feedbackselection() {
-			var index = document.exercise_admin.exerciseFeedbackType.selectedIndex;
-
-			if (index == \'1\') {
-				document.exercise_admin.exerciseType[1].checked=true;
-				document.exercise_admin.exerciseType[0].disabled=true;
-			} else {
-				document.exercise_admin.exerciseType[0].disabled=false;
-			}
-		}
-
-	    function option_time_expired() {
-		    if(document.getElementById(\'timercontrol\').style.display == \'none\')
-		    {
-		      document.getElementById(\'timercontrol\').style.display = \'block\';
-		    } else {
-		      document.getElementById(\'timercontrol\').style.display = \'none\';
-		    }
-	    }
-
-     	function check_per_page_one() {
-     		/*if (document.getElementById(\'divtimecontrol\').style.display==\'none\') {
-     			document.getElementById(\'divtimecontrol\').style.display=\'block\';
-     			document.getElementById(\'divtimecontrol\').display=block;
-     			document.getElementById(\'timecontrol\').display=none;
-     		}*/
-     		document.getElementById(\'exerciseType_0\').checked=true;
-		}
-
-		function check_per_page_all() {
-			/*if (document.getElementById(\'divtimecontrol\').style.display==\'block\') {
-				document.getElementById(\'divtimecontrol\').style.display=\'none\';
-				document.getElementById(\'enabletimercontroltotalminutes\').value=\'\';
-			}*/
-
-			if (document.getElementById(\'exerciseType_1\') && document.getElementById(\'exerciseType_1\').checked) {
-				document.getElementById(\'exerciseType_0\').checked = true;
-			}
-		}
-
-		function check_feedback() {
-		    if (document.getElementById(\'result_disabled_1\').checked == true) {
-		        document.getElementById(\'result_disabled_0\').checked = true;
-		    }
-		}
-
-		function check_direct_feedback() {
-			document.getElementById(\'option_page_one\').checked = true;
-			document.getElementById(\'result_disabled_0\').checked = true;
-	    }
-
-		function check_results_disabled() {
-			document.getElementById(\'exerciseType_2\').checked = true;
-		}
-		</script>';
+        function feedbackselection() {
+            var index = document.exercise_admin.exerciseFeedbackType.selectedIndex;
+
+            if (index == \'1\') {
+                document.exercise_admin.exerciseType[1].checked=true;
+                document.exercise_admin.exerciseType[0].disabled=true;
+            } else {
+                document.exercise_admin.exerciseType[0].disabled=false;
+            }
+        }
+
+        function option_time_expired() {
+            if(document.getElementById(\'timercontrol\').style.display == \'none\')
+            {
+              document.getElementById(\'timercontrol\').style.display = \'block\';
+            } else {
+              document.getElementById(\'timercontrol\').style.display = \'none\';
+            }
+        }
+
+         function check_per_page_one() {
+             /*if (document.getElementById(\'divtimecontrol\').style.display==\'none\') {
+                 document.getElementById(\'divtimecontrol\').style.display=\'block\';
+                 document.getElementById(\'divtimecontrol\').display=block;
+                 document.getElementById(\'timecontrol\').display=none;
+             }*/
+             document.getElementById(\'exerciseType_0\').checked=true;
+        }
+
+        function check_per_page_all() {
+            /*if (document.getElementById(\'divtimecontrol\').style.display==\'block\') {
+                document.getElementById(\'divtimecontrol\').style.display=\'none\';
+                document.getElementById(\'enabletimercontroltotalminutes\').value=\'\';
+            }*/
+
+            if (document.getElementById(\'exerciseType_1\') && document.getElementById(\'exerciseType_1\').checked) {
+                document.getElementById(\'exerciseType_0\').checked = true;
+            }
+        }
+
+        function check_feedback() {
+            if (document.getElementById(\'result_disabled_1\').checked == true) {
+                document.getElementById(\'result_disabled_0\').checked = true;
+            }
+        }
+
+        function check_direct_feedback() {
+            document.getElementById(\'option_page_one\').checked = true;
+            document.getElementById(\'result_disabled_0\').checked = true;
+        }
+
+        function check_results_disabled() {
+            document.getElementById(\'exerciseType_2\').checked = true;
+        }
+        </script>';
 
 // to correct #4029 Random and number of attempt menu empty added window.onload=advanced_parameters;
 $htmlHeadXtra[] = '<script>
@@ -153,70 +153,70 @@ $course_id = api_get_course_int_id();
 
 //INIT FORM
 if (isset($_GET['exerciseId'])) {
-	$form = new FormValidator('exercise_admin', 'post', api_get_self().'?'.api_get_cidreq().'&exerciseId='.intval($_GET['exerciseId']));
-	$objExercise->read($_GET['exerciseId']);
-	$form->addElement('hidden','edit','true');
+    $form = new FormValidator('exercise_admin', 'post', api_get_self().'?'.api_get_cidreq().'&exerciseId='.intval($_GET['exerciseId']));
+    $objExercise->read($_GET['exerciseId']);
+    $form->addElement('hidden','edit','true');
 } else {
-	$form = new FormValidator('exercise_admin','post',api_get_self().'?'.api_get_cidreq());
-	$form->addElement('hidden','edit','false');
+    $form = new FormValidator('exercise_admin','post',api_get_self().'?'.api_get_cidreq());
+    $form->addElement('hidden','edit','false');
 }
 
 $objExercise->createForm($form);
 
 // VALIDATE FORM
 if ($form->validate()) {
-	$objExercise->processCreation($form);
-	if ($form->getSubmitValue('edit') == 'true') {
-	    $message = 'ExerciseEdited';
-	} else {
-	    $message = 'ExerciseAdded';
-	}
-	$exercise_id = $objExercise->id;
-	Session::erase('objExercise');
-	header('Location:admin.php?message='.$message.'&exerciseId='.$exercise_id);
-	exit;
+    $objExercise->processCreation($form);
+    if ($form->getSubmitValue('edit') == 'true') {
+        $message = 'ExerciseEdited';
+    } else {
+        $message = 'ExerciseAdded';
+    }
+    $exercise_id = $objExercise->id;
+    Session::erase('objExercise');
+    header('Location:admin.php?message='.$message.'&exerciseId='.$exercise_id);
+    exit;
 } else {
     // DISPLAY FORM
-	if (isset($_SESSION['gradebook'])) {
-		$gradebook=	$_SESSION['gradebook'];
-	}
-
-	if (!empty($gradebook) && $gradebook=='view') {
-		$interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
-	}
-	$nameTools = get_lang('ExerciseManagement');
-	$interbreadcrumb[] = array("url"=>'exercice.php', 'name'=> get_lang('Exercices'));
+    if (isset($_SESSION['gradebook'])) {
+        $gradebook=    $_SESSION['gradebook'];
+    }
+
+    if (!empty($gradebook) && $gradebook=='view') {
+        $interbreadcrumb[]= array ('url' => '../gradebook/'.$_SESSION['gradebook_dest'],'name' => get_lang('ToolGradebook'));
+    }
+    $nameTools = get_lang('ExerciseManagement');
+    $interbreadcrumb[] = array("url"=>'exercice.php', 'name'=> get_lang('Exercices'));
     $interbreadcrumb[] = array("url"=>"admin.php?exerciseId=".$objExercise->id, "name" => $objExercise->name);
 
-	Display::display_header($nameTools,get_lang('Exercise'));
+    Display::display_header($nameTools,get_lang('Exercise'));
 
-	echo '<div class="actions">';
+    echo '<div class="actions">';
 
-	if ($objExercise->id != 0) {
-	    echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
-	} else {
-		if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
-			if (!empty($_POST['lp_id'])){
-				$lp_id = Security::remove_XSS($_POST['lp_id']);//TODO:this remains to be implemented after press the first post
-			} else {
-				$lp_id = Security::remove_XSS($_GET['lp_id']);
-			}
-			echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'',ICON_SIZE_MEDIUM)."</a>";
+    if ($objExercise->id != 0) {
+        echo '<a href="admin.php?'.api_get_cidReq().'&exerciseId='.$objExercise->id.'">' . Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+    } else {
+        if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
+            if (!empty($_POST['lp_id'])){
+                $lp_id = Security::remove_XSS($_POST['lp_id']);//TODO:this remains to be implemented after press the first post
+            } else {
+                $lp_id = Security::remove_XSS($_GET['lp_id']);
+            }
+            echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'',ICON_SIZE_MEDIUM)."</a>";
         } else {
-	    	echo '<a href="exercice.php">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
-		}
-	}
-	echo '</div>';
+            echo '<a href="exercice.php">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+        }
+    }
+    echo '</div>';
 
-	if ($objExercise->feedback_type==1)
-		Display::display_normal_message(get_lang('DirectFeedbackCantModifyTypeQuestion'));
+    if ($objExercise->feedback_type==1)
+        Display::display_normal_message(get_lang('DirectFeedbackCantModifyTypeQuestion'));
 
-	if (api_get_setting('search_enabled')=='true' && !extension_loaded('xapian')) {
-		Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
-	}
+    if (api_get_setting('search_enabled')=='true' && !extension_loaded('xapian')) {
+        Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
+    }
 
-	// to hide the exercise description
-	echo '<style> .media { display:none;}</style>';
-	$form->display();
+    // to hide the exercise description
+    echo '<style> .media { display:none;}</style>';
+    $form->display();
 }
 Display::display_footer();

From 32f1b6d972ae25e13ae67b8ee47344f77a1547e8 Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Wed, 8 Jan 2014 10:29:14 +0100
Subject: [PATCH 7/9] Call html_entity_decode when editing exercice title

See https://github.com/chamilo/chamilo-lms/commit/4f0a911d5bbc82af92067392929227ff0328fcee#commitcomment-4998599
---
 main/exercice/exercise.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 0dbf79072d..c00048d4d7 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -1169,7 +1169,7 @@ class Exercise {
 
                 $defaults['randomAnswers']          = $this->selectRandomAnswers();
                 $defaults['exerciseType']           = $this->selectType();
-                $defaults['exerciseTitle']          = $this->selectTitle();
+                $defaults['exerciseTitle']          = html_entity_decode($this->selectTitle());
                 $defaults['exerciseDescription']    = $this->selectDescription();
                 $defaults['exerciseAttempts']       = $this->selectAttempts();
                 $defaults['exerciseFeedbackType']   = $this->selectFeedbackType();

From 60dd525e51806278848fa636764ed5f432d9a869 Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Wed, 8 Jan 2014 17:20:56 +0100
Subject: [PATCH 8/9] Inprove transparency in teachers.gif and students.gif
 files

---
 main/img/students.gif | Bin 1230 -> 1408 bytes
 main/img/teachers.gif | Bin 1208 -> 1403 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/main/img/students.gif b/main/img/students.gif
index d36c0637d48b4f37c58779a55b32c79cf02cc1fc..da34cdfa1c855a15f05651a036350a83f82c6992 100755
GIT binary patch
literal 1408
zcmZ?wbhEHb6k`x$I3myRU|oVk%JP*LfBm^S>GJd66Hfo>-SGO~o74ZFZ1mXpKVjeh
zfB%2aowu>_@ZU4n-ap>l@aoIo_lK*eR0oO`KmGsxNnHQchi`wU7EZUF`e##r$p5=@
zci;PcdWKcb{IACjZu|fLzv6%H2;Tq&m&B4pAZ=q`QIMFNom!%hl$xHIXRGvn_kJaX
z%oJOta8q9c-vZ~<j7*QJqSW9jzmVjr>}1OnC3`ysn+mIn+=ATHl0=1y+?>2(s|s7C
z#FYG`R4X7GB&@Hb09I0xZL8!6l28EI>6~Abs$i;Tpqp%9W~g9hqGxDgU}<8hqhMrU
zXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN<$C4Ddih1^
z`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83mzLNn0bL65
zLT&-v*t}vruy^#5^K<np5)1SV^$b8>f+_U%#ji9s7p}UvBq$Z(UaSTehg24%>IbD3
z=a&{GrvjBLgRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFitNp+b0OUP^v>F<8B?
zua#$BaY<rca;m3`trE}#z0AxMD@P+sHx~nES91$<H$y{LV@p?K3nx<-XA?71CqqX|
zH<(_R{N&Qy)Vvay-V}shH=KGwNg=lYXtPUdQD#|cid#{Bt^(N0R++fn;*8TgsNNLZ
zZgIh>S0CsYeNe<AMKnwZn0i1=c(Mg@;0Zr95187EfXSNi|G&R~e*gOU<NLR-Up{~O
z_~HG#w{Kp*dimn{v!_oUKYIA!{=K_*Zr{3j<NCF$S1w<=c;WoHvu949I(g#wv7<*0
zA3Ato|GvF@cJJD`WBazPTQ+anxMBUewQE+dTDfBRvZYHFFIu=@{=B(!X3v^AWBRnI
zQzlQEIHA9<x2L<Sv!lJOwWYbKv7x@Mwx+tOvZB1Kw4}JGupmD#HzzwQGb24MH6=MI
zF(E!KHYPeMG9o-IG$c4EFu>o>*T>t-)5G1()y3J#(ZSx%*2db((!$)#)Wp~bn5Fb|
zb+olKHPqEqRg{$!73Ae)Wu&DfCB(%<MTCU}1^D@RdAPYaIoR1)S(up^85k6QvH(eW
z1|0?<0F_4!tPdZk_dQCsJK((TO|gzhX$C{Ky|<onO>X~0XPq*KjJ}!kH7YX9dYc>H
zi$AnocyZ<0RS#tsH*>iEtjsv@g2Tb-pUb%i9aVSI7@ia{v@0i0;FguEs+N)Dk!54E
zXX4{yVd9y{!^+w-L5Gcnk6TQvPhcJkH=kIS3eyS}0f9MU0xatmFiDH6u&t10S+!1V
z*IelpqAIderH}2~u&aN{A!P~PDLal`KE`_Ctday5?}dvi?laxt6;=`D<hp%l%Ij;q
rFBr9jpTBtd=nJRtR&7RM3C{oDg%V~6ILz<m=3v%{=_qjJV6X-N_74}V

literal 1230
zcmV;<1Tp(ZNk%w1VHN-u0Qdg@X1)KZ(fZBZ{lv!4^wEvi<o;T&|5K>{wbuFn{OYW&
zxYp_Y=Dv01w0oM&_toO}{n(i9?(Uk(`u*CJYQ6tmv;U;h{{H>>|Nrz+YoPz-xajWq
z|KFwZ_WtMY{ffr^+3EUly#Gd*|L3`Z<F{h>(~wkVnuWvueZT(e^!<Uy|DVzSdBOjK
zzW3ej`!aXymBsh}|NsB-*Z=L#$B`_#-T(O1lK1T0q@}L^=)wQttN-4c`qq_^$^ZZ6
zy#L~`_3-BS`1q^O_y6Ol=IZo*fRwq?`Owwxe!Tg%-2MCZ@cHiL#-xIv!~bMxf!^r)
z&DZg&&it^dqi4AO(xF8E`0F`u>c!FS|KqKnslIW9td5nY&d0rz%=(ti|C*43t=a#V
zsH&y1%z%1s)6>&?YEJ*%lhNn>)u>#?-}~phXQ!s4sm%EE(2Mobi@mX=>hk)Brr&kD
z|07AV!QJ`r#elQP`=Xx0|Ml1Z-J;8+Nm-27u8~m3phC#x|Fqlx`2PRn<Kxk>djIIS
z{@b6Fm66u!_ulXRUSxs6%<@HKzQw9(-L+)@_2SOZ+e3QM*zEt@>;L`Qo1%O*-J@J(
zhsS4<({z&F|J<JCz;^G&b(qNhk<S0-yOSkj;Na-^;OzLz=>AZq|LDPx;@Z^m-pF&o
z|6gd6S8Jb+$o^h!o#Cl#f1mN;u6mWr{`%_1xzhCi?!%Ogf#&f0s?_`7s$8tr{{QHu
ztfau&-0aJpN2#2&g~j~g@%-ZT|G9@P<@Epm^WD+r``fWz)aU%o&CuMgTE5-*oRhKt
z=feNnn8m@imeT*h;QGVi|HtC_e!%~K#QtHH_s`z(aGmzA%l-N6*K&HG+}zxX!};;_
z`B{zkzqYRI@%;bn%fggIw6wLly1VSbg73<KGFP<1-~5xc^Mu6ulehfv%Z9he^tI6P
ztjq9;toU@k|KQ^BZoU7a(ER7;=jp_I>cxHT$9uTh_W$_hzuNV%j9Jy!>#WuL|L@Gr
z=l`<X|NsC0A^8LW00930EC2ui02Tli000R80RIUb_-{$4RwEj$VnT|bLxQCmSi_J2
zPplo3-aK@8V+4j67aGm*f#p^$ZW{-VdUdZ#m0;d9aFApsU!asq#PORUL&l68KM3)d
zfJREn8+8Wx$dSy)k30};xH0x6B@hNfIOx#90aH{0^>oQfc|p()2xuYjDA8sfiAifx
z{^O!XnT--92&Bt2j7Ax3a-S3;p=lgF28^iC7_&vLfF`V#E&8UX&o4e<sF@S9Q9w0)
zi6GfRwhPxC30~A4F_Oh$2Xqgv#PDz^*MkllrWJ?*B~qLL1nopwCk$8$Ktw!fd-tgu
z92c-^XbCc~T>v3|`YrG^E5(KdAY6c}O2fuqrD6lANwDyzhO<z_dVx4(=nOFgn^ss-
zFi_eDS1VWmMiS*bgU>PcG($%`CvdU{4g+n&!U-Srz>EXz&|(2C2<#I;HYlj@2!sM%
zVt^@fgm?}NJ#^s!45@qo4GU9{6V5=6SYZGF6olYTG`zIX0ut`PLqP?eAR-Sz11R!>
s2%;EJ0RR9@QNaNsyfB9oWIPms0@tX5N(N+RV1fy!6ah{I0|f*CJ1!#n{Qv*}

diff --git a/main/img/teachers.gif b/main/img/teachers.gif
index a9e78520c8b636fe62f0a653d1895d2715d18d92..8970f5754323fb73bf01dd25db75cd3956144378 100755
GIT binary patch
literal 1403
zcmZ?wbhEHb6k`x$I3myR(7^EF`c%`*-G8o3`2Oo__sQRvUjJEn`S<bJbN{_NTXy*8
z|EHV1w*8&B<-NtyztiWhICuHY_Q$`r=GG+d|NDAhZDiktqT>GSd0$V>uw2*So;m$y
z)smYblfVAIGxy5wegFUeSNzW%;Txdfl30=mq;2dg3KEmEQ%e+*Qqwc@Y?a>c-mj#P
znPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(;w+TacStlBiITo0C^;Rbi`?
zn3A8AY6WD2g!Ppaz)DK8ZIv8B5(*$Yo%4%Q6-@OEbdwFt3>C~w^bAc5EKMwR6pRcE
z4fG9-^bO2)4GpYJ&8-X!6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M(T(8_%FTW^V
z-_X+1Qs2Nx-^fT8s6w~6GOr}DLN~8i8D@e@YH@N=W<g12ex3rz#Kffh(h^%Gpi3cM
z$Sr^yn^&v{_Kse1ey)B+Vu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo{h-w1
z{L-T2RG@NYkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mQ;@R0z+^OUW-U2CMh=
zwerj>E=kNwPW5!LRRWrzmzkMjW$EH%?q+1*Xl`NdW@zYYZ0TrX=;rKfX=r3*=4$C`
z0MqM|pIn-onpXnTn}X2mgi|jlDdZLaZFWg5$}CGwaVyHtRRDY0DigO`EO43!)tiFb
zEtWX->H{644~kf%h=vIPQxAv<Pqsh~JmIJ20aJSsFj+JH|M&OL?_WQEeE;_K%jZuY
zKfHhU_RZ^8FJC-=_Vmf)M-Ly|zjyb}?OQi*T)%ep%H>NJFPuMj_RQ&1Cr=zdcJ#>M
zLkAD+-?w+q?p-@~Y~QwZ%jQiRH>_W`cFpQlD_1OEwsgtjMGF_qpEq~T>{&BsOrJJ&
z%H&BCC-nFA_H=i3cC@#(wlp_2Hq_VE)>KzjR+N{OmJ}Bi7UbvU=45AOW~8U3rX(jN
zCd9|Z#zaR&Mudljh6D!%2Kf8=`gnVJdbqo}x;Q&II@sIU+E`mzT9})eniv}avy`5$
zj<%MjhPs-nin5ZTg1nrpjI@-bgt(Zfh_H~L06!lu4>uPl2Rj=p3o{cV1B2pE79c6l
zpu+$Jpz?@;_09wJJ|)orHK%ntQw3Zml`v)p8_dzE$?ab^C+DJOTAk|5N!KMWOpxcw
z_sHR^vCnMJlnpSr;81L%F}v^KI!lJOIyv?AoXs0;7PNM^`yNk`6X)f%XBQA)V+Wcp
z#KqdmUarl{CSWkNTaJy5rCnN^ec@~axtW$7ohrPGX0t72;Fv8axKLC@yq|ruAV;^*
z=Dz-I$}+6S7P9Z{*~Kc{cUVd0+_7Uq-3(W_ZZWAy@d%&0b&Wyn)-#?vDolLB_a8`0
jJ^1uOOo!<;A0N+eo}YZ*zt%-;C|Iv>ph4M*fx#L8;(ZPa

literal 1208
zcma)*@lTX>9LFCK2o&oSMJ2!tWNu+;UPeTY$$>>!<j~pni~-%ST^F-@ETZQJfoG^i
zOz`mp_JBsuZti?`qwDdO*AtV+XGgnzBYXD5==SV#`0cXW<4x&1+Sq5-<A2cS=g&T$
z_viI~e-6G@U-@EN0aZZ#Ls4Z7vdah3aHA9hE6PAhq(h($3d-YoMv};jz=w&IwzPnk
zALN8i7DqKLis%jwmJKN&nn4;z-12@G7X>z|ka-@3HES7~{lE;HXu>7UgQ63z+uP_7
zjAc+#fP*Y7TiBjIZ;2}KQHu!!J!r@=0%=3+b}C^B5<H^<Bo&;*oJw$nGpnkVILM#V
zL?56dpxMF#66<M{L$Vp7*-4|i(}IT<EXw>Gc*hJ#YoZRKUo=WG%`|ALY);Zlx4=vT
zuadHMtWCN|j5AX}Ql>D-$?aY=hv-g03Meqo6Z?c9Ab+DaN06;K%;J(FGhsp+^W8io
zL`W$EDzQ|KG&E|%71A8BVw^h+MhcWgYrrQOy5W9A3F82bRR-;=9*BY&l9>r2$Dz4H
zz{>zDAjClPb4oYoYFD%gX&?yhevNBkmHrCn$CkCfn(gILd4=<+Y=l_pLmtNsSGPgR
z%b0$N9wcrb(Z)n{z=h_CcN%aStb!sjgh&GMJ{~0jm1k-`m#h;_MJTEW0YwRkhMzVf
z3J$wDzp1pi@ggQwPTIpuK^ado#-z(!0X_z71l+@h5>Z$cPyz%UkZvjo8!s_+Q?s!|
zcz6hs4(v40L9kRF2fXYAQ8sLZCBqE6N!o-suj#fg5{iRs4CpX$cG6a$IRH`|aEOH!
zi-`ae1=_Yo2eJYvZIi*x9>I#TM$%589U+io00{w-8m9u$?Y(wdkm#3in1hrypn^09
zuw;@nhPXie@2Ysz`REs@oPVjF+@c%_J(u4e*t9nD?B&|t@xTu?$KTHw?s}u~73Nqn
zyQ=kWO8oj4>D2g^Cm##69lxiY{iO6~?fh4LM`HON{hQkC^Yuerv~PU!+=hulr!#ip
z?@v3nUM$`e6f0I={cW`4Xpd*%!M(md{zlQzoeblz>&2eKGff#jKI_}Uxwo$8b3Z-t
zeCyS&hPu}DxO>~enRBb>N7uY_sE}LPoi#+AR0>YS&%9T&X7`DjkyY1l&-J&TJ$&Yw
zKc-%<Jb_N_Y1O}2-@C3YK;3MvJCfOZXZSnn&(k;e<y^dfcUAby+6xZ0{N&bSJ4e2M
z^V01f<5TrRJ2qTe#ILHeO}?JbIzAZx{nwkDw-;4rUT8YEeck1<Yc1;}{`k>gnQ^7~
z-5t4WbF%8ES_jwfy0X`?WADiMgC%ikDz;@OeY>SZ9?3scmc0hg?A}X%v^G0g9m>r(
zJ<>O`OEs73OT&52Sx1X|slL3awNzWbfT+6i(VEh%;ujnnXP!End8=o0_Wc{Hoh^)`
g=4tBIp4r;_-UnPk!u`^LZFD4*<H*a~=%8Ny59DvQtpET3


From 1a43df604b2bf7e5ca5b9b863bf3f4d3d2420ff3 Mon Sep 17 00:00:00 2001
From: Hubert Borderiou <baelmyhu@gmail.com>
Date: Wed, 8 Jan 2014 17:39:12 +0100
Subject: [PATCH 9/9] Course catalog display - ref #6654

---
 .../default/auth/courses_categories.php       | 234 +++++++++++++-----
 1 file changed, 169 insertions(+), 65 deletions(-)

diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php
index 5a6f29f93d..cf598f9998 100644
--- a/main/template/default/auth/courses_categories.php
+++ b/main/template/default/auth/courses_categories.php
@@ -142,93 +142,197 @@ $stok = Security::get_token();
         }
 
         $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
+        $user_id = api_get_user_id();
 
         if (!empty($browse_courses_in_category)) {
 
             foreach ($browse_courses_in_category as $course) {
 
-                // if course is closed, don't show it.
-                if ($course['visibility'] == COURSE_VISIBILITY_CLOSED || $course['visibility'] == COURSE_VISIBILITY_HIDDEN) {
+                $course_hidden = ($course['visibility'] == COURSE_VISIBILITY_HIDDEN);
+
+                if ($course_hidden) {
                     continue;
                 }
-                // course isn't closed
-                $title      = cut($course['title'], 70);
-                $tutor_name = $course['tutor'];
 
-                $creation_date = substr($course['creation_date'],0,10);
+                $user_registerd_in_course = CourseManager::is_user_subscribed_in_course($user_id, $course['code']);
+                $user_registerd_in_course_as_teacher = CourseManager::is_course_teacher($user_id, $course['code']);
+                $user_registerd_in_course_as_student = ($user_registerd_in_course && !$user_registerd_in_course_as_teacher);
+                $course_public = ($course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD);
+                $course_open = ($course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM);
+                $course_private = ($course['visibility'] == COURSE_VISIBILITY_REGISTERED);
+                $course_closed = ($course['visibility'] == COURSE_VISIBILITY_CLOSED);
+                $course_subscribe_allowed = ($course['subscribe'] == 1);
+                $course_unsubscribe_allowed = ($course['unsubscribe'] == 1);
                 $count_connections = $course['count_connections'];
+                $creation_date = substr($course['creation_date'],0,10);
 
-                $course_path = api_get_path(SYS_COURSE_PATH).$course['directory'];   // course path
-
-                if (file_exists($course_path.'/course-pic85x85.png')) {
-                    $course_medium_image = api_get_path(WEB_COURSE_PATH).$course['directory'].'/course-pic85x85.png'; // redimensioned image 85x85
-                } else {
-                    $course_medium_image = api_get_path(WEB_IMG_PATH).'without_picture.png'; // without picture
-                }
-
-                $rating = Display::return_rating_system('star_'.$course['real_id'], $ajax_url.'&amp;course_id='.$course['real_id'], $course['point_info']);
-
+                // display the course bloc
                 echo '<div class="well_border"><div class="row">';
-                    echo '<div class="span2">';
-                        echo '<div class="thumbnail">';
-                        if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-                            echo '<a class="ajax" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&amp;code='.$course['code'].'" title="'.$icon_title.'" rel="gb_page_center[778]">';
-                            echo '<img src="'.$course_medium_image.'" alt="" />';
-                            echo '</a>';
-                        } else {
-                            echo '<img src="'.$course_medium_image.'" alt="'.$title.'"/>';
-                        }
-                        echo '</div>';//thumb
-                    echo '</div>';
-
-                    echo '<div class="span4">';
-                    $teachers = CourseManager::get_teacher_list_from_course_code_to_string($course['code']);
-                    $teachers = '<h5>'.$teachers.'</h5>';
-                    echo '<div class="categories-course-description"><h3>'.cut($title, 60).'</h3>'.$teachers.$rating.'</div>';
 
-                    echo '<p>';
-                    // we display the icon to subscribe or the text already subscribed
-                    echo '<div class="btn-toolbar">';
+                // display thumbnail
+                display_thumbnail($course, $icon_title);
 
-                    if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-                        echo '<a class="ajax btn" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&amp;code='.$course['code'].'" title="'.$icon_title.'" class="thickbox">'.get_lang('Description').'</a>';
-                    }
-
-                    // Get access type for course button ("enter" or/and "register")
-                    $access_type = CourseManager::get_access_link_by_user(api_get_user_id(), $course);
-
-                    // Go To Course button (only if admin, if course public or if student already subscribed)
-                    if ($access_type && in_array('enter', $access_type)) {
-                        echo ' <a class="btn btn-primary" href="'.  api_get_course_url($course['code']).'">'.get_lang('GoToCourse').'</a>';
+                // display course title and button bloc
+                echo '<div class="span4">';
+                display_title($course);
+                // display button line
+                echo '<div class="btn-toolbar">';
+                // if user registered as student
+                if ($user_registerd_in_course_as_student) {
+                    if (!$course_closed) {
+                        display_description_button($course, $icon_title);
+                        display_goto_button($course);
+                        if ($course_unsubscribe_allowed) {
+                            display_unregister_button($course, $stok, $search_term, $code);
+                        }
+                        display_already_registered_label('student');
                     }
-
-                    // Register button
-                    if ($access_type && in_array('register', $access_type)) {
-                         echo ' <a class="btn btn-primary" href="'. api_get_self().'?action=subscribe_course&amp;sec_token='.$stok.'&amp;subscribe_course='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Subscribe').'</a>';
+                } elseif ($user_registerd_in_course_as_teacher) {
+                    // if user registered as teacher
+                    display_description_button($course, $icon_title);
+                    display_goto_button($course);
+                    if ($course_unsubscribe_allowed) {
+                        display_unregister_button($course, $stok, $search_term, $code);
                     }
-
-                    // If user is already subscribed to the course
-                    if (!api_is_anonymous() && in_array($course['code'], $user_coursecodes)) {
-                        if ($course['unsubscribe'] == UNSUBSCRIBE_ALLOWED) {
-                            echo ' <a class="btn btn-primary" href="'. api_get_self().'?action=unsubscribe&amp;sec_token='.$stok.'&amp;unsubscribe='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Unsubscribe').'</a>';
+                    display_already_registered_label('teacher');
+                } else {
+                    // if user not registered in the course
+                    if (!$course_closed) {
+                        display_description_button($course, $icon_title);
+                        if (!$course_private) {
+                            display_goto_button($course);
+                            if ($course_subscribe_allowed) {
+                                display_register_button($course, $stok, $code, $search_term);
+                            }
                         }
-                        echo '<br />';
-                        echo '<br />';
-                        echo Display::label(get_lang("AlreadyRegisteredToCourse"), "info");
                     }
-                    echo '</div>';
-                    echo '</p>';
-                    echo '</div>';
-                    echo '<div class="span2">';
-                        echo '<div class="course-block-popularity"><span>'.get_lang('ConnectionsLastMonth').'</span><div class="course-block-popularity-score">'.$count_connections.'</div></div>';
-                    echo '</div>';
-                echo '</div></div>';
+                }
+                echo '</div>'; // btn-toolbar
+                echo '</div>'; // span4
+
+                // display counter
+                echo '<div class="span2">';
+                echo '<div class="course-block-popularity"><span>'.get_lang('ConnectionsLastMonth').'</span><div class="course-block-popularity-score">'.$count_connections.'</div></div>';
+                echo '</div>';
+
+                // end of course bloc
+                echo '</div></div>'; // well_border row
+
             }
         } else {
             if (!isset($_REQUEST['subscribe_user_with_password']) && !isset($_REQUEST['subscribe_course'])) {
-                echo Display::display_warning_message(get_lang('ThereAreNoCoursesInThisCategory'));
+                Display::display_warning_message(get_lang('ThereAreNoCoursesInThisCategory'));
             }
         }
         ?>
     </div>
 </div>
+
+<?php
+
+/**
+ * Display the course catalog image of a course
+ * @param $course
+ * @param $icon_title
+ */
+function display_thumbnail($course, $icon_title)
+{
+    $title      = cut($course['title'], 70);
+    $course_path = api_get_path(SYS_COURSE_PATH).$course['directory'];   // course path
+
+    if (file_exists($course_path.'/course-pic85x85.png')) {
+        $course_medium_image = api_get_path(WEB_COURSE_PATH).$course['directory'].'/course-pic85x85.png'; // redimensioned image 85x85
+    } else {
+        $course_medium_image = api_get_path(WEB_IMG_PATH).'without_picture.png'; // without picture
+    }
+
+    // course image
+    echo '<div class="span2">';
+    echo '<div class="thumbnail">';
+    if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
+        echo '<a class="ajax" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&amp;code='.$course['code'].'" title="'.$icon_title.'" rel="gb_page_center[778]">';
+        echo '<img src="'.$course_medium_image.'" alt="" />';
+        echo '</a>';
+    } else {
+        echo '<img src="'.$course_medium_image.'" alt="'.$title.'"/>';
+    }
+    echo '</div>';  // thumbail
+    echo '</div>';  // span2
+}
+
+/**
+ * Display the title of a course in course catalog
+ * @param $course
+ */
+function display_title($course)
+{
+    $title      = cut($course['title'], 70);
+    $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
+    $teachers = CourseManager::get_teacher_list_from_course_code_to_string($course['code']);
+    $rating = Display::return_rating_system('star_'.$course['real_id'], $ajax_url.'&amp;course_id='.$course['real_id'], $course['point_info']);
+
+    $teachers = '<h5>'.$teachers.'</h5>';
+    echo '<div class="categories-course-description">';
+    echo '<h3>'.cut($title, 60).'</h3>';
+    echo $teachers;
+    echo $rating;
+    echo '</div>';  // categories-course-description
+}
+
+/**
+ * Display the description button of a course in the course catalog
+ * @param $course
+ * @param $icon_title
+ */
+function display_description_button($course, $icon_title)
+{
+    if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
+        echo '<a class="ajax btn" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&amp;code='.$course['code'].'" title="'.$icon_title.'" class="thickbox">'.get_lang('Description').'</a>';
+    }
+}
+
+/**
+ * Display the goto course button of a course in the course catalog
+ * @param $course
+ */
+function display_goto_button($course)
+{
+    echo ' <a class="btn btn-primary" href="'.api_get_course_url($course['code']).'">'.get_lang('GoToCourse').'</a>';
+}
+
+/**
+ * Display the already registerd text in a course in the course catalog
+ * @param $in_status
+ */
+function display_already_registered_label($in_status)
+{
+    $icon = Display::return_icon('teachers.gif', get_lang('Teacher'));
+    if ($in_status == 'student') {
+        $icon = Display::return_icon('students.gif', get_lang('Student'));
+    }
+    echo Display::label($icon.' '.get_lang("AlreadyRegisteredToCourse"), "info");
+}
+
+/**
+ * Display the register button of a course in the course catalog
+ * @param $course
+ * @param $stok
+ * @param $code
+ * @param $search_term
+ */
+function display_register_button($course, $stok, $code, $search_term)
+{
+    echo ' <a class="btn btn-primary" href="'.api_get_self().'?action=subscribe_course&amp;sec_token='.$stok.'&amp;subscribe_course='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Subscribe').'</a>';
+}
+
+/**
+ * Display the unregister button of a course in the course catalog
+ * @param $course
+ * @param $stok
+ * @param $search_term
+ * @param $code
+ */
+function display_unregister_button($course, $stok, $search_term, $code)
+{
+    echo ' <a class="btn btn-primary" href="'. api_get_self().'?action=unsubscribe&amp;sec_token='.$stok.'&amp;unsubscribe='.$course['code'].'&amp;search_term='.$search_term.'&amp;category_code='.$code.'">'.get_lang('Unsubscribe').'</a>';
+}