chamilo / chamilo-lms

main/admin/skill_badge_create.php

Spacing +12 added lines, -12 removed lines

@@ -22,16 +22,16 @@ 
 $objSkill = new Skill();
 $skill = $objSkill->get($skillId);
 
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/css/core.css" rel="stylesheet">';
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/css/core.css" rel="stylesheet">';
 
 // Add badge studio paths
 
 $badgeStudio = [
-    'core' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/',
-    'media' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/',
-    'templates' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/images/templates/',
-    'masks' => api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/images/masks/',
-    'script_js' => '<script src="'. api_get_path(WEB_LIBRARY_JS_PATH) .'badge-studio/media/js/studio.js?"></script>'
+    'core' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/',
+    'media' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/',
+    'templates' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/images/templates/',
+    'masks' => api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/images/masks/',
+    'script_js' => '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'badge-studio/media/js/studio.js?"></script>'
 ];
 
 
@@ -59,10 +59,10 @@ 
         if ($existsBadgesDirectory) {
 
             if (!empty($skill['icon'])) {
-                $iconFileAbsolutePath = $badgePath . $skill['icon'];
+                $iconFileAbsolutePath = $badgePath.$skill['icon'];
 
                 if (Security::check_abs_path($iconFileAbsolutePath, $badgePath)) {
-                    unlink($badgePath . $skill['icon']);
+                    unlink($badgePath.$skill['icon']);
                 }
             }
 
@@ -85,24 +85,24 @@ 
 
     $objSkill->update($params);
 
-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php');
+    header('Location: '.api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php');
     exit;
 }
 
 $interbreadcrumb = array(
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
         'name' => get_lang('Administration')
     ),
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
         'name' => get_lang('Badges')
     )
 );
 
 $toolbar = Display::toolbarButton(
     get_lang('ManageSkills'),
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
     'list',
     'primary',
     ['title' => get_lang('ManageSkills')]

main/inc/lib/fileManage.lib.php

Doc Comments +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
  * Deletes a file or a directory
  *
  * @author - Hugues Peeters
- * @param  $file (String) - the path of file or directory to delete
- * @return boolean - true if the delete succeed, false otherwise.
+ * @param  string $file (String) - the path of file or directory to delete
+ * @return boolean|null - true if the delete succeed, false otherwise.
  * @see    - delete() uses check_name_exist() and removeDir() functions
  */
 function my_delete($file)
@@ -127,7 +127,7 @@ 
  * @author Hugues Peeters <peeters@ipm.ucl.ac.be>
  * @param  string $file_path complete path of the file or the directory
  * @param  string $new_file_name new name for the file or the directory
- * @return boolean true if succeed, false otherwise
+ * @return string|false true if succeed, false otherwise
  * @see rename() uses the check_name_exist() and php2phps() functions
  */
 function my_rename($file_path, $new_file_name) {
@@ -174,7 +174,7 @@ 
  * @param  string $target the path of the new area
  * @param  bool $forceMove Whether to force a move or to make a copy (safer but slower) and then delete the original
  * @param	bool $moveContent In some cases (including migrations), we need to move the *content* and not the folder itself
- * @return bool true if the move succeed, false otherwise.
+ * @return boolean|null true if the move succeed, false otherwise.
  * @see move() uses check_name_exist() and copyDirTo() functions
  */
 function move($source, $target, $forceMove = false, $moveContent = false)

Indentation +41 added lines, -41 removed lines

@@ -132,38 +132,38 @@ 
  */
 function my_rename($file_path, $new_file_name) {
 
-	$save_dir = getcwd();
-	$path = dirname($file_path);
-	$old_file_name = basename($file_path);
-	$new_file_name = api_replace_dangerous_char($new_file_name);
+    $save_dir = getcwd();
+    $path = dirname($file_path);
+    $old_file_name = basename($file_path);
+    $new_file_name = api_replace_dangerous_char($new_file_name);
 
-	// If no extension, take the old one
-	if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
-		$new_file_name .= substr($old_file_name, $dotpos);
-	}
+    // If no extension, take the old one
+    if ((strpos($new_file_name, '.') === false) && ($dotpos = strrpos($old_file_name, '.'))) {
+        $new_file_name .= substr($old_file_name, $dotpos);
+    }
 
-	// Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
-	// This is useful for folder names, where otherwise '.' would be sticky
+    // Note: still possible: 'xx.yy' -rename-> '.yy' -rename-> 'zz'
+    // This is useful for folder names, where otherwise '.' would be sticky
 
-	// Extension PHP is not allowed, change to PHPS
-	$new_file_name = php2phps($new_file_name);
+    // Extension PHP is not allowed, change to PHPS
+    $new_file_name = php2phps($new_file_name);
 
-	if ($new_file_name == $old_file_name) {
-		return $old_file_name;
-	}
+    if ($new_file_name == $old_file_name) {
+        return $old_file_name;
+    }
 
-	if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
-		return false;
-	}
-	// On a Windows server, it would be better not to do the above check
-	// because it succeeds for some new names resembling the old name.
-	// But on Unix/Linux the check must be done because rename overwrites.
+    if (strtolower($new_file_name) != strtolower($old_file_name) && check_name_exist($path.'/'.$new_file_name)) {
+        return false;
+    }
+    // On a Windows server, it would be better not to do the above check
+    // because it succeeds for some new names resembling the old name.
+    // But on Unix/Linux the check must be done because rename overwrites.
 
-	chdir($path);
-	$res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
-	chdir($save_dir);
+    chdir($path);
+    $res = rename($old_file_name, $new_file_name) ? $new_file_name : false;
+    chdir($save_dir);
 
-	return $res;
+    return $res;
 }
 
 /**
@@ -185,7 +185,7 @@ 
         $file_name = basename($source);
         // move onto self illegal: mv a/b/c a/b/c or mv a/b/c a/b
         if (strcasecmp($target, dirname($source)) === 0) {
-               return false;
+                return false;
         }
         $isWindowsOS = api_is_windows_os();
         $canExec = function_exists('exec');
@@ -265,8 +265,8 @@ 
  */
 function getextension($filename)
 {
-	$bouts = explode('.', $filename);
-	return array(array_pop($bouts), implode('.', $bouts));
+    $bouts = explode('.', $filename);
+    return array(array_pop($bouts), implode('.', $bouts));
 }
 
 /**
@@ -277,17 +277,17 @@ 
  * @param 	boolean $recursive if true , include subdirectory in total
  */
 function dirsize($root, $recursive = true) {
-	$dir = @opendir($root);
-	$size = 0;
-	while ($file = @readdir($dir)) {
-		if (!in_array($file, array('.', '..'))) {
-			if (is_dir($root.'/'.$file)) {
-				$size += $recursive ? dirsize($root.'/'.$file) : 0;
-			} else {
-				$size += @filesize($root.'/'.$file);
-			}
-		}
-	}
-	@closedir($dir);
-	return $size;
+    $dir = @opendir($root);
+    $size = 0;
+    while ($file = @readdir($dir)) {
+        if (!in_array($file, array('.', '..'))) {
+            if (is_dir($root.'/'.$file)) {
+                $size += $recursive ? dirsize($root.'/'.$file) : 0;
+            } else {
+                $size += @filesize($root.'/'.$file);
+            }
+        }
+    }
+    @closedir($dir);
+    return $size;
 }

Spacing +2 added lines, -2 removed lines

@@ -193,9 +193,9 @@
         /* File case */
         if (is_file($source)) {
             if ($forceMove && !$isWindowsOS && $canExec) {
-                exec('mv ' . $source . ' ' . $target . '/' . $file_name);
+                exec('mv '.$source.' '.$target.'/'.$file_name);
             } else {
-                copy($source, $target . '/' . $file_name);
+                copy($source, $target.'/'.$file_name);
                 unlink($source);
             }
             return true;

main/social/group_view.php

Spacing +35 added lines, -35 removed lines

@@ -86,31 +86,31 @@ 
 
 </script>';
 
-$allowed_views = array('mygroups','newest','pop');
+$allowed_views = array('mygroups', 'newest', 'pop');
 $content = null;
 
-if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
+if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
     if ($_GET['view'] == 'mygroups') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MyGroups'));
-    } else if ( $_GET['view'] == 'newest') {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Newest'));
-    } else  {
-        $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Popular'));
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('MyGroups'));
+    } else if ($_GET['view'] == 'newest') {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Newest'));
+    } else {
+        $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Popular'));
     }
 } else {
-    $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
+    $interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
     if (!isset($_GET['id'])) {
-        $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('GroupList'));
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('GroupList'));
     } else {
         //$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Group'));
     }
 }
 
 // getting group information
-$group_id	= isset($_GET['id']) ? intval($_GET['id']) : null;
+$group_id = isset($_GET['id']) ? intval($_GET['id']) : null;
 $relation_group_title = '';
 $role = 0;
 
@@ -120,9 +120,9 @@ 
     $group_info = $usergroup->get($group_id);
 
 
-    $interbreadcrumb[]= array ('url' =>'#','name' => $group_info['name']);
+    $interbreadcrumb[] = array('url' =>'#', 'name' => $group_info['name']);
 
-    if (isset($_GET['action']) && $_GET['action']=='leave') {
+    if (isset($_GET['action']) && $_GET['action'] == 'leave') {
         $user_leaved = intval($_GET['u']);
         // I can "leave me myself"
         if (api_get_user_id() == $user_leaved) {
@@ -136,7 +136,7 @@ 
     }
 
     // add a user to a group if its open
-    if (isset($_GET['action']) && $_GET['action']=='join') {
+    if (isset($_GET['action']) && $_GET['action'] == 'join') {
         // we add a user only if is a open group
         $user_join = intval($_GET['u']);
         if (api_get_user_id() == $user_join && !empty($group_id)) {
@@ -165,7 +165,7 @@ 
 $group_info = $usergroup->get($group_id);
 
 //Loading group information
-if (isset($_GET['status']) && $_GET['status']=='sent') {
+if (isset($_GET['status']) && $_GET['status'] == 'sent') {
     $social_right_content .= Display::return_message(get_lang('MessageHasBeenSent'), 'confirmation', false);
 }
 
@@ -174,7 +174,7 @@ 
 
 if (!$is_group_member && $group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
     if ($role == GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER) {
-        $social_right_content .=  Display::return_message(get_lang('YouAlreadySentAnInvitation'));
+        $social_right_content .= Display::return_message(get_lang('YouAlreadySentAnInvitation'));
     }
 }
 
@@ -185,19 +185,19 @@ 
         ) {
             $social_right_content .= '<div class="group-tool">';
             $social_right_content .= '<div class="pull-right">';
-            $social_right_content .=  '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
+            $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
                 get_lang('JoinGroup').'</a>';
-            $social_right_content .=  '</div>';
-            $social_right_content .=  '</div>';
+            $social_right_content .= '</div>';
+            $social_right_content .= '</div>';
         } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
             $social_right_content .= '<div class="group-tool">';
             $social_right_content .= '<div class="pull-right">';
-            $social_right_content .=  '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
+            $social_right_content .= '<a class="btn btn-default btn-sm" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.
                     Display::returnFontAwesomeIcon('envelope').' '.
                 get_lang('YouHaveBeenInvitedJoinNow').'</a>';
         }
-        $social_right_content .=  '</div>';
-        $social_right_content .=  '</div>';
+        $social_right_content .= '</div>';
+        $social_right_content .= '</div>';
     }
     $content = MessageManager::display_messages_for_group($group_id);
     if ($is_group_member) {
@@ -211,7 +211,7 @@ 
                     'action' => 'add_message_group'
                 ]);
             $create_thread_link = Display::url(
-                Display::returnFontAwesomeIcon('commenting') . ' ' .
+                Display::returnFontAwesomeIcon('commenting').' '.
                 get_lang('YouShouldCreateATopic'),
                 $createThreadUrl,
                 [
@@ -231,7 +231,7 @@ 
                     'action' => 'add_message_group',
                 ]);
             $create_thread_link = Display::url(
-                Display::returnFontAwesomeIcon('commenting') . ' ' .
+                Display::returnFontAwesomeIcon('commenting').' '.
                 get_lang('NewTopic'),
                 $createThreadUrl,
                 [
@@ -271,21 +271,21 @@ 
         foreach ($members as $member) {
             // if is a member
             if (in_array($member['relation_type'],
-                array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))
+                array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR))
             ) {
                 //add icons
                 if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-                    $icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
+                    $icon = Display::return_icon('social_group_admin.png', get_lang('Admin'));
                 } elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-                    $icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
+                    $icon = Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
                 } else {
-                    $icon= '';
+                    $icon = '';
                 }
 
                 $userPicture = UserManager::getUserPicture($member['id']);
                 $member_content .= '<div class="col-md-3">';
                 $member_content .= '<div class="items-user">';
-                $member_name = Display::url(api_get_person_name(cut($member['user_info']['firstname'],15),cut($member['user_info']['lastname'],15)).'&nbsp;'.$icon, $member['user_info']['profile_url']);
+                $member_name = Display::url(api_get_person_name(cut($member['user_info']['firstname'], 15), cut($member['user_info']['lastname'], 15)).'&nbsp;'.$icon, $member['user_info']['profile_url']);
                 $member_content .= Display::div('<img class="img-circle" src="'.$userPicture.'"/>', array('class' => 'avatar'));
                 $member_content .= Display::div($member_name, array('class' => 'name'));
                 $member_content .= '</div>';
@@ -297,10 +297,10 @@ 
     }
 
     if (!empty($create_thread_link)) {
-        $create_thread_link =  Display::div($create_thread_link, array('class'=>'pull-right'));
+        $create_thread_link = Display::div($create_thread_link, array('class'=>'pull-right'));
     }
     $headers = array(get_lang('Discussions'), get_lang('Members'));
-    $socialForum = Display::tabs($headers, array($content, $member_content),'tabs');
+    $socialForum = Display::tabs($headers, array($content, $member_content), 'tabs');
 
 } else {
     // if I already sent an invitation message
@@ -312,9 +312,9 @@ 
         )
     )
     ) {
-        $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
+        $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
     } elseif ($role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-        $social_right_content .=  '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
+        $social_right_content .= '<a class="btn" href="group_view.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
     }
 }
 

main/social/group_invitation.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-$tbl_group_rel_user	= Database::get_main_table(TABLE_USERGROUP_REL_USER);
+$tbl_group_rel_user = Database::get_main_table(TABLE_USERGROUP_REL_USER);
 
 // setting the name of the tool
 $tool_name = get_lang('SubscribeUsersToGroup');
@@ -40,7 +40,7 @@ 
     }
 }
 
-$interbreadcrumb[] = array('url' =>'groups.php','name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' =>'groups.php', 'name' => get_lang('Groups'));
 $interbreadcrumb[] = array('url' => 'group_view.php?id='.$group_id, 'name' => $group_info['name']);
 $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('SubscribeUsersToGroup'));
 
@@ -74,7 +74,7 @@ 
 
         if (is_array($user_list) && count($user_list) > 0) {
             //send invitation message
-            foreach ($user_list as $user_id){
+            foreach ($user_list as $user_id) {
                 $result = MessageManager::send_message(
                     $user_id,
                     $title,
@@ -110,8 +110,8 @@ 
 
             if (!isset($group_friend_list[$group_id]) ||
                 isset($group_friend_list[$group_id]) &&
-                $group_friend_list[$group_id]['relation_type'] == '' ) {
-                $Users[$friend['friend_user_id']]= array(
+                $group_friend_list[$group_id]['relation_type'] == '') {
+                $Users[$friend['friend_user_id']] = array(
                     'user_id' => $friend['friend_user_id'],
                     'firstname' => $friend['firstName'],
                     'lastname' => $friend['lastName'],
@@ -120,7 +120,7 @@ 
                 );
             }
         } else {
-            $Users[$friend['friend_user_id']]= array(
+            $Users[$friend['friend_user_id']] = array(
                 'user_id' => $friend['friend_user_id'],
                 'firstname' =>$friend['firstName'],
                 'lastname' => $friend['lastName'],
@@ -131,7 +131,7 @@ 
     }
 }
 
-if (is_array($Users) && count($Users) > 0 ) {
+if (is_array($Users) && count($Users) > 0) {
     foreach ($Users as $user) {
         if ($user['group_id'] != $group_id) {
             $nosessionUsersList[$user['user_id']] = api_get_person_name(
@@ -143,7 +143,7 @@ 
 }
 
 $social_left_content = SocialManager::show_social_menu('invite_friends', $group_id);
-$social_right_content =  '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>';
+$social_right_content = '<h3 class="group-title">'.Security::remove_XSS($group_info['name'], STUDENT, true).'</h3>';
 
 if (count($nosessionUsersList) == 0) {
     $friends = SocialManager::get_friends(api_get_user_id());
@@ -179,7 +179,7 @@ 
     array(GROUP_USER_PERMISSION_PENDING_INVITATION)
 );
 
-if (is_array($members) && count($members)>0) {
+if (is_array($members) && count($members) > 0) {
     foreach ($members as &$member) {
         $image = UserManager::getUserPicture($member['id']);
         $member['image'] = '<img class="img-circle" src="'.$image.'"  width="50px" height="50px"  />';

main/inc/lib/system_announcements.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -306,7 +306,7 @@
      * @param int    Whether the announcement should be visible to anonymous users (1) or not (0)
      * @param string The language for which the announvement should be shown. Leave null for all langages
      * @param int    Whether to send an e-mail to all users (1) or not (0)
-     * @return mixed  insert_id on success, false on failure
+     * @return false|string  insert_id on success, false on failure
      */
     public static function add_announcement(
         $title,

Spacing +17 added lines, -17 removed lines

@@ -22,14 +22,14 @@ 
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
         $userGroup = new UserGroup();
 
-        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
+        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
         $groups = array();
         foreach ($temp_user_groups as $user_group) {
             $groups = array_merge($groups, array($user_group['id']));
             $groups = array_merge($groups, $userGroup->get_parent_groups($user_group['id']));
         }
 
-        $groups_string = '('.implode($groups,',').')';
+        $groups_string = '('.implode($groups, ',').')';
         $now = api_get_utc_datetime();
         $sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y %h:%i:%s') AS display_date
                 FROM  $db_table
@@ -104,13 +104,13 @@ 
      * @param string $user_id
      * @return string
      */
-    public static function display_all_announcements($visible, $id = -1, $start = 0,$user_id='')
+    public static function display_all_announcements($visible, $id = -1, $start = 0, $user_id = '')
     {
         $user_selected_language = api_get_interface_language();
-        $start	= intval($start);
+        $start = intval($start);
         $userGroup = new UserGroup();
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
-        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(),0);
+        $temp_user_groups = $userGroup->get_groups_by_user(api_get_user_id(), 0);
         $groups = array();
         foreach ($temp_user_groups as $user_group) {
             $groups = array_merge($groups, array($user_group['id']));
@@ -118,10 +118,10 @@ 
         }
 
         // Checks if tables exists to not break platform not updated
-        $groups_string = '('.implode($groups,',').')';
+        $groups_string = '('.implode($groups, ',').')';
 
         $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-        $now  = api_get_utc_datetime();
+        $now = api_get_utc_datetime();
 
         $sql = "SELECT * FROM ".$db_table."
                 WHERE
@@ -152,10 +152,10 @@ 
             $sql .= " AND access_url_id IN ('1', '$current_access_url_id')";
         }
 
-        if(!isset($_GET['start']) || $_GET['start'] == 0) {
+        if (!isset($_GET['start']) || $_GET['start'] == 0) {
             $sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
         } else {
-            $sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
+            $sql .= " ORDER BY date_start DESC LIMIT ".($start + 1).",20";
         }
         $announcements = Database::query($sql);
         $content = '';
@@ -204,10 +204,10 @@ 
      */
     public static function display_arrow($user_id)
     {
-        $start = (int)$_GET['start'];
+        $start = (int) $_GET['start'];
         $nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start, $user_id);
-        $next = ((int)$_GET['start']+19);
-        $prev = ((int)$_GET['start']-19);
+        $next = ((int) $_GET['start'] + 19);
+        $prev = ((int) $_GET['start'] - 19);
         $content = '';
         if (!isset($_GET['start']) || $_GET['start'] == 0) {
             if ($nb_announcement > 20) {
@@ -564,7 +564,7 @@ 
                 $sendEmailTest
             );
         } else {
-            if ($send_mail==1) {
+            if ($send_mail == 1) {
                 SystemAnnouncementManager::send_system_announcement_by_email(
                     $title,
                     $content,
@@ -675,7 +675,7 @@ 
         $language = null,
         $sendEmailTest = false
     ) {
-        $content = str_replace(array('\r\n', '\n', '\r'),'', $content);
+        $content = str_replace(array('\r\n', '\n', '\r'), '', $content);
         $now = api_get_utc_datetime();
 
         if ($sendEmailTest) {
@@ -701,7 +701,7 @@ 
 					WHERE status = '5' ";
 		}
 
-		if ($teacher<> 0 && $student <> 0) {
+		if ($teacher <> 0 && $student <> 0) {
 			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
 					WHERE 1 = 1 ";
 		}
@@ -734,7 +734,7 @@ 
 
         $message_sent = false;
 
-		while ($row = Database::fetch_array($result,'ASSOC')) {
+		while ($row = Database::fetch_array($result, 'ASSOC')) {
             MessageManager::send_message_simple($row['user_id'], $title, $content);
             $message_sent = true;
 		}
@@ -755,7 +755,7 @@ 
         $cut_size = 500;
         $now = api_get_utc_datetime();
 
-        $sql = "SELECT * FROM " . $table . "
+        $sql = "SELECT * FROM ".$table."
 				WHERE
 				    (lang = '$user_selected_language' OR lang = '') AND
 				    ('$now' >= date_start AND '$now' <= date_end) ";

Indentation +129 added lines, -129 removed lines

@@ -10,12 +10,12 @@ 
     const VISIBLE_STUDENT = 2;
     const VISIBLE_TEACHER = 3;
 
-	/**
-	 * Displays all announcements
-	 * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
-	 * @param int $id The identifier of the announcement to display
-	 */
-	public static function display_announcements($visible, $id = -1)
+    /**
+     * Displays all announcements
+     * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
+     * @param int $id The identifier of the announcement to display
+     */
+    public static function display_announcements($visible, $id = -1)
     {
         $user_selected_language = api_get_interface_language();
         $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
@@ -423,10 +423,10 @@ 
     }
 
     /**
-    * Makes the announcement id visible only for groups in groups_array
-    * @param int $announcement_id
-    * @param array $group_array array of group id
-    **/
+     * Makes the announcement id visible only for groups in groups_array
+     * @param int $announcement_id
+     * @param array $group_array array of group id
+     **/
     public static function announcement_for_groups($announcement_id, $group_array)
     {
         $tbl_announcement_group = Database:: get_main_table(
@@ -459,10 +459,10 @@ 
     }
 
     /**
-    * Gets the groups of this announce
-    * @param int announcement id
-    * @return array array of group id
-    **/
+     * Gets the groups of this announce
+     * @param int announcement id
+     * @return array array of group id
+     **/
     public static function get_announcement_groups($announcement_id)
     {
         $tbl_announcement_group = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
@@ -482,15 +482,15 @@ 
         return $groups;
     }
 
-	/**
-	 * Updates an announcement to the database
-	 * @param integer $id      : id of the announcement
-	 * @param string  $title   : title of the announcement
-	 * @param string  $content : content of the announcement
-	 * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
-	 * @return	bool	True on success, false on failure
-	 */
+    /**
+     * Updates an announcement to the database
+     * @param integer $id      : id of the announcement
+     * @param string  $title   : title of the announcement
+     * @param string  $content : content of the announcement
+     * @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
+     * @return	bool	True on success, false on failure
+     */
     public static function update_announcement(
         $id,
         $title,
@@ -505,7 +505,7 @@ 
         $sendEmailTest = false
     ) {
         $em = Database::getManager();
-		$announcement = $em->find('ChamiloCoreBundle:SysAnnouncement', $id);
+        $announcement = $em->find('ChamiloCoreBundle:SysAnnouncement', $id);
 
         if (!$announcement) {
             return false;
@@ -529,28 +529,28 @@ 
             return false;
         }
 
-		if (($date_end_to_compare[1] ||
+        if (($date_end_to_compare[1] ||
             $date_end_to_compare[2] ||
             $date_end_to_compare[0]) &&
             !checkdate($date_end_to_compare[1], $date_end_to_compare[2], $date_end_to_compare[0])
         ) {
-			Display :: display_normal_message(get_lang('InvalidEndDate'));
+            Display :: display_normal_message(get_lang('InvalidEndDate'));
 
-			return false;
-		}
+            return false;
+        }
 
-		if (strlen(trim($title)) == 0) {
-			Display::display_normal_message(get_lang('InvalidTitle'));
+        if (strlen(trim($title)) == 0) {
+            Display::display_normal_message(get_lang('InvalidTitle'));
 
-			return false;
-		}
+            return false;
+        }
 
         $start = api_get_utc_datetime($date_start);
         $end = api_get_utc_datetime($date_end);
 
-		//Fixing urls that are sent by email
-		//$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
-		//$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
+        //Fixing urls that are sent by email
+        //$content = str_replace('src=\"/home/', 'src=\"'.api_get_path(WEB_PATH).'home/', $content);
+        //$content = str_replace('file=/home/', 'file='.api_get_path(WEB_PATH).'home/', $content);
         $content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
         $content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
 
@@ -592,81 +592,81 @@ 
         $em->merge($announcement);
         $em->flush();
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Deletes an announcement
-	 * @param 	int $id The identifier of the announcement that should be
-	 * @return	bool	True on success, false on failure
-	 */
-	public static function delete_announcement($id)
+    /**
+     * Deletes an announcement
+     * @param 	int $id The identifier of the announcement that should be
+     * @return	bool	True on success, false on failure
+     */
+    public static function delete_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "DELETE FROM ".$db_table." WHERE id =".$id;
-		$res = Database::query($sql);
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "DELETE FROM ".$db_table." WHERE id =".$id;
+        $res = Database::query($sql);
         if ($res === false) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Gets an announcement
-	 * @param 	int		$id The identifier of the announcement that should be
-	 * @return	object	Object of class StdClass or the required class, containing the query result row
-	 */
-	public static function get_announcement($id)
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Gets an announcement
+     * @param 	int		$id The identifier of the announcement that should be
+     * @return	object	Object of class StdClass or the required class, containing the query result row
+     */
+    public static function get_announcement($id)
     {
-		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$id = intval($id);
-		$sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
-		$announcement = Database::fetch_object(Database::query($sql));
-
-		return $announcement;
-	}
-
-	/**
-	 * Change the visibility of an announcement
-	 * @param 	int $announcement_id
-	 * @param 	int $user For who should the visibility be changed
+        $db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $id = intval($id);
+        $sql = "SELECT * FROM ".$db_table." WHERE id = ".$id;
+        $announcement = Database::fetch_object(Database::query($sql));
+
+        return $announcement;
+    }
+
+    /**
+     * Change the visibility of an announcement
+     * @param 	int $announcement_id
+     * @param 	int $user For who should the visibility be changed
      * (possible values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST)
-	 * @return 	bool	True on success, false on failure
-	 */
-	public static function set_visibility($announcement_id, $user, $visible)
+     * @return 	bool	True on success, false on failure
+     */
+    public static function set_visibility($announcement_id, $user, $visible)
     {
-		$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
-		$visible = intval($visible);
-		$announcement_id = intval($announcement_id);
+        $db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
+        $visible = intval($visible);
+        $announcement_id = intval($announcement_id);
 
         if (!in_array($user, array(self::VISIBLE_GUEST, self::VISIBLE_STUDENT, self::VISIBLE_TEACHER))) {
             return false;
         }
 
-		$field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
+        $field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest'));
 
-		$sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
+        $sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."'
 		        WHERE id='".$announcement_id."'";
-		$res = Database::query($sql);
-
-		if ($res === false) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send a system announcement by e-mail to all teachers/students depending on parameters
-	 * @param	string	$title
-	 * @param	string	$content
-	 * @param	int		$teacher Whether to send to all teachers (1) or not (0)
-	 * @param	int		$student Whether to send to all students (1) or not (0)
-	 * @param	string	$language Language (optional, considered for all languages if left empty)
+        $res = Database::query($sql);
+
+        if ($res === false) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send a system announcement by e-mail to all teachers/students depending on parameters
+     * @param	string	$title
+     * @param	string	$content
+     * @param	int		$teacher Whether to send to all teachers (1) or not (0)
+     * @param	int		$student Whether to send to all students (1) or not (0)
+     * @param	string	$language Language (optional, considered for all languages if left empty)
      * @param	bool	$sendEmailTest
      * @return  bool    True if the message was sent or there was no destination matching. False on database or e-mail sending error.
-	 */
+     */
     public static function send_system_announcement_by_email(
         $title,
         $content,
@@ -692,26 +692,26 @@ 
         }
 
         if ($teacher <> 0 && $student == 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
 					WHERE status = '1' ";
-		}
+        }
 
-		if ($teacher == 0 && $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
+        if ($teacher == 0 && $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
 					WHERE status = '5' ";
-		}
+        }
 
-		if ($teacher<> 0 && $student <> 0) {
-			$sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
+        if ($teacher<> 0 && $student <> 0) {
+            $sql = "SELECT DISTINCT u.user_id FROM $user_table u $url_condition 
 					WHERE 1 = 1 ";
-		}
+        }
 
-		if (!empty($language)) {
-			//special condition because language was already treated for SQL insert before
-			$sql .= " AND language = '".Database::escape_string($language)."' ";
-		}
+        if (!empty($language)) {
+            //special condition because language was already treated for SQL insert before
+            $sql .= " AND language = '".Database::escape_string($language)."' ";
+        }
 
-		if (api_is_multiple_url_enabled()) {
+        if (api_is_multiple_url_enabled()) {
             $sql .= " AND access_url_id = '".$current_access_url_id."' ";
         }
 
@@ -721,36 +721,36 @@ 
         // Expiration date
         $sql .= " AND (expiration_date = '' OR expiration_date IS NULL OR expiration_date > '$now') ";
 
-		if ((empty($teacher) || $teacher == '0') && (empty($student) || $student == '0')) {
+        if ((empty($teacher) || $teacher == '0') && (empty($student) || $student == '0')) {
 
-			return true;
-		}
+            return true;
+        }
 
-		$result = Database::query($sql);
-		if ($result === false) {
+        $result = Database::query($sql);
+        if ($result === false) {
 
-			return false;
-		}
+            return false;
+        }
 
         $message_sent = false;
 
-		while ($row = Database::fetch_array($result,'ASSOC')) {
+        while ($row = Database::fetch_array($result,'ASSOC')) {
             MessageManager::send_message_simple($row['user_id'], $title, $content);
             $message_sent = true;
-		}
+        }
 	    
-	    	// Minor validation to clean up the attachment files in the announcement
-		if (!empty($_FILES)) {
-		    $attachments = $_FILES;
-		    foreach ($attachments as $attachment) {
-			unlink($attachment['tmp_name']);
-		    }
-		}
-
-		return $message_sent; //true if at least one e-mail was sent
-	}
-
-	/**
+            // Minor validation to clean up the attachment files in the announcement
+        if (!empty($_FILES)) {
+            $attachments = $_FILES;
+            foreach ($attachments as $attachment) {
+            unlink($attachment['tmp_name']);
+            }
+        }
+
+        return $message_sent; //true if at least one e-mail was sent
+    }
+
+    /**
      * Displays announcements as an slideshow
      * @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
      * @param int $id The identifier of the announcement to display

main/course_progress/index.php

Spacing +13 added lines, -13 removed lines

@@ -46,7 +46,7 @@ 
     'thematic_advance_delete'
 );
 
-$action  = 'thematic_details';
+$action = 'thematic_details';
 if (isset($_REQUEST['action']) && in_array($_REQUEST['action'], $actions)) {
     $action = $_REQUEST['action'];
 }
@@ -184,7 +184,7 @@ 
 $thematicControl = Session::read('thematic_control');
 
 if ($action == 'thematic_list') {
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicControl'));
 }
 if ($action == 'thematic_add') {
     $interbreadcrumb[] = array(
@@ -198,10 +198,10 @@ 
         'url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl,
         'name' => get_lang('ThematicControl')
     );
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('EditThematicSection'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditThematicSection'));
 }
 if ($action == 'thematic_details') {
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicControl'));
 }
 if ($action == 'thematic_plan_list' || $action == 'thematic_plan_delete') {
     $interbreadcrumb[] = array(
@@ -216,22 +216,22 @@ 
     }
 }
 if ($action == 'thematic_plan_add' || $action == 'thematic_plan_edit') {
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].')');
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].')');
     if ($description_type >= ADD_THEMATIC_PLAN) {
-        $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewBloc'));
+        $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewBloc'));
     } else {
-        $interbreadcrumb[] = array ('url' => '#', 'name' => $default_thematic_plan_title[$description_type]);
+        $interbreadcrumb[] = array('url' => '#', 'name' => $default_thematic_plan_title[$description_type]);
     }
 }
 if ($action == 'thematic_advance_list' || $action == 'thematic_advance_delete') {
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
 }
 if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') {
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
-    $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
-    $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewThematicAdvance'));
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action='.$thematicControl, 'name' => get_lang('ThematicControl'));
+    $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic_id, 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('NewThematicAdvance'));
 }
 
 // Distpacher actions to controller

main/inc/lib/system/session.class.php

Doc Comments +4 added lines, -1 removed lines

@@ -14,6 +14,9 @@ 
 class Session implements \ArrayAccess
 {
 
+    /**
+     * @param string $variable
+     */
     static function read($variable, $default = null)
     {
         return isset($_SESSION[$variable]) ? $_SESSION[$variable] : $default;
@@ -39,7 +42,7 @@ 
      * Returns true if session has variable set up, false otherwise.
      *
      * @param string $variable
-     * @return mixed value
+     * @return boolean value
      */
     static function has($variable)
     {

main/inc/lib/certificate.lib.php

Indentation +8 added lines, -8 removed lines

@@ -253,12 +253,12 @@ 
     }
 
     /**
-    * update user info about certificate
-    * @param int $cat_id category id
-    * @param int $user_id user id
-    * @param string $path_certificate the path name of the certificate
-    * @return void
-    */
+     * update user info about certificate
+     * @param int $cat_id category id
+     * @param int $user_id user id
+     * @param string $path_certificate the path name of the certificate
+     * @return void
+     */
     public function update_user_info_about_certificate(
         $cat_id,
         $user_id,
@@ -418,8 +418,8 @@ 
     }
 
     /**
-    * Shows the student's certificate (HTML file)
-    */
+     * Shows the student's certificate (HTML file)
+     */
     public function show()
     {
         header('Content-Type: text/html; charset='. api_get_system_encoding());

Spacing +9 added lines, -9 removed lines

@@ -204,7 +204,7 @@ 
                             // Creating new name
                             $name = md5($this->user_id.$this->certificate_data['cat_id']).'.html';
                             $my_path_certificate = $this->certification_user_path.$name;
-                            $path_certificate    ='/'.$name;
+                            $path_certificate    = '/'.$name;
 
                             //Getting QR filename
                             $file_info = pathinfo($path_certificate);
@@ -350,11 +350,11 @@ 
             $final_content['gradebook_institution'].' - '.
             $final_content['gradebook_sitename'].' - '.
             get_lang('Certification').$break_space.
-            get_lang('Student'). ': '.$final_content['user_firstname'].' '.$final_content['user_lastname'].$break_space.
-            get_lang('Teacher'). ': '.$final_content['teacher_firstname'].' '.$final_content['teacher_lastname'].$break_space.
-            get_lang('Date'). ': '.$final_content['date_certificate'].$break_space.
-            get_lang('Score'). ': '.$final_content['gradebook_grade'].$break_space.
-            'URL'. ': '.$final_content['certificate_link'];
+            get_lang('Student').': '.$final_content['user_firstname'].' '.$final_content['user_lastname'].$break_space.
+            get_lang('Teacher').': '.$final_content['teacher_firstname'].' '.$final_content['teacher_lastname'].$break_space.
+            get_lang('Date').': '.$final_content['date_certificate'].$break_space.
+            get_lang('Score').': '.$final_content['gradebook_grade'].$break_space.
+            'URL'.': '.$final_content['certificate_link'];
 
         return $text;
     }
@@ -407,7 +407,7 @@ 
             return false;
         }
 
-        $user_certificate = $this->certification_user_path . basename($this->certificate_data['path_certificate']);
+        $user_certificate = $this->certification_user_path.basename($this->certificate_data['path_certificate']);
 
         if (!file_exists($user_certificate)) {
             return false;
@@ -421,9 +421,9 @@ 
     */
     public function show()
     {
-        header('Content-Type: text/html; charset='. api_get_system_encoding());
+        header('Content-Type: text/html; charset='.api_get_system_encoding());
 
-        $user_certificate = $this->certification_user_path . basename($this->certificate_data['path_certificate']);
+        $user_certificate = $this->certification_user_path.basename($this->certificate_data['path_certificate']);
         $certificateContent = file_get_contents($user_certificate);
 
         $certificate = new DOMDocument();

main/exercise/export/exercise_import.inc.php

Doc Comments -1 removed lines

@@ -949,7 +949,6 @@
 /**
  * Processes an IMS/QTI manifest file: store links to new files to be able to transform them into questions text
  * @param string $filePath The absolute filepath
- * @param array $links List of filepaths changes
  * @return bool
  */
 function qtiProcessManifest($filePath)

Spacing +38 added lines, -38 removed lines

@@ -59,7 +59,7 @@ 
     global $questionTempDir;
     global $resourcesLinks;
 
-    $baseWorkDir = api_get_path(SYS_ARCHIVE_PATH) . 'qti2';
+    $baseWorkDir = api_get_path(SYS_ARCHIVE_PATH).'qti2';
 
     if (!is_dir($baseWorkDir)) {
         mkdir($baseWorkDir, api_get_permissions_for_new_directories(), true);
@@ -103,35 +103,35 @@ 
     // The assets-related code is a bit fragile as it has to deal with files renamed by Chamilo and it only works if
     // the imsmanifest.xml file is read.
     while (false !== ($file = readdir($exerciseHandle))) {
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
             // Find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             // Only analyse one level of subdirectory - no recursivity here
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.xml$/i', $questionFile)) {
-                    $isQti = isQtiQuestionBank($baseWorkDir . '/' . $file . '/' . $questionFile);
+                    $isQti = isQtiQuestionBank($baseWorkDir.'/'.$file.'/'.$questionFile);
                     if ($isQti) {
                         $result = qti_parse_file($baseWorkDir, $file, $questionFile);
-                        $filePath = $baseWorkDir . $file;
+                        $filePath = $baseWorkDir.$file;
                         $file_found = true;
                     } else {
-                        $isManifest = isQtiManifest($baseWorkDir . '/' . $file . '/' . $questionFile);
+                        $isManifest = isQtiManifest($baseWorkDir.'/'.$file.'/'.$questionFile);
                         if ($isManifest) {
-                            $resourcesLinks = qtiProcessManifest($baseWorkDir . '/' . $file . '/' . $questionFile);
+                            $resourcesLinks = qtiProcessManifest($baseWorkDir.'/'.$file.'/'.$questionFile);
                         }
                     }
                 }
             }
         } elseif (preg_match('/.xml$/i', $file)) {
-            $isQti = isQtiQuestionBank($baseWorkDir . '/' . $file);
+            $isQti = isQtiQuestionBank($baseWorkDir.'/'.$file);
             if ($isQti) {
                 $result = qti_parse_file($baseWorkDir, '', $file);
-                $filePath = $baseWorkDir . '/' . $file;
+                $filePath = $baseWorkDir.'/'.$file;
                 $file_found = true;
             } else {
-                $isManifest = isQtiManifest($baseWorkDir . '/' . $file);
+                $isManifest = isQtiManifest($baseWorkDir.'/'.$file);
                 if ($isManifest) {
-                    $resourcesLinks = qtiProcessManifest($baseWorkDir . '/' . $file);
+                    $resourcesLinks = qtiProcessManifest($baseWorkDir.'/'.$file);
                 }
             }
 
@@ -165,7 +165,7 @@ 
             $question->type = $question_array['type'];
             $question->setAnswer();
             if (strlen($question_array['title']) < 50) {
-                $question->updateTitle(formatText(strip_tags($question_array['title'])) . '...');
+                $question->updateTitle(formatText(strip_tags($question_array['title'])).'...');
             } else {
                 $question->updateTitle(formatText(substr(strip_tags($question_array['title']), 0, 50)));
                 $question->updateDescription($question_array['title']);
@@ -211,7 +211,7 @@ 
         }
 
         // delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         return $last_exercise_id;
     }
 
@@ -239,8 +239,8 @@ 
     global $record_item_body;
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!($fp = fopen($questionFilePath, 'r'))) {
         Display::addFlash(Display::return_message(get_lang('Error opening question\'s XML file'), 'error'));
@@ -295,7 +295,7 @@ 
         $error = xml_get_error_code();
         Display::addFlash(
             Display::return_message(
-                get_lang('Error reading XML file') . sprintf('[%d:%d]', xml_get_current_line_number($xml_parser), xml_get_current_column_number($xml_parser)),
+                get_lang('Error reading XML file').sprintf('[%d:%d]', xml_get_current_line_number($xml_parser), xml_get_current_column_number($xml_parser)),
                 'error'
             )
         );
@@ -361,9 +361,9 @@ 
     if ($record_item_body) {
 
         if ((!in_array($current_element, $non_HTML_tag_to_avoid))) {
-            $current_question_item_body .= "<" . $name;
+            $current_question_item_body .= "<".$name;
             foreach ($attributes as $attribute_name => $attribute_value) {
-                $current_question_item_body .= " " . $attribute_name . "=\"" . $attribute_value . "\"";
+                $current_question_item_body .= " ".$attribute_name."=\"".$attribute_value."\"";
             }
             $current_question_item_body .= ">";
         } else {
@@ -371,11 +371,11 @@ 
             //we first save with claroline tags ,then when the answer will be parsed, the claroline tags will be replaced
 
             if ($current_element == 'INLINECHOICEINTERACTION') {
-                $current_question_item_body .= "**claroline_start**" . $attributes['RESPONSEIDENTIFIER'] . "**claroline_end**";
+                $current_question_item_body .= "**claroline_start**".$attributes['RESPONSEIDENTIFIER']."**claroline_end**";
             }
             if ($current_element == 'TEXTENTRYINTERACTION') {
                 $correct_answer_value = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
-                $current_question_item_body .= "[" . $correct_answer_value . "]";
+                $current_question_item_body .= "[".$correct_answer_value."]";
 
             }
             if ($current_element == 'BR') {
@@ -492,7 +492,7 @@ 
     //treat the record of the full content of itembody tag :
 
     if ($record_item_body && (!in_array($current_element, $non_HTML_tag_to_avoid))) {
-        $current_question_item_body .= "</" . $name . ">";
+        $current_question_item_body .= "</".$name.">";
     }
 
     switch ($name) {
@@ -550,14 +550,14 @@ 
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= '' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= ''.trim($data);
             }
             break;
         case 'FEEDBACKINLINE':
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' ' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' '.trim($data);
             }
             break;
         case 'SIMPLEASSOCIABLECHOICE':
@@ -577,7 +577,7 @@ 
             // $resourcesLinks is only defined by qtiProcessManifest()
             if (isset($resourcesLinks) && isset($resourcesLinks['manifest']) && isset($resourcesLinks['web'])) {
                 foreach ($resourcesLinks['manifest'] as $key => $value) {
-                    $data = preg_replace('|' . $value . '|', $resourcesLinks['web'][$key], $data);
+                    $data = preg_replace('|'.$value.'|', $resourcesLinks['web'][$key], $data);
                 }
             }
             $current_question_item_body .= $data;
@@ -587,8 +587,8 @@ 
             $answer_identifier = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
             if ($current_inlinechoice_id == $answer_identifier) {
                 $current_question_item_body = str_replace(
-                    "**claroline_start**" . $current_answer_id . "**claroline_end**",
-                    "[" . $data . "]",
+                    "**claroline_start**".$current_answer_id."**claroline_end**",
+                    "[".$data."]",
                     $current_question_item_body
                 );
             } else {
@@ -647,9 +647,9 @@ 
     if ($record_item_body) {
 
         if ((!in_array($current_element, $non_HTML_tag_to_avoid))) {
-            $current_question_item_body .= "<" . $name;
+            $current_question_item_body .= "<".$name;
             foreach ($attributes as $attribute_name => $attribute_value) {
-                $current_question_item_body .= " " . $attribute_name . "=\"" . $attribute_value . "\"";
+                $current_question_item_body .= " ".$attribute_name."=\"".$attribute_value."\"";
             }
             $current_question_item_body .= ">";
         } else {
@@ -657,11 +657,11 @@ 
             //we first save with claroline tags ,then when the answer will be parsed, the claroline tags will be replaced
 
             if ($current_element == 'INLINECHOICEINTERACTION') {
-                $current_question_item_body .= "**claroline_start**" . $attributes['RESPONSEIDENTIFIER'] . "**claroline_end**";
+                $current_question_item_body .= "**claroline_start**".$attributes['RESPONSEIDENTIFIER']."**claroline_end**";
             }
             if ($current_element == 'TEXTENTRYINTERACTION') {
                 $correct_answer_value = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
-                $current_question_item_body .= "[" . $correct_answer_value . "]";
+                $current_question_item_body .= "[".$correct_answer_value."]";
 
             }
             if ($current_element == 'BR') {
@@ -780,7 +780,7 @@ 
     //treat the record of the full content of itembody tag :
 
     if ($record_item_body && (!in_array($current_element, $non_HTML_tag_to_avoid))) {
-        $current_question_item_body .= "</" . $name . ">";
+        $current_question_item_body .= "</".$name.">";
     }
 
     switch ($name) {
@@ -897,7 +897,7 @@ 
             // $resourcesLinks is only defined by qtiProcessManifest()
             if (isset($resourcesLinks) && isset($resourcesLinks['manifest']) && isset($resourcesLinks['web'])) {
                 foreach ($resourcesLinks['manifest'] as $key=>$value) {
-                    $data = preg_replace('|' . $value . '|', $resourcesLinks['web'][$key], $data);
+                    $data = preg_replace('|'.$value.'|', $resourcesLinks['web'][$key], $data);
                 }
             }
             if (!empty($current_question_item_body)) {
@@ -971,9 +971,9 @@ 
     $sessionId = api_get_session_id();
     $courseDir = $course['path'];
     $sysPath = api_get_path(SYS_COURSE_PATH);
-    $exercisesSysPath = $sysPath . $courseDir . '/document/';
+    $exercisesSysPath = $sysPath.$courseDir.'/document/';
     $webPath = api_get_path(WEB_CODE_PATH);
-    $exercisesWebPath = $webPath . 'document/document.php?' . api_get_cidreq() . '&action=download&id=';
+    $exercisesWebPath = $webPath.'document/document.php?'.api_get_cidreq().'&action=download&id=';
     $links = array(
         'manifest' => array(),
         'system' => array(),
@@ -981,7 +981,7 @@ 
     );
     $tableDocuments = Database::get_course_table(TABLE_DOCUMENT);
     $countResources = count($xml->resources->resource->file);
-    for ($i=0; $i < $countResources; $i++) {
+    for ($i = 0; $i < $countResources; $i++) {
         $file = $xml->resources->resource->file[$i];
         $href = '';
         foreach ($file->attributes() as $key => $value) {
@@ -993,17 +993,17 @@ 
         }
         if (!empty($href)) {
             $links['manifest'][] = (string) $href;
-            $links['system'][] = $exercisesSysPath . strtolower($href);
+            $links['system'][] = $exercisesSysPath.strtolower($href);
             $specialHref = Database::escape_string(preg_replace('/_/', '-', strtolower($href)));
             $specialHref = preg_replace('/(-){2,8}/', '-', $specialHref);
 
-            $sql = "SELECT iid FROM " . $tableDocuments . " WHERE c_id = " . $course['real_id'] . " AND session_id = $sessionId AND path = '/" . $specialHref . "'";
+            $sql = "SELECT iid FROM ".$tableDocuments." WHERE c_id = ".$course['real_id']." AND session_id = $sessionId AND path = '/".$specialHref."'";
             $result = Database::query($sql);
             $documentId = 0;
             while ($row = Database::fetch_assoc($result)) {
                 $documentId = $row['iid'];
             }
-            $links['web'][] = $exercisesWebPath . $documentId;
+            $links['web'][] = $exercisesWebPath.$documentId;
         }
     }
     return $links;