chamilo / chamilo-lms

main/inc/lib/skill.visualizer.lib.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
         $this->center_x = intval($offset_x + $this->canvas_x/2 - $this->block_size/2);
     }
 
+    /**
+     * @param string $class
+     */
     function prepare_skill_box($skill, $position, $class)
     {
         $block_id = $skill['id'];

Spacing +13 added lines, -13 removed lines

@@ -27,7 +27,7 @@ 
     {
         $this->skills   = $skills;
         $this->type     = $type;
-        $this->center_x = intval($offset_x + $this->canvas_x/2 - $this->block_size/2);
+        $this->center_x = intval($offset_x + $this->canvas_x / 2 - $this->block_size / 2);
     }
 
     function prepare_skill_box($skill, $position, $class)
@@ -39,9 +39,9 @@ 
             $extra_class = 'second_window';
         }
 
-        $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.'  '.$class.'" style = "top:' . $position['y'] . 'px; left:' . $position['x'] . 'px;">';
+        $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.'  '.$class.'" style = "top:'.$position['y'].'px; left:'.$position['x'].'px;">';
 
-        $content =  $skill['name'];
+        $content = $skill['name'];
         $content .= '<div class="btn-group">';
         $content .= Display::url(get_lang('Edit'), '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
         $content .= Display::url('+', '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
@@ -87,9 +87,9 @@ 
         }
         //default_arrow_color
 
-        $this->js .= 'var e'.$block_id.' = prepare("block_' . $block_id.'",  '.$end_point.');'."\n";
-        $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_' . $skill['parent_id'].'",  '.$end_point.');'."\n";
-        $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n";;
+        $this->js .= 'var e'.$block_id.' = prepare("block_'.$block_id.'",  '.$end_point.');'."\n";
+        $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_'.$skill['parent_id'].'",  '.$end_point.');'."\n";
+        $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n"; ;
     }
 
     /**
@@ -125,10 +125,10 @@ 
         $brothers = array();
 
         foreach ($this->skills as &$skill) {
-            if (!in_array($skill['parent_id'], array(0,1))) {
+            if (!in_array($skill['parent_id'], array(0, 1))) {
                 continue;
             }
-            $childs = isset($skill['children']) ? count($skill['children']) : 0 ;
+            $childs = isset($skill['children']) ? count($skill['children']) : 0;
 
             //$x = round($this->offsetX * sin(deg2rad($corner * $count)));
             //$y = round($this->offsetY * cos(deg2rad($corner * $count)));
@@ -144,10 +144,10 @@ 
             if ($skill['parent_id'] == 0) {
                 //$x = 130*$childs/2;
                 //$x = $this->space_between_blocks_x*$childs/2;
-                $x = $this->canvas_x/2  - $this->block_size/2;
+                $x = $this->canvas_x / 2 - $this->block_size / 2;
             } else {
                 $max = isset($this->skills[$skill['parent_id']]['children']) ? count($this->skills[$skill['parent_id']]['children']) : 0;
-                foreach($this->skills[$skill['parent_id']]['children'] as  $id => $sk) {
+                foreach ($this->skills[$skill['parent_id']]['children'] as  $id => $sk) {
                     if ($skill['id'] == $sk['id']) {
                         break;
                     }
@@ -155,17 +155,17 @@ 
                 }
                 $parent_x = isset($this->skills[$skill['parent_id']]['x']) ? $this->skills[$skill['parent_id']]['x'] : 0;
                 //$x = $my_count*$this->space_between_blocks_x + $parent_x  + $this->block_size - ($this->space_between_blocks_x*$max/2) ;
-                $x = $my_count*$this->space_between_blocks_x + $parent_x  + $this->block_size - ($this->canvas_x/2 ) ;
+                $x = $my_count * $this->space_between_blocks_x + $parent_x + $this->block_size - ($this->canvas_x / 2);
             }
 
-            $y = $skill['level']*$this->space_between_blocks_y;
+            $y = $skill['level'] * $this->space_between_blocks_y;
 
             $skill['x'] = $x;
             $skill['y'] = $y;
 
             //$skill['description']  = "{$brothers[$skill['parent_id']]} $x - $y";
             //$skill['name']  =  $skill['name']."  |  $x = $my_count * 150  +  $parent_x - (150* $max/2) - 10*$childs ";
-            $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y +$y));
+            $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y + $y));
         }
         return $this->get_html();
     }

main/inc/lib/social.lib.php

Doc Comments +14 added lines, -4 removed lines

@@ -63,6 +63,8 @@ 
      * @param int user id
      * @param int user friend id
      * @param string
+     * @param integer $user_id
+     * @param integer $user_friend
      * @author isaac flores paz
      */
     public static function get_relation_between_contacts($user_id, $user_friend)
@@ -94,6 +96,8 @@ 
      * @param int group id
      * @param string name to search
      * @param bool true will load firstname, lastname, and image name
+     * @param integer $user_id
+     * @param integer $id_group
      * @return array
      * @author Julio Montoya <gugli100@gmail.com> Cleaning code, function renamed, $load_extra_info option added
      * @author isaac flores paz
@@ -170,6 +174,9 @@ 
      * @param int user friend id
      * @param string title of the message
      * @param string content of the message
+     * @param integer $user_id
+     * @param string $message_title
+     * @param string $message_content
      * @return boolean
      * @author isaac flores paz
      * @author Julio Montoya <gugli100@gmail.com> Cleaning code
@@ -241,6 +248,7 @@ 
      * Get number messages of the inbox
      * @author isaac flores paz
      * @param int user receiver id
+     * @param integer $user_receiver_id
      * @return int
      */
     public static function get_message_number_invitation_by_user_id($user_receiver_id)
@@ -283,6 +291,7 @@ 
      * Get invitation list sent by user
      * @author Julio Montoya <gugli100@gmail.com>
      * @param int user id
+     * @param integer $user_id
      * @return array()
      */
     public static function get_list_invitation_sent_by_user_id($user_id)
@@ -325,6 +334,7 @@ 
      * Denies invitation
      * @param int user sender id
      * @param int user receiver id
+     * @param integer $user_receiver_id
      * @author isaac flores paz
      * @author Julio Montoya <gugli100@gmail.com> Cleaning code
      */
@@ -360,7 +370,7 @@ 
      * @author Isaac Flores Paz <isaac.flores.paz@gmail.com>
      * @author Julio Montoya <gugli100@gmail.com> Cleaning code
      * @param void
-     * @return string message invitation
+     * @return false|null message invitation
      */
     public static function send_invitation_friend_user($userfriend_id, $subject_message = '', $content_message = '')
     {
@@ -1229,7 +1239,7 @@ 
      * @param string $messageContent of the message
      * @param int $messageId id parent
      * @param string $messageStatus status type of message
-     * @return boolean
+     * @return false|string
      * @author Yannick Warnier
      */
     public static function sendWallMessage($userId, $friendId, $messageContent, $messageId = 0, $messageStatus = '')
@@ -1318,7 +1328,7 @@ 
      * Gets all messages from someone's wall (within specific limits)
      * @param int $userId id of wall shown
      * @param string $messageStatus status wall message
-     * @param int|string $parentId id message (Post main)
+     * @param integer|null $parentId id message (Post main)
      * @param date $start Date from which we want to show the messages, in UTC time
      * @param int $limit Limit for the number of parent messages we want to show
      * @param int $offset Wall message query offset
@@ -1647,7 +1657,7 @@ 
     /**
     * Delete messages delete logic
     * @param int $id id message to delete.
-    * @return bool status query
+    * @return Statement|null status query
     */
     public static function deleteMessage($id)
     {

Indentation +6 added lines, -6 removed lines

@@ -510,7 +510,7 @@ 
         if ($course_visibility != COURSE_VISIBILITY_HIDDEN &&
             ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER)
         ) {
-           $result .= '<span class="title">' . $course_title . '<span>';
+            $result .= '<span class="title">' . $course_title . '<span>';
         } else {
             $result .= $course_title." "." ".get_lang('CourseClosed')."";
         }
@@ -1414,7 +1414,7 @@ 
             }
             $media .= '<div class="user-image">';
             $media .= '<a href="'.$url.'" ><img src="'. $users[$userIdLoop]['avatar'] .
-                       '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
+                        '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
             $media .= '</div>';
             $media .= '<div class="user-data">';
             $media .= '<div class="username">' . '<a href="'.$url.'">'.$nameComplete.'</a></div>';
@@ -1645,10 +1645,10 @@ 
         return $name;
     }
     /**
-    * Delete messages delete logic
-    * @param int $id id message to delete.
-    * @return bool status query
-    */
+     * Delete messages delete logic
+     * @param int $id id message to delete.
+     * @return bool status query
+     */
     public static function deleteMessage($id)
     {
         $id = intval($id);

Braces +9 added lines, -5 removed lines

@@ -1631,11 +1631,11 @@ 
 
             if ($size == IMAGE_WALL_SMALL) {
                 $name = IMAGE_WALL_SMALL. '_' . $array[2];
-            }else if($size == IMAGE_WALL_MEDIUM){
+            } else if($size == IMAGE_WALL_MEDIUM){
                 $name = IMAGE_WALL_MEDIUM. '_' . $array[2];
-            }else if($size == IMAGE_WALL_BIG){
+            } else if($size == IMAGE_WALL_BIG){
                 $name = IMAGE_WALL_BIG. '_' . $array[2];
-            }else {
+            } else {
                 $name = IMAGE_WALL_SMALL. '_' . $array[2];
             }
             $lessImage = str_replace($array[2], '', $path);
@@ -1759,7 +1759,9 @@ 
             $friendHtml.= '<ul class="nav nav-list">';
             $j = 1;
             for ($k=0; $k < $number_friends; $k++) {
-                if ($j > $number_of_images) break;
+                if ($j > $number_of_images) {
+                    break;
+                }
 
                 if (isset($friends[$k])) {
                     $friend = $friends[$k];
@@ -1815,7 +1817,9 @@ 
             $friendHtml.= '<div class="list-group">';
             $j = 1;
             for ($k=0; $k < $number_friends; $k++) {
-                if ($j > $number_of_images) break;
+                if ($j > $number_of_images) {
+                    break;
+                }
 
                 if (isset($friends[$k])) {
                     $friend = $friends[$k];

Spacing +116 added lines, -116 removed lines

@@ -109,12 +109,12 @@ 
                     friend_user_id<>'.((int) $user_id).' AND
                     user_id='.((int) $user_id);
         if (isset($id_group) && $id_group > 0) {
-            $sql.=' AND relation_type='.$id_group;
+            $sql .= ' AND relation_type='.$id_group;
         }
         if (isset($search_name)) {
             $search_name = trim($search_name);
             $search_name = str_replace(' ', '', $search_name);
-            $sql.=' AND friend_user_id IN (
+            $sql .= ' AND friend_user_id IN (
                 SELECT user_id FROM '.$tbl_my_user.'
                 WHERE
                     firstName LIKE "%'.Database::escape_string($search_name).'%" OR
@@ -368,7 +368,7 @@ 
 
         $user_info = api_get_user_info($userfriend_id);
         $succes = get_lang('MessageSentTo');
-        $succes.= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
+        $succes .= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
 
         if (isset($subject_message) && isset($content_message) && isset($userfriend_id)) {
             $send_message = MessageManager::send_message($userfriend_id, $subject_message, $content_message);
@@ -485,7 +485,7 @@ 
         $user_in_course_status = CourseManager :: get_user_in_course_status(api_get_user_id(), $course_code);
 
         //$valor = api_get_settings_params();
-        $course_path = api_get_path(SYS_COURSE_PATH).$course_directory;   // course path
+        $course_path = api_get_path(SYS_COURSE_PATH).$course_directory; // course path
         if (api_get_setting('course_images_in_courses_list') === 'true') {
             if (file_exists($course_path.'/course-pic85x85.png')) {
                 $image = $my_course['course_info']['course_image'];
@@ -510,7 +510,7 @@ 
         if ($course_visibility != COURSE_VISIBILITY_HIDDEN &&
             ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER)
         ) {
-           $result .= '<span class="title">' . $course_title . '<span>';
+           $result .= '<span class="title">'.$course_title.'<span>';
         } else {
             $result .= $course_title." "." ".get_lang('CourseClosed')."";
         }
@@ -729,57 +729,57 @@ 
             $links = '<ul class="nav nav-pills nav-stacked">';
             $active = $show == 'home' ? 'active' : null;
             $links .= '
-                <li class="home-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/home.php">
-                        ' . $homeIcon . ' ' . get_lang('Home') . '
+                <li class="home-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/home.php">
+                        ' . $homeIcon.' '.get_lang('Home').'
                     </a>
                 </li>';
             $active = $show == 'messages' ? 'active' : null;
             $links .= '
-                <li class="messages-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'messages/inbox.php?f=social">
-                        ' . $messagesIcon . ' ' . get_lang('Messages') . $count_unread_message . '
+                <li class="messages-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'messages/inbox.php?f=social">
+                        ' . $messagesIcon.' '.get_lang('Messages').$count_unread_message.'
                     </a>
                 </li>';
 
             //Invitations
             $active = $show == 'invitations' ? 'active' : null;
             $links .= '
-                <li class="invitations-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/invitations.php">
-                        ' . $invitationsIcon . ' ' . get_lang('Invitations') . $total_invitations . '
+                <li class="invitations-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/invitations.php">
+                        ' . $invitationsIcon.' '.get_lang('Invitations').$total_invitations.'
                     </a>
                 </li>';
 
             //Shared profile and groups
             $active = $show == 'shared_profile' ? 'active' : null;
             $links .= '
-                <li class="shared-profile-icon' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php">
-                        ' . $sharedProfileIcon . ' ' . get_lang('ViewMySharedProfile') . '
+                <li class="shared-profile-icon' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/profile.php">
+                        ' . $sharedProfileIcon.' '.get_lang('ViewMySharedProfile').'
                     </a>
                 </li>';
             $active = $show == 'friends' ? 'active' : null;
             $links .= '
-                <li class="friends-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/friends.php">
-                        ' . $friendsIcon . ' ' . get_lang('Friends') . '
+                <li class="friends-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/friends.php">
+                        ' . $friendsIcon.' '.get_lang('Friends').'
                     </a>
                 </li>';
             $active = $show == 'browse_groups' ? 'active' : null;
             $links .= '
-                <li class="browse-groups-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/groups.php">
-                        ' . $groupsIcon . ' ' . get_lang('SocialGroups') . '
+                <li class="browse-groups-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/groups.php">
+                        ' . $groupsIcon.' '.get_lang('SocialGroups').'
                     </a>
                 </li>';
 
             //Search users
             $active = $show == 'search' ? 'active' : null;
             $links .= '
-                <li class="search-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/search.php">
-                        ' . $searchIcon . ' ' . get_lang('Search') . '
+                <li class="search-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/search.php">
+                        ' . $searchIcon.' '.get_lang('Search').'
                     </a>
                 </li>';
 
@@ -787,9 +787,9 @@ 
             $active = $show == 'myfiles' ? 'active' : null;
 
             $myFiles = '
-                <li class="myfiles-icon ' . $active . '">
-                    <a href="' . api_get_path(WEB_CODE_PATH) . 'social/myfiles.php">
-                        ' . $filesIcon . ' ' . get_lang('MyFiles') . '
+                <li class="myfiles-icon ' . $active.'">
+                    <a href="' . api_get_path(WEB_CODE_PATH).'social/myfiles.php">
+                        ' . $filesIcon.' '.get_lang('MyFiles').'
                     </a>
                 </li>';
 
@@ -798,7 +798,7 @@ 
             }
             $links .= $myFiles;
 
-            $links .='</ul>';
+            $links .= '</ul>';
             
             $html .= Display::panelCollapse(
                     get_lang('SocialNetwork'),
@@ -819,57 +819,57 @@ 
         }
 
         if ($show == 'shared_profile') {
-            $links =  '<ul class="nav nav-pills nav-stacked">';
+            $links = '<ul class="nav nav-pills nav-stacked">';
             // My own profile
             if ($show_full_profile && $user_id == intval(api_get_user_id())) {
                 $links .= '
-                    <li class="home-icon ' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/home.php">
-                            ' . $homeIcon . ' ' . get_lang('Home') . '
+                    <li class="home-icon ' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/home.php">
+                            ' . $homeIcon.' '.get_lang('Home').'
                         </a>
                     </li>
-                    <li class="messages-icon ' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'messages/inbox.php?f=social">
-                            ' . $messagesIcon . ' ' . get_lang('Messages') . $count_unread_message . '
+                    <li class="messages-icon ' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'messages/inbox.php?f=social">
+                            ' . $messagesIcon.' '.get_lang('Messages').$count_unread_message.'
                         </a>
                     </li>';
                 $active = $show == 'invitations' ? 'active' : null;
                 $links .= '
-                    <li class="invitations-icon' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/invitations.php">
-                            ' . $invitationsIcon . ' ' . get_lang('Invitations') . $total_invitations . '
+                    <li class="invitations-icon' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/invitations.php">
+                            ' . $invitationsIcon.' '.get_lang('Invitations').$total_invitations.'
                         </a>
                     </li>';
 
                 $links .= '
                     <li class="shared-profile-icon active">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php">
-                            ' . $sharedProfileIcon . ' ' . get_lang('ViewMySharedProfile') . '
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/profile.php">
+                            ' . $sharedProfileIcon.' '.get_lang('ViewMySharedProfile').'
                         </a>
                     </li>
                     <li class="friends-icon">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/friends.php">
-                            ' . $friendsIcon . ' ' . get_lang('Friends') . '
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/friends.php">
+                            ' . $friendsIcon.' '.get_lang('Friends').'
                         </a>
                     </li>
                     <li class="browse-groups-icon">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/groups.php">
-                            ' . $groupsIcon . ' ' . get_lang('SocialGroups') . '
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/groups.php">
+                            ' . $groupsIcon.' '.get_lang('SocialGroups').'
                         </a>
                     </li>';
                 $active = $show == 'search' ? 'active' : null;
                 $links .= '
-                    <li class="search-icon ' . $active . '">
-                        <a href="' . api_get_path(WEB_CODE_PATH) . 'social/search.php">
-                            ' . $searchIcon . ' ' . get_lang('Search') . '
+                    <li class="search-icon ' . $active.'">
+                        <a href="' . api_get_path(WEB_CODE_PATH).'social/search.php">
+                            ' . $searchIcon.' '.get_lang('Search').'
                         </a>
                     </li>';
                 $active = $show == 'myfiles' ? 'active' : null;
 
                 $myFiles = '
-                    <li class="myfiles-icon ' . $active . '">
-                     <a href="' . api_get_path(WEB_CODE_PATH) . 'social/myfiles.php">
-                            ' . $filesIcon . ' ' . get_lang('MyFiles') . '
+                    <li class="myfiles-icon ' . $active.'">
+                     <a href="' . api_get_path(WEB_CODE_PATH).'social/myfiles.php">
+                            ' . $filesIcon.' '.get_lang('MyFiles').'
                         </a>
                     </li>';
 
@@ -915,7 +915,7 @@ 
                 $links .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'social/invitations.php">'.Display::return_icon('invitation.png', get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
             } else {
                 if (!$show_full_profile) {
-                    $links .= '<li><a class="btn-to-send-invitation" href="#" data-send-to="' . $user_id . '" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
+                    $links .= '<li><a class="btn-to-send-invitation" href="#" data-send-to="'.$user_id.'" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('invitation.png', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';
                 }
             }
 
@@ -1027,10 +1027,10 @@ 
         foreach ($user_list as $uid) {
             $user_info = api_get_user_info($uid, $checkIfUserOnline = true);
             $lastname = $user_info['lastname'];
-            $firstname =  $user_info['firstname'];
+            $firstname = $user_info['firstname'];
             $completeName = $firstname.', '.$lastname;
 
-            $user_rol = $user_info['status'] == 1 ? Display::return_icon('teacher.png',get_lang('Teacher'),null,ICON_SIZE_TINY) : Display::return_icon('user.png',get_lang('Student'),null,ICON_SIZE_TINY);
+            $user_rol = $user_info['status'] == 1 ? Display::return_icon('teacher.png', get_lang('Teacher'), null, ICON_SIZE_TINY) : Display::return_icon('user.png', get_lang('Student'), null, ICON_SIZE_TINY);
             $status_icon_chat = null;
             if ($user_info['user_is_online_in_chat'] == 1) {
                 $status_icon_chat = Display::return_icon('online.png', get_lang('Online'));
@@ -1042,7 +1042,7 @@ 
             $officialCode = '<div class="items-user-official-code"><p style="min-height: 30px;" title="'.get_lang('OfficialCode').'">'.$user_info['official_code'].'</p></div>';
             $img = '<img class="img-responsive img-circle" title="'.$completeName.'" alt="'.$completeName.'" src="'.$userPicture.'">';
 
-            $url =  null;
+            $url = null;
             // Anonymous users can't have access to the profile
             if (!api_is_anonymous()) {
                 if (api_get_setting('allow_social_tool') == 'true') {
@@ -1209,13 +1209,13 @@ 
             case SOCIAL_CENTER_PLUGIN:
                 $social_plugins = array(1, 2);
                 if (is_array($social_plugins) && count($social_plugins) > 0) {
-                    $content.= '<div id="social-plugins">';
+                    $content .= '<div id="social-plugins">';
                     foreach ($social_plugins as $plugin) {
-                        $content.= '<div class="social-plugin-item">';
-                        $content.= $plugin;
-                        $content.= '</div>';
+                        $content .= '<div class="social-plugin-item">';
+                        $content .= $plugin;
+                        $content .= '</div>';
                     }
-                    $content.= '</div>';
+                    $content .= '</div>';
                 }
                 break;
             case SOCIAL_LEFT_PLUGIN:
@@ -1283,12 +1283,12 @@ 
         if (!in_array($extension, $allowedTypes)) {
             $flag = false;
         } else {
-            $newFileName = uniqid('') . '.' . $extension;
+            $newFileName = uniqid('').'.'.$extension;
             if (!file_exists($pathMessageAttach)) {
                 @mkdir($pathMessageAttach, api_get_permissions_for_new_directories(), true);
             }
 
-            $newPath = $pathMessageAttach . $newFileName;
+            $newPath = $pathMessageAttach.$newFileName;
             if (is_uploaded_file($fileAttach['tmp_name'])) {
                 @copy($fileAttach['tmp_name'], $newPath);
             }
@@ -1297,9 +1297,9 @@ 
             $medium = self::resize_picture($newPath, IMAGE_WALL_MEDIUM_SIZE);
 
             $big = new Image($newPath);
-            $ok = $small && $small->send_image($pathMessageAttach . IMAGE_WALL_SMALL . '_' . $newFileName) &&
-                $medium && $medium->send_image($pathMessageAttach . IMAGE_WALL_MEDIUM .'_' . $newFileName) &&
-                $big && $big->send_image($pathMessageAttach . IMAGE_WALL_BIG . '_' . $newFileName);
+            $ok = $small && $small->send_image($pathMessageAttach.IMAGE_WALL_SMALL.'_'.$newFileName) &&
+                $medium && $medium->send_image($pathMessageAttach.IMAGE_WALL_MEDIUM.'_'.$newFileName) &&
+                $big && $big->send_image($pathMessageAttach.IMAGE_WALL_BIG.'_'.$newFileName);
 
             // Insert
             $newFileName = $social.$newFileName;
@@ -1390,7 +1390,7 @@ 
             $start = '0000-00-00';
         }
 
-        $isOwnWall = (api_get_user_id() == $userId  && $userId == $friendId);
+        $isOwnWall = (api_get_user_id() == $userId && $userId == $friendId);
         $messages = self::getWallMessages($userId, MESSAGE_STATUS_WALL, $idMessage, $start, $limit, $offset);
         $formattedList = '<div class="sub-mediapost">';
         $users = array();
@@ -1405,8 +1405,8 @@ 
             }
 
             $nameComplete = api_is_western_name_order()
-                ? $users[$userIdLoop]['firstname'] .' ' . $users[$userIdLoop]['lastname']
-                : $users[$userIdLoop]['lastname'] . ' ' . $users[$userIdLoop]['firstname'];
+                ? $users[$userIdLoop]['firstname'].' '.$users[$userIdLoop]['lastname']
+                : $users[$userIdLoop]['lastname'].' '.$users[$userIdLoop]['firstname'];
             $url = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$userIdLoop;
             $media = '';
             $media .= '<div class="rep-post">';
@@ -1417,11 +1417,11 @@ 
                 $media .= '</div>';
             }
             $media .= '<div class="user-image">';
-            $media .= '<a href="'.$url.'" ><img src="'. $users[$userIdLoop]['avatar'] .
+            $media .= '<a href="'.$url.'" ><img src="'.$users[$userIdLoop]['avatar'].
                        '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
             $media .= '</div>';
             $media .= '<div class="user-data">';
-            $media .= '<div class="username">' . '<a href="'.$url.'">'.$nameComplete.'</a></div>';
+            $media .= '<div class="username">'.'<a href="'.$url.'">'.$nameComplete.'</a></div>';
             $media .= '<div class="time timeago" title="'.$date.'">'.$date.'</div>';
             $media .= '</div>';
             $media .= '<div class="msg-content">';
@@ -1456,12 +1456,12 @@ 
      * @param   int     $offset     Wall messages offset
      * @return  array   $data       return user's starting wall messages along with message extra data
      */
-    public static function getWallMessagesPostHTML($userId, $friendId = 0, $start = null, $limit = 10, $offset= 0)
+    public static function getWallMessagesPostHTML($userId, $friendId = 0, $start = null, $limit = 10, $offset = 0)
     {
         if (empty($start)) {
             $start = '0000-00-00';
         }
-        $isOwnWall = (api_get_user_id() == $userId  && $userId == $friendId);
+        $isOwnWall = (api_get_user_id() == $userId && $userId == $friendId);
         $messages = self::getWallMessages($userId, MESSAGE_STATUS_WALL_POST, null, $start, $limit, $offset);
         $users = array();
         $data = array();
@@ -1520,7 +1520,7 @@ 
 
         $htmlReceiver = '';
         if ($authorId != $receiverId) {
-            $htmlReceiver = ' > <a href="'.$urlReceiver.'">' . $nameCompleteReceiver . '</a> ';
+            $htmlReceiver = ' > <a href="'.$urlReceiver.'">'.$nameCompleteReceiver.'</a> ';
         }
 
         $wallImage = '';
@@ -1555,7 +1555,7 @@ 
         $html .= '<div class="img-post">';
         $html .= $wallImage;
         $html .= '</div>';
-        $html .= '<p>'. Security::remove_XSS($message['content']).'</p>';
+        $html .= '<p>'.Security::remove_XSS($message['content']).'</p>';
         $html .= '</div>';
         $html .= '</div>'; // end mediaPost
 
@@ -1578,11 +1578,11 @@ 
         $domain = empty($url) ? parse_url($link) : parse_url($url);
         $domain = $domain['scheme'].'://'.$domain['host'];
         // Trick to verify if the Image Url Exist because of some bad metatag dev
-        if (self::verifyUrl($image) == false){
-            if (!($image[0] == '/')){
-                $domain = $domain . '/';
+        if (self::verifyUrl($image) == false) {
+            if (!($image[0] == '/')) {
+                $domain = $domain.'/';
             }
-            $image = $domain . $image;
+            $image = $domain.$image;
         }
         $title = $graph->title;
         
@@ -1634,16 +1634,16 @@ 
         if (isset($array[2]) && !empty($array[2])) {
 
             if ($size == IMAGE_WALL_SMALL) {
-                $name = IMAGE_WALL_SMALL. '_' . $array[2];
-            }else if($size == IMAGE_WALL_MEDIUM){
-                $name = IMAGE_WALL_MEDIUM. '_' . $array[2];
-            }else if($size == IMAGE_WALL_BIG){
-                $name = IMAGE_WALL_BIG. '_' . $array[2];
-            }else {
-                $name = IMAGE_WALL_SMALL. '_' . $array[2];
+                $name = IMAGE_WALL_SMALL.'_'.$array[2];
+            } else if ($size == IMAGE_WALL_MEDIUM) {
+                $name = IMAGE_WALL_MEDIUM.'_'.$array[2];
+            } else if ($size == IMAGE_WALL_BIG) {
+                $name = IMAGE_WALL_BIG.'_'.$array[2];
+            } else {
+                $name = IMAGE_WALL_SMALL.'_'.$array[2];
             }
             $lessImage = str_replace($array[2], '', $path);
-            $name = $lessImage . $name;
+            $name = $lessImage.$name;
         }
 
         return $name;
@@ -1752,18 +1752,18 @@ 
         if ($number_friends != 0) {
             if ($number_friends > $number_of_images) {
                 if (api_get_user_id() == $user_id) {
-                    $friendHtml.= ' <span><a href="friends.php">'.get_lang('SeeAll').'</a></span>';
+                    $friendHtml .= ' <span><a href="friends.php">'.get_lang('SeeAll').'</a></span>';
                 } else {
-                    $friendHtml.= ' <span>'
+                    $friendHtml .= ' <span>'
                         .'<a href="'.api_get_path(WEB_CODE_PATH).'social/profile_friends_and_groups.inc.php'
                         .'?view=friends&height=390&width=610&user_id='.$user_id.'"'
                         .'class="ajax" data-title="'.get_lang('SeeAll').'" title="'.get_lang('SeeAll').'" >'.get_lang('SeeAll').'</a></span>';
                 }
             }
 
-            $friendHtml.= '<ul class="nav nav-list">';
+            $friendHtml .= '<ul class="nav nav-list">';
             $j = 1;
-            for ($k=0; $k < $number_friends; $k++) {
+            for ($k = 0; $k < $number_friends; $k++) {
                 if ($j > $number_of_images) break;
 
                 if (isset($friends[$k])) {
@@ -1777,26 +1777,26 @@ 
                         $statusIcon = Display::span('', array('class' => 'offline_user_in_text'));
                     }
 
-                    $friendHtml.= '<li>';
-                    $friendHtml.= '<div>';
+                    $friendHtml .= '<li>';
+                    $friendHtml .= '<div>';
 
                     // the height = 92 must be the same in the image_friend_network span style in default.css
                     $friends_profile = UserManager::getUserPicture($friend['friend_user_id'], USER_IMAGE_SIZE_SMALL);
-                    $friendHtml.= '<img src="'.$friends_profile.'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'"/>';
+                    $friendHtml .= '<img src="'.$friends_profile.'" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$name_user.'"/>';
                     $link_shared = (empty($link_shared)) ? '' : '&'.$link_shared;
-                    $friendHtml.= $statusIcon .'<a href="profile.php?' .'u=' . $friend['friend_user_id'] . $link_shared . '">' . $name_user .'</a>';
-                    $friendHtml.= '</div>';
-                    $friendHtml.= '</li>';
+                    $friendHtml .= $statusIcon.'<a href="profile.php?'.'u='.$friend['friend_user_id'].$link_shared.'">'.$name_user.'</a>';
+                    $friendHtml .= '</div>';
+                    $friendHtml .= '</li>';
                 }
                 $j++;
             }
-            $friendHtml.='</ul>';
+            $friendHtml .= '</ul>';
         } else {
-            $friendHtml.= '<div class="">'.get_lang('NoFriendsInYourContactList').'<br />'
-                .'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '. get_lang('TryAndFindSomeFriends').'</a></div>';
+            $friendHtml .= '<div class="">'.get_lang('NoFriendsInYourContactList').'<br />'
+                .'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '.get_lang('TryAndFindSomeFriends').'</a></div>';
         }
 
-        $friendHtml = Display::panel($friendHtml, get_lang('SocialFriend').' (' . $number_friends . ')' );
+        $friendHtml = Display::panel($friendHtml, get_lang('SocialFriend').' ('.$number_friends.')');
 
         return $friendHtml;
     }
@@ -1817,9 +1817,9 @@ 
 
         if ($number_friends != 0) {
 
-            $friendHtml.= '<div class="list-group">';
+            $friendHtml .= '<div class="list-group">';
             $j = 1;
-            for ($k=0; $k < $number_friends; $k++) {
+            for ($k = 0; $k < $number_friends; $k++) {
                 if ($j > $number_of_images) break;
 
                 if (isset($friends[$k])) {
@@ -1828,11 +1828,11 @@ 
                     $user_info_friend = api_get_user_info($friend['friend_user_id'], true);
 
                     if ($user_info_friend['user_is_online']) {
-                        $statusIcon = Display::return_icon('statusonline.png',get_lang('Online'));
-                        $status=1;
+                        $statusIcon = Display::return_icon('statusonline.png', get_lang('Online'));
+                        $status = 1;
                     } else {
-                        $statusIcon = Display::return_icon('statusoffline.png',get_lang('Offline'));
-                        $status=0;
+                        $statusIcon = Display::return_icon('statusoffline.png', get_lang('Offline'));
+                        $status = 0;
                     }
 
                     $friendAvatarMedium = UserManager::getUserPicture($friend['friend_user_id'], USER_IMAGE_SIZE_MEDIUM);
@@ -1841,24 +1841,24 @@ 
                     $showLinkToChat = api_is_global_chat_enabled() &&
                         $friend['friend_user_id'] != api_get_user_id();
 
-                    if ($showLinkToChat){
+                    if ($showLinkToChat) {
                         $friendHtml .= '<a onclick="javascript:chatWith(\''.$friend['friend_user_id'].'\', \''.$name_user.'\', \''.$status.'\',\''.$friendAvatarSmall.'\')" href="javascript:void(0);" class="list-group-item">';
-                        $friendHtml .=  $friend_avatar.' <span class="username">' . $name_user . '</span>';
-                        $friendHtml .= '<span class="status">' . $statusIcon . '</span>';
+                        $friendHtml .= $friend_avatar.' <span class="username">'.$name_user.'</span>';
+                        $friendHtml .= '<span class="status">'.$statusIcon.'</span>';
                     } else {
                         $link_shared = (empty($link_shared)) ? '' : '&'.$link_shared;
-                        $friendHtml .= '<a href="profile.php?' .'u=' . $friend['friend_user_id'] . $link_shared . '" class="list-group-item">';
-                        $friendHtml .=  $friend_avatar.' <span class="username-all">' . $name_user . '</span>';
+                        $friendHtml .= '<a href="profile.php?'.'u='.$friend['friend_user_id'].$link_shared.'" class="list-group-item">';
+                        $friendHtml .= $friend_avatar.' <span class="username-all">'.$name_user.'</span>';
                     }
 
                     $friendHtml .= '</a>';
                 }
                 $j++;
             }
-            $friendHtml.='</div>';
+            $friendHtml .= '</div>';
         } else {
-            $friendHtml.= '<div class="help">'.get_lang('NoFriendsInYourContactList').' '
-                .'<a href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '. get_lang('TryAndFindSomeFriends').'</a></div>';
+            $friendHtml .= '<div class="help">'.get_lang('NoFriendsInYourContactList').' '
+                .'<a href="'.api_get_path(WEB_PATH).'whoisonline.php"><em class="fa fa-search"></em> '.get_lang('TryAndFindSomeFriends').'</a></div>';
         }
 
         return $friendHtml;
@@ -1876,7 +1876,7 @@ 
                 'post',
                 api_get_path(WEB_CODE_PATH).'social/profile.php'.$userId,
                 null,
-                array('enctype' => 'multipart/form-data') ,
+                array('enctype' => 'multipart/form-data'),
                 FormValidator::LAYOUT_HORIZONTAL    
             );
 

main/inc/lib/sortable_table.class.php

Doc Comments +1 added lines

@@ -443,6 +443,7 @@
      * @param bool       hide navigation optionally
      * @param int        content per page when show navigation (optional)
      * @param bool       sort data optionally
+     * @param boolean $visibility_options
      * @return string    grid html
      */
     public function display_simple_grid($visibility_options, $hide_navigation = true, $per_page = 20, $sort_data = true, $grid_class = array())

Indentation +5 added lines, -5 removed lines

@@ -339,9 +339,9 @@ 
     }
 
     /**
-    * This function shows the content of a table in a grid.
-    * Should not be use to edit information (edit/delete rows) only.
-    **/
+     * This function shows the content of a table in a grid.
+     * Should not be use to edit information (edit/delete rows) only.
+     **/
     public function display_grid()
     {
 
@@ -790,7 +790,7 @@ 
                 //$param[$tablename.'_direction'] = $_GET[$tablename.'_direction'];
                 $my_get_direction = $_GET[$tablename.'_direction'];
                 if (!in_array($my_get_direction, array('ASC', 'DESC'))) {
-                     $param[$tablename.'_direction'] =  'ASC';
+                        $param[$tablename.'_direction'] =  'ASC';
                 } else {
                     $param[$tablename.'_direction'] = $my_get_direction;
                 }
@@ -917,7 +917,7 @@ 
         if (is_array($row)) {
             foreach ($row as & $value) {
                 if (empty($value)) {
-                     $value = '-';
+                        $value = '-';
                 }
             }
         }

Braces +3 added lines, -2 removed lines

@@ -808,8 +808,9 @@
             foreach ($param as $key => & $value) {
                 $param_string_parts[] = urlencode($key).'='.urlencode($value);
             }
-            if (count($param_string_parts) > 0)
-                $result .= '&'.implode('&', $param_string_parts);
+            if (count($param_string_parts) > 0) {
+                            $result .= '&'.implode('&', $param_string_parts);
+            }
         }
         return $result;
     }

Spacing +16 added lines, -16 removed lines

@@ -175,7 +175,7 @@ 
         $this->per_page = isset($_GET[$this->param_prefix.'per_page']) ? intval($_GET[$this->param_prefix.'per_page']) : $this->per_page;
 
         $_SESSION[$this->param_prefix.'per_page']  = $this->per_page;
-        $_SESSION[$this->param_prefix.'direction'] = $this->direction ;
+        $_SESSION[$this->param_prefix.'direction'] = $this->direction;
         $_SESSION[$this->param_prefix.'page_nr']   = $this->page_nr;
         $_SESSION[$this->param_prefix.'column']    = $this->column;
         $this->pager                               = null;
@@ -215,7 +215,7 @@ 
             $params['spacesBeforeSeparator'] = '';
             $params['spacesAfterSeparator']  = '';
             $query_vars = array_keys($_GET);
-            $query_vars_needed = array ($this->param_prefix.'column', $this->param_prefix.'direction', $this->param_prefix.'per_page');
+            $query_vars_needed = array($this->param_prefix.'column', $this->param_prefix.'direction', $this->param_prefix.'per_page');
             if (count($this->additional_parameters) > 0) {
                 $query_vars_needed = array_merge($query_vars_needed, array_keys($this->additional_parameters));
             }
@@ -289,7 +289,7 @@ 
 
         if (!$empty_table) {
             if (!empty($this->additional_parameters)) {
-                foreach($this->additional_parameters as $key => $value) {
+                foreach ($this->additional_parameters as $key => $value) {
                     $html .= '<input type="hidden" name ="'.Security::remove_XSS($key).'" value ="'.Security::remove_XSS($value).'" />';
                 }
             }
@@ -314,7 +314,7 @@ 
                         $html .= '<li><a data-action ="'.$action.'" href="#" onclick="javascript:action_click(this, \''.$table_id.'\');">'.$label.'</a></li>';
                     }
                     $html .= '</ul>';
-                    $html .= '</div>';//btn-group
+                    $html .= '</div>'; //btn-group
                 $html .= '</div>'; //toolbar
             } else {
                 $html .= $form;
@@ -338,7 +338,7 @@ 
             }
         }
         
-        return '<div class="table-responsive">' . $html . '</div>';
+        return '<div class="table-responsive">'.$html.'</div>';
     }
 
     /**
@@ -393,7 +393,7 @@ 
 
             $html .= '<div class="clear"></div>';
             if (count($this->form_actions) > 0) {
-                $script= '<script>
+                $script = '<script>
                             /*<![CDATA[*/
                             function setCheckbox(value) {
                                  d = document.form_'.$this->table_name.';
@@ -415,7 +415,7 @@ 
             }
         }
         // Getting the items of the table
-        $items = $this->get_clean_html(false);    //no sort
+        $items = $this->get_clean_html(false); //no sort
 
         // Generation of style classes must be improved. Maybe we need a a table name to create style on the fly:
         // i.e: .whoisonline_table_grid_container instead of  .grid_container
@@ -483,7 +483,7 @@ 
 
             $html .= '<div class="clear"></div>';
             if (count($this->form_actions) > 0) {
-                $script= '<script>
+                $script = '<script>
                             /*<![CDATA[*/
                             function setCheckbox(value) {
                                  d = document.form_'.$this->table_name.';
@@ -589,7 +589,7 @@ 
                     $counter = 0;
                     foreach ($row as $index => $rowInfo) {
                         if (!isset($this->columnsToHide[$index])) {
-                            $newRow[$counter] = $rowInfo ;
+                            $newRow[$counter] = $rowInfo;
                             $counter++;
                         }
                     }
@@ -604,7 +604,7 @@ 
         }
 
         if ($this->odd_even_rows_enabled == true) {
-            $this->altRowAttributes(0, array ('class' => 'row_odd'), array ('class' => 'row_even'), true);
+            $this->altRowAttributes(0, array('class' => 'row_odd'), array('class' => 'row_even'), true);
         }
 
         foreach ($this->th_attributes as $column => $attributes) {
@@ -664,11 +664,11 @@ 
         }
         $result[] = '<select name="'.$this->param_prefix.'per_page" onchange="javascript: this.form.submit();">';
         for ($nr = 10; $nr <= min(50, $total_number_of_items); $nr += 10) {
-            $result[] = '<option value="'.$nr.'" '. ($nr == $this->per_page ? 'selected="selected"' : '').'>'.$nr.'</option>';
+            $result[] = '<option value="'.$nr.'" '.($nr == $this->per_page ? 'selected="selected"' : '').'>'.$nr.'</option>';
         }
         // @todo no limits
         //if ($total_number_of_items < 500) {
-            $result[] = '<option value="'.$total_number_of_items.'" '. ($total_number_of_items == $this->per_page ? 'selected="selected"' : '').'>'.api_ucfirst(get_lang('All')).'</option>';
+            $result[] = '<option value="'.$total_number_of_items.'" '.($total_number_of_items == $this->per_page ? 'selected="selected"' : '').'>'.api_ucfirst(get_lang('All')).'</option>';
         //}
         $result[] = '</select>';
         $result[] = '<noscript>';
@@ -780,7 +780,7 @@ 
      */
     public function get_additional_url_paramstring()
     {
-        $param_string_parts = array ();
+        $param_string_parts = array();
         if (is_array($this->additional_parameters) && count($this->additional_parameters) > 0) {
             foreach ($this->additional_parameters as $key => & $value) {
                 $param_string_parts[] = urlencode($key).'='.urlencode($value);
@@ -793,7 +793,7 @@ 
                 //$param[$tablename.'_direction'] = $_GET[$tablename.'_direction'];
                 $my_get_direction = $_GET[$tablename.'_direction'];
                 if (!in_array($my_get_direction, array('ASC', 'DESC'))) {
-                     $param[$tablename.'_direction'] =  'ASC';
+                     $param[$tablename.'_direction'] = 'ASC';
                 } else {
                     $param[$tablename.'_direction'] = $my_get_direction;
                 }
@@ -807,7 +807,7 @@ 
             if (isset($_GET[$tablename.'_column'])) {
                 $param[$tablename.'_column'] = intval($_GET[$tablename.'_column']);
             }
-            $param_string_parts = array ();
+            $param_string_parts = array();
             foreach ($param as $key => & $value) {
                 $param_string_parts[] = urlencode($key).'='.urlencode($value);
             }
@@ -827,7 +827,7 @@ 
         $param[$this->param_prefix.'page_nr'] = $this->page_nr;
         $param[$this->param_prefix.'per_page'] = $this->per_page;
         $param[$this->param_prefix.'column'] = $this->column;
-        $param_string_parts = array ();
+        $param_string_parts = array();
         foreach ($param as $key => & $value) {
             $param_string_parts[] = urlencode($key).'='.urlencode($value);
         }

main/inc/lib/specific_fields_manager.lib.php

Doc Comments +3 added lines, -1 removed lines

@@ -100,7 +100,7 @@ 
 
 /**
  * @param array $conditions a list of condition (exemple : status=>STUDENT)
- * @param array $order_by a list of fields on which sort
+ * @param string[] $order_by a list of fields on which sort
  * @return array An array with all users of the platform.
  */
 function get_specific_field_values_list(
@@ -235,6 +235,7 @@ 
  * @param   string  Course code
  * @param   string  Tool ID
  * @param   int     Internal ID used in specific tool table
+ * @param string $tool_id
  */
 function delete_all_values_for_item($course_id, $tool_id, $ref_id) {
   $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
@@ -248,6 +249,7 @@ 
  * Defaults to the first letter of the name, otherwise iterate through available
  * letters
  * @param   string  Name
+ * @param string $name
  * @return  string  One-letter code, upper-case
  */
 function get_specific_field_code_from_name($name) {

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 function delete_specific_field($id)
 {
     $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
-    $id = (int)$id;
+    $id = (int) $id;
     if (!is_numeric($id)) {
         return false;
     }
@@ -60,7 +60,7 @@ 
 function edit_specific_field($id, $name)
 {
     $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
-    $id = (int)$id;
+    $id = (int) $id;
     if (!is_numeric($id)) {
         return false;
     }

Indentation +4 added lines, -4 removed lines

@@ -237,10 +237,10 @@
  * @param   int     Internal ID used in specific tool table
  */
 function delete_all_values_for_item($course_id, $tool_id, $ref_id) {
-  $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
-  $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
-  $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
-  Database::query($sql);
+    $table_sf_values = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
+    $sql = 'DELETE FROM %s WHERE course_code = \'%s\' AND tool_id = \'%s\' AND ref_id = %s';
+    $sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id);
+    Database::query($sql);
 }
 
 /**

main/inc/lib/statsUtils.lib.inc.php

Doc Comments +1 added lines

@@ -85,6 +85,7 @@
     /**
      * @author Sebastien Piraux <piraux_seb@hotmail.com>
      * @param sql : a sql query (as a string)
+     * @param integer $X
      * @desc Return many results of a query in a X column tab
      * in $resu[$i][0], $resu[$i][1],$resu[$i][2],...
      * this function is more 'standard' but use a little

Indentation +8 added lines, -8 removed lines

@@ -107,14 +107,14 @@
         return $resu;
     }
 
-	/**
-	 * @author Sebastien Piraux <piraux_seb@hotmail.com>
-	 * @param sql : a sql query (as a string)
-	 * @return hours_array
-	 * @desc        Return an assoc array.  Keys are the hours, values are
-	 * the number of time this hours was found.
-	 * key 'total' return the sum of all number of time hours
-	 * appear
+    /**
+     * @author Sebastien Piraux <piraux_seb@hotmail.com>
+     * @param sql : a sql query (as a string)
+     * @return hours_array
+     * @desc        Return an assoc array.  Keys are the hours, values are
+     * the number of time this hours was found.
+     * key 'total' return the sum of all number of time hours
+     * appear
      */
     public static function hoursTab($sql)
     {

Spacing +5 added lines, -5 removed lines

@@ -155,7 +155,7 @@ 
             $last_day = -1;
             while ($row = Database::fetch_row($res)) {
                 $date_array = getdate($row[0]);
-                $display_date = $date_array['mday'] . ' ' . $MonthsShort[$date_array['mon'] - 1] . ' ' . $date_array['year'];
+                $display_date = $date_array['mday'].' '.$MonthsShort[$date_array['mon'] - 1].' '.$date_array['year'];
                 if ($date_array['mday'] == $last_day) {
                     $days_array[$display_date]++;
                 } else {
@@ -221,7 +221,7 @@ 
                      
                 </td>
                 <td width='10%'>
-                    <b>" . get_lang('Hits') . "</b>
+                    <b>".get_lang('Hits')."</b>
                 </td>
                 <td width='15%'>
                     <b>%</b>
@@ -249,7 +249,7 @@ 
                     echo "<img src='".Display::returnIconPath('bar_1m.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
                 }
                 if ($pourcent != 100) {
-                    echo "<img src='".Display::returnIconPath('bar_1r.gif')."' width='" . ($maxSize - $barwidth) . "' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
+                    echo "<img src='".Display::returnIconPath('bar_1r.gif')."' width='".($maxSize - $barwidth)."' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
                 }
                 echo "<img src='".Display::returnIconPath('bar_1.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />
                     </td>
@@ -265,13 +265,13 @@ 
         }
         echo "<tr bgcolor='#E6E6E6'>
                 <td width='15%' align='center'>
-                    " . get_lang('Total') . "
+                    " . get_lang('Total')."
                 </td>
                 <td align='right' width='60%'>
                     &nbsp;
                 </td>
                 <td align='center' width='10%'>
-                    " . $period_array['total'] . "
+                    " . $period_array['total']."
                 </td>
                 <td width='15%'>
                     &nbsp;

main/inc/lib/sub_language.class.php

Doc Comments +4 added lines, -1 removed lines

@@ -18,6 +18,7 @@ 
      * Get all files of lang folder (forum.inc.php,gradebook.inc.php,notebook.inc.php)
      * @param String The lang path folder  (/var/www/my_lms/main/lang/spanish)
      * @param bool true if we only want the "subname" trad4all instead of  trad4all.inc.php
+     * @param string $path
      *
      * @return Array All file of lang folder
      */
@@ -68,6 +69,7 @@ 
     /**
      * Get all information of language
      * @param Integer The parent id(Language father id)
+     * @param integer $parent_id
      * @return Array All information about language
      */
     public static function get_all_information_of_language($parent_id)
@@ -86,6 +88,7 @@ 
     /**
      * Get all information of chamilo file
      * @param String The chamilo path file (/var/www/chamilo/main/lang/spanish/gradebook.inc.php)
+     * @param string $system_path_file
      * @patam Bool Whether we want to remove the '$' prefix in the results or not
      * @return Array Contains all information of chamilo file
      */
@@ -345,7 +348,7 @@ 
     /**
      * Make available the language
      * @param Integer The language id
-     * @return void
+     * @return boolean
      */
     public static function make_available_language($language_id)
     {

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
                 while (($file = readdir($dh)) !== false) {
                     if ($file[0] <> '.' && substr($file, -4, strlen($file)) == '.php') {
                         if ($only_main_name) {
-                            if ($file != '' && strpos($file, '.inc.php'))
-                                $content_dir[] = substr($file, 0, strpos($file, '.inc.php'));
+                            if ($file != '' && strpos($file, '.inc.php')) {
+                                                            $content_dir[] = substr($file, 0, strpos($file, '.inc.php'));
+                            }
                         } else {
                             $content_dir[] = $file;
                         }

Spacing +32 added lines, -32 removed lines

@@ -23,7 +23,7 @@ 
     public static function getAllLanguages($onlyActive = false)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT * FROM ' . $table;
+        $sql = 'SELECT * FROM '.$table;
         if ($onlyActive) {
             $sql .= ' WHERE available = 1';
         }
@@ -75,10 +75,10 @@ 
     public static function get_all_information_of_sub_language($parent_id, $sub_language_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT * FROM ' . $table . '
+        $sql = 'SELECT * FROM '.$table.'
                 WHERE
                     parent_id= ' . intval($parent_id).' AND
-                    id= ' . intval($sub_language_id) . '';
+                    id= ' . intval($sub_language_id).'';
         $rs = Database::query($sql);
         $all_information = array();
         while ($row = Database::fetch_array($rs, 'ASSOC')) {
@@ -96,7 +96,7 @@ 
     public static function get_all_information_of_language($parent_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT * FROM ' . $table . ' WHERE id = "' . intval($parent_id) . '"';
+        $sql = 'SELECT * FROM '.$table.' WHERE id = "'.intval($parent_id).'"';
         $rs = Database::query($sql);
         $all_information = array();
         while ($row = Database::fetch_array($rs, 'ASSOC')) {
@@ -143,7 +143,7 @@ 
      */
     public static function add_file_in_language_directory($system_path_file)
     {
-        $return_value = @file_put_contents($system_path_file, '<?php' . PHP_EOL);
+        $return_value = @file_put_contents($system_path_file, '<?php'.PHP_EOL);
 
         return $return_value;
     }
@@ -158,10 +158,10 @@ 
     public static function write_data_in_file($path_file, $new_term, $new_variable)
     {
         $return_value = false;
-        $new_data = $new_variable . '=' . $new_term;
+        $new_data = $new_variable.'='.$new_term;
         $resource = @fopen($path_file, "a");
         if (file_exists($path_file) && $resource) {
-            if (fwrite($resource, $new_data . PHP_EOL) === false) {
+            if (fwrite($resource, $new_data.PHP_EOL) === false) {
                 //not allow to write
                 $return_value = false;
             } else {
@@ -183,7 +183,7 @@ 
         if (empty($sub_language_dir)) {
             return false;
         }
-        $dir = api_get_path(SYS_LANG_PATH) . $sub_language_dir;
+        $dir = api_get_path(SYS_LANG_PATH).$sub_language_dir;
         if (is_dir($dir)) {
             return true;
         } //even if the dir already exists, we reach the objective of having the directory there
@@ -207,8 +207,8 @@ 
             return false;
         }
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT dokeos_folder FROM ' . $table . '
-                WHERE parent_id = ' . $parent_id . ' and id = ' . $sub_language_id;
+        $sql = 'SELECT dokeos_folder FROM '.$table.'
+                WHERE parent_id = ' . $parent_id.' and id = '.$sub_language_id;
         $res = Database::query($sql);
         if ($res === false or Database::num_rows($res) < 1) {
             return false;
@@ -218,7 +218,7 @@ 
         if ($res === false) {
             return false;
         } //can't delete dir, so do not delete language record
-        $sql = 'DELETE FROM ' . $table . '
+        $sql = 'DELETE FROM '.$table.'
                 WHERE id= ' . intval($sub_language_id);
         $res = Database::query($sql);
 
@@ -235,7 +235,7 @@ 
         if (empty($sub_language_dir)) {
             return false;
         }
-        $dir = api_get_path(SYS_LANG_PATH) . $sub_language_dir;
+        $dir = api_get_path(SYS_LANG_PATH).$sub_language_dir;
         if (!is_dir($dir)) {
             return true;
         } //even if the dir does not exist, we reach the objective of not having the directory there
@@ -243,7 +243,7 @@ 
 
         if (count($content) > 0) {
             foreach ($content as $value_content) {
-                $path_file = $dir . '/' . $value_content;
+                $path_file = $dir.'/'.$value_content;
                 unlink($path_file);
             }
             return @rmdir($dir);
@@ -261,8 +261,8 @@ 
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = 'SELECT count(*) as count
-                FROM ' . $table . '
-                WHERE id="' . intval($language_id) . '"';
+                FROM ' . $table.'
+                WHERE id="' . intval($language_id).'"';
         $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
             if (Database::result($rs, 0, 'count') == 1) {
@@ -284,8 +284,8 @@ 
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = 'SELECT original_name
-                FROM ' . $table . '
-                WHERE id= ' . intval($language_id) . '';
+                FROM ' . $table.'
+                WHERE id= ' . intval($language_id).'';
         $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
             return Database::result($rs, 0, 'original_name');
@@ -303,8 +303,8 @@ 
     public static function check_if_language_is_sub_language($language_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT count(*) AS count FROM ' . $table . '
-                WHERE id = ' . intval($language_id) . ' AND NOT ISNULL(parent_id)';
+        $sql = 'SELECT count(*) AS count FROM '.$table.'
+                WHERE id = ' . intval($language_id).' AND NOT ISNULL(parent_id)';
         $rs = Database::query($sql);
 
         if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') == 1) {
@@ -322,7 +322,7 @@ 
     {
         $language_info = self::get_all_information_of_language($language_id);
         $table = Database :: get_main_table(TABLE_MAIN_USER);
-        $sql = 'SELECT count(*) AS count FROM ' . $table . '
+        $sql = 'SELECT count(*) AS count FROM '.$table.'
                 WHERE language ="' . Database::escape_string($language_info['english_name']).'"';
         $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') >= 1) {
@@ -340,8 +340,8 @@ 
     public static function check_if_language_is_father($language_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = 'SELECT count(*) AS count FROM ' . $table . '
-                WHERE parent_id= ' . intval($language_id) . ' AND NOT ISNULL(parent_id);';
+        $sql = 'SELECT count(*) AS count FROM '.$table.'
+                WHERE parent_id= ' . intval($language_id).' AND NOT ISNULL(parent_id);';
         $rs = Database::query($sql);
 
         if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') == 1) {
@@ -360,7 +360,7 @@ 
     {
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = "UPDATE $tbl_admin_languages SET available='0'
-                WHERE id = " . intval($language_id) . "";
+                WHERE id = ".intval($language_id)."";
         $result = Database::query($sql);
 
         return $result !== false; //only return false on sql error
@@ -375,7 +375,7 @@ 
     {
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = "UPDATE $tbl_admin_languages SET available='1'
-                WHERE id = " . intval($language_id) . "";
+                WHERE id = ".intval($language_id)."";
         $result = Database::query($sql);
 
         return $result !== false; //only return false on sql error
@@ -393,11 +393,11 @@ 
         }
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
-        $sql = "SELECT english_name FROM " . $tbl_admin_languages . "
-                WHERE id= " . intval($language_id) . "";
+        $sql = "SELECT english_name FROM ".$tbl_admin_languages."
+                WHERE id= " . intval($language_id)."";
         $result = Database::query($sql);
         $lang = Database::fetch_array($result);
-        $sql_update_2 = "UPDATE " . $tbl_settings_current . " SET selected_value='" . $lang['english_name'] . "'
+        $sql_update_2 = "UPDATE ".$tbl_settings_current." SET selected_value='".$lang['english_name']."'
                          WHERE variable='platformLanguage'";
         $result_2 = Database::query($sql_update_2);
         Event::addEvent(
@@ -417,7 +417,7 @@ 
     {
         $name = api_get_setting('platformLanguage');
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
-        $sql = "SELECT id FROM " . $tbl_admin_languages . " WHERE english_name ='$name'";
+        $sql = "SELECT id FROM ".$tbl_admin_languages." WHERE english_name ='$name'";
         $res = Database::query($sql);
         if (Database::num_rows($res) < 1) {
             return false;
@@ -436,10 +436,10 @@ 
     {
         $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         $sql = "SELECT dokeos_folder
-                FROM " . $tbl_admin_languages . "
+                FROM " . $tbl_admin_languages."
                 WHERE id = (
-                    SELECT parent_id FROM " . $tbl_admin_languages . "
-                    WHERE dokeos_folder = '" . Database::escape_string($language_path) . "'
+                    SELECT parent_id FROM " . $tbl_admin_languages."
+                    WHERE dokeos_folder = '" . Database::escape_string($language_path)."'
                 )
                 ";
         $result = Database::query($sql);
@@ -461,7 +461,7 @@ 
         $adminLanguagesTable = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
         // select language - if case several languages match, get the last (more recent) one
         $sql = "SELECT english_name
-                FROM " . $adminLanguagesTable . "
+                FROM " . $adminLanguagesTable."
                 WHERE
                     isocode ='$isocode' AND
                     available = 1

main/inc/lib/system/web/request.class.php

Doc Comments +4 added lines

@@ -31,6 +31,10 @@
         return $method == 'GET';
     }
 
+    /**
+     * @param string $key
+     * @param string $default
+     */
     public static function post($key, $default = null)
     {
         return isset($_POST[$key]) ? $_POST[$key] : $default;

Indentation -1 removed lines

@@ -2,7 +2,6 @@
 
 /**
  * Provides access to various HTTP request elements: GET, POST, FILE, etc paramaters.
-
  * @license see /license.txt
  * @deprecated
  * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         return isset($_REQUEST[$key]) ? $_REQUEST[$key] : $default;
     }
 
-    public static function has($key){
+    public static function has($key) {
         return isset($_REQUEST[$key]);
     }
 

main/inc/lib/table_sort.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	 * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
 	 * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
 	 * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
-	 * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
+	 * @param integer $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
 	 * @return array The sorted dataset
 	 * @author bart.mollet@hogent.be
 	 */

Spacing +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
 
                 $new_data_order = array();
                 if (!empty($docs_to_sort)) {
-                    foreach($docs_to_sort as $id => $document) {
+                    foreach ($docs_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }
@@ -165,7 +165,7 @@ 
                 }
 
                 if (!empty($folder_to_sort)) {
-                    foreach($folder_to_sort as $id => $document) {
+                    foreach ($folder_to_sort as $id => $document) {
                         if (isset($new_data[$id])) {
                             $new_data_order[] = $new_data[$id];
                         }

Indentation +104 added lines, -104 removed lines

@@ -15,16 +15,16 @@ 
 class TableSort
 {
     /**
-    * Sorts 2-dimensional table.
-    * @param array $data The data to be sorted.
-    * @param int $column The column on which the data should be sorted (default = 0)
-    * @param int $direction The direction to sort (SORT_ASC (default) or SORT_DESC)
-    * @param int $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC,
-    * SORT_STRING,SORT_DATE,SORT_IMAGE)
-    * @return array The sorted dataset
-    * @author bart.mollet@hogent.be
-    */
-	public static function sort_table($data, $column = 0, $direction = SORT_ASC, $type = SORT_REGULAR)
+     * Sorts 2-dimensional table.
+     * @param array $data The data to be sorted.
+     * @param int $column The column on which the data should be sorted (default = 0)
+     * @param int $direction The direction to sort (SORT_ASC (default) or SORT_DESC)
+     * @param int $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC,
+     * SORT_STRING,SORT_DATE,SORT_IMAGE)
+     * @return array The sorted dataset
+     * @author bart.mollet@hogent.be
+     */
+    public static function sort_table($data, $column = 0, $direction = SORT_ASC, $type = SORT_REGULAR)
     {
         if (!is_array($data) || empty($data)) {
             return array();
@@ -71,20 +71,20 @@ 
         usort($data, create_function('$a, $b', $compare_function));
 
         return $data;
-	}
+    }
 
-	/**
-	 * Sorts 2-dimensional table. It is possile changing the columns that will be shown and the way that the columns are to be sorted.
-	 * @param array $data The data to be sorted.
-	 * @param int $column The column on which the data should be sorted (default = 0)
-	 * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
-	 * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
-	 * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
-	 * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
-	 * @return array The sorted dataset
-	 * @author bart.mollet@hogent.be
-	 */
-	public static function sort_table_config(
+    /**
+     * Sorts 2-dimensional table. It is possile changing the columns that will be shown and the way that the columns are to be sorted.
+     * @param array $data The data to be sorted.
+     * @param int $column The column on which the data should be sorted (default = 0)
+     * @param string $direction The direction to sort (SORT_ASC (default) orSORT_DESC)
+     * @param array $column_show The columns that we will show in the table i.e: $column_show = array('1','0','1') we will show the 1st and the 3th column.
+     * @param array $column_order Changes how the columns will be sorted ie. $column_order = array('0','3','2','3') The column [1] will be sorted like the column [3]
+     * @param constant $type How should data be sorted (SORT_REGULAR, SORT_NUMERIC, SORT_STRING, SORT_DATE, SORT_IMAGE)
+     * @return array The sorted dataset
+     * @author bart.mollet@hogent.be
+     */
+    public static function sort_table_config(
         $data,
         $column = 0,
         $direction = SORT_ASC,
@@ -132,9 +132,9 @@ 
             if (!empty($data)) {
                 foreach ($data as $document) {
                     if ($document['type'] == 'folder') {
-                      $docs_to_sort[$document['id']]   = api_strtolower($document['name']);
+                        $docs_to_sort[$document['id']]   = api_strtolower($document['name']);
                     } else {
-                      $folder_to_sort[$document['id']] = api_strtolower($document['name']);
+                        $folder_to_sort[$document['id']] = api_strtolower($document['name']);
                     }
                     $new_data[$document['id']] = $document;
                 }
@@ -196,91 +196,91 @@ 
             usort($data, create_function('$a, $b', $compare_function));
         }
 
-		if (is_array($column_show) && !empty($column_show)) {
+        if (is_array($column_show) && !empty($column_show)) {
 
-			// We show only the columns data that were set up on the $column_show array
-			$new_order_data = array();
-			$count_data = count($data);
-			$count_column_show = count($column_show);
-			for ($j = 0; $j < $count_data; $j++) {
-				$k = 0;
-				for ($i = 0; $i < $count_column_show; $i++) {
-					if ($column_show[$i]) {
-						$new_order_data[$j][$k] = $data[$j][$i];
-					}
-					$k++;
-				}
-			}
-			// Replace the multi-arrays
-			$data = $new_order_data;
-		}
+            // We show only the columns data that were set up on the $column_show array
+            $new_order_data = array();
+            $count_data = count($data);
+            $count_column_show = count($column_show);
+            for ($j = 0; $j < $count_data; $j++) {
+                $k = 0;
+                for ($i = 0; $i < $count_column_show; $i++) {
+                    if ($column_show[$i]) {
+                        $new_order_data[$j][$k] = $data[$j][$i];
+                    }
+                    $k++;
+                }
+            }
+            // Replace the multi-arrays
+            $data = $new_order_data;
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
-	/**
-	 * Checks whether a column of a 2D-array contains only numeric values
-	 * @param array $data		The data-array
-	 * @param int $column		The index of the column to check
-	 * @return bool				TRUE if column contains only dates, FALSE otherwise
-	 * @todo Take locale into account (eg decimal point or comma ?)
-	 * @author bart.mollet@hogent.be
-	 */
-	private static function is_numeric_column(& $data, $column)
+    /**
+     * Checks whether a column of a 2D-array contains only numeric values
+     * @param array $data		The data-array
+     * @param int $column		The index of the column to check
+     * @return bool				TRUE if column contains only dates, FALSE otherwise
+     * @todo Take locale into account (eg decimal point or comma ?)
+     * @author bart.mollet@hogent.be
+     */
+    private static function is_numeric_column(& $data, $column)
     {
-		$is_numeric = true;
-		foreach ($data as $index => & $row) {
-			$is_numeric &= is_numeric(strip_tags($row[$column]));
-			if (!$is_numeric) {
-				break;
-			}
-		}
-		return $is_numeric;
-	}
+        $is_numeric = true;
+        foreach ($data as $index => & $row) {
+            $is_numeric &= is_numeric(strip_tags($row[$column]));
+            if (!$is_numeric) {
+                break;
+            }
+        }
+        return $is_numeric;
+    }
 
-	/**
-	 * Checks whether a column of a 2D-array contains only dates (GNU date syntax)
-	 * @param array $data		The data-array
-	 * @param int $column		The index of the column to check
-	 * @return bool				TRUE if column contains only dates, FALSE otherwise
-	 * @author bart.mollet@hogent.be
-	 */
-	private static function is_date_column(& $data, $column)
+    /**
+     * Checks whether a column of a 2D-array contains only dates (GNU date syntax)
+     * @param array $data		The data-array
+     * @param int $column		The index of the column to check
+     * @return bool				TRUE if column contains only dates, FALSE otherwise
+     * @author bart.mollet@hogent.be
+     */
+    private static function is_date_column(& $data, $column)
     {
-		$is_date = true;
-		foreach ($data as $index => & $row) {
-			if (strlen(strip_tags($row[$column])) != 0) {
-				$check_date = strtotime(strip_tags($row[$column]));
-				// strtotime Returns a timestamp on success, FALSE otherwise.
-				// Previous to PHP 5.1.0, this function would return -1 on failure.
-				$is_date &= ($check_date != -1 && $check_date);
-			} else {
-				$is_date &= false;
-			}
-			if (!$is_date) {
-				break;
-			}
-		}
-		return $is_date;
-	}
+        $is_date = true;
+        foreach ($data as $index => & $row) {
+            if (strlen(strip_tags($row[$column])) != 0) {
+                $check_date = strtotime(strip_tags($row[$column]));
+                // strtotime Returns a timestamp on success, FALSE otherwise.
+                // Previous to PHP 5.1.0, this function would return -1 on failure.
+                $is_date &= ($check_date != -1 && $check_date);
+            } else {
+                $is_date &= false;
+            }
+            if (!$is_date) {
+                break;
+            }
+        }
+        return $is_date;
+    }
 
-	/**
-	 * Checks whether a column of a 2D-array contains only images (<img src="path/file.ext" alt=".."/>)
-	 * @param array $data		The data-array
-	 * @param int $column		The index of the column to check
-	 * @return bool				TRUE if column contains only images, FALSE otherwise
-	 * @author bart.mollet@hogent.be
-	 */
-	private static function is_image_column(& $data, $column)
+    /**
+     * Checks whether a column of a 2D-array contains only images (<img src="path/file.ext" alt=".."/>)
+     * @param array $data		The data-array
+     * @param int $column		The index of the column to check
+     * @return bool				TRUE if column contains only images, FALSE otherwise
+     * @author bart.mollet@hogent.be
+     */
+    private static function is_image_column(& $data, $column)
     {
-		$is_image = true;
-		foreach ($data as $index => & $row) {
-			$is_image &= strlen(trim(strip_tags($row[$column], '<img>'))) > 0; // at least one img-tag
-			$is_image &= strlen(trim(strip_tags($row[$column]))) == 0; // and no text outside attribute-values
-			if (!$is_image) {
-				break;
-			}
-		}
-		return $is_image;
-	}
+        $is_image = true;
+        foreach ($data as $index => & $row) {
+            $is_image &= strlen(trim(strip_tags($row[$column], '<img>'))) > 0; // at least one img-tag
+            $is_image &= strlen(trim(strip_tags($row[$column]))) == 0; // and no text outside attribute-values
+            if (!$is_image) {
+                break;
+            }
+        }
+        return $is_image;
+    }
 }

main/inc/lib/template.lib.php

Doc Comments +2 added lines

@@ -330,6 +330,7 @@ 
     /**
      * Sets the footer visibility
      * @param bool true if we show the footer
+     * @param boolean $status
      */
     public function set_footer($status)
     {
@@ -370,6 +371,7 @@ 
     /**
      * Sets the header visibility
      * @param bool true if we show the header
+     * @param boolean $status
      */
     public function set_header($status)
     {

Spacing +30 added lines, -30 removed lines

@@ -264,7 +264,7 @@ 
                 $content = '<li class="help">';
                 $content .= Display::url(
                     Display::return_icon('help.large.png', get_lang('Help')),
-                    api_get_path(WEB_CODE_PATH) . 'help/help.php?open=' . $help,
+                    api_get_path(WEB_CODE_PATH).'help/help.php?open='.$help,
                     [
                         'class' => 'ajax',
                         'data-title' => get_lang('Help')
@@ -478,7 +478,7 @@ 
             'web_course' => api_get_path(WEB_COURSE_PATH),
             'web_main' => api_get_path(WEB_CODE_PATH),
             'web_css' => api_get_path(WEB_CSS_PATH),
-            'web_css_theme' => api_get_path(WEB_CSS_PATH) . 'themes/' . $this->theme . '/',
+            'web_css_theme' => api_get_path(WEB_CSS_PATH).'themes/'.$this->theme.'/',
             'web_ajax' => api_get_path(WEB_AJAX_PATH),
             'web_img' => api_get_path(WEB_IMG_PATH),
             'web_plugin' => api_get_path(WEB_PLUGIN_PATH),
@@ -536,12 +536,12 @@ 
         foreach ($bowerCSSFiles as $file) {
             $css[] = api_get_path(WEB_PATH).'web/assets/'.$file;
         }
-        $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/bootstrap-select/css/bootstrap-select.min.css';
-        $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chosen/chosen.css';
-        $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/tag/style.css';
+        $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/bootstrap-select/css/bootstrap-select.min.css';
+        $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chosen/chosen.css';
+        $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css';
 
         if (api_is_global_chat_enabled()) {
-            $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chat/css/chat.css';
+            $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chat/css/chat.css';
         }
 
         //THEME CSS STYLE
@@ -608,7 +608,7 @@ 
 
             $style_print = '';
             if (is_readable(api_get_path(SYS_CSS_PATH).$this->theme.'/print.css')) {
-                $style_print = api_get_css(api_get_cdn_path(api_get_path(WEB_CSS_PATH) . $this->theme . '/print.css'),
+                $style_print = api_get_css(api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->theme.'/print.css'),
                     'print');
             }
             $this->assign('css_style_print', $style_print);
@@ -631,10 +631,10 @@ 
 
         $isoCode = api_get_language_isocode();
 
-        $selectLink = 'bootstrap-select/js/i18n/defaults-' . $isoCode . '_' . strtoupper($isoCode) . '.min.js';
+        $selectLink = 'bootstrap-select/js/i18n/defaults-'.$isoCode.'_'.strtoupper($isoCode).'.min.js';
 
         if ($isoCode == 'en') {
-            $selectLink = 'bootstrap-select/js/i18n/defaults-' . $isoCode . '_US.min.js';
+            $selectLink = 'bootstrap-select/js/i18n/defaults-'.$isoCode.'_US.min.js';
         }
         // JS files
         $js_files = array(
@@ -684,8 +684,8 @@ 
         }
 
         if ($isoCode != 'en') {
-            $bowerJsFiles[] = 'jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-' . $isoCode . '.js';
-            $bowerJsFiles[] = 'jquery-ui/ui/minified/i18n/datepicker-' . $isoCode . '.min.js';
+            $bowerJsFiles[] = 'jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-'.$isoCode.'.js';
+            $bowerJsFiles[] = 'jquery-ui/ui/minified/i18n/datepicker-'.$isoCode.'.min.js';
         }
 
         foreach ($bowerJsFiles as $file) {
@@ -766,7 +766,7 @@ 
         }
 
         $this->assign('online_button', Display::return_icon('statusonline.png', null, null, ICON_SIZE_ATOM));
-        $this->assign('offline_button',Display::return_icon('statusoffline.png', null, null, ICON_SIZE_ATOM));
+        $this->assign('offline_button', Display::return_icon('statusoffline.png', null, null, ICON_SIZE_ATOM));
 
         // Get language iso-code for this page - ignore errors
         $this->assign('document_language', api_get_language_isocode());
@@ -825,15 +825,15 @@ 
         $this->assign('section_name', 'section-'.$this_section);
 
         //Defaul root chamilo favicon
-        $favico = '<link rel="shortcut icon" href="' . api_get_path(WEB_PATH) . 'favicon.ico" type="image/x-icon" />';
+        $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_PATH).'favicon.ico" type="image/x-icon" />';
 
         //Added to verify if in the current Chamilo Theme exist a favicon
-        $favicoThemeUrl = api_get_path(SYS_CSS_PATH) . 'themes/' . $this->theme . '/images/';
+        $favicoThemeUrl = api_get_path(SYS_CSS_PATH).'themes/'.$this->theme.'/images/';
 
         //If exist pick the current chamilo theme favicon
-        if (is_file($favicoThemeUrl . 'favicon.ico')) {
-            $favico = '<link rel="shortcut icon" href="' . api_get_path(WEB_CSS_PATH)
-                . 'themes/' . $this->theme . '/images/favicon.ico" type="image/x-icon" />';
+        if (is_file($favicoThemeUrl.'favicon.ico')) {
+            $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_CSS_PATH)
+                . 'themes/'.$this->theme.'/images/favicon.ico" type="image/x-icon" />';
         }
 
         if (api_is_multiple_url_enabled()) {
@@ -863,7 +863,7 @@ 
         if (api_get_setting('show_link_bug_notification') == 'true' && $this->user_is_logged_in) {
             $bug_notification_link = '<li class="report">
 		<a href="http://support.chamilo.org/projects/chamilo-18/wiki/How_to_report_bugs" target="_blank">
-                    '. $iconBug . '
+                    '. $iconBug.'
                 </a>
 		</li>';
         }
@@ -975,13 +975,13 @@ 
         $socialMeta = '';
         $metaTitle = api_get_setting('meta_title');
         if (!empty($metaTitle)) {
-            $socialMeta .= '<meta name="twitter:card" content="summary" />' . "\n";
+            $socialMeta .= '<meta name="twitter:card" content="summary" />'."\n";
             $metaSite = api_get_setting('meta_twitter_site');
             if (!empty($metaSite)) {
-                $socialMeta .= '<meta name="twitter:site" content="' . $metaSite . '" />' . "\n";
+                $socialMeta .= '<meta name="twitter:site" content="'.$metaSite.'" />'."\n";
                 $metaCreator = api_get_setting('meta_twitter_creator');
                 if (!empty($metaCreator)) {
-                    $socialMeta .= '<meta name="twitter:creator" content="' . $metaCreator . '" />' . "\n";
+                    $socialMeta .= '<meta name="twitter:creator" content="'.$metaCreator.'" />'."\n";
                 }
             }
 
@@ -993,19 +993,19 @@ 
             if (!$userId && !$skillId) {
                 // no combination of user and skill ID has been defined,
                 // so print the normal OpenGraph meta tags
-                $socialMeta .= '<meta property="og:title" content="' . $metaTitle . '" />' . "\n";
-                $socialMeta .= '<meta property="og:url" content="' . api_get_path(WEB_PATH) . '" />' . "\n";
+                $socialMeta .= '<meta property="og:title" content="'.$metaTitle.'" />'."\n";
+                $socialMeta .= '<meta property="og:url" content="'.api_get_path(WEB_PATH).'" />'."\n";
 
                 $metaDescription = api_get_setting('meta_description');
                 if (!empty($metaDescription)) {
-                    $socialMeta .= '<meta property="og:description" content="' . $metaDescription . '" />' . "\n";
+                    $socialMeta .= '<meta property="og:description" content="'.$metaDescription.'" />'."\n";
                 }
 
                 $metaImage = api_get_setting('meta_image_path');
                 if (!empty($metaImage)) {
-                    if (is_file(api_get_path(SYS_PATH) . $metaImage)) {
-                        $path = api_get_path(WEB_PATH) . $metaImage;
-                        $socialMeta .= '<meta property="og:image" content="' . $path . '" />' . "\n";
+                    if (is_file(api_get_path(SYS_PATH).$metaImage)) {
+                        $path = api_get_path(WEB_PATH).$metaImage;
+                        $socialMeta .= '<meta property="og:image" content="'.$path.'" />'."\n";
                     }
                 }
             }
@@ -1039,7 +1039,7 @@ 
         // Tutor name
         if (api_get_setting('show_tutor_data') == 'true') {
             // Course manager
-            $courseId  = api_get_course_int_id();
+            $courseId = api_get_course_int_id();
             $id_session = api_get_session_id();
             if (!empty($courseId)) {
                 $tutor_data = '';
@@ -1071,7 +1071,7 @@ 
             $courseId = api_get_course_int_id();
             if (!empty($courseId)) {
                 $teacher_data = '';
-                $mail= CourseManager::get_emails_of_tutors_to_course($courseId);
+                $mail = CourseManager::get_emails_of_tutors_to_course($courseId);
                 if (!empty($mail)) {
                     $teachers_parsed = array();
                     foreach ($mail as $value) {
@@ -1305,7 +1305,7 @@ 
                     'sessionVar'   => basename(__FILE__, '.php'),
                     'imageOptions' => array(
                         'font_size' => 20,
-                        'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
+                        'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
                         'font_file' => 'OpenSans-Regular.ttf',
                         //'output' => 'gif'
                     )