chamilo / chamilo-lms

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

Spacing +10 added lines, -10 removed lines

@@ -52,15 +52,15 @@ 
      */
     protected function build_move_form()
     {
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement(
             'static',
             null,
             null,
-            '"' . $this->category_object->get_name() . '" '
+            '"'.$this->category_object->get_name().'" '
         );
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
         $line = null;
         foreach ($this->category_object->get_target_categories() as $cat) {
@@ -68,9 +68,9 @@ 
                 $line .= '--';
             }
             if ($cat[0] != $this->category_object->get_parent_id()) {
-                $select->addoption($line . ' ' . $cat[1], $cat[0]);
+                $select->addoption($line.' '.$cat[1], $cat[0]);
             } else {
-                $select->addoption($line . ' ' . $cat[1], $cat[0], 'disabled');
+                $select->addoption($line.' '.$cat[1], $cat[0], 'disabled');
             }
             $line = '';
         }
@@ -153,7 +153,7 @@ 
         $grade_model_id = $this->category_object->get_grade_model_id();
 
         if (empty($links)) {
-            $grade_model_id    = 0;
+            $grade_model_id = 0;
         }
 
         $category_name = $this->category_object->get_name();
@@ -242,7 +242,7 @@ 
                     [
                         'id' => 'skills',
                         'multiple' => 'multiple',
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'skill.ajax.php?a=search_skills'
+                        'url' => api_get_path(WEB_AJAX_PATH).'skill.ajax.php?a=search_skills'
                     ]
                 );
 
@@ -400,14 +400,14 @@ 
         //only return courses that are not yet created by the teacher
 
         foreach ($coursecat as $row) {
-            $select->addoption($row[1],$row[0]);
+            $select->addoption($row[1], $row[0]);
         }
         $this->setDefaults(array(
             'hid_user_id' => $this->category_object->get_user_id(),
             'hid_parent_id' => $this->category_object->get_parent_id()
         ));
-        $this->addElement('hidden','hid_user_id');
-        $this->addElement('hidden','hid_parent_id');
+        $this->addElement('hidden', 'hid_user_id');
+        $this->addElement('hidden', 'hid_parent_id');
         $this->addElement('submit', null, get_lang('Ok'));
     }
 

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

Spacing +15 added lines, -15 removed lines

@@ -201,9 +201,9 @@ 
             $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
             $chartHash = $myCache->getHash($dataSet);
             if ($myCache->isInCache($chartHash)) {
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             } else {
                 /* Create the pChart object */
                 $widthSize = 480;
@@ -230,7 +230,7 @@ 
                 /* Set the default font */
                 $myPicture->setFontProperties(
                     array(
-                        'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                        'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                         'FontSize' => 10
                     )
                 );
@@ -302,11 +302,11 @@ 
                 /* Render the picture (choose the best way) */
 
                 $myCache->writeToCache($chartHash, $myPicture);
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             }
-            echo '<img src="' . $imgPath . '" >';
+            echo '<img src="'.$imgPath.'" >';
             if ($i % 2 == 0 && $i != 0) {
                 echo '<br /><br />';
             } else {
@@ -349,10 +349,10 @@ 
             // previous X
             $header .= '<td style="width:100%;">';
             if ($this->offset >= GRADEBOOK_ITEM_LIMIT) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . (($this->offset) - GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.(($this->offset) - GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)
                     . '</a>';
             } else {
@@ -364,10 +364,10 @@ 
                 ($totalitems - (GRADEBOOK_ITEM_LIMIT + $this->offset)) : GRADEBOOK_ITEM_LIMIT;
 
             if ($calcnext > 0) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . ($this->offset + GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.($this->offset + GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
                     . '</a>';
             } else {
@@ -475,6 +475,6 @@ 
      */
     private function build_name_link($user_id, $name)
     {
-        return '<a href="user_stats.php?userid=' . $user_id . '&selectcat=' . $this->selectcat->get_id() . '&'.api_get_cidreq().'">' . $name . '</a>';
+        return '<a href="user_stats.php?userid='.$user_id.'&selectcat='.$this->selectcat->get_id().'&'.api_get_cidreq().'">'.$name.'</a>';
     }
 }

Braces +3 added lines, -2 removed lines

@@ -149,8 +149,9 @@
                 }
 
                 foreach ($customdisplays as $display) {
-                    if (!in_array($display['display'], $key_list))
-                        $resource_list[$key][$display['display']] = 0;
+                    if (!in_array($display['display'], $key_list)) {
+                                            $resource_list[$key][$display['display']] = 0;
+                    }
                 }
                 $i++;
             }

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);
             }
         }
     }
@@ -79,7 +79,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'));
@@ -96,10 +96,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);
             }
         }
@@ -110,7 +110,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);
                 }
             }
@@ -182,7 +182,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) {
@@ -251,7 +251,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,
@@ -307,7 +307,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);
         }
@@ -348,7 +348,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)
@@ -358,7 +358,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);
 
@@ -410,9 +410,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);
     }
 
     /**
@@ -420,9 +420,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).' %';
     }
 
     /**
@@ -438,7 +438,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];
         }
     }
 
@@ -448,7 +448,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) {
@@ -512,7 +512,7 @@ 
                 ORDER BY score';
         $result = Database::query($sql);
 
-        return Database::store_result($result,'ASSOC');
+        return Database::store_result($result, 'ASSOC');
     }
 
     /**

main/gradebook/lib/be/exerciselink.class.php

Indentation +13 added lines, -13 removed lines

@@ -194,13 +194,13 @@ 
         in exercice/exercice.php, look for note-query-exe-results marker*/
         $session_id = api_get_session_id();
         $courseId = $this->getCourseId();
-	    $exercise = new Exercise($courseId);
+        $exercise = new Exercise($courseId);
         $exercise->read($this->get_ref_id());
 
         if (!$this->is_hp) {
 
-		if ($exercise->exercise_was_added_in_lp == false) {
-			$sql = "SELECT * FROM $tblStats
+        if ($exercise->exercise_was_added_in_lp == false) {
+            $sql = "SELECT * FROM $tblStats
 			        WHERE
 			            exe_exo_id = ".intval($this->get_ref_id())." AND
 			            orig_lp_id = 0 AND
@@ -209,15 +209,15 @@ 
 			            session_id = $session_id AND
                                     c_id = $courseId 
                                 ";
-		    } else {
-		        $lpId = null;
-		        if (!empty($exercise->lpList)) {
-		            // Taking only the first LP
-		            $lpId = current($exercise->lpList);
-		            $lpId = $lpId['lp_id'];
-		        }
-
-		        $sql = "SELECT * FROM $tblStats
+            } else {
+                $lpId = null;
+                if (!empty($exercise->lpList)) {
+                    // Taking only the first LP
+                    $lpId = current($exercise->lpList);
+                    $lpId = $lpId['lp_id'];
+                }
+
+                $sql = "SELECT * FROM $tblStats
 		                WHERE
 		                    exe_exo_id = ".intval($this->get_ref_id())." AND
 		                    orig_lp_id = $lpId AND
@@ -225,7 +225,7 @@ 
 		                    session_id = $session_id AND
                                     c_id = $courseId 
                                 ";
-		    }
+            }
 
             if (!empty($stud_id) && $type != 'ranking') {
                 $sql .= " AND exe_user_id = $stud_id ";

Spacing +11 added lines, -11 removed lines

@@ -51,8 +51,8 @@ 
 
         $result = Database::query($sql);
         $cats = array();
-        while ($data=Database::fetch_array($result)) {
-            $cats[] = array ($data['id'], $data['title']);
+        while ($data = Database::fetch_array($result)) {
+            $cats[] = array($data['id'], $data['title']);
         }
 
         return $cats;
@@ -116,15 +116,15 @@ 
         $cats = array();
         if (isset($result)) {
             if (Database::num_rows($result) > 0) {
-                while ($data=Database::fetch_array($result)) {
-                    $cats[] = array ($data['id'], $data['title']);
+                while ($data = Database::fetch_array($result)) {
+                    $cats[] = array($data['id'], $data['title']);
                 }
             }
         }
 
         if (isset($result2)) {
             if (Database::num_rows($result2) > 0) {
-                while ($row=Database::fetch_array($result2)) {
+                while ($row = Database::fetch_array($result2)) {
                     /*$path = $data['path'];
                     $fname = GetQuizName($path,$documentPath);
         			$cats[] = array ($data['id'], $fname);*/
@@ -170,9 +170,9 @@ 
                 WHERE
                     session_id = $session_id AND
                     c_id = $course_id AND
-                    exe_exo_id   = ".(int)$this->get_ref_id();
+                    exe_exo_id   = ".(int) $this->get_ref_id();
         $result = Database::query($sql);
-        $number=Database::fetch_row($result);
+        $number = Database::fetch_row($result);
         return ($number[0] != 0);
     }
 
@@ -254,7 +254,7 @@ 
         } else {
             // all students -> get average
             // normal way of getting the info
-            $students = array();  // user list, needed to make sure we only
+            $students = array(); // user list, needed to make sure we only
             // take first attempts into account
             $student_count = 0;
             $sum = 0;
@@ -289,7 +289,7 @@ 
                         /*if (empty($count)) {
                             return null;
                         }*/
-                        return array($sumResult/$count , $weight);
+                        return array($sumResult / $count, $weight);
                         break;
                     case 'ranking':
                         return AbstractLink::getCurrentUserRanking($stud_id, $students);
@@ -319,7 +319,7 @@ 
         $session_id = api_get_session_id();
 
         $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$this->get_ref_id().'&type='.$this->get_type();
-        if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user!=1) {
+        if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user != 1) {
             $url .= '&doexercise='.$this->get_ref_id();
         }
 
@@ -364,7 +364,7 @@ 
     public function is_valid_link()
     {
         $sql = 'SELECT count(id) from '.$this->get_exercise_table().'
-                WHERE c_id = '.$this->course_id.' AND id = '.(int)$this->get_ref_id().' ';
+                WHERE c_id = '.$this->course_id.' AND id = '.(int) $this->get_ref_id().' ';
         $result = Database::query($sql);
         $number = Database::fetch_row($result);
 

main/gradebook/lib/be/gradebookitem.class.php

Indentation +12 added lines, -12 removed lines

@@ -8,16 +8,16 @@
  */
 interface GradebookItem
 {
-	public function get_item_type();
-	public function get_id();
-	public function get_name();
-	public function get_description();
-	public function get_course_code();
-	public function get_weight();
-	public function get_date();
-	public function is_visible();
-	public function get_icon_name();
-	public function getStudentList();
-	public function setStudentList($list);
-	public function calc_score($stud_id = null, $type = null);
+    public function get_item_type();
+    public function get_id();
+    public function get_name();
+    public function get_description();
+    public function get_course_code();
+    public function get_weight();
+    public function get_date();
+    public function is_visible();
+    public function get_icon_name();
+    public function getStudentList();
+    public function setStudentList($list);
+    public function calc_score($stud_id = null, $type = null);
 }

main/gradebook/lib/be/category.class.php

Indentation -2 removed lines

@@ -1571,7 +1571,6 @@ 
      * @param string $course_code Course code (optional)
      * @param int    $session_id Session ID (optional)
      * @param bool   $order
-
      * @return array Array of subcategories
      */
     public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null)
@@ -1850,7 +1849,6 @@ 
      * This function, locks a category , only one who can unlock it is
      * the platform administrator.
      * @param int locked 1 or unlocked 0
-
      * @return bool
      * */
     public function lock($locked)

Spacing +63 added lines, -63 removed lines

@@ -199,7 +199,7 @@ 
      */
     public function set_session_id($session_id = 0)
     {
-        $this->session_id = (int)$session_id;
+        $this->session_id = (int) $session_id;
     }
 
     /**
@@ -288,7 +288,7 @@ 
         $skills = $this->get_skills();
         $skill_select = array();
         if (!empty($skills)) {
-            foreach($skills as $skill) {
+            foreach ($skills as $skill) {
                 $skill_select[$skill['id']] = $skill['name'];
             }
         }
@@ -322,7 +322,7 @@ 
      */
     public static function load_session_categories($id = null, $session_id = null)
     {
-        if (isset($id) && (int)$id === 0) {
+        if (isset($id) && (int) $id === 0) {
             $cats = array();
             $cats[] = Category::create_root_category();
             return $cats;
@@ -335,7 +335,7 @@ 
         if (!empty($session_id)) {
             $tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
             $sql = 'SELECT id, course_code
-                    FROM '.$tbl_grade_categories. '
+                    FROM '.$tbl_grade_categories.'
                     WHERE session_id = '.$session_id;
             $result_session = Database::query($sql);
             if (Database::num_rows($result_session) > 0) {
@@ -375,7 +375,7 @@ 
     ) {
         //if the category given is explicitly 0 (not null), then create
         // a root category object (in memory)
-        if (isset($id) && (int)$id === 0) {
+        if (isset($id) && (int) $id === 0) {
             $cats = array();
             $cats[] = Category::create_root_category();
 
@@ -386,8 +386,8 @@ 
         $sql = 'SELECT * FROM '.$tbl_grade_categories;
         $paramcount = 0;
         if (isset($id)) {
-            $sql.= ' WHERE id = '.intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE id = '.intval($id);
+            $paramcount++;
         }
 
         if (isset($user_id)) {
@@ -423,10 +423,10 @@ 
             if (empty($session_id)) {
                 $sql .= ' AND (session_id IS NULL OR session_id = 0) ';
             } else {
-                $sql .= ' AND session_id = '.(int)$session_id.' ';
+                $sql .= ' AND session_id = '.(int) $session_id.' ';
             }
             //}
-            $paramcount ++;
+            $paramcount++;
         }
 
         if (isset($parent_id)) {
@@ -598,7 +598,7 @@ 
                             $default_weight = $default_weight_setting;
                         }
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -615,7 +615,7 @@ 
                 }
             }
 
-            $gradebook= new Gradebook();
+            $gradebook = new Gradebook();
             $gradebook->update_skills_to_gradebook($this->id, $this->get_skills(false));
 
             return $id;
@@ -680,7 +680,7 @@ 
                         $params['description']      = $component['title'];
                         $params['user_id']          = api_get_user_id();
                         $params['parent_id']        = $this->id;
-                        $params['weight']           = $component['percentage']/100*$default_weight;
+                        $params['weight']           = $component['percentage'] / 100 * $default_weight;
                         $params['session_id']       = api_get_session_id();
                         $params['course_code']      = $this->get_course_code();
 
@@ -690,7 +690,7 @@ 
             }
         }
 
-        $gradebook= new Gradebook();
+        $gradebook = new Gradebook();
         $gradebook->update_skills_to_gradebook(
             $this->id,
             $this->get_skills(false),
@@ -710,7 +710,7 @@ 
         if (!empty($links)) {
             foreach ($links as $link_item) {
                 if (isset($link_item)) {
-                    $new_item_weight =  $new_weight * $link_item->get_weight() / $old_weight;
+                    $new_item_weight = $new_weight * $link_item->get_weight() / $old_weight;
                     $link_item->set_weight($new_item_weight);
                     $link_item->save();
                 }
@@ -751,7 +751,7 @@ 
                     visible=3';
         $res = Database::query($sql);
         $option = Database::fetch_array($res, 'ASSOC');
-        if ($option['num']>=1) {
+        if ($option['num'] >= 1) {
             return '&nbsp;&nbsp;<span class="resource-deleted">(&nbsp;'.get_lang('ResourceDeleted').'&nbsp;)</span>';
         } else {
             return false;
@@ -812,9 +812,9 @@ 
             $sql .= ' AND user_id = '.api_get_user_id();
         }
         if (!isset ($parent)) {
-            $sql.= ' AND parent_id is null';
+            $sql .= ' AND parent_id is null';
         } else {
-            $sql.= ' AND parent_id = '.intval($parent);
+            $sql .= ' AND parent_id = '.intval($parent);
         }
 
         $result = Database::query($sql);
@@ -912,7 +912,7 @@ 
                     }
 
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
-                        $ressum += $score[0]/$score[1] * $catweight;
+                        $ressum += $score[0] / $score[1] * $catweight;
                     }
                 }
             }
@@ -1001,7 +1001,7 @@ 
                     }
 
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
-                        $ressum += $score[0]/$score[1] * $catweight;
+                        $ressum += $score[0] / $score[1] * $catweight;
 
                         if ($ressum > $bestResult) {
                             $bestResult = $ressum;
@@ -1140,7 +1140,7 @@ 
                 // session, we don't check his registration to these, but this
                 // could be an improvement
                 if (!empty($session_id)) {
-                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int)$session_id;
+                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int) $session_id;
                 } else {
                     $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id is null OR session_id=0";
                 }
@@ -1164,9 +1164,9 @@ 
                 // could be an improvement
                 $sql .= " AND course_code  = '".Database::escape_string($course_code)."'";
                 if (!empty($session_id)) {
-                    $sql .= " AND session_id = ".(int)$session_id;
+                    $sql .= " AND session_id = ".(int) $session_id;
                 } else {
-                    $sql .="AND session_id IS NULL OR session_id=0";
+                    $sql .= "AND session_id IS NULL OR session_id=0";
                 }
             } else {
                 $sql .= ' AND course_code IN
@@ -1180,10 +1180,10 @@ 
                     )';
             }
         }elseif (api_is_platform_admin()) {
-            if (isset($session_id) && $session_id!=0) {
-                $sql.=' AND session_id='.intval($session_id);
+            if (isset($session_id) && $session_id != 0) {
+                $sql .= ' AND session_id='.intval($session_id);
             } else {
-                $sql.=' AND coalesce(session_id,0)=0';
+                $sql .= ' AND coalesce(session_id,0)=0';
             }
         }
         $result = Database::query($sql);
@@ -1191,7 +1191,7 @@ 
 
         // course independent categories
         if (empty($course_code)) {
-            $cats = Category::get_independent_categories_with_result_for_student (0, $stud_id, $cats);
+            $cats = Category::get_independent_categories_with_result_for_student(0, $stud_id, $cats);
         }
 
         return $cats;
@@ -1206,7 +1206,7 @@ 
     public function get_root_categories_for_teacher($user_id, $course_code = null, $session_id = null)
     {
         if ($user_id == null) {
-            return Category::load(null,null,$course_code,0,null,$session_id);
+            return Category::load(null, null, $course_code, 0, null, $session_id);
         }
 
         $courseTable = Database :: get_main_table(TABLE_MAIN_COURSE);
@@ -1218,7 +1218,7 @@ 
         if (!empty($course_code)) {
             $sql .= " AND course_code = '".Database::escape_string($course_code)."' ";
             if (!empty($session_id)) {
-                $sql .= " AND session_id = ".(int)$session_id;
+                $sql .= " AND session_id = ".(int) $session_id;
             }
         } else {
             $sql .= ' AND course_code in
@@ -1234,7 +1234,7 @@ 
         $cats = Category::create_category_objects_from_sql_result($result);
         // course independent categories
         if (isset($course_code)) {
-            $indcats = Category::load(null,$user_id,$course_code,0,null,$session_id);
+            $indcats = Category::load(null, $user_id, $course_code, 0, null, $session_id);
             $cats = array_merge($cats, $indcats);
         }
 
@@ -1277,20 +1277,20 @@ 
             $targets[] = $root;
 
             if (isset($this->course_code) && !empty($this->course_code)) {
-                $crscats = Category::load(null,null,$this->course_code,0);
+                $crscats = Category::load(null, null, $this->course_code, 0);
                 foreach ($crscats as $cat) {
                     if ($this->can_be_moved_to_cat($cat)) {
-                        $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                        $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                        $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                        $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
                     }
                 }
             }
 
-            $indcats = Category::load(null,$user,0,0);
+            $indcats = Category::load(null, $user, 0, 0);
             foreach ($indcats as $cat) {
                 if ($this->can_be_moved_to_cat($cat)) {
-                    $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                    $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                    $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                    $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
                 }
             }
 
@@ -1303,11 +1303,11 @@ 
      */
     private function add_target_subcategories($targets, $level, $catid)
     {
-        $subcats = Category::load(null,null,null,$catid);
+        $subcats = Category::load(null, null, null, $catid);
         foreach ($subcats as $cat) {
             if ($this->can_be_moved_to_cat($cat)) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
             }
         }
 
@@ -1320,7 +1320,7 @@ 
      * Impossible when origin and target are the same... children won't be processed
      * either. (a category can't be moved to one of its own children)
      */
-    private function can_be_moved_to_cat ($cat)
+    private function can_be_moved_to_cat($cat)
     {
         return $cat->get_id() != $this->get_id();
     }
@@ -1349,7 +1349,7 @@ 
     {
         $cats = Category::load(null, null, null, $this->id, null);
         $evals = Evaluation::load(null, null, null, $this->id, null);
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
 
         foreach ($cats as $cat) {
             $cat->set_course_code($this->get_course_code());
@@ -1382,15 +1382,15 @@ 
             $user = (api_is_platform_admin() ? null : api_get_user_id());
             $cats = Category::get_root_categories_for_teacher($user);
             foreach ($cats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),null);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), null);
             }
         } else {
             // student
             $cats = Category::get_root_categories_for_student(api_get_user_id());
             foreach ($cats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(), 1);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), 1);
             }
         }
 
@@ -1400,14 +1400,14 @@ 
     /**
      * Internal function used by get_tree()
      */
-    private function add_subtree ($targets, $level, $catid, $visible)
+    private function add_subtree($targets, $level, $catid, $visible)
     {
-        $subcats = Category::load(null,null,null,$catid,$visible);
+        $subcats = Category::load(null, null, null, $catid, $visible);
 
         if (!empty($subcats)) {
             foreach ($subcats as $cat) {
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),$visible);
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), $visible);
             }
         }
 
@@ -1418,7 +1418,7 @@ 
      * Generate an array of courses that a teacher hasn't created a category for.
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
-    public function get_not_created_course_categories ($user_id)
+    public function get_not_created_course_categories($user_id)
     {
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1440,9 +1440,9 @@ 
                 )';
         $result = Database::query($sql);
 
-        $cats=array();
-        while ($data=Database::fetch_array($result)) {
-            $cats[] = array ($data['code'], $data['title']);
+        $cats = array();
+        while ($data = Database::fetch_array($result)) {
+            $cats[] = array($data['code'], $data['title']);
         }
 
         return $cats;
@@ -1452,7 +1452,7 @@ 
      * Generate an array of all courses that a teacher is admin of.
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
      */
-    public function get_all_courses ($user_id)
+    public function get_all_courses($user_id)
     {
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1466,7 +1466,7 @@ 
         $result = Database::query($sql);
         $cats = array();
         while ($data = Database::fetch_array($result)) {
-            $cats[] = array ($data['code'], $data['title']);
+            $cats[] = array($data['code'], $data['title']);
         }
 
         return $cats;
@@ -1479,7 +1479,7 @@ 
     {
         $cats = Category::load(null, null, null, $this->id, null);
         $evals = Evaluation::load(null, null, null, $this->id, null);
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
         if (!empty($cats)) {
             foreach ($cats as $cat) {
                 $cat->set_visible($this->is_visible());
@@ -1834,7 +1834,7 @@ 
      * @param string $name_mask search string
      * @return array category objects matching the search criterium
      */
-    public function find_category($name_mask,$allcat)
+    public function find_category($name_mask, $allcat)
     {
         $foundcats = array();
         foreach ($allcat as $search_cat) {
@@ -1877,9 +1877,9 @@ 
                 }
             }
 
-            $link_to_lock= $this->get_links();
+            $link_to_lock = $this->get_links();
             if (!empty($link_to_lock)) {
-                foreach ($link_to_lock as $item ) {
+                foreach ($link_to_lock as $item) {
                     $item->lock($locked);
                 }
             }
@@ -1968,7 +1968,7 @@ 
                 return [
                     'badge_link' => Display::url(
                         get_lang('DownloadBadges'),
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
                         array(
                             'target' => '_blank',
                             'class' => 'btn btn-default'
@@ -2002,7 +2002,7 @@ 
             $fileWasGenerated = $certificate_obj->html_file_is_generated();
 
             if (!empty($fileWasGenerated)) {
-                $url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $my_certificate['id'];
+                $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$my_certificate['id'];
 
                 $certificates = Display::url(
                     Display::returnFontAwesomeIcon('download').' '.get_lang('DownloadCertificate'),
@@ -2025,7 +2025,7 @@ 
 
                 $hideExportLink = api_get_setting('hide_certificate_export_link');
                 $hideExportLinkStudent = api_get_setting('hide_certificate_export_link_students');
-                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true') ) {
+                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true')) {
                     $exportToPDF = null;
                 }
 
@@ -2038,7 +2038,7 @@ 
                 if ($skillToolEnabled && $userHasSkills) {
                     $html['badge_link'] = Display::url(
                         get_lang('DownloadBadges'),
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
                         array(
                             'target' => '_blank',
                             'class' => 'btn btn-default'
@@ -2098,7 +2098,7 @@ 
                     $certificate_obj = new Certificate($value_certificate['id']);
                     $certificate_obj->generate(array('hide_print_button' => true));
                     if ($certificate_obj->html_file_is_generated()) {
-                        $certificate_path_list[]= $certificate_obj->html_file;
+                        $certificate_path_list[] = $certificate_obj->html_file;
                     }
                 }
             }

Braces +1 added lines, -1 removed lines

@@ -1179,7 +1179,7 @@
                             cu.status = '.COURSEMANAGER.'
                     )';
             }
-        }elseif (api_is_platform_admin()) {
+        } elseif (api_is_platform_admin()) {
             if (isset($session_id) && $session_id!=0) {
                 $sql.=' AND session_id='.intval($session_id);
             } else {

Doc Comments +1 added lines, -1 removed lines

@@ -1545,7 +1545,7 @@
      * Retrieve all categories inside a course independent category
      * that should be visible to a student.
      * @param integer $cat_id parent category
-     * @param $stud_id student id
+     * @param integer $stud_id student id
      * @param $cats optional: if defined, the categories will be added to this array
      */
     public function get_independent_categories_with_result_for_student($cat_id, $stud_id, $cats = array())

main/gradebook/lib/be/attendancelink.class.php

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,7 @@ 
             }
 		} else {
             // all students -> get average
-            $students = array();  // user list, needed to make sure we only
+            $students = array(); // user list, needed to make sure we only
             // take first attempts into account
             $rescount = 0;
             $sum = 0;
@@ -239,7 +239,7 @@ 
 		$this->get_attendance_data();
 		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
 		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+		if (isset($attendance_qualify_title) && $attendance_qualify_title != '') {
 			return $this->attendance_data['attendance_qualify_title'];
 		} else {
 			return $attendance_title;
@@ -279,7 +279,7 @@ 
 		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
 		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
+		$row = Database::fetch_array($result, 'ASSOC');
 		$attendance_id = $row['id'];
 		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
 

Indentation +202 added lines, -202 removed lines

@@ -8,48 +8,48 @@ 
  */
 class AttendanceLink extends AbstractLink
 {
-	private $attendance_table = null;
-	private $itemprop_table = null;
+    private $attendance_table = null;
+    private $itemprop_table = null;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_ATTENDANCE);
-	}
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_ATTENDANCE);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_type_name()
-	{
-		return get_lang('Attendance');
-	}
+    /**
+     * @return string
+     */
+    public function get_type_name()
+    {
+        return get_lang('Attendance');
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
 
-	/**
-	 * Generate an array of attendances that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 * @todo seems to be depracated
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+    /**
+     * Generate an array of attendances that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     * @todo seems to be depracated
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 
-		$sql = 'SELECT att.id, att.name, att.attendance_qualify_title
+        $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
 				FROM '.$this->get_attendance_table().' att
 				WHERE
 					att.c_id = '.$this->course_id.' AND
@@ -60,7 +60,7 @@ 
 							course_code = "'.Database::escape_string($this->get_course_code()).'"
 					)
 				AND att.session_id='.api_get_session_id().'';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         $cats = array();
         while ($data = Database::fetch_array($result)) {
@@ -71,13 +71,13 @@ 
             }
         }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
-	/**
-	 * Generate an array of all attendances available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
+    /**
+     * Generate an array of all attendances available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
     public function get_all_links()
     {
         if (empty($this->course_code)) {
@@ -104,55 +104,55 @@ 
         $my_cats = isset($cats) ? $cats : null;
 
         return $my_cats;
-	}
+    }
 
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
 				WHERE
 					session_id = $session_id AND
 					c_id = '.$this->course_id.' AND
 					attendance_id = '".intval($this->get_ref_id())."'";
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
 
-		return $number[0] != 0;
-	}
+        return $number[0] != 0;
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
 
-		// get attendance qualify max
-		$sql = 'SELECT att.attendance_qualify_max
+        // get attendance qualify max
+        $sql = 'SELECT att.attendance_qualify_max
 		        FROM '.$this->get_attendance_table().' att
   				WHERE
   					att.c_id = '.$this->course_id.' AND
   					att.id = '.intval($this->get_ref_id()).' AND
   					att.session_id='.intval($session_id).'';
-		$query = Database::query($sql);
-		$attendance = Database::fetch_array($query, 'ASSOC');
+        $query = Database::query($sql);
+        $attendance = Database::fetch_array($query, 'ASSOC');
 
-		// Get results
-		$sql = 'SELECT *
+        // Get results
+        $sql = 'SELECT *
 		        FROM '.$tbl_attendance_result.'
   	    		WHERE c_id = '.$this->course_id.' AND attendance_id = '.intval($this->get_ref_id());
-		if (isset($stud_id)) {
-			$sql .= ' AND user_id = '.intval($stud_id);
-		}
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
+        if (isset($stud_id)) {
+            $sql .= ' AND user_id = '.intval($stud_id);
+        }
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
             if ($data = Database::fetch_array($scores, 'ASSOC')) {
                 return array(
                     $data['score'],
@@ -162,7 +162,7 @@ 
                 //We sent the 0/attendance_qualify_max instead of null for correct calculations
                 return array(0, $attendance['attendance_qualify_max']);
             }
-		} else {
+        } else {
             // all students -> get average
             $students = array();  // user list, needed to make sure we only
             // take first attempts into account
@@ -171,144 +171,144 @@ 
             $sumResult = 0;
             $bestResult = 0;
 
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($attendance['attendance_qualify_max'] != 0) {
-						$students[$data['user_id']] = $data['score'];
-						$rescount++;
-						$sum += $data['score'] / $attendance['attendance_qualify_max'];
-						$sumResult += $data['score'];
-						if ($data['score'] > $bestResult) {
-							$bestResult = $data['score'];
-						}
-						$weight = $attendance['attendance_qualify_max'];
-					}
-				}
-			}
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($attendance['attendance_qualify_max'] != 0) {
+                        $students[$data['user_id']] = $data['score'];
+                        $rescount++;
+                        $sum += $data['score'] / $attendance['attendance_qualify_max'];
+                        $sumResult += $data['score'];
+                        if ($data['score'] > $bestResult) {
+                            $bestResult = $data['score'];
+                        }
+                        $weight = $attendance['attendance_qualify_max'];
+                    }
+                }
+            }
 
-			if ($rescount == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult / $rescount, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
+            if ($rescount == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult / $rescount, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
 
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_attendance_table()
-	{
-		$this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
-		return $this->attendance_table;
-	}
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_attendance_table()
+    {
+        $this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
+        return $this->attendance_table;
+    }
 
-	public function needs_name_and_description()
-	{
-		return false;
-	}
+    public function needs_name_and_description()
+    {
+        return false;
+    }
 
-	public function needs_max()
-	{
-		return false;
-	}
+    public function needs_max()
+    {
+        return false;
+    }
 
-	public function needs_results()
-	{
-		return false;
-	}
+    public function needs_results()
+    {
+        return false;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_attendance_data();
-		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
-		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
-			return $this->attendance_data['attendance_qualify_title'];
-		} else {
-			return $attendance_title;
-		}
-	}
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_attendance_data();
+        $attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
+        $attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
+        if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+            return $this->attendance_data['attendance_qualify_title'];
+        } else {
+            return $attendance_title;
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return '';
-	}
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return '';
+    }
 
-	/**
-	 * Check if this still links to an exercise
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
+    /**
+     * Check if this still links to an exercise
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
         		 WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
 
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
 
-	public function get_link()
-	{
-		//it was extracts the attendance id
-		$session_id = api_get_session_id();
-		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    public function get_link()
+    {
+        //it was extracts the attendance id
+        $session_id = api_get_session_id();
+        $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
-		$attendance_id = $row['id'];
-		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result,'ASSOC');
+        $attendance_id = $row['id'];
+        $url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
 
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * @return array|bool
-	 */
-	private function get_attendance_data()
-	{
-		$tbl_name = $this->get_attendance_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->attendance_data)) {
-			$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    /**
+     * @return array|bool
+     */
+    private function get_attendance_data()
+    {
+        $tbl_name = $this->get_attendance_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->attendance_data)) {
+            $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
 					WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-			$query = Database::query($sql);
-			$this->attendance_data = Database::fetch_array($query);
-		}
-		return $this->attendance_data;
-	}
+            $query = Database::query($sql);
+            $this->attendance_data = Database::fetch_array($query);
+        }
+        return $this->attendance_data;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_icon_name()
-	{
-		return 'attendance';
-	}
+    /**
+     * @return string
+     */
+    public function get_icon_name()
+    {
+        return 'attendance';
+    }
 }

main/gradebook/lib/be/evallink.class.php

Spacing +4 added lines, -4 removed lines

@@ -47,10 +47,10 @@ 
         $eval = $this->get_evaluation();
         // course/platform admin can go to the view_results page
         if (api_is_allowed_to_edit()) {
-            return 'gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } // students can go to the statistics page (if custom display enabled)
         elseif (ScoreDisplay :: instance()->is_custom()) {
-            return 'gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } else {
             return null;
         }
@@ -176,8 +176,8 @@ 
                 $eval = new Evaluation();
                 $eval->set_category_id(-1);
                 $eval->set_date(api_get_utc_datetime()); // these values will be changed
-                $eval->set_weight(0);    //   when the link setter
-                $eval->set_visible(0);   //     is called
+                $eval->set_weight(0); //   when the link setter
+                $eval->set_visible(0); //     is called
                 $eval->set_id(-1); // a 'real' id will be set when eval is added to db
                 $eval->set_user_id($this->get_user_id());
                 $eval->set_course_code($this->get_course_code());

Doc Comments +9 added lines

@@ -117,6 +117,9 @@ 
         }
     }
 
+    /**
+     * @param string $name
+     */
     public function set_name($name)
     {
         if ($this->is_valid_link()) {
@@ -124,6 +127,9 @@ 
         }
     }
 
+    /**
+     * @param string $description
+     */
     public function set_description($description)
     {
         if ($this->is_valid_link()) {
@@ -131,6 +137,9 @@ 
         }
     }
 
+    /**
+     * @param integer $max
+     */
     public function set_max($max)
     {
         if ($this->is_valid_link()) {

main/gradebook/lib/be/surveylink.class.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 			$links[] = array(
 				$data['survey_id'],
 				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
+					$data['code'].': '.self::html_to_text($data['title']),
 					80
 				)
 			);
@@ -121,7 +121,7 @@ 
 	/**
 	 * Has anyone done this survey yet?
 	 */
-	public function has_results($stud_id=null)
+	public function has_results($stud_id = null)
 	{
 		$ref_id = intval($this->get_ref_id());
 		$session_id = api_get_session_id();

Indentation +246 added lines, -246 removed lines

@@ -8,98 +8,98 @@ 
  */
 class SurveyLink extends AbstractLink
 {
-	private $survey_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_SURVEY);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_survey_data();
+    private $survey_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_SURVEY);
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_survey_data();
 		
-		return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
-	}
-
-	public function get_description()
-	{
-		$this->get_survey_data();
-		return $this->survey_data['subtitle'];
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Survey');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	/**
-	 * Generates an array of all surveys available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_all_links() : course code not set');
-		}
-		$tbl_survey = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		$course_id = api_get_course_int_id();
-		$sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
+        return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
+    }
+
+    public function get_description()
+    {
+        $this->get_survey_data();
+        return $this->survey_data['subtitle'];
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Survey');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    /**
+     * Generates an array of all surveys available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_all_links() : course code not set');
+        }
+        $tbl_survey = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        $course_id = api_get_course_int_id();
+        $sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
 				WHERE c_id = '.$course_id.' AND session_id = '.intval($session_id).'';
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
-					80
-				)
-			);
-		}
-
-		return isset($links) ? $links : null;
-	}
-
-	/**
-	 * Generates an array of surveys that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT survey_id, title, code
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str(
+                    $data['code'] . ': ' . self::html_to_text($data['title']),
+                    80
+                )
+            );
+        }
+
+        return isset($links) ? $links : null;
+    }
+
+    /**
+     * Generates an array of surveys that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT survey_id, title, code
     			FROM '.$this->get_survey_table().' AS srv
 				WHERE survey_id NOT IN
 					(
@@ -110,28 +110,28 @@ 
 					)
 					AND srv.session_id = '.api_get_session_id();
 
-		$result = Database::query($sql);
-
-		$links = array();
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
-			);
-		}
-		return $links;
-	}
-
-	/**
-	 * Has anyone done this survey yet?
-	 */
-	public function has_results($stud_id=null)
-	{
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
-		$sql = "SELECT
+        $result = Database::query($sql);
+
+        $links = array();
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
+            );
+        }
+        return $links;
+    }
+
+    /**
+     * Has anyone done this survey yet?
+     */
+    public function has_results($stud_id=null)
+    {
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $sql = "SELECT
 				COUNT(i.answered)
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i ON s.code = i.survey_code
@@ -141,30 +141,30 @@ 
 					s.survey_id = $ref_id AND
 					i.session_id = $session_id";
 
-		$sql_result = Database::query($sql);
-		$data = Database::fetch_array($sql_result);
+        $sql_result = Database::query($sql);
+        $data = Database::fetch_array($sql_result);
 
-		return ($data[0] != 0);
-	}
+        return ($data[0] != 0);
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		// Note: Max score is assumed to be always 1 for surveys,
-		// only student's participation is to be taken into account.
-		$max_score = 1;
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        // Note: Max score is assumed to be always 1 for surveys,
+        // only student's participation is to be taken into account.
+        $max_score = 1;
 
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
 
-		$get_individual_score = !is_null($stud_id);
+        $get_individual_score = !is_null($stud_id);
 
-		$sql = "SELECT i.answered
+        $sql = "SELECT i.answered
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i
 				ON s.code = i.survey_code
@@ -175,131 +175,131 @@ 
 					i.session_id = $session_id
 				";
 
-		if ($get_individual_score) {
-			$sql .= ' AND i.user = '.intval($stud_id);
-		}
-
-		$sql_result = Database::query($sql);
-
-		if ($get_individual_score) {
-			// for 1 student
-			if ($data = Database::fetch_array($sql_result)) {
-				return array($data['answered'] ? $max_score : 0, $max_score);
-			}
-			return array(0, $max_score);
-		} else {
-			// for all the students -> get average
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			while ($data = Database::fetch_array($sql_result)) {
-				$sum += $data['answered'] ? $max_score : 0;
-				$rescount++;
-				if ($data['answered'] > $bestResult) {
-					$bestResult = $data['answered'];
-					$weight = $assignment['qualification'];
-				}
-			}
-			$sum = $sum / $max_score;
-
-			if ($rescount == 0) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $rescount);
-					break;
-				case 'average':
-					return array($sum, $rescount);
-					break;
-				case 'ranking':
-					return null;
-					break;
-				default:
-					return array($sum, $rescount);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the surveys
-	 */
-	private function get_survey_table()
-	{
-		$this->survey_table = Database :: get_course_table(TABLE_SURVEY);
-		return $this->survey_table;
-	}
-
-	/**
-	 * Check if this still links to a survey
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
+        if ($get_individual_score) {
+            $sql .= ' AND i.user = '.intval($stud_id);
+        }
+
+        $sql_result = Database::query($sql);
+
+        if ($get_individual_score) {
+            // for 1 student
+            if ($data = Database::fetch_array($sql_result)) {
+                return array($data['answered'] ? $max_score : 0, $max_score);
+            }
+            return array(0, $max_score);
+        } else {
+            // for all the students -> get average
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            while ($data = Database::fetch_array($sql_result)) {
+                $sum += $data['answered'] ? $max_score : 0;
+                $rescount++;
+                if ($data['answered'] > $bestResult) {
+                    $bestResult = $data['answered'];
+                    $weight = $assignment['qualification'];
+                }
+            }
+            $sum = $sum / $max_score;
+
+            if ($rescount == 0) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $rescount);
+                    break;
+                case 'average':
+                    return array($sum, $rescount);
+                    break;
+                case 'ranking':
+                    return null;
+                    break;
+                default:
+                    return array($sum, $rescount);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the surveys
+     */
+    private function get_survey_table()
+    {
+        $this->survey_table = Database :: get_course_table(TABLE_SURVEY);
+        return $this->survey_table;
+    }
+
+    /**
+     * Check if this still links to a survey
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
         		 WHERE
         		 	c_id = '.$this->course_id.' AND
         		 	survey_id = '.intval($this->get_ref_id()).' AND
         		 	session_id='.intval($session_id).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
-			$tbl_name = $this->get_survey_table();
-			$session_id = api_get_session_id();
-			if ($tbl_name != '') {
-				$sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
+            $tbl_name = $this->get_survey_table();
+            $session_id = api_get_session_id();
+            if ($tbl_name != '') {
+                $sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
     					WHERE
     						c_id = '.$this->course_id.' AND
     						survey_id = '.intval($this->get_ref_id()).' AND
     						session_id = '.intval($session_id).' ';
-				$result = Database::query($sql);
-				$row = Database::fetch_array($result, 'ASSOC');
-				$survey_id = $row['survey_id'];
-				return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
-			}
-		}
-		return null;
-	}
-
-	private function get_survey_data()
-	{
-		$tbl_name = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->survey_data)) {
-			$sql = 'SELECT * FROM '.$tbl_name.'
+                $result = Database::query($sql);
+                $row = Database::fetch_array($result, 'ASSOC');
+                $survey_id = $row['survey_id'];
+                return api_get_path(WEB_PATH).'main/survey/reporting.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&survey_id='.$survey_id;
+            }
+        }
+        return null;
+    }
+
+    private function get_survey_data()
+    {
+        $tbl_name = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->survey_data)) {
+            $sql = 'SELECT * FROM '.$tbl_name.'
 					WHERE
 						c_id = '.$this->course_id.' AND
 						survey_id = '.intval($this->get_ref_id()).' AND
 						session_id='.intval($session_id).'';
-			$query = Database::query($sql);
-			$this->survey_data = Database::fetch_array($query);
-		}
-		return $this->survey_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'survey';
-	}
-
-	private static function html_to_text($string)
-	{
-		return strip_tags($string);
-		//return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
-	}
+            $query = Database::query($sql);
+            $this->survey_data = Database::fetch_array($query);
+        }
+        return $this->survey_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'survey';
+    }
+
+    private static function html_to_text($string)
+    {
+        return strip_tags($string);
+        //return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
+    }
 }