chamilo / chamilo-lms

main/gradebook/lib/user_data_generator.class.php

Doc Comments +5 added lines, -4 removed lines

@@ -72,6 +72,7 @@ 
 
     /**
      * Get actual array data
+     * @param integer $count
      * @return array 2-dimensional array - each array contains the elements:
      * 0: eval/link object
      * 1: item name
@@ -285,7 +286,7 @@ 
 
     /**
      * @param $item
-     * @param $ignore_score_color
+     * @param boolean $ignore_score_color
      * @return string
      */
     private function build_average_column($item, $ignore_score_color)
@@ -306,7 +307,7 @@ 
 
     /**
      * @param $item
-     * @param $ignore_score_color
+     * @param boolean $ignore_score_color
      * @return string
      */
     private function build_result_column($item, $ignore_score_color)
@@ -323,7 +324,7 @@ 
 
     /**
      * @param $item
-     * @param $ignore_score_color
+     * @param boolean $ignore_score_color
      * @return string
      */
     private function build_mask_column($item, $ignore_score_color)
@@ -339,7 +340,7 @@ 
 
     /**
      * @param $coursecode
-     * @return mixed
+     * @return string
      */
     private function get_course_name_from_code_cached($coursecode)
     {

Spacing +21 added lines, -21 removed lines

@@ -50,9 +50,9 @@ 
 
         }
         if (count($result) == 0) {
-            $evals_filtered=$evals;
+            $evals_filtered = $evals;
         } else {
-            $evals_filtered=$evals_filtered_copy;
+            $evals_filtered = $evals_filtered_copy;
         }
         $this->items = array_merge($evals_filtered, $links);
 
@@ -85,7 +85,7 @@ 
     {
         // do some checks on count, redefine if invalid value
         if (!isset($count)) {
-            $count = count ($this->items) - $start;
+            $count = count($this->items) - $start;
         }
         if ($count < 0) {
             $count = 0;
@@ -104,20 +104,20 @@ 
         } elseif ($sorting & self :: UDG_SORT_AVERAGE) {
             // if user sorts on average scores, first calculate them and cache them
             foreach ($allitems as $item) {
-                $this->avgcache[$item->get_item_type() . $item->get_id()]= $item->calc_score();
+                $this->avgcache[$item->get_item_type().$item->get_id()] = $item->calc_score();
             }
             usort($allitems, array('UserDataGenerator', 'sort_by_average'));
         } elseif ($sorting & self :: UDG_SORT_SCORE) {
             // if user sorts on student's scores, first calculate them and cache them
             foreach ($allitems as $item) {
-                $this->scorecache[$item->get_item_type() . $item->get_id()]
+                $this->scorecache[$item->get_item_type().$item->get_id()]
                     = $item->calc_score($this->userid);
             }
             usort($allitems, array('UserDataGenerator', 'sort_by_score'));
         } elseif ($sorting & self :: UDG_SORT_MASK) {
             // if user sorts on student's masks, first calculate scores and cache them
             foreach ($allitems as $item) {
-                $this->scorecache[$item->get_item_type() . $item->get_id()]
+                $this->scorecache[$item->get_item_type().$item->get_id()]
                     = $item->calc_score($this->userid);
             }
             usort($allitems, array('UserDataGenerator', 'sort_by_mask'));
@@ -132,7 +132,7 @@ 
         // fill score cache if not done yet
         if (!isset ($this->scorecache)) {
             foreach ($visibleitems as $item) {
-                $this->scorecache[$item->get_item_type() . $item->get_id()]
+                $this->scorecache[$item->get_item_type().$item->get_id()]
                     = $item->calc_score($this->userid);
             }
 
@@ -141,7 +141,7 @@ 
         $scoredisplay = ScoreDisplay :: instance();
         $data = array();
         foreach ($visibleitems as $item) {
-            $row = array ();
+            $row = array();
             $row[] = $item;
             $row[] = $item->get_name();
             $row[] = $this->build_course_name($item);
@@ -163,7 +163,7 @@ 
     function sort_by_type($item1, $item2)
     {
         if ($item1->get_item_type() == $item2->get_item_type()) {
-            return $this->sort_by_name($item1,$item2);
+            return $this->sort_by_name($item1, $item2);
         } else {
             return ($item1->get_item_type() < $item2->get_item_type() ? -1 : 1);
         }
@@ -203,7 +203,7 @@ 
      */
     function sort_by_name($item1, $item2)
     {
-        return api_strnatcmp($item1->get_name(),$item2->get_name());
+        return api_strnatcmp($item1->get_name(), $item2->get_name());
     }
 
     /**
@@ -213,8 +213,8 @@ 
      */
     function sort_by_average($item1, $item2)
     {
-        $score1 = $this->avgcache[$item1->get_item_type() . $item1->get_id()];
-        $score2 = $this->avgcache[$item2->get_item_type() . $item2->get_id()];
+        $score1 = $this->avgcache[$item1->get_item_type().$item1->get_id()];
+        $score2 = $this->avgcache[$item2->get_item_type().$item2->get_id()];
 
         return $this->compare_scores($score1, $score2);
     }
@@ -226,8 +226,8 @@ 
      */
     function sort_by_score($item1, $item2)
     {
-        $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
-        $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
+        $score1 = $this->scorecache[$item1->get_item_type().$item1->get_id()];
+        $score2 = $this->scorecache[$item2->get_item_type().$item2->get_id()];
 
         return $this->compare_scores($score1, $score2);
     }
@@ -239,8 +239,8 @@ 
      */
     function sort_by_mask($item1, $item2)
     {
-        $score1 = $this->scorecache[$item1->get_item_type() . $item1->get_id()];
-        $score2 = $this->scorecache[$item2->get_item_type() . $item2->get_id()];
+        $score1 = $this->scorecache[$item1->get_item_type().$item1->get_id()];
+        $score2 = $this->scorecache[$item2->get_item_type().$item2->get_id()];
 
         return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
     }
@@ -256,10 +256,10 @@ 
             return (isset($score2) ? 1 : 0);
         } elseif (!isset($score2)) {
             return -1;
-        } elseif (($score1[0]/$score1[1]) == ($score2[0]/$score2[1])) {
+        } elseif (($score1[0] / $score1[1]) == ($score2[0] / $score2[1])) {
             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);
         }
     }
 
@@ -291,7 +291,7 @@ 
     private function build_average_column($item, $ignore_score_color)
     {
         if (isset($this->avgcache)) {
-            $avgscore = $this->avgcache[$item->get_item_type() . $item->get_id()];
+            $avgscore = $this->avgcache[$item->get_item_type().$item->get_id()];
         } else {
             $avgscore = $item->calc_score();
         }
@@ -311,7 +311,7 @@ 
      */
     private function build_result_column($item, $ignore_score_color)
     {
-        $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
+        $studscore = $this->scorecache[$item->get_item_type().$item->get_id()];
         $scoredisplay = ScoreDisplay :: instance();
         $displaytype = SCORE_DIV_PERCENT;
         if ($ignore_score_color) {
@@ -328,7 +328,7 @@ 
      */
     private function build_mask_column($item, $ignore_score_color)
     {
-        $studscore = $this->scorecache[$item->get_item_type() . $item->get_id()];
+        $studscore = $this->scorecache[$item->get_item_type().$item->get_id()];
         $scoredisplay = ScoreDisplay :: instance();
         $displaytype = SCORE_DIV_PERCENT;
         if ($ignore_score_color) {

Braces +4 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
         // sort users array
         if ($sorting & self :: UDG_SORT_TYPE) {
             usort($allitems, array('UserDataGenerator', 'sort_by_type'));
-        }elseif ($sorting & self :: UDG_SORT_NAME) {
+        } elseif ($sorting & self :: UDG_SORT_NAME) {
             usort($allitems, array('UserDataGenerator', 'sort_by_name'));
         } elseif ($sorting & self :: UDG_SORT_COURSE) {
             usort($allitems, array('UserDataGenerator', 'sort_by_course'));
@@ -148,8 +148,9 @@ 
             $row[] = $this->build_category_name($item);
             $row[] = $this->build_average_column($item, $ignore_score_color);
             $row[] = $this->build_result_column($item, $ignore_score_color);
-            if ($scoredisplay->is_custom())
-                $row[] = $this->build_mask_column($item, $ignore_score_color);
+            if ($scoredisplay->is_custom()) {
+                            $row[] = $this->build_mask_column($item, $ignore_score_color);
+            }
             $data[] = $row;
         }
         return $data;

main/forum/viewthread_flat.inc.php

Spacing +26 added lines, -26 removed lines

@@ -63,7 +63,7 @@ 
                     if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
                         $buttonReply = Display::toolbarButton(
                             get_lang('ReplyToMessage'),
-                            'reply.php?' . api_get_cidreq() . '&' . http_build_query([
+                            'reply.php?'.api_get_cidreq().'&'.http_build_query([
                                 'forum' => $clean_forum_id,
                                 'thread' => $clean_thread_id,
                                 'post' => $row['post_id'],
@@ -76,7 +76,7 @@ 
 
                         $buttonQuote = Display::toolbarButton(
                             get_lang('QuoteMessage'),
-                            'reply.php?' . api_get_cidreq() . '&' . http_build_query([
+                            'reply.php?'.api_get_cidreq().'&'.http_build_query([
                                 'forum' => $clean_forum_id,
                                 'thread' => $clean_thread_id,
                                 'post' => $row['post_id'],
@@ -92,21 +92,21 @@ 
                 if (($current_forum_category && $current_forum_category['locked'] == 1)) {
                     $closedPost = Display::tag(
                         'div',
-                        '<em class="fa fa-exclamation-triangle"></em> ' . get_lang('ForumcategoryLocked'),
+                        '<em class="fa fa-exclamation-triangle"></em> '.get_lang('ForumcategoryLocked'),
                         array('class' => 'alert alert-warning post-closed')
                     );
                 }
                 if ($current_forum['locked'] == 1) {
                     $closedPost = Display::tag(
                         'div',
-                        '<em class="fa fa-exclamation-triangle"></em> ' . get_lang('ForumLocked'),
+                        '<em class="fa fa-exclamation-triangle"></em> '.get_lang('ForumLocked'),
                         array('class' => 'alert alert-warning post-closed')
                     );
                 }
                 if ($current_thread['locked'] == 1) {
                     $closedPost = Display::tag(
                         'div',
-                        '<em class="fa fa-exclamation-triangle"></em> ' . get_lang('ThreadLocked'),
+                        '<em class="fa fa-exclamation-triangle"></em> '.get_lang('ThreadLocked'),
                         array('class' => 'alert alert-warning post-closed')
                     );
                 }
@@ -121,7 +121,7 @@ 
 
             if ($origin != 'learnpath') {
                 if (api_get_course_setting('allow_user_image_forum')) {
-                    $html .= '<div class="thumbnail">' . display_user_image($row['user_id'], $name, $origin) . '</div>';
+                    $html .= '<div class="thumbnail">'.display_user_image($row['user_id'], $name, $origin).'</div>';
                 }
                 $html .= Display::tag(
                     'h4',
@@ -130,9 +130,9 @@ 
                 );
             } else {
                 if (api_get_course_setting('allow_user_image_forum')) {
-                    $html .= '<div class="thumbnail">' . display_user_image($row['user_id'], $name, $origin) . '</div>';
+                    $html .= '<div class="thumbnail">'.display_user_image($row['user_id'], $name, $origin).'</div>';
                 }
-                $name = Display::tag('strong', "#" . $postCount--, ['class' => 'text-info']) . " | $name";
+                $name = Display::tag('strong', "#".$postCount--, ['class' => 'text-info'])." | $name";
                 $html .= Display::tag(
                     'p',
                     $name,
@@ -176,10 +176,10 @@ 
             ) {
                 if (api_is_allowed_to_session_edit(false, true)) {
                     if ($locked == false) {
-                        $iconEdit .= "<a href=\"editpost.php?" . api_get_cidreq() . "&forum=" . $clean_forum_id
-                            . "&thread=" . $clean_thread_id . "&post=" . $row['post_id'] . "&origin="
-                            . $origin . "&edit=edition&id_attach=" . $id_attach . "\">"
-                            . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . "</a>";
+                        $iconEdit .= "<a href=\"editpost.php?".api_get_cidreq()."&forum=".$clean_forum_id
+                            . "&thread=".$clean_thread_id."&post=".$row['post_id']."&origin="
+                            . $origin."&edit=edition&id_attach=".$id_attach."\">"
+                            . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL)."</a>";
                     }
                 }
             }
@@ -190,7 +190,7 @@ 
                     !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)
                 ) {
                     if ($locked === false) {
-                        $deleteUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+                        $deleteUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
                             'forum' => $clean_forum_id,
                             'thread' => $clean_thread_id,
                             'action' => 'delete',
@@ -229,9 +229,9 @@ 
                     );
 
                     if ($increment > 0) {
-                        $iconEdit .= "<a href=\"viewthread.php?" . api_get_cidreq() . "&forum=" . $clean_forum_id
-                            . "&thread=" . $clean_thread_id . "&action=move&post=" . $row['post_id']
-                            . "&origin=" . $origin . "\">"
+                        $iconEdit .= "<a href=\"viewthread.php?".api_get_cidreq()."&forum=".$clean_forum_id
+                            . "&thread=".$clean_thread_id."&action=move&post=".$row['post_id']
+                            . "&origin=".$origin."\">"
                             . Display::return_icon('move.png', get_lang('MovePost'), array(), ICON_SIZE_SMALL)
                             . "</a>";
                     }
@@ -254,16 +254,16 @@ 
                     $userCanEdit = true;
                 }
                 if ($increment > 0 && $locked == false && $userCanEdit) {
-                    $iconEdit .= "<a href=\"forumqualify.php?" . api_get_cidreq() . "&forum=" . $my_forum_id
-                        . "&thread=" . $clean_thread_id . "&action=list&post=" . $row['post_id']
-                        . "&user=" . $row['poster_id'] . "&user_id=" . $row['poster_id']
-                        . "&origin=" . $origin . "&idtextqualify=" . $current_qualify_thread . "\" >"
+                    $iconEdit .= "<a href=\"forumqualify.php?".api_get_cidreq()."&forum=".$my_forum_id
+                        . "&thread=".$clean_thread_id."&action=list&post=".$row['post_id']
+                        . "&user=".$row['poster_id']."&user_id=".$row['poster_id']
+                        . "&origin=".$origin."&idtextqualify=".$current_qualify_thread."\" >"
                         . Display::return_icon('quiz.gif', get_lang('Qualify'))
                         . "</a> ";
                 }
             }
             if ($iconEdit != '') {
-                $html .= '<div class="tools-icons">' . $iconEdit . $statusIcon.'</div>';
+                $html .= '<div class="tools-icons">'.$iconEdit.$statusIcon.'</div>';
             }
             $html .= $closedPost;
             $html .= '</div>';
@@ -317,26 +317,26 @@ 
                     $realname = $attachment['path'];
                     $user_filename = $attachment['filename'];
                     $html .= Display::return_icon('attachment.gif', get_lang('Attachment'));
-                    $html .= '<a href="download.php?file=' . $realname . '"> ' . $user_filename . ' </a>';
+                    $html .= '<a href="download.php?file='.$realname.'"> '.$user_filename.' </a>';
 
                     if (($current_forum['allow_edit'] == 1 && $row['user_id'] == $_user['user_id']) ||
                         (api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId))
                     ) {
-                        $html .= '&nbsp;&nbsp;<a href="' . api_get_self() . '?' . api_get_cidreq() . '&action=delete_attach&id_attach='
-                            . $attachment['iid'] . '&forum=' . $clean_forum_id . '&thread=' . $clean_thread_id
+                        $html .= '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_attach&id_attach='
+                            . $attachment['iid'].'&forum='.$clean_forum_id.'&thread='.$clean_thread_id
                             . '" onclick="javascript:if(!confirm(\''
                             . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))
                             . '\')) return false;">'
                             . Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)
                             . '</a><br />';
                     }
-                    $html .= '<span class="forum_attach_comment" >' . $attachment['comment'] . '</span>';
+                    $html .= '<span class="forum_attach_comment" >'.$attachment['comment'].'</span>';
                 }
             }
 
             $html .= '</div>';
             $html .= '<div class="col-md-5 text-right">';
-            $html .= $buttonReply . ' ' . $buttonQuote;
+            $html .= $buttonReply.' '.$buttonQuote;
             $html .= '</div>';
             $html .= '</div>';
 

main/gradebook/gradebook_showlog_link.php

Spacing +5 added lines, -5 removed lines

@@ -39,15 +39,15 @@
         FROM ".$t_link_log." lk inner join ".$t_user." us
         ON lk.user_id_log=us.user_id
         WHERE lk.id_linkeval_log=".$evaledit[0]->get_id()." AND lk.type='link';";
-$result=Database::query($sql);
-$list_info=array();
-while ($row=Database::fetch_row($result)) {
+$result = Database::query($sql);
+$list_info = array();
+while ($row = Database::fetch_row($result)) {
     $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');
+    $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_result.php

Spacing +7 added lines, -7 removed lines

@@ -7,12 +7,12 @@ 
 require_once '../inc/global.inc.php';
 api_block_anonymous_users();
 GradebookUtils::block_students();
-$select_eval=Security::remove_XSS($_GET['selecteval']);
+$select_eval = Security::remove_XSS($_GET['selecteval']);
 if (empty($select_eval)) {
     api_not_allowed();
 }
-$resultedit = Result :: load (null,null,$select_eval);
-$evaluation = Evaluation :: load ($select_eval);
+$resultedit = Result :: load(null, null, $select_eval);
+$evaluation = Evaluation :: load($select_eval);
 
 $evaluation[0]->check_lock_permissions();
 
@@ -29,9 +29,9 @@ 
     $values = $edit_result_form->exportValues();
     $scores = ($values['score']);
     foreach ($scores as $row) {
-        $resultedit = Result :: load (key($scores));
+        $resultedit = Result :: load(key($scores));
         $row_value = $row;
-        if ($row_value != '' ) {
+        if ($row_value != '') {
             $resultedit[0]->set_score(floatval(number_format($row_value, api_get_setting('gradebook_number_decimals'))));
             $resultedit[0]->save();
         }
@@ -41,11 +41,11 @@ 
     exit;
 }
 
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'],
     'name' => get_lang('Gradebook')
 );
-$interbreadcrumb[]= array (
+$interbreadcrumb[] = array(
     'url' => 'gradebook_view_result.php?selecteval='.$select_eval.'&'.api_get_cidreq(),
     'name' => get_lang('ViewResult')
 );

main/gradebook/lib/fe/linkaddeditform.class.php

Indentation +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@ 
  */
 class LinkAddEditForm extends FormValidator
 {
-	const TYPE_ADD = 1;
-	const TYPE_EDIT = 2;
+    const TYPE_ADD = 1;
+    const TYPE_EDIT = 2;
 
     /**
      * Constructor
@@ -188,5 +188,5 @@ 
 
         // set default values
         $this->setDefaults($defaults);
-	}
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -31,7 +31,7 @@ 
         if (isset($link_object)) {
             $link = $link_object;
         } elseif (isset($link_type) && isset($category_object)) {
-            $link = LinkFactory :: create ($link_type);
+            $link = LinkFactory :: create($link_type);
             $link->set_course_code(api_get_course_id());
             $link->set_category_id($category_object[0]->get_id());
         } else {
@@ -52,12 +52,12 @@ 
             } else {
                 $select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
                 foreach ($link->get_all_links() as $newlink) {
-                    $select->addoption($newlink[1],$newlink[0]);
+                    $select->addoption($newlink[1], $newlink[0]);
                 }
             }
         } else {
-            $this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
-            $this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
+            $this->addElement('label', get_lang('Name'), '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
+            $this->addElement('hidden', 'name_link', $link->get_name(), array('id'=>'name_link'));
         }
 
         if (count($category_object) == 1) {
@@ -78,7 +78,7 @@ 
                     if ($my_cat->get_course_code() == api_get_course_id()) {
                         $grade_model_id = $my_cat->get_grade_model_id();
                         if (empty($grade_model_id)) {
-                            if ($my_cat->get_parent_id() == 0 ) {
+                            if ($my_cat->get_parent_id() == 0) {
                                 $default_weight = $my_cat->get_weight();
                                 $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
                             } else {
@@ -117,8 +117,8 @@ 
             'class' => 'span1'
         ));*/
 
-        $this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
-        $this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+        $this->addRule('weight_mask', get_lang('OnlyNumbers'), 'numeric');
+        $this->addRule(array('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
         if ($form_type == self :: TYPE_EDIT) {
             $parent_cat = Category :: load($link->get_category_id());
 
@@ -131,20 +131,20 @@ 
                 //var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
                 //$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
                 //$values['weight'] = $weight;
-                $values['weight'] = $link->get_weight() ;
+                $values['weight'] = $link->get_weight();
             }
-            $defaults['weight_mask'] = $values['weight'] ;
+            $defaults['weight_mask'] = $values['weight'];
             $defaults['select_gradebook'] = $link->get_category_id();
 
         }
         // ELEMENT: max
         if ($link->needs_max()) {
             if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
-                $this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
+                $this->addText('max', get_lang('QualificationNumeric'), false, array('size' => '4', 'maxlength' => '5', 'disabled' => 'disabled'));
             } else {
-                $this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
+                $this->addText('max', get_lang('QualificationNumeric'), true, array('size' => '4', 'maxlength' => '5'));
                 $this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
-                $this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+                $this->addRule(array('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
             }
             if ($form_type == self :: TYPE_EDIT) {
                 $defaults['max'] = $link->get_max();
@@ -153,7 +153,7 @@ 
 
         // ELEMENT: description
         if ($link->needs_name_and_description()) {
-            $this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
+            $this->addElement('textarea', 'description', get_lang('Description'), array('rows' => '3', 'cols' => '34'));
             if ($form_type == self :: TYPE_EDIT) {
                 $defaults['description'] = $link->get_description();
             }
@@ -183,7 +183,7 @@ 
             if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
                 $visibility_default = 0;
             }
-            $defaults['visible']  = $visibility_default;
+            $defaults['visible'] = $visibility_default;
         }
 
         // set default values

main/gradebook/lib/fe/userform.class.php

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
  */
 class UserForm extends FormValidator
 {
-    const TYPE_USER_INFO= 1;
+    const TYPE_USER_INFO = 1;
     const TYPE_SIMPLE_SEARCH = 3;
 
     /**
@@ -20,15 +20,15 @@ 
      * @param method
      * @param action
      */
-    public function __construct($form_type, $user, $form_name, $method= 'post', $action= null)
+    public function __construct($form_type, $user, $form_name, $method = 'post', $action = null)
     {
         parent :: __construct($form_name, $method, $action);
-        $this->form_type= $form_type;
+        $this->form_type = $form_type;
         if (isset ($user)) {
-            $this->user_info= $user;
+            $this->user_info = $user;
         }
         if (isset ($result_object)) {
-            $this->result_object= $result_object;
+            $this->result_object = $result_object;
         }
         if ($this->form_type == self :: TYPE_USER_INFO) {
             $this->build_user_info_form();
@@ -46,9 +46,9 @@ 
                 'keyword' => Security::remove_XSS($_GET['search'])
             ));
         }
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
-        $this->addElement('text','keyword','');
+        $this->addElement('text', 'keyword', '');
         $this->addButtonSearch(get_lang('Search'), 'submit');
     }
 
@@ -62,7 +62,7 @@ 
             $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
         }
         $this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
-        $this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
+        $this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:'.$this->user_info['email'].'">'.$this->user_info['email'].'</a>');
         $this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
         $this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
         $this->addButtonSave(get_lang('Back'), 'submit');
@@ -73,7 +73,7 @@ 
         parent :: display();
     }
 
-    function setDefaults($defaults= array(), $filter = null)
+    function setDefaults($defaults = array(), $filter = null)
     {
         parent :: setDefaults($defaults, $filter);
     }

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
         }
         if ($this->form_type == self :: TYPE_USER_INFO) {
             $this->build_user_info_form();
-        }
-        elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
+        } elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
             $this->build_simple_search();
         }
         $this->setDefaults();

main/gradebook/lib/fe/resulttable.class.php

Indentation +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
         foreach ($data_array as $item) {
             $row = array ();
             if ($this->iscourse == '1') {
-                 $row[] = $item['result_id'];
+                    $row[] = $item['result_id'];
             }
             if ($is_western_name_order) {
                 $row[] = $item['firstname'];

Spacing +16 added lines, -16 removed lines

@@ -18,7 +18,7 @@ 
     /**
      * Constructor
      */
-    public function __construct($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
+    public function __construct($evaluation, $results = array(), $iscourse, $addparams = null, $forprint = false)
     {
         parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
 
@@ -28,14 +28,14 @@ 
         $this->iscourse = $iscourse;
         $this->forprint = $forprint;
 
-        if (isset ($addparams))  {
+        if (isset ($addparams)) {
             $this->set_additional_parameters($addparams);
         }
         $scoredisplay = ScoreDisplay :: instance();
-        $column= 0;
+        $column = 0;
         if ($this->iscourse == '1') {
             $this->set_header($column++, '', false);
-            $this->set_form_actions(array (
+            $this->set_form_actions(array(
                     'delete' => get_lang('Delete')
             ));
         }
@@ -51,14 +51,14 @@ 
             $this->set_header($column++, get_lang('Display'));
         }
         if (!$this->forprint) {
-            $this->set_header($column++, get_lang('Modify'),false);
+            $this->set_header($column++, get_lang('Modify'), false);
         }
     }
 
     /**
      * Function used by SortableTable to get total number of items in the table
      */
-    public function get_total_number_of_items ()
+    public function get_total_number_of_items()
     {
         return $this->datagen->get_total_results_count();
     }
@@ -111,7 +111,7 @@ 
         // generate the data to display
         $sortable_data = array();
         foreach ($data_array as $item) {
-            $row = array ();
+            $row = array();
             if ($this->iscourse == '1') {
                  $row[] = $item['result_id'];
             }
@@ -123,13 +123,13 @@ 
                 $row[] = $item['firstname'];
             }
 
-            $row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+            $row[] = Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
             if ($scoredisplay->is_custom()) {
                 $row[] = $item['display'];
             }
             if (!$this->forprint) {
-                $row[] = $this->build_edit_column ($item);
+                $row[] = $this->build_edit_column($item);
             }
             $sortable_data[] = $row;
         }
@@ -142,17 +142,17 @@ 
         $locked_status = $this->evaluation->get_locked();
         if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
             //api_is_course_admin()
-            $edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-                Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-            $edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-                Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+            $edit_column = '<a href="'.api_get_self().'?editres='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('edit.png', get_lang('Modify'), '', '22').'</a>';
+            $edit_column .= ' <a href="'.api_get_self().'?delete_mark='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('delete.png', get_lang('Delete'), '', '22').'</a>';
         }
 
         if ($this->evaluation->get_course_code() == null) {
-            $edit_column .= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">';
+            $edit_column .= '&nbsp;<a href="'.api_get_self().'?resultdelete='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'" onclick="return confirmationuser();">';
             $edit_column .= Display::return_icon('delete.png', get_lang('Delete'));
             $edit_column .= '</a>';
-            $edit_column .= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">';
+            $edit_column .= '&nbsp;<a href="user_stats.php?userid='.$item['id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">';
             $edit_column .= Display::return_icon('statistics.gif', get_lang('Statistics'));
             $edit_column .= '</a>';
         }
@@ -163,7 +163,7 @@ 
             $doc_url = $link->get_view_url($item['id']);
 
             if ($doc_url != null) {
-                $edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">';
+                $edit_column .= '&nbsp;<a href="'.$doc_url.'" target="_blank">';
                 $edit_column .= Display::return_icon('link.gif', get_lang('OpenDocument')).'</a>';
             }
         }

main/gradebook/lib/fe/usertable.class.php

Spacing +5 added lines, -5 removed lines

@@ -87,8 +87,8 @@ 
         // generate the data to display
         $sortable_data = array();
         foreach ($data_array as $data) {
-            if ($data[2]!="") {//filter by course removed
-                $row = array ();
+            if ($data[2] != "") {//filter by course removed
+                $row = array();
                 $row[] = $this->build_type_column($data[0]);
                 $row[] = $this->build_name_link($data[0]);
                 $row[] = $data[2];
@@ -124,15 +124,15 @@ 
             // evaluation
             case 'E':
                 return ' '
-                . '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+                . '<a href="gradebook_view_result.php?selecteval='.$item->get_id().'">'
                 . $item->get_name()
                 . '</a>';
             // link
             case 'L':
-                return '&nbsp;<a href="' . $item->get_link() . '">'
+                return '&nbsp;<a href="'.$item->get_link().'">'
                 . $item->get_name()
                 . '</a>'
-                . '&nbsp;[' . $item->get_type_name() . ']';
+                . '&nbsp;['.$item->get_type_name().']';
         }
     }
 }

main/gradebook/lib/fe/linkform.class.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 
     protected function build_move()
     {
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement(
             'static',
@@ -138,7 +138,7 @@ 
         $link = LinkFactory::create($link);
         if (!empty($courseCode)) {
             $link->set_course_code($courseCode);
-        } elseif(!empty($_GET['course_code'])) {
+        } elseif (!empty($_GET['course_code'])) {
             $link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
         }