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/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

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())

Indentation -2 removed lines

@@ -1583,7 +1583,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)
@@ -1862,7 +1861,6 @@ 
      * This function, locks a category , only one who can unlock it is
      * the platform administrator.
      * @param int locked 1 or unlocked 0
-
      * @return boolean|null
      * */
     public function lock($locked)

Spacing +63 added lines, -63 removed lines

@@ -201,7 +201,7 @@ 
      */
     public function set_session_id($session_id = 0)
     {
-        $this->session_id = (int)$session_id;
+        $this->session_id = (int) $session_id;
     }
 
     /**
@@ -290,7 +290,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'];
             }
         }
@@ -324,7 +324,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;
@@ -337,7 +337,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) {
@@ -377,7 +377,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();
 
@@ -388,8 +388,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)) {
@@ -425,10 +425,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)) {
@@ -596,7 +596,7 @@ 
                             $default_weight = $default_weight_setting;
                         }
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -613,7 +613,7 @@ 
                 }
             }
 
-            $gradebook= new Gradebook();
+            $gradebook = new Gradebook();
             $gradebook->update_skills_to_gradebook($this->id, $this->get_skills(false));
 
             return $id;
@@ -678,7 +678,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();
 
@@ -688,7 +688,7 @@ 
             }
         }
 
-        $gradebook= new Gradebook();
+        $gradebook = new Gradebook();
         $gradebook->update_skills_to_gradebook(
             $this->id,
             $this->get_skills(false),
@@ -708,7 +708,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();
                 }
@@ -749,7 +749,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;
@@ -810,9 +810,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);
@@ -913,7 +913,7 @@ 
                     }
 
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
-                        $ressum += $score[0]/$score[1] * $catweight;
+                        $ressum += $score[0] / $score[1] * $catweight;
                     }
                 }
             }
@@ -1002,7 +1002,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;
@@ -1144,7 +1144,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";
                 }
@@ -1168,9 +1168,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
@@ -1184,10 +1184,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);
@@ -1195,7 +1195,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;
@@ -1213,7 +1213,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);
@@ -1225,7 +1225,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
@@ -1241,7 +1241,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);
         }
 
@@ -1284,20 +1284,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());
                 }
             }
 
@@ -1311,11 +1311,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());
             }
         }
 
@@ -1328,7 +1328,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();
     }
@@ -1357,7 +1357,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());
@@ -1390,15 +1390,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);
             }
         }
 
@@ -1410,14 +1410,14 @@ 
      * @param integer $level
      * @param null|integer $visible
      */
-    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);
             }
         }
 
@@ -1429,7 +1429,7 @@ 
      * @param integer $user_id
      * @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);
@@ -1451,9 +1451,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;
@@ -1464,7 +1464,7 @@ 
      * @param integer $user_id
      * @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);
@@ -1478,7 +1478,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;
@@ -1491,7 +1491,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());
@@ -1846,7 +1846,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) {
@@ -1889,9 +1889,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);
                 }
             }
@@ -1979,7 +1979,7 @@ 
                 return [
                     'badge_link' => Display::toolbarButton(
                         get_lang('ExportBadges'),
-                        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",
                         'external-link'
                     )
                 ];
@@ -2010,7 +2010,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::toolbarButton(get_lang('DisplayCertificate'), $url, 'eye', 'primary');
 
@@ -2026,7 +2026,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;
                 }
 
@@ -2039,7 +2039,7 @@ 
                 if ($skillToolEnabled && $userHasSkills) {
                     $html['badge_link'] = Display::toolbarButton(
                         get_lang('ExportBadges'),
-                        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",
                         'external-link'
                     );
                 }
@@ -2096,7 +2096,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;
                     }
                 }
             }

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));
+    }
 }

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

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      * @param string $name_mask search string
      * @return array link objects matching the search criterium
      */
-    public function find_links($name_mask,$selectcat)
+    public function find_links($name_mask, $selectcat)
     {
         return AbstractLink::find_links($name_mask, $selectcat);
     }
@@ -98,7 +98,7 @@ 
     public static function get_all_types()
     {
         //LINK_DROPBOX,
-        return array (
+        return array(
             LINK_EXERCISE,
             //LINK_DROPBOX,
             LINK_HOTPOTATOES,

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
     /**
      * Return an array of all known link types
-     * @return array
+     * @return integer[]
      */
     public static function get_all_types()
     {

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

Spacing +29 added lines, -29 removed lines

@@ -90,23 +90,23 @@ 
         if (is_null($id) && is_null($user_id) && !is_null($evaluation_id)) {
             // Verified_if_exist_evaluation
             $sql = 'SELECT COUNT(*) AS count
-                    FROM ' . $tbl_grade_results . '
-                    WHERE evaluation_id="' . Database::escape_string($evaluation_id) . '";';
+                    FROM ' . $tbl_grade_results.'
+                    WHERE evaluation_id="' . Database::escape_string($evaluation_id).'";';
             $result = Database::query($sql);
             $existEvaluation = Database::result($result, 0, 0);
 
             if ($existEvaluation != 0) {
                 if ($sessionId) {
                     $sql = 'SELECT c_id, user_id as user_id, status
-                            FROM ' . $tbl_session_rel_course_user . '
+                            FROM ' . $tbl_session_rel_course_user.'
 							WHERE
 							    status= 0 AND
-							    c_id = "' . api_get_course_int_id() . '" AND
+							    c_id = "' . api_get_course_int_id().'" AND
 							    session_id = ' . $sessionId;
                 } else {
                     $sql = 'SELECT c_id, user_id, status
-                            FROM ' . $tbl_course_rel_course . '
-                            WHERE status ="' . STUDENT . '" AND c_id = "' . api_get_course_int_id() . '" ';
+                            FROM ' . $tbl_course_rel_course.'
+                            WHERE status ="' . STUDENT.'" AND c_id = "'.api_get_course_int_id().'" ';
                 }
 
                 $res_course_rel_user = Database::query($sql);
@@ -116,15 +116,15 @@ 
                 $current_date = api_get_utc_datetime();
                 for ($i = 0; $i < count($list_user_course_list); $i++) {
                     $sql_verified = 'SELECT COUNT(*) AS count
-                                    FROM ' . $tbl_grade_results . '
+                                    FROM ' . $tbl_grade_results.'
                                     WHERE
-                                        user_id="' . intval($list_user_course_list[$i]['user_id']) . '" AND
-                                        evaluation_id="' . intval($evaluation_id) . '";';
+                                        user_id="' . intval($list_user_course_list[$i]['user_id']).'" AND
+                                        evaluation_id="' . intval($evaluation_id).'";';
                     $res_verified = Database::query($sql_verified);
                     $info_verified = Database::result($res_verified, 0, 0);
                     if ($info_verified == 0) {
-                        $sql_insert = 'INSERT INTO ' . $tbl_grade_results . '(user_id,evaluation_id,created_at,score)
-									   VALUES ("' . intval($list_user_course_list[$i]['user_id']) . '","' . intval($evaluation_id) . '","' . $current_date . '",0);';
+                        $sql_insert = 'INSERT INTO '.$tbl_grade_results.'(user_id,evaluation_id,created_at,score)
+									   VALUES ("' . intval($list_user_course_list[$i]['user_id']).'","'.intval($evaluation_id).'","'.$current_date.'",0);';
                         Database::query($sql_insert);
                     }
                 }
@@ -148,16 +148,16 @@ 
 
         $paramcount = 0;
         if (!empty($id)) {
-            $sql.= ' WHERE gr.id = ' . intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE gr.id = '.intval($id);
+            $paramcount++;
         }
         if (!empty($user_id)) {
             if ($paramcount != 0)
                 $sql .= ' AND';
             else
                 $sql .= ' WHERE';
-            $sql .= ' gr.user_id = ' . intval($user_id);
-            $paramcount ++;
+            $sql .= ' gr.user_id = '.intval($user_id);
+            $paramcount++;
         }
         if (!empty($evaluation_id)) {
             if ($paramcount != 0) {
@@ -165,8 +165,8 @@ 
             } else {
                 $sql .= ' WHERE';
             }
-            $sql .= ' gr.evaluation_id = ' . intval($evaluation_id);
-            $paramcount ++;
+            $sql .= ' gr.evaluation_id = '.intval($evaluation_id);
+            $paramcount++;
         }
         $sql .= ' ORDER BY u.lastname, u.firstname';
         $result = Database::query($sql);
@@ -191,17 +191,17 @@ 
     {
         if (isset($this->user_id) && isset($this->evaluation)) {
             $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-            $sql = "INSERT INTO " . $tbl_grade_results
+            $sql = "INSERT INTO ".$tbl_grade_results
                 . " (user_id, evaluation_id,
 					created_at";
             if (isset($this->score)) {
                 $sql .= ",score";
             }
             $sql .= ") VALUES
-					(" . (int) $this->get_user_id() . ", " . (int) $this->get_evaluation_id()
-                . ", '" . $this->get_date() . "' ";
+					(" . (int) $this->get_user_id().", ".(int) $this->get_evaluation_id()
+                . ", '".$this->get_date()."' ";
             if (isset($this->score)) {
-                $sql .= ", " . $this->get_score();
+                $sql .= ", ".$this->get_score();
             }
             $sql .= ")";
             Database::query($sql);
@@ -222,16 +222,16 @@ 
             $arr_result = $result->load(null, $userid, $evaluationid);
             $arr = get_object_vars($arr_result[0]);
 
-            $sql = 'INSERT INTO ' . $tbl_grade_results_log
+            $sql = 'INSERT INTO '.$tbl_grade_results_log
                 . ' (id_result,user_id, evaluation_id,created_at';
             if (isset($arr['score'])) {
                 $sql .= ',score';
             }
             $sql .= ') VALUES
-					(' . (int) $arr['id'] . ',' . (int) $arr['user_id'] . ', ' . (int) $arr['evaluation']
-                . ", '" . api_get_utc_datetime() . "'";
+					(' . (int) $arr['id'].','.(int) $arr['user_id'].', '.(int) $arr['evaluation']
+                . ", '".api_get_utc_datetime()."'";
             if (isset($arr['score'])) {
-                $sql .= ', ' . $arr['score'];
+                $sql .= ', '.$arr['score'];
             }
             $sql .= ')';
 
@@ -247,16 +247,16 @@ 
     public function save()
     {
         $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-        $sql = 'UPDATE ' . $tbl_grade_results . '
+        $sql = 'UPDATE '.$tbl_grade_results.'
                 SET user_id = ' . $this->get_user_id()
-            . ', evaluation_id = ' . $this->get_evaluation_id()
+            . ', evaluation_id = '.$this->get_evaluation_id()
             . ', score = ';
         if (isset($this->score)) {
             $sql .= $this->get_score();
         } else {
             $sql .= 'null';
         }
-        $sql .= ' WHERE id = ' . $this->id;
+        $sql .= ' WHERE id = '.$this->id;
         // no need to update creation date
         Database::query($sql);
     }
@@ -267,7 +267,7 @@ 
     public function delete()
     {
         $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-        $sql = 'DELETE FROM ' . $tbl_grade_results . ' WHERE id = ' . $this->id;
+        $sql = 'DELETE FROM '.$tbl_grade_results.' WHERE id = '.$this->id;
         Database::query($sql);
     }
 }

Braces +5 added lines, -4 removed lines

@@ -152,10 +152,11 @@
             $paramcount ++;
         }
         if (!empty($user_id)) {
-            if ($paramcount != 0)
-                $sql .= ' AND';
-            else
-                $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                            $sql .= ' AND';
+            } else {
+                            $sql .= ' WHERE';
+            }
             $sql .= ' gr.user_id = ' . intval($user_id);
             $paramcount ++;
         }

main/admin/course_request_accepted.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     $from = intval($from);
     $number_of_items = intval($number_of_items);
     $column = intval($column);
-    $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction;
+    $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
 
     $sql = "SELECT
                 id AS col0,

main/admin/ldap_import_students.php

Braces +1 added lines, -2 removed lines

@@ -269,8 +269,7 @@
     echo '<br /><br />';
     echo '</div>';
 
-}
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+} elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
 	$id=$_POST['username_form'];
 	$UserList=array();

Indentation +101 added lines, -101 removed lines

@@ -56,19 +56,19 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($course))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
-		echo get_lang('LDAPSelectFilterOnUsersOU');
-		//echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
-		///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
-
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
+        echo get_lang('LDAPSelectFilterOnUsersOU');
+        //echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
+        ///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
+
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 /*
@@ -200,71 +200,71 @@ 
 */
 elseif(!empty($annee) && empty($course))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="course">';
-	$courses = CourseManager::get_courses_list();
-	foreach($courses as $row)
-	{
-		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="course">';
+    $courses = CourseManager::get_courses_list();
+    foreach($courses as $row)
+    {
+        echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($course) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key ++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut=5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key ++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut=5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -272,27 +272,27 @@ 
 }
 elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['course']))
-	{
-		foreach($UserList as $user_id)
-		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
-		}
-		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
-	}
-	/*
+    $id=$_POST['username_form'];
+    $UserList=array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[]= $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['course']))
+    {
+        foreach($UserList as $user_id)
+        {
+            CourseManager::add_user_to_course($user_id,$_POST['course']);
+        }
+        header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -311,13 +311,13 @@ 
 		Display :: display_normal_message($message,false);
 	}
 	*/
-	else
-	{
-		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
-	}
-	echo '<br /><br />';
+    else
+    {
+        Display::display_header($tool_name);
+        $message=get_lang('NoUserAdded');
+        Display :: display_normal_message($message,false);
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

Spacing +17 added lines, -17 removed lines

@@ -6,7 +6,7 @@ 
  * Copyright (c) 2007 Mustapha Alouani (supervised by Michel Moreau-Belliard)
  */
 // resetting the course id
-$cidReset=true;
+$cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -15,11 +15,11 @@ 
 api_protect_admin_script();
 require('../auth/ldap/authldap.php');
 
-$annee_base=date('Y');
+$annee_base = date('Y');
 
 $tool_name = get_lang('LDAPImport');
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
 var buttoncheck = 1;
@@ -45,7 +45,7 @@ 
 
 $annee = $_GET['annee'];
 $composante = $_GET['composante'];
-$etape =  $_GET['etape'];
+$etape = $_GET['etape'];
 $course = $_POST['course'];
 
 
@@ -195,7 +195,7 @@ 
 	echo '</div>';
 }
 */
-elseif(!empty($annee) && empty($course))
+elseif (!empty($annee) && empty($course))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -203,7 +203,7 @@ 
 	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
 	echo '<select name="course">';
 	$courses = CourseManager::get_courses_list();
-	foreach($courses as $row)
+	foreach ($courses as $row)
 	{
 		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
 	}
@@ -236,7 +236,7 @@ 
 
 		$info = ldap_get_entries($ds, $sr);
 
-		for ($key = 0; $key < $info["count"]; $key ++) {
+		for ($key = 0; $key < $info["count"]; $key++) {
 			$nom_form[] = $info[$key]["sn"][0];
 			$prenom_form[] = $info[$key]["givenname"][0];
 			$email_form[] = $info[$key]["mail"][0];
@@ -256,7 +256,7 @@ 
 		asort($nom_form);
 		reset($nom_form);
 
-		$statut=5;
+		$statut = 5;
 		include ('ldap_form_add_users_group.php');
 	} else {
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -267,25 +267,25 @@ 
     echo '</div>';
 
 }
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+elseif (!empty($annee) && !empty($course) && ($_POST['confirmed'] == 'yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
+	$id = $_POST['username_form'];
+	$UserList = array();
 	$userid_match_login = array();
 	foreach ($id as $form_index=>$user_id)
 	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
 		{
 			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
+			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
 		}
 	}
 	if (!empty($_POST['course']))
 	{
-		foreach($UserList as $user_id)
+		foreach ($UserList as $user_id)
 		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
+			CourseManager::add_user_to_course($user_id, $_POST['course']);
 		}
 		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
 	}
@@ -311,8 +311,8 @@ 
 	else
 	{
 		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		$message = get_lang('NoUserAdded');
+		Display :: display_normal_message($message, false);
 	}
 	echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';