chamilo / chamilo-lms

main/exercice/MatchingDraggable.php

Spacing +14 added lines, -14 removed lines

@@ -67,12 +67,12 @@ 
                 for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
                     if ($answer->isCorrect($i)) {
                         $nb_matches++;
-                        $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i);
-                        $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1);
-                        $defaults['matches[' . $nb_matches . ']'] = $answer->correct[$i];
+                        $defaults['answer['.$nb_matches.']'] = $answer->selectAnswer($i);
+                        $defaults['weighting['.$nb_matches.']'] = float_format($answer->selectWeighting($i), 1);
+                        $defaults['matches['.$nb_matches.']'] = $answer->correct[$i];
                     } else {
                         $nb_options++;
-                        $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i);
+                        $defaults['option['.$nb_options.']'] = $answer->selectAnswer($i);
                     }
                 }
             }
@@ -103,10 +103,10 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="10">' . get_lang('Number') . '</th>
-                    <th width="85%">' . get_lang('Answer') . '</th>
-                    <th width="15%">' . get_lang('MatchesTo') . '</th>
-                    <th width="10">' . get_lang('Weighting') . '</th>
+                    <th width="10">' . get_lang('Number').'</th>
+                    <th width="85%">' . get_lang('Answer').'</th>
+                    <th width="15%">' . get_lang('MatchesTo').'</th>
+                    <th width="10">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -154,8 +154,8 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="15%">' . get_lang('Number') . '</th>
-                    <th width="85%">' . get_lang('Answer') . '</th>
+                    <th width="15%">' . get_lang('Number').'</th>
+                    <th width="85%">' . get_lang('Answer').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -176,7 +176,7 @@ 
             );
 
             $form->addHtml('<tr>');
-            $form->addHtml('<td>' . chr(64 + $i) . '</td>');
+            $form->addHtml('<td>'.chr(64 + $i).'</td>');
             $form->addText("option[$i]", null);
             $form->addHtml('</tr>');
         }
@@ -258,10 +258,10 @@ 
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="' . $this->question_table_class . '">
+        $header .= '<table class="'.$this->question_table_class.'">
                 <tr>
-                    <th>' . get_lang('ElementList') . '</th>
-                    <th>' . get_lang('CorrespondsTo') . '</th>
+                    <th>' . get_lang('ElementList').'</th>
+                    <th>' . get_lang('CorrespondsTo').'</th>
                 </tr>';
 
         return $header;

main/exercice/unique_answer_no_option.class.php

Indentation +62 added lines, -62 removed lines

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

Spacing +52 added lines, -52 removed lines

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

Braces +13 added lines, -10 removed lines

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

main/exercice/question_pool.php

Indentation +121 added lines, -121 removed lines

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

Spacing +21 added lines, -21 removed lines

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

main/gradebook/gradebook_showlog_eval.php

Spacing +7 added lines, -7 removed lines

@@ -9,15 +9,15 @@ 
 api_block_anonymous_users();
 GradebookUtils::block_students();
 
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'].'?',
     'name' => get_lang('Gradebook'
 ));
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']),
     'name' => get_lang('Details'
 ));
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => 'gradebook_showlog_eval.php?visiblelog='.Security::remove_XSS($_GET['visiblelog']).'&selectcat='.Security::remove_XSS($_GET['selectcat']),
     'name' => get_lang('GradebookQualifyLog')
 );
@@ -28,7 +28,7 @@ 
 
 $t_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
 $t_user = Database :: get_main_table(TABLE_MAIN_USER);
-$visible_log=Security::remove_XSS($_GET['visiblelog']);
+$visible_log = Security::remove_XSS($_GET['visiblelog']);
 
 $evaledit = Evaluation :: load($visible_log);
 $sql = "SELECT le.name,le.description,le.weight,le.visible,le.type,le.created_at,us.username
@@ -42,9 +42,9 @@ 
     $list_info[] = $row;
 }
 
-foreach($list_info as $key => $info_log) {
-    $list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
-    $list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
+foreach ($list_info as $key => $info_log) {
+    $list_info[$key][5] = ($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
+    $list_info[$key][3] = ($info_log[3] == 1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
 }
 
 $parameters = array(

main/gradebook/gradebook_edit_cat.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
         $cat->setGenerateCertificates(false);
     }
 
-    if ($values['hid_parent_id'] == 0 ) {
+    if ($values['hid_parent_id'] == 0) {
         $cat->set_certificate_min_score($values['certif_min_score']);
     }
 
@@ -81,12 +81,12 @@ 
     }
 
     $cat->save();
-    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat=' . $cat->get_parent_id().'&'.api_get_cidreq());
+    header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?editcat=&selectcat='.$cat->get_parent_id().'&'.api_get_cidreq());
     exit;
 }
 $selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
 $interbreadcrumb[] = array(
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $selectcat . '&' . api_get_cidreq(),
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat.'&'.api_get_cidreq(),
     'name' => get_lang('Gradebook')
 );
 $this_section = SECTION_COURSES;

main/gradebook/gradebook_edit_eval.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
     null,
     'edit_eval_form',
     null,
-    api_get_self() . '?editeval=' . Security::remove_XSS($_GET['editeval'])
+    api_get_self().'?editeval='.Security::remove_XSS($_GET['editeval'])
 );
 if ($form->validate()) {
     $values = $form->exportValues();
@@ -45,11 +45,11 @@ 
     }
     $eval->set_visible($visible);
     $eval->save();
-    header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat=' . $eval->get_category_id());
+    header('Location: '.$_SESSION['gradebook_dest'].'?editeval=&selectcat='.$eval->get_category_id());
     exit;
 }
-$selectcat_inter=isset($_GET['selectcat'])?Security::remove_XSS($_GET['selectcat']):'';
-$interbreadcrumb[] = array (
+$selectcat_inter = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : '';
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat_inter,
     'name' => get_lang('Gradebook'
     ));

main/gradebook/index.php

Spacing +109 added lines, -109 removed lines

@@ -11,7 +11,7 @@ 
 //$cidReset = false;
 $_in_course = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 
@@ -80,9 +80,9 @@ 
 });
 </script>';
 api_block_anonymous_users();
-$htmlHeadXtra[]= '<script type="text/javascript">
+$htmlHeadXtra[] = '<script type="text/javascript">
 function confirmation() {
-	if (confirm("' . get_lang('DeleteAll') . '?")) {
+	if (confirm("' . get_lang('DeleteAll').'?")) {
 		return true;
 	} else {
 		return false;
@@ -109,13 +109,13 @@ 
 $_GET['selectcat'] = $cats[0]->get_id();
 
 if (isset($_GET['isStudentView'])) {
-    if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
-        $interbreadcrumb[]= array ('url' => 'index.php'.'?selectcat=0&amp;isStudentView='.$_GET['isStudentView'],'name' => get_lang('ToolGradebook'));
+    if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0) && (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')) {
+        $interbreadcrumb[] = array('url' => 'index.php'.'?selectcat=0&amp;isStudentView='.$_GET['isStudentView'], 'name' => get_lang('ToolGradebook'));
     }
 }
 
-if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) &&
-    (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview')
+if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0) &&
+    (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')
 ) {
     /*Display :: display_header();
     //Introduction tool: student view
@@ -132,19 +132,19 @@ 
     exit;*/
 } else {
     if (!isset($_GET['selectcat']) &&
-        ($_SESSION['studentview']=='studentview') ||
-        (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true')
+        ($_SESSION['studentview'] == 'studentview') ||
+        (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true')
     ) {
         Display :: display_header(get_lang('Gradebook'));
 
         //Introduction tool: student view
         Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
-        $addparams=array();
-        $cats = Category :: load (0, null, null, null, null, null, false);
-        $allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-        $alleval= $cats[0]->get_evaluations($stud_id);
-        $alllink= $cats[0]->get_links($stud_id);
-        $gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
+        $addparams = array();
+        $cats = Category :: load(0, null, null, null, null, null, false);
+        $allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
+        $alleval = $cats[0]->get_evaluations($stud_id);
+        $alllink = $cats[0]->get_links($stud_id);
+        $gradebooktable = new GradebookTable($cats[0], $allcat, $alleval, $alllink, $addparams);
         $gradebooktable->display();
         Display :: display_footer();
         exit;
@@ -155,10 +155,10 @@ 
 //this is called when there is no data for the course admin
 if (isset($_GET['createallcategories'])) {
     GradebookUtils::block_students();
-    $coursecat= Category :: get_not_created_course_categories($stud_id);
+    $coursecat = Category :: get_not_created_course_categories($stud_id);
     if (!count($coursecat) == 0) {
         foreach ($coursecat as $row) {
-            $cat= new Category();
+            $cat = new Category();
             $cat->set_name($row[1]);
             $cat->set_course_code($row[0]);
             $cat->set_description(null);
@@ -176,25 +176,25 @@ 
 
 //show logs evaluations
 if (isset($_GET['visiblelog'])) {
-    header('Location: ' . api_get_self().'/gradebook_showlog_eval.php');
+    header('Location: '.api_get_self().'/gradebook_showlog_eval.php');
     exit;
 }
 
 //move a category
 if (isset($_GET['movecat'])) {
     GradebookUtils::block_students();
-    $cats= Category :: load($_GET['movecat']);
+    $cats = Category :: load($_GET['movecat']);
     if (!isset ($_GET['targetcat'])) {
-        $move_form= new CatForm(CatForm :: TYPE_MOVE,
+        $move_form = new CatForm(CatForm :: TYPE_MOVE,
             $cats[0],
             'move_cat_form',
             null,
-            api_get_self() . '?movecat=' . Security::remove_XSS($_GET['movecat'])
-            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            api_get_self().'?movecat='.Security::remove_XSS($_GET['movecat'])
+            . '&selectcat='.Security::remove_XSS($_GET['selectcat']));
         if ($move_form->validate()) {
-            header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                . '&movecat=' . Security::remove_XSS($_GET['movecat'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                . '&movecat='.Security::remove_XSS($_GET['movecat'])
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
@@ -203,7 +203,7 @@ 
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $cats[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            header('Location: '.api_get_self().'?categorymoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
             exit;
         }
         unset ($targetcat);
@@ -214,30 +214,30 @@ 
 //move an evaluation
 if (isset($_GET['moveeval'])) {
     GradebookUtils::block_students();
-    $evals= Evaluation :: load($_GET['moveeval']);
+    $evals = Evaluation :: load($_GET['moveeval']);
     if (!isset ($_GET['targetcat'])) {
 
-        $move_form= new EvalForm(EvalForm :: TYPE_MOVE,
+        $move_form = new EvalForm(EvalForm :: TYPE_MOVE,
             $evals[0],
             null,
             'move_eval_form',
             null,
-            api_get_self() . '?moveeval=' . Security::remove_XSS($_GET['moveeval'])
-            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            api_get_self().'?moveeval='.Security::remove_XSS($_GET['moveeval'])
+            . '&selectcat='.Security::remove_XSS($_GET['selectcat']));
 
         if ($move_form->validate()) {
-            header('Location: ' .api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                . '&moveeval=' . Security::remove_XSS($_GET['moveeval'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                . '&moveeval='.Security::remove_XSS($_GET['moveeval'])
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
-        $targetcat= Category :: load($_GET['targetcat']);
+        $targetcat = Category :: load($_GET['targetcat']);
         $course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $evals[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            header('Location: '.api_get_self().'?evaluationmoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
             exit;
         }
         unset ($targetcat);
@@ -248,21 +248,21 @@ 
 //move a link
 if (isset($_GET['movelink'])) {
     GradebookUtils::block_students();
-    $link= LinkFactory :: load($_GET['movelink']);
+    $link = LinkFactory :: load($_GET['movelink']);
     $move_form = new LinkForm(
         LinkForm :: TYPE_MOVE,
         null,
         $link[0],
         'move_link_form',
         null,
-        api_get_self() . '?movelink=' . $_GET['movelink'] . '&selectcat=' . Security::remove_XSS($_GET['selectcat'])
+        api_get_self().'?movelink='.$_GET['movelink'].'&selectcat='.Security::remove_XSS($_GET['selectcat'])
     );
 
     if ($move_form->validate()) {
-        $targetcat= Category :: load($move_form->exportValue('move_cat'));
+        $targetcat = Category :: load($move_form->exportValue('move_cat'));
         $link[0]->move_to_cat($targetcat[0]);
         unset ($link);
-        header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        header('Location: '.api_get_self().'?linkmoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
         exit;
     }
 }
@@ -272,9 +272,9 @@ 
     GradebookUtils::block_students();
 
     if (isset($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
     $cats = Category :: load($_GET['visiblecat']);
     $cats[0]->set_visible($visibility_command);
@@ -309,11 +309,11 @@ 
 if (isset($_GET['visibleeval'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
-    $eval= Evaluation :: load($_GET['visibleeval']);
+    $eval = Evaluation :: load($_GET['visibleeval']);
     $eval[0]->set_visible($visibility_command);
     $eval[0]->save();
     unset ($eval);
@@ -330,7 +330,7 @@ 
 if (isset($_GET['lockedeval'])) {
     GradebookUtils::block_students();
     $locked = Security::remove_XSS($_GET['lockedeval']);
-    if (isset($_GET['typelocked']) && api_is_platform_admin()){
+    if (isset($_GET['typelocked']) && api_is_platform_admin()) {
         $type_locked = 0;
         $confirmation_message = get_lang('EvaluationHasBeenUnLocked');
     } else {
@@ -347,7 +347,7 @@ 
 
 if (isset($_GET['deleteeval'])) {
     GradebookUtils::block_students();
-    $eval= Evaluation :: load($_GET['deleteeval']);
+    $eval = Evaluation :: load($_GET['deleteeval']);
     if ($eval[0] != null) {
         $eval[0]->delete_with_results();
     }
@@ -359,11 +359,11 @@ 
 if (isset($_GET['visiblelink'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
-    $link= LinkFactory :: load($_GET['visiblelink']);
+    $link = LinkFactory :: load($_GET['visiblelink']);
     if (isset($link) && isset($link[0])) {
         $link[0]->set_visible($visibility_command);
         $link[0]->save();
@@ -385,7 +385,7 @@ 
     $get_delete_link = intval($_GET['deletelink']);
     //fixing #5229
     if (!empty($get_delete_link)) {
-        $link= LinkFactory :: load($get_delete_link);
+        $link = LinkFactory :: load($get_delete_link);
         if ($link[0] != null) {
             // Clean forum qualify
             $sql = 'UPDATE '.$tbl_forum_thread.' SET
@@ -420,11 +420,11 @@ 
     if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
         die ('Error: movecat or moveeval not defined');
     }
-    $button = '<form name="confirm" method="post" action="'.api_get_self() .'?confirm='
-        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-            : '&moveeval=' . Security::remove_XSS($_GET['moveeval']) )
-        .'&selectcat=' . Security::remove_XSS($_GET['selectcat'])
-        .'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+    $button = '<form name="confirm" method="post" action="'.api_get_self().'?confirm='
+        .(isset($_GET['movecat']) ? '&movecat='.Security::remove_XSS($_GET['movecat'])
+            : '&moveeval='.Security::remove_XSS($_GET['moveeval']))
+        .'&selectcat='.Security::remove_XSS($_GET['selectcat'])
+        .'&targetcat='.Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.get_lang('Ok').'">
 			   </form>';
     $warning_message = get_lang('MoveWarning').'<br><br>'.$button;
@@ -455,7 +455,7 @@ 
 //actions on the sortabletable
 if (isset($_POST['action'])) {
     GradebookUtils::block_students();
-    $number_of_selected_items= count($_POST['id']);
+    $number_of_selected_items = count($_POST['id']);
 
     if ($number_of_selected_items == '0') {
         $warning_message = get_lang('NoItemsSelected');
@@ -463,19 +463,19 @@ 
     } else {
         switch ($_POST['action']) {
             case 'deleted':
-                $number_of_deleted_categories= 0;
-                $number_of_deleted_evaluations= 0;
-                $number_of_deleted_links= 0;
+                $number_of_deleted_categories = 0;
+                $number_of_deleted_evaluations = 0;
+                $number_of_deleted_links = 0;
                 foreach ($_POST['id'] as $indexstr) {
                     if (substr($indexstr, 0, 4) == 'CATE') {
-                        $cats= Category :: load(substr($indexstr, 4));
+                        $cats = Category :: load(substr($indexstr, 4));
                         if ($cats[0] != null) {
                             $cats[0]->delete_all();
                         }
                         $number_of_deleted_categories++;
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         if ($eval[0] != null) {
                             $eval[0]->delete_with_results();
                         }
@@ -486,7 +486,7 @@ 
                         //fixing #5229
                         $id = substr($indexstr, 4);
                         if (!empty($id)) {
-                            $link= LinkFactory :: load($id);
+                            $link = LinkFactory :: load($id);
                             if ($link[0] != null) {
                                 $link[0]->delete();
                             }
@@ -494,7 +494,7 @@ 
                         }
                     }
                 }
-                $confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
+                $confirmation_message = get_lang('DeletedCategories').' : <b>'.$number_of_deleted_categories.'</b><br />'.get_lang('DeletedEvaluations').' : <b>'.$number_of_deleted_evaluations.'</b><br />'.get_lang('DeletedLinks').' : <b>'.$number_of_deleted_links.'</b><br /><br />'.get_lang('TotalItems').' : <b>'.$number_of_selected_items.'</b>';
                 $filter_confirm_msg = false;
                 break;
             case 'setvisible':
@@ -506,12 +506,12 @@ 
                         $cats[0]->apply_visibility_to_children();
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         $eval[0]->set_visible(1);
                         $eval[0]->save();
                     }
                     if (substr($indexstr, 0, 4) == 'LINK') {
-                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link = LinkFactory :: load(substr($indexstr, 4));
                         $link[0]->set_visible(1);
                         $link[0]->save();
                     }
@@ -528,12 +528,12 @@ 
                         $cats[0]->apply_visibility_to_children();
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         $eval[0]->set_visible(0);
                         $eval[0]->save();
                     }
                     if (substr($indexstr, 0, 4) == 'LINK') {
-                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link = LinkFactory :: load(substr($indexstr, 4));
                         $link[0]->set_visible(0);
                         $link[0]->save();
                     }
@@ -546,7 +546,7 @@ 
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-    header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+    header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
         . '&search='.Security::remove_XSS($_POST['keyword']));
     exit;
 }
@@ -554,13 +554,13 @@ 
 // DISPLAY HEADERS AND MESSAGES
 if (!isset($_GET['exportpdf'])) {
     if (isset ($_GET['studentoverview'])) {
-        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('ToolGradebook'));
         Display :: display_header(get_lang('FlatView'));
     } elseif (isset ($_GET['search'])) {
-        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('ToolGradebook'));
         Display :: display_header(get_lang('SearchResults'));
-    } elseif(isset ($_GET['selectcat'])) {
-        $interbreadcrumb[]= array (	'url' =>'#','name' => get_lang('ToolGradebook'));
+    } elseif (isset ($_GET['selectcat'])) {
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('ToolGradebook'));
         if (!isset($_GET['gradebooklist_direction'])) {
             //$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
         }
@@ -571,46 +571,46 @@ 
 }
 
 if (isset ($_GET['categorymoved'])) {
-    Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
+    Display :: display_confirmation_message(get_lang('CategoryMoved'), false);
 }
 if (isset ($_GET['evaluationmoved'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationMoved'), false);
 }
 if (isset ($_GET['linkmoved'])) {
-    Display :: display_confirmation_message(get_lang('LinkMoved'),false);
+    Display :: display_confirmation_message(get_lang('LinkMoved'), false);
 }
 if (isset ($_GET['addcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
+    Display :: display_confirmation_message(get_lang('CategoryAdded'), false);
 }
 if (isset ($_GET['linkadded'])) {
-    Display :: display_confirmation_message(get_lang('LinkAdded'),false);
+    Display :: display_confirmation_message(get_lang('LinkAdded'), false);
 }
 if (isset ($_GET['addresult'])) {
-    Display :: display_confirmation_message(get_lang('ResultAdded'),false);
+    Display :: display_confirmation_message(get_lang('ResultAdded'), false);
 }
 if (isset ($_GET['editcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
+    Display :: display_confirmation_message(get_lang('CategoryEdited'), false);
 }
 if (isset ($_GET['editeval'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationEdited'), false);
 }
 if (isset ($_GET['linkedited'])) {
-    Display :: display_confirmation_message(get_lang('LinkEdited'),false);
+    Display :: display_confirmation_message(get_lang('LinkEdited'), false);
 }
-if (isset ($_GET['nolinkitems'])){
-    Display :: display_warning_message(get_lang('NoLinkItems'),false);
+if (isset ($_GET['nolinkitems'])) {
+    Display :: display_warning_message(get_lang('NoLinkItems'), false);
 }
-if (isset ($_GET['addallcat'])){
-    Display :: display_normal_message(get_lang('AddAllCat'),false);
+if (isset ($_GET['addallcat'])) {
+    Display :: display_normal_message(get_lang('AddAllCat'), false);
 }
-if (isset ($confirmation_message)){
-    Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
+if (isset ($confirmation_message)) {
+    Display :: display_confirmation_message($confirmation_message, $filter_confirm_msg);
 }
-if (isset ($warning_message)){
-    Display :: display_warning_message($warning_message,$filter_warning_msg);
+if (isset ($warning_message)) {
+    Display :: display_warning_message($warning_message, $filter_warning_msg);
 }
-if (isset ($move_form)){
-    Display :: display_normal_message($move_form->toHtml(),false);
+if (isset ($move_form)) {
+    Display :: display_normal_message($move_form->toHtml(), false);
 }
 
 // LOAD DATA & DISPLAY TABLE
@@ -624,17 +624,17 @@ 
 } else {
     $category = $_GET['selectcat'];
 }
-$simple_search_form='';
+$simple_search_form = '';
 
 if (isset($_GET['studentoverview'])) {
     //@todo this code also seems to be deprecated ...
     $cats = Category :: load($category);
-    $stud_id= (api_is_allowed_to_edit() ? null : $stud_id);
+    $stud_id = (api_is_allowed_to_edit() ? null : $stud_id);
     $allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-    $alleval= $cats[0]->get_evaluations($stud_id, true);
-    $alllink= $cats[0]->get_links($stud_id, true);
+    $alleval = $cats[0]->get_evaluations($stud_id, true);
+    $alllink = $cats[0]->get_links($stud_id, true);
     if (isset ($_GET['exportpdf'])) {
-        $datagen = new GradebookDataGenerator($allcat,$alleval, $alllink);
+        $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
         $header_names = array(
             get_lang('Name'),
             get_lang('Description'),
@@ -642,18 +642,18 @@ 
             get_lang('Date'),
             get_lang('Results'),
         );
-        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
+        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME, 0, null, true);
         $newarray = array();
         foreach ($data_array as $data) {
             $newarray[] = array_slice($data, 1);
         }
-        $pdf= new Cezpdf();
+        $pdf = new Cezpdf();
         $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
         $pdf->ezSetMargins(30, 30, 50, 30);
         $pdf->ezSetY(810);
-        $pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-        $pdf->line(50,790,550,790);
-        $pdf->line(50,40,550,40);
+        $pdf->ezText(get_lang('FlatView').' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')', 12, array('justification'=>'center'));
+        $pdf->line(50, 790, 550, 790);
+        $pdf->line(50, 40, 550, 40);
         $pdf->ezSetY(750);
         $pdf->ezTable(
             $newarray,
@@ -744,10 +744,10 @@ 
     $addparams['studentoverview'] = '';
 }
 //$addparams['cidReq']='';
-if (isset($_GET['cidReq']) && $_GET['cidReq']!='') {
+if (isset($_GET['cidReq']) && $_GET['cidReq'] != '') {
     $addparams['cidReq'] = Security::remove_XSS($_GET['cidReq']);
 } else {
-    $addparams['cidReq']='';
+    $addparams['cidReq'] = '';
 }
 
 $no_qualification = false;
@@ -771,7 +771,7 @@ 
                 $stud_id
             );
             if (isset($certificate['pdf_url'])) {
-                $actionsLeft .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o') .
+                $actionsLeft .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o').
                     get_lang('DownloadCertificatePdf'),
                     $certificate['pdf_url'],
                     ['class' => 'btn btn-default']
@@ -786,7 +786,7 @@ 
 
 if (!api_is_allowed_to_edit(null, true)) {
     $actionsLeft .= Display::url(
-            Display::returnFontAwesomeIcon('file-pdf-o') . get_lang('DownloadReportPdf'),
+            Display::returnFontAwesomeIcon('file-pdf-o').get_lang('DownloadReportPdf'),
             api_get_self()."?".api_get_self()."&action=export_table",
             ['class' => 'btn btn-default']
     );
@@ -798,7 +798,7 @@ 
     // Tool introduction
     Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
 
-    if ((isset ($_GET['selectcat']) && $_GET['selectcat']<>0)) {
+    if ((isset ($_GET['selectcat']) && $_GET['selectcat'] <> 0)) {
         //
     } else {
         if ((
@@ -820,7 +820,7 @@ 
     }
 }
 
-if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
+if (isset($first_time) && $first_time == 1 && api_is_allowed_to_edit(null, true)) {
     echo '<meta http-equiv="refresh" content="0;url='.api_get_self().'?cidReq='.$course_code.'" />';
 } else {
     $cats = Category::load(null, null, $course_code, null, null, $session_id, false);
@@ -857,7 +857,7 @@ 
                         $components = $obj->get_components($value);
 
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -905,7 +905,7 @@ 
                     $certificate
                 );
 
-                if (api_is_allowed_to_edit(null,true) &&
+                if (api_is_allowed_to_edit(null, true) &&
                     api_get_setting('gradebook_enable_grade_model') == 'true'
                 ) {
                     //Showing the grading system

main/gradebook/gradebook_display_certificate.php

Indentation +9 added lines, -9 removed lines

@@ -162,17 +162,17 @@
 
     if ($form->validate()) {
         $officialCode = $form->getSubmitValue('filter');
-         if ($officialCode == 'all') {
+            if ($officialCode == 'all') {
             $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
         } else {
-             $userList = UserManager::getUsersByOfficialCode($officialCode);
-             if (!empty($userList)) {
-                 $certificate_list = GradebookUtils::get_list_users_certificates(
-                     $cat_id,
-                     $userList
-                 );
-             }
-         }
+                $userList = UserManager::getUsersByOfficialCode($officialCode);
+                if (!empty($userList)) {
+                    $certificate_list = GradebookUtils::get_list_users_certificates(
+                        $cat_id,
+                        $userList
+                    );
+                }
+            }
     } else {
         $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
     }

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
  * @package chamilo.gradebook
  */
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 if (!api_is_student_boss()) {
     api_protect_course_script(true);
@@ -16,9 +16,9 @@ 
 ini_set('max_execution_time', 0);
 
 //extra javascript functions for in html head:
-$htmlHeadXtra[] ="<script>
+$htmlHeadXtra[] = "<script>
 function confirmation() {
-	if (confirm(\" " . trim(get_lang('AreYouSureToDelete')) . " ?\")) {
+	if (confirm(\" " . trim(get_lang('AreYouSureToDelete'))." ?\")) {
 	    return true;
 	} else {
 	    return false;
@@ -31,7 +31,7 @@ 
     api_not_allowed(true);
 }
 
-$cat_id = isset($_GET['cat_id']) ? (int)$_GET['cat_id'] : null;
+$cat_id = isset($_GET['cat_id']) ? (int) $_GET['cat_id'] : null;
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
 $filterOfficialCode = isset($_POST['filter']) ? Security::remove_XSS($_POST['filter']) : null;
 $filterOfficialCodeGet = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
@@ -72,8 +72,8 @@ 
 
 $course_code = api_get_course_id();
 
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsCertificates'));
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsCertificates'));
 
 $this_section = SECTION_COURSES;
 
@@ -85,7 +85,7 @@ 
         $certificate = new Certificate($_GET['certificate_id']);
         $result = $certificate->delete(true);
         Security::clear_token();
-        if ($result ==true) {
+        if ($result == true) {
             Display::display_confirmation_message(get_lang('CertificateRemoved'));
         } else {
             Display::display_error_message(get_lang('CertificateNotRemoved'));
@@ -104,9 +104,9 @@ 
 
     //with this fix the teacher only can view 1 gradebook
     if (api_is_platform_admin()) {
-        $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
+        $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
     } else {
-        $stud_id= api_get_user_id();
+        $stud_id = api_get_user_id();
     }
 
     $total_weight = $cats[0]->get_weight();
@@ -115,7 +115,7 @@ 
     $alleval = $cats[0]->get_evaluations($stud_id);
     $alllink = $cats[0]->get_links($stud_id);
 
-    $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
+    $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
 
     $total_resource_weight = 0;
     if (!empty($datagen)) {
@@ -132,7 +132,7 @@ 
                 $newarray[] = array_slice($data, 1);
             }
 
-            foreach($newarray as $item) {
+            foreach ($newarray as $item) {
                 $total_resource_weight = $total_resource_weight + $item['2'];
             }
         }
@@ -150,7 +150,7 @@ 
 if ($filter === 'true') {
     echo '<br />';
     $options = UserManager::getOfficialCodeGrouped();
-    $options =array_merge(array('all' => get_lang('All')), $options);
+    $options = array_merge(array('all' => get_lang('All')), $options);
     $form = new FormValidator(
         'official_code_filter',
         'POST',
@@ -196,7 +196,7 @@ 
 
 echo $filterForm;
 
-if (count($certificate_list) == 0 ) {
+if (count($certificate_list) == 0) {
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
 } else {
 
@@ -219,7 +219,7 @@ 
             $certificates = Display::url(get_lang('Certificate'), $url, array('target'=>'_blank', 'class' => 'btn btn-default'));
             echo $certificates;
             echo '<a onclick="return confirmation();" href="gradebook_display_certificate.php?sec_token='.$token.'&cidReq='.$course_code.'&action=delete&cat_id='.$cat_id.'&certificate_id='.$value_certificate['id'].'">
-                    '.Display::return_icon('delete.png',get_lang('Delete')).'
+                    '.Display::return_icon('delete.png', get_lang('Delete')).'
                   </a>';
             echo '</td></tr>';
         }

main/gradebook/gradebook_display_summary.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script();
 
@@ -21,7 +21,7 @@ 
     api_not_allowed(true);
 }
 
-$cat_id = isset($_GET['selectcat']) ? (int)$_GET['selectcat'] : null;
+$cat_id = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : null;
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
 
 $userList = CourseManager::get_user_list_from_course_code(
@@ -113,8 +113,8 @@ 
 
 $course_code = api_get_course_id();
 
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsReports'));
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsReports'));
 
 $this_section = SECTION_COURSES;
 
@@ -131,7 +131,7 @@ 
 }
 echo '</div>';
 
-if (count($userList) == 0 ) {
+if (count($userList) == 0) {
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
 } else {
     echo '<br /><br /><table class="data_table">';