chamilo / chamilo-lms

main/gradebook/lib/scoredisplay.class.php

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
     /**
      * Compare the custom display of 2 scores, can be useful in sorting
      */
-    public static function compare_scores_by_custom_display ($score1, $score2)
+    public static function compare_scores_by_custom_display($score1, $score2)
     {
         if (!isset($score1)) {
             return (isset($score2) ? 1 : 0);
@@ -47,7 +47,7 @@ 
             if ($custom1 == $custom2) {
                 return 0;
             } else {
-                return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
+                return (($score1[0] / $score1[1]) < ($score2[0] / $score2[1]) ? -1 : 1);
             }
         }
     }
@@ -78,7 +78,7 @@ 
         //Setting custom enabled
         $value = api_get_setting('gradebook_score_display_custom');
         $value = $value['my_display_custom'];
-        $this->custom_enabled  = $value == 'true' ? true : false;
+        $this->custom_enabled = $value == 'true' ? true : false;
 
         if ($this->custom_enabled) {
             $params = array('category = ?' =>  array('Gradebook'));
@@ -95,10 +95,10 @@ 
                 sort($portal_displays);
             }
             $this->custom_display = $portal_displays;
-            if (count($this->custom_display)>0) {
+            if (count($this->custom_display) > 0) {
                 $value = api_get_setting('gradebook_score_display_upperlimit');
                 $value = $value['my_display_upperlimit'];
-                $this->upperlimit_included  = $value == 'true' ? true : false;
+                $this->upperlimit_included = $value == 'true' ? true : false;
                 $this->custom_display_conv = $this->convert_displays($this->custom_display);
             }
         }
@@ -109,7 +109,7 @@ 
             //Load course settings
             if ($this->custom_enabled) {
                 $this->custom_display = $this->get_custom_displays();
-                if (count($this->custom_display)> 0) {
+                if (count($this->custom_display) > 0) {
                     $this->custom_display_conv = $this->convert_displays($this->custom_display);
                 }
             }
@@ -180,7 +180,7 @@ 
         }
 
         $sql = 'SELECT id FROM '.$tbl_gradebook_category.'
-                WHERE course_code = "'.$curr_course_code.'" '. $session_condition;
+                WHERE course_code = "'.$curr_course_code.'" '.$session_condition;
         $rs  = Database::query($sql);
         $category_id = 0;
         if (Database::num_rows($rs) > 0) {
@@ -249,7 +249,7 @@ 
         );
 
         $tbl_display = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_SCORE_DISPLAY);
-        foreach($display as $value => $text) {
+        foreach ($display as $value => $text) {
             $params = array(
                 'score' => $value,
                 'display' => $text,
@@ -305,7 +305,7 @@ 
         $my_score = $score == 0 ? 1 : $score;
 
         if ($type == SCORE_BAR) {
-            $percentage = $my_score[0]/$my_score[1]*100;
+            $percentage = $my_score[0] / $my_score[1] * 100;
 
             return Display::bar_progress($percentage);
         }
@@ -346,7 +346,7 @@ 
             case SCORE_PERCENT:                        // XX %
                 return $this->display_as_percent($score);
             case SCORE_DIV_PERCENT:                    // X / Y (XX %)
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')';
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')';
             case SCORE_AVERAGE:                        // XX %
                 return $this->display_as_percent($score);
             case SCORE_DECIMAL:                        // 0.50  (X/Y)
@@ -356,7 +356,7 @@ 
                 if (!empty($custom)) {
                     $custom = ' - '.$custom;
                 }
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')'.$custom;
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')'.$custom;
             case SCORE_DIV_SIMPLE_WITH_CUSTOM:         // X - Good!
                 $custom = $this->display_custom($score);
 
@@ -408,9 +408,9 @@ 
      */
     private function display_as_decimal($score)
     {
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
 
-        return $this->format_score($score[0]/$score_denom);
+        return $this->format_score($score[0] / $score_denom);
     }
 
     /**
@@ -418,9 +418,9 @@ 
      */
     private function display_as_percent($score)
     {
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
 
-        return $this->format_score($score[0]/$score_denom*100) . ' %';
+        return $this->format_score($score[0] / $score_denom * 100).' %';
     }
 
     /**
@@ -436,7 +436,7 @@ 
         } else {
             $score[0] = isset($score[0]) ? $this->format_score($score[0]) : 0;
             $score[1] = isset($score[1]) ? $this->format_score($score[1]) : 0;
-            return  $score[0] . ' / ' . $score[1];
+            return  $score[0].' / '.$score[1];
         }
     }
 
@@ -446,7 +446,7 @@ 
      */
     private function display_custom($score)
     {
-        $my_score_denom= ($score[1]==0) ? 1 : $score[1];
+        $my_score_denom = ($score[1] == 0) ? 1 : $score[1];
         $scaledscore = $score[0] / $my_score_denom;
         if ($this->upperlimit_included) {
             foreach ($this->custom_display_conv as $displayitem) {
@@ -510,7 +510,7 @@ 
                 ORDER BY score';
         $result = Database::query($sql);
 
-        return Database::store_result($result,'ASSOC');
+        return Database::store_result($result, 'ASSOC');
     }
 
     /**

main/gradebook/lib/results_data_generator.class.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * Get total number of results (rows)
      */
-    public function get_total_results_count ()
+    public function get_total_results_count()
     {
         return count($this->results);
     }
@@ -54,12 +54,12 @@ 
      * 4 ['score']     : student's score
      * 5 ['display']   : custom score display (only if custom scoring enabled)
      */
-    public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf=false)
+    public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf = false)
     {
         // do some checks on count, redefine if invalid value
         $number_decimals = api_get_setting('gradebook_number_decimals');
         if (!isset($count)) {
-            $count = count ($this->results) - $start;
+            $count = count($this->results) - $start;
         }
         if ($count < 0) {
             $count = 0;
@@ -67,11 +67,11 @@ 
         $scoredisplay = ScoreDisplay :: instance();
         // generate actual data array
         $table = array();
-        foreach($this->results as $result) {
+        foreach ($this->results as $result) {
             $user = array();
             $info = api_get_user_info($result->get_user_id());
             $user['id'] = $result->get_user_id();
-            if ($pdf){
+            if ($pdf) {
                 $user['username'] = $info['username'];
             }
             $user['result_id'] = $result->get_id();
@@ -93,7 +93,7 @@ 
                 true
             )
             );
-            if ($pdf && $number_decimals == null){
+            if ($pdf && $number_decimals == null) {
                 $user['scoreletter'] = $result->get_score();
             }
             if ($scoredisplay->is_custom()) {
@@ -134,13 +134,13 @@ 
      * @param boolean $realscore
      * @result string The score as we want to show it
      */
-    private function get_score_display ($score, $realscore, $ignore_score_color = false)
+    private function get_score_display($score, $realscore, $ignore_score_color = false)
     {
         if ($score != null) {
             $scoredisplay = ScoreDisplay :: instance();
             $type = SCORE_CUSTOM;
             if ($realscore === true) {
-                $type = SCORE_DIV_PERCENT ;
+                $type = SCORE_DIV_PERCENT;
             }
 
             return $scoredisplay->display_score(
@@ -174,10 +174,10 @@ 
         }
     }
 
-    function sort_by_mask ($item1, $item2)
+    function sort_by_mask($item1, $item2)
     {
-        $score1 = (isset($item1['score']) ? array($item1['score'],$this->evaluation->get_max()) : null);
-        $score2 = (isset($item2['score']) ? array($item2['score'],$this->evaluation->get_max()) : null);
+        $score1 = (isset($item1['score']) ? array($item1['score'], $this->evaluation->get_max()) : null);
+        $score2 = (isset($item2['score']) ? array($item2['score'], $this->evaluation->get_max()) : null);
         return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
     }
 }

main/gradebook/index.php

Spacing +85 added lines, -85 removed lines

@@ -11,7 +11,7 @@ 
 //$cidReset = false;
 $_in_course = true;
 require_once __DIR__.'/../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 
@@ -75,9 +75,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;
@@ -113,11 +113,11 @@ 
     }
 }
 
-if ($selectCat > 0 && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='true')) {
+if ($selectCat > 0 && (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'true')) {
 
 } else {
     if (empty($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'));
 
@@ -152,10 +152,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);
@@ -173,26 +173,26 @@ 
 
 //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(
+        $move_form = new CatForm(
             CatForm :: TYPE_MOVE,
             $cats[0],
             'move_cat_form',
             null,
-            api_get_self() . '?movecat=' . intval($_GET['movecat']). '&selectcat=' . $selectCat
+            api_get_self().'?movecat='.intval($_GET['movecat']).'&selectcat='.$selectCat
         );
         if ($move_form->validate()) {
-            header('Location: ' . api_get_self() . '?selectcat=' . $selectCat
-                . '&movecat=' . intval($_GET['movecat'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.$selectCat
+                . '&movecat='.intval($_GET['movecat'])
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
@@ -201,7 +201,7 @@ 
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $cats[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . $selectCat);
+            header('Location: '.api_get_self().'?categorymoved=&selectcat='.$selectCat);
             exit;
         }
         unset ($targetcat);
@@ -212,31 +212,31 @@ 
 //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(
+        $move_form = new EvalForm(
             EvalForm :: TYPE_MOVE,
             $evals[0],
             null,
             'move_eval_form',
             null,
-            api_get_self() . '?moveeval=' . Security::remove_XSS($_GET['moveeval']). '&selectcat=' . $selectCat
+            api_get_self().'?moveeval='.Security::remove_XSS($_GET['moveeval']).'&selectcat='.$selectCat
         );
 
         if ($move_form->validate()) {
-            header('Location: ' .api_get_self() . '?selectcat='.$selectCat
-                . '&moveeval=' . Security::remove_XSS($_GET['moveeval'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.$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=' . $selectCat);
+            header('Location: '.api_get_self().'?evaluationmoved=&selectcat='.$selectCat);
             exit;
         }
         unset($targetcat);
@@ -247,21 +247,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=' . $selectCat
+        api_get_self().'?movelink='.$_GET['movelink'].'&selectcat='.$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=' . $selectCat);
+        header('Location: '.api_get_self().'?linkmoved=&selectcat='.$selectCat);
         exit;
     }
 }
@@ -271,9 +271,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);
@@ -308,11 +308,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);
@@ -329,7 +329,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 {
@@ -346,7 +346,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();
     }
@@ -358,11 +358,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();
@@ -384,7 +384,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
@@ -419,9 +419,9 @@ 
     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=' . intval($_GET['movecat'])
-            : '&moveeval=' . Security::remove_XSS($_GET['moveeval'])).'&selectcat=' . $selectCat.'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+    $button = '<form name="confirm" method="post" action="'.api_get_self().'?confirm='
+        .(isset($_GET['movecat']) ? '&movecat='.intval($_GET['movecat'])
+            : '&moveeval='.Security::remove_XSS($_GET['moveeval'])).'&selectcat='.$selectCat.'&targetcat='.Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.get_lang('Ok').'">
 			   </form>';
     $warning_message = get_lang('MoveWarning').'<br><br>'.$button;
@@ -452,7 +452,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');
@@ -460,19 +460,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();
                         }
@@ -483,7 +483,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();
                             }
@@ -491,7 +491,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':
@@ -503,12 +503,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();
                     }
@@ -525,12 +525,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();
                     }
@@ -543,7 +543,7 @@ 
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-    header('Location: ' . api_get_self() . '?selectcat=' . $selectCat. '&search='.Security::remove_XSS($_POST['keyword']));
+    header('Location: '.api_get_self().'?selectcat='.$selectCat.'&search='.Security::remove_XSS($_POST['keyword']));
     exit;
 }
 
@@ -561,7 +561,7 @@ 
             'name' => get_lang('ToolGradebook')
         );
         Display :: display_header(get_lang('SearchResults'));
-    } elseif(!empty($selectCat)) {
+    } elseif (!empty($selectCat)) {
         $interbreadcrumb[] = array(
             'url' => '#',
             'name' => get_lang('ToolGradebook')
@@ -574,46 +574,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
@@ -630,7 +630,7 @@ 
     $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'),
@@ -648,13 +648,13 @@ 
         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,
@@ -745,10 +745,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;
@@ -772,7 +772,7 @@ 
             );
 
             if (isset($certificate['pdf_url']) && $hideCertificateExport !== 'true') {
-                $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']
@@ -822,7 +822,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().'?'.api_get_cidreq().'" />';
 } else {
     $cats = Category::load(null, null, $course_code, null, null, $session_id, false);
@@ -859,7 +859,7 @@ 
                         $components = $obj->get_components($value);
 
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -907,7 +907,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.php

Spacing +118 added lines, -118 removed lines

@@ -8,7 +8,7 @@ 
 
 // $cidReset : This is the main difference with gradebook.php, here we say,
 // basically, that we are inside a course, and many things depend from that
-$cidReset= true;
+$cidReset = true;
 $_in_course = false;
 //make sure the destination for scripts is index.php instead of gradebook.php
 require_once __DIR__.'/../inc/global.inc.php';
@@ -21,7 +21,7 @@ 
     unset($_GET['course']);
 }
 
-$selectcat = isset($_GET['selectcat']) ?  (int) $_GET['selectcat'] : 0;
+$selectcat = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : 0;
 
 $htmlHeadXtra[] = '<script>
 $(document).ready( function() {
@@ -34,7 +34,7 @@ 
  </script>';
 api_block_anonymous_users();
 
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 function confirmation () {
 	if (confirm("'.get_lang('DeleteAll').'?")) {
 	    return true;
@@ -50,10 +50,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(api_get_user_id());
+    $coursecat = Category :: get_not_created_course_categories(api_get_user_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);
@@ -75,26 +75,26 @@ 
     GradebookUtils::block_students();
     $cats = Category :: load($move_cat);
     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=' . $move_cat. '&selectcat=' . $selectcat
+            api_get_self().'?movecat='.$move_cat.'&selectcat='.$selectcat
         );
         if ($move_form->validate()) {
-            header('Location: ' . api_get_self() . '?selectcat=' . $selectcat
-                . '&movecat=' . $move_cat
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.$selectcat
+                . '&movecat='.$move_cat
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
-        $get_target_cat=Security::remove_XSS($_GET['targetcat']);
-        $targetcat= Category :: load($get_target_cat);
+        $get_target_cat = Security::remove_XSS($_GET['targetcat']);
+        $targetcat = Category :: load($get_target_cat);
         $course_to_crsind = ($cats[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $cats[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . $selectcat);
+            header('Location: '.api_get_self().'?categorymoved=&selectcat='.$selectcat);
             exit;
         }
         unset($targetcat);
@@ -105,8 +105,8 @@ 
 //move an evaluation
 if (isset ($_GET['moveeval'])) {
     GradebookUtils::block_students();
-    $get_move_eval=Security::remove_XSS($_GET['moveeval']);
-    $evals= Evaluation :: load($get_move_eval);
+    $get_move_eval = Security::remove_XSS($_GET['moveeval']);
+    $evals = Evaluation :: load($get_move_eval);
     if (!isset ($_GET['targetcat'])) {
 
         $move_form = new EvalForm(EvalForm :: TYPE_MOVE,
@@ -114,23 +114,23 @@ 
             null,
             'move_eval_form',
             null,
-            api_get_self() . '?moveeval=' . $get_move_eval. '&selectcat=' . $selectcat
+            api_get_self().'?moveeval='.$get_move_eval.'&selectcat='.$selectcat
         );
 
         if ($move_form->validate()) {
-            header('Location: ' .api_get_self() . '?selectcat=' . $selectcat
-                . '&moveeval=' . $get_move_eval
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.$selectcat
+                . '&moveeval='.$get_move_eval
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
-        $get_target_cat=Security::remove_XSS($_GET['targetcat']);
-        $targetcat= Category :: load($get_target_cat);
+        $get_target_cat = Security::remove_XSS($_GET['targetcat']);
+        $targetcat = Category :: load($get_target_cat);
         $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=' . $selectcat);
+            header('Location: '.api_get_self().'?evaluationmoved=&selectcat='.$selectcat);
             exit;
         }
         unset ($targetcat);
@@ -141,8 +141,8 @@ 
 //move a link
 if (isset ($_GET['movelink'])) {
     GradebookUtils::block_students();
-    $get_move_link=Security::remove_XSS($_GET['movelink']);
-    $link= LinkFactory :: load($get_move_link);
+    $get_move_link = Security::remove_XSS($_GET['movelink']);
+    $link = LinkFactory :: load($get_move_link);
     $move_form = new LinkForm(
         LinkForm :: TYPE_MOVE,
         null,
@@ -152,10 +152,10 @@ 
         api_get_self().'?movelink='.$get_move_link.'&selectcat='.$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=' . $selectcat);
+        header('Location: '.api_get_self().'?linkmoved=&selectcat='.$selectcat);
         exit;
     }
 }
@@ -164,11 +164,11 @@ 
 if (isset ($_GET['visiblecat'])) {
     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 = Category :: load($_GET['visiblecat']);
     $cats[0]->set_visible($visibility_command);
     $cats[0]->save();
     $cats[0]->apply_visibility_to_children();
@@ -183,7 +183,7 @@ 
 }
 if (isset ($_GET['deletecat'])) {
     GradebookUtils::block_students();
-    $cats= Category :: load($_GET['deletecat']);
+    $cats = Category :: load($_GET['deletecat']);
     //delete all categories,subcategories and results
     if ($cats[0] != null) {
         if ($cats[0]->get_id() != 0) {
@@ -198,12 +198,12 @@ 
 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);
@@ -217,7 +217,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();
     }
@@ -228,11 +228,11 @@ 
 if (isset ($_GET['visiblelink'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
-    }else {
-        $visibility_command= 0;
+        $visibility_command = 1;
+    } else {
+        $visibility_command = 0;
     }
-    $link= LinkFactory :: load($_GET['visiblelink']);
+    $link = LinkFactory :: load($_GET['visiblelink']);
     $link[0]->set_visible($visibility_command);
     $link[0]->save();
     unset ($link);
@@ -248,7 +248,7 @@ 
     GradebookUtils::block_students();
     //fixing #5229
     if (!empty($_GET['deletelink'])) {
-        $link= LinkFactory :: load($_GET['deletelink']);
+        $link = LinkFactory :: load($_GET['deletelink']);
         if ($link[0] != null) {
             $link[0]->delete();
         }
@@ -265,9 +265,9 @@ 
     }
     $button = '<form name="confirm"
                  method="post"
-                 action="'.api_get_self() .'?confirm='
-        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-            : '&moveeval=' . intval($_GET['moveeval']) ).'&selectcat=' . $selectcat.'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+                 action="'.api_get_self().'?confirm='
+        .(isset($_GET['movecat']) ? '&movecat='.Security::remove_XSS($_GET['movecat'])
+            : '&moveeval='.intval($_GET['moveeval'])).'&selectcat='.$selectcat.'&targetcat='.Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.'  '.get_lang('Ok').'  '.'">
 			   </form>';
 
@@ -277,7 +277,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');
         $filter_warning_msg = false;
@@ -285,19 +285,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 (api_substr($indexstr, 0, 4) == 'CATE') {
-                        $cats= Category :: load(api_substr($indexstr, 4));
+                        $cats = Category :: load(api_substr($indexstr, 4));
                         if ($cats[0] != null) {
                             $cats[0]->delete_all();
                         }
                         $number_of_deleted_categories++;
                     }
                     if (api_substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(api_substr($indexstr, 4));
+                        $eval = Evaluation :: load(api_substr($indexstr, 4));
                         if ($eval[0] != null) {
                             $eval[0]->delete_with_results();
                         }
@@ -306,7 +306,7 @@ 
                     if (api_substr($indexstr, 0, 4) == 'LINK') {
                         $id = api_substr($indexstr, 4);
                         if (!empty($id)) {
-                            $link= LinkFactory :: load();
+                            $link = LinkFactory :: load();
                             if ($link[0] != null) {
                                 $link[0]->delete();
                             }
@@ -314,7 +314,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' :
@@ -366,7 +366,7 @@ 
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-    header('Location: ' . api_get_self() . '?selectcat=' . $selectcat
+    header('Location: '.api_get_self().'?selectcat='.$selectcat
         . '&search='.Security::remove_XSS($_POST['keyword']));
     exit;
 }
@@ -374,8 +374,8 @@ 
 // DISPLAY HEADERS AND MESSAGES                           -
 if (!isset($_GET['exportpdf']) && !isset($_GET['export_certificate'])) {
     if (isset ($_GET['studentoverview'])) {
-        $interbreadcrumb[]= array (
-            'url' => $_SESSION['gradebook_dest'].'?selectcat=' . $selectcat.'&'.api_get_cidreq(),
+        $interbreadcrumb[] = array(
+            'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat.'&'.api_get_cidreq(),
             'name' => get_lang('ToolGradebook')
         );
         Display :: display_header(get_lang('FlatView'));
@@ -386,13 +386,13 @@ 
             $gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']);
         }
 
-        $interbreadcrumb[]= array ('url' => $gradebook_dest,'name' => get_lang('Gradebook'));
+        $interbreadcrumb[] = array('url' => $gradebook_dest, 'name' => get_lang('Gradebook'));
 
-        if ((isset($_GET['selectcat']) && $_GET['selectcat']>0)) {
+        if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0)) {
             if (!empty($_GET['course'])) {
-                $interbreadcrumb[]= array ('url' => $gradebook_dest.'selectcat='.$selectcat,'name' => get_lang('Details'));
+                $interbreadcrumb[] = array('url' => $gradebook_dest.'selectcat='.$selectcat, 'name' => get_lang('Details'));
             } else {
-                $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=0','name' => get_lang('Details'));
+                $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat=0', 'name' => get_lang('Details'));
             }
         }
         Display :: display_header('');
@@ -402,50 +402,50 @@ 
 }
 
 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);
+    Display :: display_warning_message(get_lang('NoLinkItems'), false);
 }
 if (isset ($_GET['addallcat'])) {
-    Display :: display_normal_message(get_lang('AddAllCat'),false);
+    Display :: display_normal_message(get_lang('AddAllCat'), false);
 }
 if (isset ($confirmation_message)) {
-    Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
+    Display :: display_confirmation_message($confirmation_message, $filter_confirm_msg);
 }
 if (isset ($warning_message)) {
-    Display :: display_warning_message($warning_message,$filter_warning_msg);
+    Display :: display_warning_message($warning_message, $filter_warning_msg);
 }
 if (isset ($move_form)) {
-    Display :: display_normal_message($move_form->toHtml(),false);
+    Display :: display_normal_message($move_form->toHtml(), false);
 }
 // LOAD DATA & DISPLAY TABLE                             -
-$is_platform_admin= api_is_platform_admin();
-$is_course_admin= api_is_allowed_to_edit();
+$is_platform_admin = api_is_platform_admin();
+$is_course_admin = api_is_allowed_to_edit();
 
 //load data for category, evaluation and links
 if (empty($selectcat)) {
@@ -462,7 +462,7 @@ 
     null,
     api_get_self().'?selectcat='.$selectcat
 );
-$values= $simple_search_form->exportValues();
+$values = $simple_search_form->exportValues();
 $keyword = '';
 if (isset($_GET['search']) && !empty($_GET['search'])) {
     $keyword = Security::remove_XSS($_GET['search']);
@@ -472,13 +472,13 @@ 
 }
 
 if (!empty($keyword)) {
-    $cats= Category :: load($category);
-    $allcat= array ();
-    if ((isset($_GET['selectcat']) && $_GET['selectcat']==0) && isset($_GET['search'])) {
-        $allcat= $cats[0]->get_subcategories(null);
-        $allcat_info = Category::find_category($keyword,$allcat);
-        $alleval=array();
-        $alllink=array();
+    $cats = Category :: load($category);
+    $allcat = array();
+    if ((isset($_GET['selectcat']) && $_GET['selectcat'] == 0) && isset($_GET['search'])) {
+        $allcat = $cats[0]->get_subcategories(null);
+        $allcat_info = Category::find_category($keyword, $allcat);
+        $alleval = array();
+        $alllink = array();
     } else {
         $alleval = Evaluation::find_evaluations($keyword, $cats[0]->get_id());
         $alllink = LinkFactory::find_links($keyword, $cats[0]->get_id());
@@ -486,13 +486,13 @@ 
 
 } elseif (isset ($_GET['studentoverview'])) {
     //@todo this code seems to be deprecated because the gradebook tab is off
-    $cats= Category :: load($category);
-    $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
-    $allcat= array ();
-    $alleval= $cats[0]->get_evaluations($stud_id, true);
-    $alllink= $cats[0]->get_links($stud_id, true);
+    $cats = Category :: load($category);
+    $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
+    $allcat = array();
+    $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'),
@@ -500,18 +500,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,
@@ -528,57 +528,57 @@ 
         $pdf->ezStream();
         exit;
     }
-} elseif (!empty($_GET['export_certificate'])){
+} elseif (!empty($_GET['export_certificate'])) {
     //@todo this code seems not to be used
     $user_id = strval(intval($_GET['user']));
-    if (!api_is_allowed_to_edit(true,true)) {
+    if (!api_is_allowed_to_edit(true, true)) {
         $user_id = api_get_user_id();
     }
-    $category = Category :: load ($_GET['cat_id']);
+    $category = Category :: load($_GET['cat_id']);
     if ($category[0]->is_certificate_available($user_id)) {
         $user = api_get_user_info($user_id);
         $scoredisplay = ScoreDisplay :: instance();
         $scorecourse = $category[0]->calc_score($user_id);
-        $scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
+        $scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse, SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
 
         $cattotal = Category :: load(0);
-        $scoretotal= $cattotal[0]->calc_score($user_id);
-        $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal,SCORE_PERCENT) : get_lang('NoResultsAvailable'));
+        $scoretotal = $cattotal[0]->calc_score($user_id);
+        $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable'));
 
         //prepare all necessary variables:
         $organization_name = api_get_setting('Institution');
         $portal_name = api_get_setting('siteName');
         $stud_fn = $user['firstname'];
         $stud_ln = $user['lastname'];
-        $certif_text = sprintf(get_lang('CertificateWCertifiesStudentXFinishedCourseYWithGradeZ'),$organization_name,$stud_fn.' '.$stud_ln,$category[0]->get_name(),$scorecourse_display);
-        $certif_text = str_replace("\\n","\n",$certif_text);
+        $certif_text = sprintf(get_lang('CertificateWCertifiesStudentXFinishedCourseYWithGradeZ'), $organization_name, $stud_fn.' '.$stud_ln, $category[0]->get_name(), $scorecourse_display);
+        $certif_text = str_replace("\\n", "\n", $certif_text);
         $date = api_convert_and_format_date(null, DATE_FORMAT_SHORT);
 
-        $pdf= new Cezpdf('a4','landscape');
+        $pdf = new Cezpdf('a4', 'landscape');
         $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
         $pdf->ezSetMargins(30, 30, 50, 50);
         //line Y coordinates in landscape mode are upside down (500 is on top, 10 is on the bottom)
-        $pdf->line(50,50,790,50);
-        $pdf->line(50,550,790,550);
+        $pdf->line(50, 50, 790, 50);
+        $pdf->line(50, 550, 790, 550);
         $pdf->ezSetY(450);
         $pdf->ezSetY(480);
-        $pdf->ezText($certif_text,28,array('justification'=>'center'));
+        $pdf->ezText($certif_text, 28, array('justification'=>'center'));
         //$pdf->ezSetY(750);
         $pdf->ezSetY(50);
-        $pdf->ezText($date,18,array('justification'=>'center'));
+        $pdf->ezText($date, 18, array('justification'=>'center'));
         $pdf->ezSetY(580);
-        $pdf->ezText($organization_name,22,array('justification'=>'left'));
+        $pdf->ezText($organization_name, 22, array('justification'=>'left'));
         $pdf->ezSetY(580);
-        $pdf->ezText($portal_name,22,array('justification'=>'right'));
+        $pdf->ezText($portal_name, 22, array('justification'=>'right'));
         $pdf->ezStream();
     }
     exit;
 } else {
-    $cats= Category :: load($category);
-    $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
-    $allcat= $cats[0]->get_subcategories($stud_id);
-    $alleval= $cats[0]->get_evaluations($stud_id);
-    $alllink= $cats[0]->get_links($stud_id);
+    $cats = Category :: load($category);
+    $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
+    $allcat = $cats[0]->get_subcategories($stud_id);
+    $alleval = $cats[0]->get_evaluations($stud_id);
+    $alllink = $cats[0]->get_links($stud_id);
 }
 $addparams = array('selectcat' => $cats[0]->get_id());
 if (isset($_GET['search'])) {
@@ -587,10 +587,10 @@ 
 if (isset ($_GET['studentoverview'])) {
     $addparams['studentoverview'] = '';
 }
-if (isset($allcat_info) && count($allcat_info)>=0 && (isset($_GET['selectcat']) && $_GET['selectcat']==0) && isset($_GET['search']) && strlen(trim($_GET['search']))>0 ) {
-    $allcat=$allcat_info;
+if (isset($allcat_info) && count($allcat_info) >= 0 && (isset($_GET['selectcat']) && $_GET['selectcat'] == 0) && isset($_GET['search']) && strlen(trim($_GET['search'])) > 0) {
+    $allcat = $allcat_info;
 } else {
-    $allcat=$allcat;
+    $allcat = $allcat;
 }
 $gradebooktable = new GradebookTable(
     $cats[0],
@@ -603,10 +603,10 @@ 
     api_is_course_tutor()
 ) {
     Display :: display_normal_message(
-        get_lang('GradebookWelcomeMessage') .
+        get_lang('GradebookWelcomeMessage').
         '<br /><br />
-        <form name="createcat" method="post" action="' . api_get_self() . '?createallcategories=1">
-        <input type="submit" value="' . get_lang('CreateAllCat') . '"></form>',
+        <form name="createcat" method="post" action="' . api_get_self().'?createallcategories=1">
+        <input type="submit" value="' . get_lang('CreateAllCat').'"></form>',
         false
     );
 }

main/gradebook/gradebook_add_result.php

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  */
 //$cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 api_block_anonymous_users();
@@ -25,14 +25,14 @@ 
     $resultadd,
     'add_result_form',
     null,
-    api_get_self() . '?selectcat=' . Security::remove_XSS($category) . '&selecteval=' . $selectEval.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.Security::remove_XSS($category).'&selecteval='.$selectEval.'&'.api_get_cidreq()
 );
 $table = $add_result_form->toHtml();
 if ($add_result_form->validate()) {
     $values = $add_result_form->exportValues();
     $nr_users = $values['nr_users'];
     if ($nr_users == '0') {
-        header('Location: gradebook_view_result.php?addresultnostudents=&selecteval=' . $selectEval.'&'.api_get_cidreq());
+        header('Location: gradebook_view_result.php?addresultnostudents=&selecteval='.$selectEval.'&'.api_get_cidreq());
         exit;
     }
     $scores = ($values['score']);
@@ -45,7 +45,7 @@ 
         $res->add();
         next($scores);
     }
-    header('Location: gradebook_view_result.php?addresult=&selecteval=' . $selectEval.'&'.api_get_cidreq());
+    header('Location: gradebook_view_result.php?addresult=&selecteval='.$selectEval.'&'.api_get_cidreq());
     exit;
 }
 $interbreadcrumb[] = array(

main/help/faq.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         array('ToolbarSet' => 'FAQ', 'Width' => '100%', 'Height' => '300')
     );
     $form->addButtonSave(get_lang('Ok'), 'faq_submit');
-    $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html');
+    $faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html');
     $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content)));
     $form->setDefaults(array('faq_content' => $faq_content));
     if ($form->validate()) {
@@ -47,7 +47,7 @@ 
         $form->display();
     }
 } else {
-	$faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file);
+	$faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file);
 	$faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content)));
 	echo $faq_content;
 }

main/badge/issued.php

Spacing +11 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
 $issue = isset($_REQUEST['issue']) ? intval($_REQUEST['issue']) : 0;
 
 if (!$issue) {
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -26,7 +26,7 @@ 
         Display::return_message(get_lang('TheUserXNotYetAchievedTheSkillX'), 'error')
     );
 
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -38,7 +38,7 @@ 
         Display::return_message(get_lang('NoResults'), 'error')
     );
 
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
@@ -177,7 +177,7 @@ 
     $entityManager->persist($skillIssue);
     $entityManager->flush();
 
-    header("Location: " . $skillIssue->getIssueUrl());
+    header("Location: ".$skillIssue->getIssueUrl());
     exit;
 }
 
@@ -208,7 +208,7 @@ 
     $entityManager->persist($skillUserComment);
     $entityManager->flush();
 
-    header("Location: " . $skillIssue->getIssueUrl());
+    header("Location: ".$skillIssue->getIssueUrl());
     exit;
 }
 
@@ -224,11 +224,11 @@ 
         $backpack = $configBackpack;
     }
 
-    $htmlHeadXtra[] = '<script src="' . $backpack . 'issuer.js"></script>';
+    $htmlHeadXtra[] = '<script src="'.$backpack.'issuer.js"></script>';
     $objSkill = new Skill();
     $assertionUrl = $skillIssueInfo['badge_assertion'];
     $skills = $objSkill->get($skillId);
-    $unbakedBadge = api_get_path(SYS_UPLOAD_PATH) . "badges/".$skills['icon'];
+    $unbakedBadge = api_get_path(SYS_UPLOAD_PATH)."badges/".$skills['icon'];
     if (!is_file($unbakedBadge)) {
         $unbakedBadge = api_get_path(WEB_CODE_PATH).'img/icons/128/badges-default.png';
     }
@@ -246,12 +246,12 @@ 
             mkdir($bakedBadge, api_get_permissions_for_new_directories(), true);
         }
         $skillRelUserId = $skillIssueInfo['id'];
-        if (!file_exists($bakedBadge . "/badge_" . $skillRelUserId)) {
-            file_put_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png", $bakedInfo);
+        if (!file_exists($bakedBadge."/badge_".$skillRelUserId)) {
+            file_put_contents($bakedBadge."/badge_".$skillRelUserId.".png", $bakedInfo);
         }
 
         //Process to validate a baked badge
-        $badgeContent = file_get_contents($bakedBadge . "/badge_" . $skillRelUserId . ".png");
+        $badgeContent = file_get_contents($bakedBadge."/badge_".$skillRelUserId.".png");
         $verifyBakedBadge = $png->extractBadgeInfo($badgeContent);
         if (!is_array($verifyBakedBadge)) {
             $badgeInfoError = true;
@@ -259,7 +259,7 @@ 
 
         if (!$badgeInfoError) {
             $personalBadge = UserManager::getUserPathById($userId, "web");
-            $personalBadge = $personalBadge."badges/badge_" . $skillRelUserId . ".png";
+            $personalBadge = $personalBadge."badges/badge_".$skillRelUserId.".png";
         }
     }
 }

main/admin/sub_language.php

Spacing +44 added lines, -44 removed lines

@@ -11,7 +11,7 @@ 
 $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
  $(document).ready(function() {
 	$(".save").click(function() {
 		var button_name=$(this).attr("name");
@@ -36,20 +36,20 @@ 
 				    \'new_language\': is_new_language,
 				    \'variable_language\': is_variable_language,
 				    \'file_id\': file_id,
-				    \'id\': ' . intval($_REQUEST['id']) . ',
-                    \'sub\': ' . intval($_REQUEST['sub_language_id']) . ',
-                    \'sub_language_id\': ' . intval($_REQUEST['sub_language_id']) . '
+				    \'id\': ' . intval($_REQUEST['id']).',
+                    \'sub\': ' . intval($_REQUEST['sub_language_id']).',
+                    \'sub_language_id\': ' . intval($_REQUEST['sub_language_id']).'
 				},
 				success: function(datos) {
 					if (datos == "1") {
-						$("#div_message_information_id").html(\'' . Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success') . '\');
+						$("#div_message_information_id").html(\'' . Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success').'\');
 					} else {
 						$("#div_message_information_id").html("<div class=\"alert alert-warning\">" + datos +"</div>");
 					}
 				}
 			});
 		} else {
-			$("#div_message_information_id").html(\'' . Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error') . '\');
+			$("#div_message_information_id").html(\'' . Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error').'\');
 		}
 	});
 });
@@ -60,14 +60,14 @@ 
 // setting the name of the tool
 $tool_name = get_lang('CreateSubLanguage');
 // setting breadcrumbs
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
 
 $sublanguage_folder_error = false;
 
-if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
+if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) {
+	$language_name              = SubLanguageManager::get_name_of_language_by_id($_GET['id']);
+	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
 	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
 	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
 	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
@@ -75,20 +75,20 @@ 
 	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
 		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
 	}
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
+	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id']) === true) {
 		$language_id_exist = true;
 	} else {
 		$language_id_exist = false;
 	}
 } else {
-	$language_name='';
-	$language_id_exist=false;
+	$language_name = '';
+	$language_id_exist = false;
 }
 
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
 
-if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
+if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder']) == 0) {
 	api_not_allowed(true);
 }
 
@@ -101,16 +101,16 @@ 
 echo '</div>';
 echo '<br />';
 $txt_search_word = (!empty($_REQUEST['txt_search_word']) ? Security::remove_XSS($_REQUEST['txt_search_word']) : '');
-$html ='<div style="float:left" class="actions">';
-$html.='<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
-$html.='&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
+$html = '<div style="float:left" class="actions">';
+$html .= '<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
+$html .= '&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
 
-$html.='<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
-$html.='<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
-$html.='<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
-$html.="&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
-$html.='</form>';
-$html.='</div>';
+$html .= '<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
+$html .= '<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
+$html .= '<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
+$html .= "&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
+$html .= '</form>';
+$html .= '</div>';
 echo $html;
 echo '<br /><br /><br />';
 if (!empty($sublanguage_folder_error)) {
@@ -146,7 +146,7 @@ 
 	$language_files_to_load_keys = array_flip($language_files_to_load);
 	$array_to_search = $parent_language_array;
 	$list_info = array();
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
+	$term = '/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
 	//@todo optimize this foreach
 	foreach ($language_files_to_load as $lang_file) {
 		//searching in parent language of the sub language
@@ -159,7 +159,7 @@ 
 				}
 				$founded = false;
 				// searching the item in the parent tool
-				if (preg_match($term,$parent_variable_value)!==0) {
+				if (preg_match($term, $parent_variable_value) !== 0) {
 					$founded = true;
 				}
 				if ($founded) {
@@ -175,11 +175,11 @@ 
 						$size =4;
 					}*/
 
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
 
 					$list_info[] = array(
-						$lang_file . '.inc.php',
+						$lang_file.'.inc.php',
 						$parent_name_variable,
 						$english_name_variable,
 						$parent_variable_value,
@@ -203,16 +203,16 @@ 
 				$founded = false;
 				if ($search_in_english && $search_in_variable) {
 					// searching the item in the parent tool
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
+					if (preg_match($term, $variable_value) !== 0 || preg_match($term, $name_variable) !== 0) {
 						$founded = true;
 					}
 				} else {
 					if ($search_in_english) {
-						if (preg_match($term,$variable_value)!==0) {
+						if (preg_match($term, $variable_value) !== 0) {
 							$founded = true;
 						}
 					} else {
-						if (preg_match($term,$name_variable)!==0) {
+						if (preg_match($term, $name_variable) !== 0) {
 							$founded = true;
 						}
 					}
@@ -229,16 +229,16 @@ 
 						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
 					}
 					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
 						$sub_language_name_variable.'
 						</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
 					//loading variable from the english array
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
 
 					$list_info[] = array(
-						$lang_file . '.inc.php',
+						$lang_file.'.inc.php',
 						$name_variable,
 						$english_name_variable,
 						$parent_variable_value,
@@ -263,7 +263,7 @@ 
 
 				$founded = false;
 				// searching the item in the parent tool
-				if (preg_match($term,$variable_value)!==0) {
+				if (preg_match($term, $variable_value) !== 0) {
 					$founded = true;
 				}
 				if ($founded) {
@@ -271,15 +271,15 @@ 
 					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
 					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
 					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
 					//loading variable from the english array
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
-					$list_info[]=array($lang_file.'.inc.php',
+					$list_info[] = array($lang_file.'.inc.php',
 						$name_variable,
 						$english_name_variable,
-						$parent_variable_value,$obj_text,$obj_button);
+						$parent_variable_value, $obj_text, $obj_button);
 				}
 			}
 		}
@@ -293,7 +293,7 @@ 
 $list_info = array();
 if (isset($_REQUEST['txt_search_word'])) {
 	//@todo fix to accept a char with 1 char
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
+	if (strlen(trim($_REQUEST['txt_search_word'])) > 2) {
 		$list_info = search_language_term(
 			$_REQUEST['txt_search_word'],
 			true,
@@ -309,14 +309,14 @@ 
 	'sub_language_id' => intval($_GET['sub_language_id']),
 	'txt_search_word' => $txt_search_word
 );
-$table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
+$table = new SortableTableFromArrayConfig($list_info, 1, 20, 'data_info');
 $table->set_additional_parameters($parameters);
 $table->set_header(0, get_lang('LanguageFile'));
 $table->set_header(1, get_lang('LanguageVariable'));
 $table->set_header(2, get_lang('EnglishName'));
 $table->set_header(3, get_lang('OriginalName'));
-$table->set_header(4, get_lang('Translation'),false);
-$table->set_header(5, get_lang('Action'),false);
+$table->set_header(4, get_lang('Translation'), false);
+$table->set_header(5, get_lang('Action'), false);
 $table->display();
 
 Display :: display_footer();

main/admin/skill_edit.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 if (!empty($jquery_ready_content)) {
     $htmlHeadXtra[] = '<script>
     $(document).ready(function(){
-        ' . $jquery_ready_content . '
+        ' . $jquery_ready_content.'
     });
     </script>';
 }
@@ -109,7 +109,7 @@ 
         );
     }
 
-    header('Location: '.api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php');
+    header('Location: '.api_get_path(WEB_CODE_PATH).'admin/skill_list.php');
     exit;
 }