chamilo / chamilo-lms

main/inc/lib/formvalidator/Element/SelectAjax.php

Spacing +4 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
         $iso = api_get_language_isocode(api_get_interface_language());
         $languageCondition = '';
 
-        if (file_exists(api_get_path(SYS_PATH) . "web/assets/select2/dist/js/i18n/$iso.js")) {
+        if (file_exists(api_get_path(SYS_PATH)."web/assets/select2/dist/js/i18n/$iso.js")) {
             $html .= api_get_asset("select2/dist/js/i18n/$iso.js");
             $languageCondition = "language: '$iso',";
         }
@@ -50,8 +50,7 @@ 
 
         //Get the minimumInputLength for select2
         $minimumInputLength = $this->getAttribute('minimumInputLength') > 3 ?
-            $this->getAttribute('minimumInputLength') :
-            3
+            $this->getAttribute('minimumInputLength') : 3
         ;
 
         $plHolder = $this->getAttribute('placeholder');
@@ -81,7 +80,7 @@ 
         $multiple = $multiple ? 'true' : 'false';
 
         $max = $this->getAttribute('maximumSelectionLength');
-        $max = !empty($max) ? "maximumSelectionLength: $max, ": '';
+        $max = !empty($max) ? "maximumSelectionLength: $max, " : '';
 
         $html .= <<<JS
             <script>
@@ -125,7 +124,7 @@ 
         $this->removeAttribute('url_function');
         $this->setAttribute('style', 'width: 100%;');
 
-        return parent::toHtml() . $html;
+        return parent::toHtml().$html;
     }
 
     /**

main/gradebook/gradebook_flatview.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 require_once '../inc/global.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/fe/exportgradebook.php';
 
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 
@@ -74,7 +74,7 @@ 
     null,
     'simple_search_form',
     null,
-    api_get_self() . '?selectcat=' . $category_id
+    api_get_self().'?selectcat='.$category_id
 );
 $values = $simple_search_form->exportValues();
 
@@ -148,15 +148,15 @@ 
     }
 }
 
-if (isset($_GET['exportpdf']))	{
-    $interbreadcrumb[] = array (
-        'url' => api_get_self().'?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq(),
+if (isset($_GET['exportpdf'])) {
+    $interbreadcrumb[] = array(
+        'url' => api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq(),
         'name' => get_lang('FlatView')
     );
 
     $pageNum = isset($_GET['flatviewlist_page_nr']) ? intval($_GET['flatviewlist_page_nr']) : null;
     $perPage = isset($_GET['flatviewlist_per_page']) ? intval($_GET['flatviewlist_per_page']) : null;
-    $url = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+    $url = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
         'exportpdf' => '',
         'offset' => $offset,
         'selectcat' => intval($_GET['selectcat']),
@@ -195,7 +195,7 @@ 
     }
 }
 
-if (isset($_GET['print']))	{
+if (isset($_GET['print'])) {
     $printable_data = GradebookUtils::get_printable_data(
         $cat[0],
         $users,

main/group/tutor_settings.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_GROUP;
+$current_course_tool = TOOL_GROUP;
 
 // Notice for unauthorized people.
 api_protect_course_script(true);
@@ -22,8 +22,8 @@ 
 $current_group = GroupManager :: get_group_properties($group_id);
 
 $nameTools = get_lang('EditGroup');
-$interbreadcrumb[] = array ('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
-$interbreadcrumb[] = array ('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']);
+$interbreadcrumb[] = array('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']);
 
 $is_group_member = GroupManager :: is_tutor_of_group(api_get_user_id(), $group_id);
 

main/session/session_edit.php

Spacing +9 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 $formSent = 0;
 
 // Crop picture plugin for session images
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
     var $image = $("#previewImage");
@@ -103,8 +103,8 @@ 
 $tool_name = get_lang('EditSession');
 
 //$interbreadcrumb[] = array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => "session_list.php","name" => get_lang('SessionList'));
-$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id,"name" => get_lang('SessionOverview'));
+$interbreadcrumb[] = array('url' => "session_list.php", "name" => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id, "name" => get_lang('SessionOverview'));
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
 	$formSent = 1;
@@ -118,7 +118,7 @@ 
         WHERE status='1'".$order_clause;
 
 if (api_is_multiple_url_enabled()) {
-	$table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+	$table_access_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 	$access_url_id = api_get_current_access_url_id();
 	if ($access_url_id != -1) {
 		$sql = "SELECT DISTINCT u.user_id,lastname,firstname,username
@@ -134,7 +134,7 @@ 
 $thisYear = date('Y');
 
 $coachesOption = array(
-    '' => '----- ' . get_lang('None') . ' -----'
+    '' => '----- '.get_lang('None').' -----'
 );
 
 foreach ($coaches as $coach) {
@@ -154,7 +154,7 @@ 
     }
 }
 
-$formAction = api_get_self() . '?';
+$formAction = api_get_self().'?';
 $formAction .= http_build_query(array(
     'page' => Security::remove_XSS($_GET['page']),
     'id' => $id
@@ -220,7 +220,7 @@ 
         $duration = null;
     }
     $description = $params['description'];
-    $showDescription = isset($params['show_description']) ? 1: 0;
+    $showDescription = isset($params['show_description']) ? 1 : 0;
     $sendSubscriptionNotification = isset($params['send_subscription_notification']);
     $isThisImageCropped = isset($params['cropResult']);
 
@@ -256,7 +256,7 @@ 
     );
 
     if ($return == strval(intval($return))) {
-		header('Location: resume_session.php?id_session=' . $return);
+		header('Location: resume_session.php?id_session='.$return);
 		exit();
 	}
 }

main/forum/viewforum.php

Spacing +70 added lines, -70 removed lines

@@ -26,7 +26,7 @@ 
 
 // Including the global initialization file.
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_FORUM;
+$current_course_tool = TOOL_FORUM;
 
 // Notification for unauthorized people.
 api_protect_course_script(true);
@@ -77,7 +77,7 @@ 
 
     // Course
     if (
-        !api_is_allowed_to_edit(false, true) &&  //is a student
+        !api_is_allowed_to_edit(false, true) && //is a student
         (($current_forum_category && $current_forum_category['visibility'] == 0) ||
         $current_forum['visibility'] == 0 || !$user_has_access_in_group)
     ) {
@@ -86,7 +86,7 @@ 
 } else {
     //Course
     if (
-        !api_is_allowed_to_edit(false, true) &&  //is a student
+        !api_is_allowed_to_edit(false, true) && //is a student
         (
             ($current_forum_category && $current_forum_category['visibility'] == 0) ||
             $current_forum['visibility'] == 0
@@ -102,12 +102,12 @@ 
 $my_action = isset($_GET['action']) ? $_GET['action'] : '';
 
 $gradebook = null;
-if (isset($_SESSION['gradebook'])){
+if (isset($_SESSION['gradebook'])) {
     $gradebook = $_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook == 'view') {
-    $interbreadcrumb[] = array (
+    $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
@@ -117,25 +117,25 @@ 
 
 if ($origin == 'group') {
     $interbreadcrumb[] = array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'group/group.php?'.api_get_cidreq(),
+        'url' => api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq(),
         'name' => get_lang('Groups')
     );
     $interbreadcrumb[] = array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'group/group_space.php?' . api_get_cidreq(),
-        'name' => get_lang('GroupSpace') . ' ' . $group_properties['name']
+        'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
+        'name' => get_lang('GroupSpace').' '.$group_properties['name']
     );
     $interbreadcrumb[] = array(
         'url' => '#',
-        'name' => get_lang('Forum') . ' ' . Security::remove_XSS($current_forum['forum_title'])
+        'name' => get_lang('Forum').' '.Security::remove_XSS($current_forum['forum_title'])
     );
 } else {
     $interbreadcrumb[] = array(
-        'url' => $forumUrl . 'index.php?search=' . Security::remove_XSS($my_search),
+        'url' => $forumUrl.'index.php?search='.Security::remove_XSS($my_search),
         'name' => get_lang('ForumCategories')
     );
     $interbreadcrumb[] = array(
-        'url' => $forumUrl . 'viewforumcategory.php?forumcategory=' . $current_forum_category['cat_id']
-            . '&search=' . Security::remove_XSS(urlencode($my_search)),
+        'url' => $forumUrl.'viewforumcategory.php?forumcategory='.$current_forum_category['cat_id']
+            . '&search='.Security::remove_XSS(urlencode($my_search)),
         'name' => prepare4display($current_forum_category['cat_title'])
     );
     $interbreadcrumb[] = array(
@@ -243,24 +243,24 @@ 
             break;
     }
 
-    $table_list = Display::page_subheader(get_lang('ThreadUsersList') . ': ' . get_name_thread_by_id($_GET['id']));
+    $table_list = Display::page_subheader(get_lang('ThreadUsersList').': '.get_name_thread_by_id($_GET['id']));
 
     if ($nrorow3 > 0 || $nrorow3 == -2) {
-        $url = api_get_cidreq() .'&forum=' . intval($my_forum) . '&action='
-            . Security::remove_XSS($_GET['action']) . '&content='
-            . Security::remove_XSS($_GET['content'], STUDENT) . '&id=' . intval($_GET['id']);
+        $url = api_get_cidreq().'&forum='.intval($my_forum).'&action='
+            . Security::remove_XSS($_GET['action']).'&content='
+            . Security::remove_XSS($_GET['content'], STUDENT).'&id='.intval($_GET['id']);
         $tabs = array(
             array(
                 'content' =>  get_lang('AllStudents'),
-                'url' => $forumUrl . 'viewforum.php?' . $url . '&origin=' . $origin . '&list=all'
+                'url' => $forumUrl.'viewforum.php?'.$url.'&origin='.$origin.'&list=all'
             ),
             array(
                 'content' =>  get_lang('StudentsQualified'),
-                'url' => $forumUrl . 'viewforum.php?' . $url . '&origin=' . $origin . '&list=qualify'
+                'url' => $forumUrl.'viewforum.php?'.$url.'&origin='.$origin.'&list=qualify'
             ),
             array(
                 'content' =>  get_lang('StudentsNotQualified'),
-                'url' => $forumUrl . 'viewforum.php?' . $url . '&origin=' . $origin . '&list=notqualify'
+                'url' => $forumUrl.'viewforum.php?'.$url.'&origin='.$origin.'&list=notqualify'
             ),
         );
         $table_list .= Display::tabsOnlyLink($tabs, $active);
@@ -269,32 +269,32 @@ 
         $table_list .= '<center><br /><table class="data_table" style="width:50%">';
         // The column headers (TODO: Make this sortable).
         $table_list .= '<tr >';
-        $table_list .= '<th height="24">' . get_lang('NamesAndLastNames') . '</th>';
+        $table_list .= '<th height="24">'.get_lang('NamesAndLastNames').'</th>';
 
         if ($listType == 'qualify') {
-            $table_list .= '<th>' . get_lang('Qualification') . '</th>';
+            $table_list .= '<th>'.get_lang('Qualification').'</th>';
         }
         if (api_is_allowed_to_edit(null, true)) {
-            $table_list .= '<th>' . get_lang('Qualify') . '</th>';
+            $table_list .= '<th>'.get_lang('Qualify').'</th>';
         }
         $table_list .= '</tr>';
         $max_qualify = showQualify('2', $userId, $_GET['id']);
         $counter_stdlist = 0;
 
         if (Database::num_rows($student_list) > 0) {
-            while ($row_student_list=Database::fetch_array($student_list)) {
+            while ($row_student_list = Database::fetch_array($student_list)) {
                 $userInfo = api_get_user_info($row_student_list['id']);
                 if ($counter_stdlist % 2 == 0) {
                     $class_stdlist = 'row_odd';
                 } else {
                     $class_stdlist = 'row_even';
                 }
-                $table_list .= '<tr class="' . $class_stdlist . '"><td>';
+                $table_list .= '<tr class="'.$class_stdlist.'"><td>';
                 $table_list .= UserManager::getUserProfileLink($userInfo);
 
                 $table_list .= '</td>';
                 if ($listType == 'qualify') {
-                    $table_list .= '<td>' . $row_student_list['qualify'] . '/' . $max_qualify . '</td>';
+                    $table_list .= '<td>'.$row_student_list['qualify'].'/'.$max_qualify.'</td>';
                 }
                 if (api_is_allowed_to_edit(null, true)) {
                     $current_qualify_thread = showQualify(
@@ -303,20 +303,20 @@ 
                         $_GET['id']
                     );
                     $table_list .= '<td>
-                        <a href="' . $forumUrl . 'forumqualify.php?' . api_get_cidreq()
-                        . '&forum=' . Security::remove_XSS($my_forum) . '&thread='
-                        . Security::remove_XSS($_GET['id']) . '&user=' . $row_student_list['id']
-                        . '&user_id=' . $row_student_list['id'] . '&idtextqualify='
-                        . $current_qualify_thread . '&origin=' . $origin . '">'
-                        . Display::return_icon($icon_qualify, get_lang('Qualify')) . '</a></td></tr>';
+                        <a href="' . $forumUrl.'forumqualify.php?'.api_get_cidreq()
+                        . '&forum='.Security::remove_XSS($my_forum).'&thread='
+                        . Security::remove_XSS($_GET['id']).'&user='.$row_student_list['id']
+                        . '&user_id='.$row_student_list['id'].'&idtextqualify='
+                        . $current_qualify_thread.'&origin='.$origin.'">'
+                        . Display::return_icon($icon_qualify, get_lang('Qualify')).'</a></td></tr>';
                 }
                 $counter_stdlist++;
             }
         } else {
             if ($listType == 'qualify') {
-                $table_list .= '<tr><td colspan="2">' . get_lang('ThereIsNotQualifiedLearners') . '</td></tr>';
+                $table_list .= '<tr><td colspan="2">'.get_lang('ThereIsNotQualifiedLearners').'</td></tr>';
             } else {
-                $table_list .= '<tr><td colspan="2">' . get_lang('ThereIsNotUnqualifiedLearners') . '</td></tr>';
+                $table_list .= '<tr><td colspan="2">'.get_lang('ThereIsNotUnqualifiedLearners').'</td></tr>';
             }
         }
 
@@ -342,14 +342,14 @@ 
 echo '<div class="actions">';
 
 if ($origin != 'learnpath') {
-    if ($origin=='group') {
-        echo '<a href="' . api_get_path(WEB_CODE_PATH) . 'group/group_space.php?'
-            . api_get_cidreq() . '&gradebook=' . $gradebook . '">'
+    if ($origin == 'group') {
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'group/group_space.php?'
+            . api_get_cidreq().'&gradebook='.$gradebook.'">'
             . Display::return_icon('back.png', get_lang('BackTo')
-            . ' ' . get_lang('Groups'), '', ICON_SIZE_MEDIUM) . '</a>';
+            . ' '.get_lang('Groups'), '', ICON_SIZE_MEDIUM).'</a>';
     } else {
         echo '<span style="float:right;">'.search_link().'</span>';
-        echo '<a href="' . $forumUrl . 'index.php?' . api_get_cidreq() . '">'
+        echo '<a href="'.$forumUrl.'index.php?'.api_get_cidreq().'">'
             . Display::return_icon('back.png', get_lang('BackToForumOverview'), '', ICON_SIZE_MEDIUM)
             . '</a>';
     }
@@ -367,14 +367,14 @@ 
     if ($current_forum['locked'] <> 1 AND $current_forum['locked'] <> 1) {
         if (!api_is_anonymous() && !api_is_invitee()) {
             if ($my_forum == strval(intval($my_forum))) {
-                echo '<a href="' . $forumUrl . 'newthread.php?' . api_get_cidreq() . '&forum='
-                    . Security::remove_XSS($my_forum) . $origin_string . '">'
+                echo '<a href="'.$forumUrl.'newthread.php?'.api_get_cidreq().'&forum='
+                    . Security::remove_XSS($my_forum).$origin_string.'">'
                     . Display::return_icon('new_thread.png', get_lang('NewTopic'), '', ICON_SIZE_MEDIUM)
                     . '</a>';
             } else {
                 $my_forum = strval(intval($my_forum));
-                echo '<a href="' . $forumUrl . 'newthread.php?' . api_get_cidreq()
-                    . '&forum=' . $my_forum . $origin_string . '">'
+                echo '<a href="'.$forumUrl.'newthread.php?'.api_get_cidreq()
+                    . '&forum='.$my_forum.$origin_string.'">'
                     . Display::return_icon('new_thread.png', get_lang('NewTopic'), '', ICON_SIZE_MEDIUM)
                     . '</a>';
             }
@@ -401,7 +401,7 @@ 
 if ($origin != 'learnpath') {
     $html .= Display::tag(
         'h3',
-        $iconForum .' '. $titleForum,
+        $iconForum.' '.$titleForum,
         array(
             'class' => 'title-forum')
     );
@@ -443,7 +443,7 @@ 
             }
 
             if (is_array($my_whatsnew_post_info) && !empty($my_whatsnew_post_info)) {
-                $newPost = ' ' . Display::return_icon('alert.png', get_lang('Forum'), null, ICON_SIZE_SMALL);
+                $newPost = ' '.Display::return_icon('alert.png', get_lang('Forum'), null, ICON_SIZE_SMALL);
             } else {
                 $newPost = '';
             }
@@ -453,12 +453,12 @@ 
             }
 
             $name = api_get_person_name($row['firstname'], $row['lastname']);
-            $linkPostForum = '<a href="viewthread.php?' . api_get_cidreq() . '&forum=' . Security::remove_XSS($my_forum)
+            $linkPostForum = '<a href="viewthread.php?'.api_get_cidreq().'&forum='.Security::remove_XSS($my_forum)
                 . "&origin=$origin&thread={$row['thread_id']}$origin_string&search="
-                . Security::remove_XSS(urlencode($my_search)) . '">'
-                . $row['thread_title'] . '</a>';
+                . Security::remove_XSS(urlencode($my_search)).'">'
+                . $row['thread_title'].'</a>';
             $html = '';
-            $html .= '<div class="panel panel-default forum '.($row['thread_sticky']?'sticky':'').'">';
+            $html .= '<div class="panel panel-default forum '.($row['thread_sticky'] ? 'sticky' : '').'">';
             $html .= '<div class="panel-body">';
             $html .= '<div class="row">';
             $html .= '<div class="col-md-6">';
@@ -490,7 +490,7 @@ 
                 );
             }
 
-            $html .= '<div class="thumbnail">' . display_user_image($row['user_id'], $name, $origin) . '</div>';
+            $html .= '<div class="thumbnail">'.display_user_image($row['user_id'], $name, $origin).'</div>';
             $html .= '</div>';
             $html .= '<div class="col-md-10">';
             $html .= Display::tag(
@@ -500,8 +500,8 @@ 
                     'class' => 'title'
                 )
             );
-            $html .= '<p>'. get_lang('By') .' ' .$authorName.'</p>';
-            $html .= '<p>' . api_convert_and_format_date($row['insert_date']) . '</p>';
+            $html .= '<p>'.get_lang('By').' '.$authorName.'</p>';
+            $html .= '<p>'.api_convert_and_format_date($row['insert_date']).'</p>';
             $html .= '</div>';
             $html .= '</div>';
 
@@ -510,13 +510,13 @@ 
             $html .= '<div class="row">';
             $html .= '<div class="col-md-4">'
                 . Display::return_icon('post-forum.png', null, null, ICON_SIZE_SMALL)
-                . " {$row['thread_replies']} " . get_lang('Replies') . '<br>';
-            $html .=  Display::return_icon(
+                . " {$row['thread_replies']} ".get_lang('Replies').'<br>';
+            $html .= Display::return_icon(
                     'post-forum.png',
                     null,
                     null,
                     ICON_SIZE_SMALL
-                ) . ' ' . $row['thread_views'] . ' ' . get_lang('Views') . '<br>' . $newPost;
+                ).' '.$row['thread_views'].' '.get_lang('Views').'<br>'.$newPost;
             $html .= '</div>';
 
             $last_post_info = get_last_post_by_thread(
@@ -530,7 +530,7 @@ 
             if ($last_post_info) {
                 $poster_info = api_get_user_info($last_post_info['poster_id']);
                 $post_date = api_convert_and_format_date($last_post_info['post_date']);
-                $last_post = $post_date . '<br>' . get_lang('By') . ' ' . display_user_link(
+                $last_post = $post_date.'<br>'.get_lang('By').' '.display_user_link(
                     $last_post_info['poster_id'],
                     $poster_info['complete_name'],
                     '',
@@ -540,7 +540,7 @@ 
 
             $html .= '<div class="col-md-5">'
                 . Display::return_icon('post-item.png', null, null, ICON_SIZE_TINY)
-                . ' ' . $last_post;
+                . ' '.$last_post;
             $html .= '</div>';
             $html .= '<div class="col-md-3">';
             $cidreq = api_get_cidreq();
@@ -555,11 +555,11 @@ 
                 if (api_is_allowed_to_edit(false, true) &&
                     !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)
                 ) {
-                    $iconsEdit .= '<a href="' . $forumUrl . 'editthread.php?' . $cidreq
-                        . '&forum=' . intval($my_forum) . '&thread='
+                    $iconsEdit .= '<a href="'.$forumUrl.'editthread.php?'.$cidreq
+                        . '&forum='.intval($my_forum).'&thread='
                         . intval($row['thread_id'])
-                        . '&id_attach=' . $id_attach . '">'
-                        . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
+                        . '&id_attach='.$id_attach.'">'
+                        . Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
                     if (api_resource_is_locked_by_gradebook($row['thread_id'], LINK_FORUM_THREAD)) {
                         $iconsEdit .= Display::return_icon(
                             'delete_na.png',
@@ -568,13 +568,13 @@ 
                             ICON_SIZE_SMALL
                         );
                     } else {
-                        $iconsEdit.= '<a href="' . api_get_self() . '?' . $cidreq . '&forum='
-                            . intval($my_forum) . '&action=delete&content=thread&id='
-                            . $row['thread_id'] . $origin_string
+                        $iconsEdit .= '<a href="'.api_get_self().'?'.$cidreq.'&forum='
+                            . intval($my_forum).'&action=delete&content=thread&id='
+                            . $row['thread_id'].$origin_string
                             . "\" onclick=\"javascript:if(!confirm('"
                             . addslashes(api_htmlentities(get_lang('DeleteCompleteThread'), ENT_QUOTES))
                             . "')) return false;\">"
-                            . Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+                            . Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
                     }
 
                     $iconsEdit .= return_visible_invisible_icon(
@@ -597,9 +597,9 @@ 
                             'gidReq' => api_get_group_id()
                         )
                     );
-                    $iconsEdit .= '<a href="viewforum.php?' . $cidreq . '&forum='
+                    $iconsEdit .= '<a href="viewforum.php?'.$cidreq.'&forum='
                         . intval($my_forum)
-                        . '&action=move&thread=' . $row['thread_id'] . $origin_string . '">'
+                        . '&action=move&thread='.$row['thread_id'].$origin_string.'">'
                         . Display::return_icon('move.png', get_lang('MoveThread'), array(), ICON_SIZE_SMALL)
                         . '</a>';
                 }
@@ -616,17 +616,17 @@ 
             }
             $icon_liststd = 'user.png';
             if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
-                $iconsEdit .= '<a href="' . api_get_self() . '?' . $cidreq . '&forum='
+                $iconsEdit .= '<a href="'.api_get_self().'?'.$cidreq.'&forum='
                     . Security::remove_XSS($my_forum)
                     . "&origin=$origin&action=notify&content=thread&id={$row['thread_id']}"
-                    . '">' . Display::return_icon($iconnotify, get_lang('NotifyMe')) . '</a>';
+                    . '">'.Display::return_icon($iconnotify, get_lang('NotifyMe')).'</a>';
             }
 
             if (api_is_allowed_to_edit(null, true) && $origin != 'learnpath') {
-                $iconsEdit .= '<a href="' . api_get_self() . '?' . $cidreq . '&forum='
+                $iconsEdit .= '<a href="'.api_get_self().'?'.$cidreq.'&forum='
                     . Security::remove_XSS($my_forum)
                     . "&origin=$origin&action=liststd&content=thread&id={$row['thread_id']}"
-                    . '">' . Display::return_icon($icon_liststd, get_lang('StudentList'), array(), ICON_SIZE_SMALL)
+                    . '">'.Display::return_icon($icon_liststd, get_lang('StudentList'), array(), ICON_SIZE_SMALL)
                     . '</a>';
             }
             $html .= $iconsEdit;

main/document/remote.php

Spacing +3 added lines, -3 removed lines

@@ -40,8 +40,8 @@ 
 $nParent = 0; // the number of /.. into the url
 while (substr($cwd, -3, 3) == '/..') {
     // go to parent directory
-    $cwd= substr($cwd, 0, -3);
-    if (strlen($cwd) == 0) { $cwd='/'; }
+    $cwd = substr($cwd, 0, -3);
+    if (strlen($cwd) == 0) { $cwd = '/'; }
     $nParent++;
 }
 for (; $nParent > 0; $nParent--) {
@@ -55,7 +55,7 @@ 
 }
 if ($action == 'list') {
     /*==== List files ====*/
-    if ($debug>0) { error_log("sending file list",0); }
+    if ($debug > 0) { error_log("sending file list", 0); }
 
     // get files list
     $files = DocumentManager::get_all_document_data($_course, $cwd, 0, NULL, false);

main/document/document.php

Spacing +34 added lines, -36 removed lines

@@ -50,10 +50,10 @@ 
 $_user = api_get_user_info();
 $courseInfo = api_get_course_info();
 $courseId = $courseInfo['real_id'];
-$course_dir = $courseInfo['directory'] . '/document';
+$course_dir = $courseInfo['directory'].'/document';
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-$base_work_dir = $sys_course_path . $course_dir;
-$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'] . '/document';
+$base_work_dir = $sys_course_path.$course_dir;
+$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'].'/document';
 $document_path = $base_work_dir;
 $usePpt2lp = api_get_setting('service_ppt2lp', 'active') == 'true';
 
@@ -238,7 +238,7 @@ 
                             $certificateId
                         );
                         Display::addFlash(Display::return_message(
-                            get_lang('DocDeleted') . ': ' . $documentInfo['title'],
+                            get_lang('DocDeleted').': '.$documentInfo['title'],
                             'success'
                         ));
                     } else {
@@ -426,11 +426,9 @@ 
     case 'convertToPdf':
         // PDF format as target by default
         $formatTarget = $_REQUEST['formatTarget'] ?
-            strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) :
-            'pdf';
+            strtolower(Security::remove_XSS($_REQUEST['formatTarget'])) : 'pdf';
         $formatType = $_REQUEST['formatType'] ?
-            strtolower(Security::remove_XSS($_REQUEST['formatType'])) :
-            'text';
+            strtolower(Security::remove_XSS($_REQUEST['formatType'])) : 'text';
         // Get the document data from the ID
         $document_info = DocumentManager::get_document_data_by_id(
             $document_id,
@@ -438,8 +436,8 @@ 
             true,
             $session_id
         );
-        $file = $sys_course_path . $courseInfo['directory'] .
-            '/document' . $document_info['path'];
+        $file = $sys_course_path.$courseInfo['directory'].
+            '/document'.$document_info['path'];
         $fileInfo = pathinfo($file);
         if ($fileInfo['extension'] == $formatTarget) {
             Display::addFlash(Display::return_message(
@@ -470,9 +468,9 @@ 
                 'warning'
             ));
         } else {
-            $convertedFile = $fileInfo['dirname'] . DIRECTORY_SEPARATOR .
-                $fileInfo['filename'] . '_from_' . $fileInfo['extension'] .
-                '.' . $formatTarget;
+            $convertedFile = $fileInfo['dirname'].DIRECTORY_SEPARATOR.
+                $fileInfo['filename'].'_from_'.$fileInfo['extension'].
+                '.'.$formatTarget;
             $convertedTitle = $document_info['title'];
             $obj = new OpenofficePresentation(true);
             if (file_exists($convertedFile)) {
@@ -497,11 +495,11 @@ 
                     $gidReq = Security::remove_XSS($_GET['gidReq']);
                     $file_link = Display::url(
                         get_lang('SeeFile'),
-                        api_get_path(WEB_CODE_PATH) .
-                        'document/showinframes.php?'.api_get_cidreq_params($cidReq, $id_session, $gidReq).'&id=' . current($result)
+                        api_get_path(WEB_CODE_PATH).
+                        'document/showinframes.php?'.api_get_cidreq_params($cidReq, $id_session, $gidReq).'&id='.current($result)
                     );
                     Display::addFlash(Display::return_message(
-                        get_lang('CopyMade') . ' ' . $file_link,
+                        get_lang('CopyMade').' '.$file_link,
                         'confirmation',
                         false
                     ));
@@ -658,7 +656,7 @@ 
             $new_content_html
         );
         $new_content_html = str_replace(
-            SYS_CODE_PATH . 'img/',
+            SYS_CODE_PATH.'img/',
             api_get_path(WEB_IMG_PATH),
             $new_content_html
         );
@@ -715,11 +713,11 @@ 
     $("#convertSelect").change(function() {
         var formatTarget = $(this).val();
         window.location.href = "'.
-            api_get_self() . '?' . api_get_cidreq() .
-            '&curdirpath=' . $curdirpath .
-            '&action=convertToPdf&formatTarget=' .
-            '" + formatTarget + "&id=" + id + "&' .
-            api_get_cidreq() . '&formatType=" + format;
+            api_get_self().'?'.api_get_cidreq().
+            '&curdirpath='.$curdirpath.
+            '&action=convertToPdf&formatTarget='.
+            '" + formatTarget + "&id=" + id + "&'.
+            api_get_cidreq().'&formatType=" + format;
     });
     $("#convertModal").on("hidden", function(){
         $("." + format + "FormatType").hide();
@@ -1051,7 +1049,7 @@ 
                 update_db_info(
                     'update',
                     $document_to_move['path'],
-                    $moveTo . '/' . basename($document_to_move['path'])
+                    $moveTo.'/'.basename($document_to_move['path'])
                 );
 
                 //update database item property
@@ -1283,7 +1281,7 @@ 
 
             if (!empty($newFolderData)) {
                 $message = Display::return_message(
-                    get_lang('DirCr') . ' ' . $newFolderData['title'],
+                    get_lang('DirCr').' '.$newFolderData['title'],
                     'confirmation'
                 );
             } else {
@@ -1368,27 +1366,27 @@ 
 
         // Create the form that asks for the directory name
         $templateForm .= '
-            <form name="set_document_as_new_template" class="form-horizontal" enctype="multipart/form-data" action="' . api_get_self() . '?add_as_template=' . $document_id_for_template . '" method="post">
+            <form name="set_document_as_new_template" class="form-horizontal" enctype="multipart/form-data" action="' . api_get_self().'?add_as_template='.$document_id_for_template.'" method="post">
                 <fieldset>
-                    <legend>' . get_lang('AddAsTemplate') . '</legend>
+                    <legend>' . get_lang('AddAsTemplate').'</legend>
                     <div class="form-group">
-                        <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName') . '</label>
+                        <label for="template_title" class="col-sm-2 control-label">' . get_lang('TemplateName').'</label>
                         <div class="col-sm-10">
                             <input type="text" class="form-control" id="template_title" name="template_title">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage') . '</label>
+                        <label for="template_image" class="col-sm-2 control-label">' . get_lang('TemplateImage').'</label>
                         <div class="col-sm-10">
                             <input type="file" name="template_image" id="template_image">
                         </div>
                     </div>
                     <div class="form-group">
                         <div class="col-sm-offset-2 col-sm-10">
-                            <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate') . '</button>
+                            <button type="submit" name="create_template" class="btn btn-primary">' . get_lang('CreateTemplate').'</button>
                         </div>
                     </div>
-                    <input type="hidden" name="curdirpath" value="' . $curdirpath . '" />
+                    <input type="hidden" name="curdirpath" value="' . $curdirpath.'" />
                 </fieldset>
             </form>
             <hr>
@@ -1590,7 +1588,7 @@ 
         if (api_get_setting('enable_record_audio') === 'true') {
             $actionsLeft .= Display::url(
                 Display::return_icon('new_recording.png', get_lang('RecordMyVoice'), '', ICON_SIZE_MEDIUM),
-                api_get_path(WEB_CODE_PATH) . 'document/record_audio.php?' . api_get_cidreq() . '&id=' . $document_id
+                api_get_path(WEB_CODE_PATH).'document/record_audio.php?'.api_get_cidreq().'&id='.$document_id
             );
         }
 
@@ -2028,18 +2026,18 @@ 
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header" style="text-align: center;">
-                <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close') . '">
+                <button type="button" class="close" data-dismiss="modal" aria-label="' . get_lang('Close').'">
                     <span aria-hidden="true">&times;</span>
                 </button>
-                <h4 class="modal-title">' . get_lang('Convert') . '</h4>
+                <h4 class="modal-title">' . get_lang('Convert').'</h4>
             </div>
             <div class="modal-body">
               <form action="#" class="form-horizontal">
                   <div class="form-group">
-                      <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats') . '</label>
+                      <label class="col-sm-4 control-label" for="convertSelect">' . get_lang('ConvertFormats').'</label>
                       <div class="col-sm-8">
                           <select id="convertSelect">
-                              <option value="">' . get_lang('Select') . '</option>
+                              <option value="">' . get_lang('Select').'</option>
                               <option value="pdf">
                                   PDF - Portable Document File
                               </option>
@@ -2058,7 +2056,7 @@ 
               </form>
             </div>
             <div class="modal-footer">
-              <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close') . '</button>
+              <button type="button" class="btn btn-default" data-dismiss="modal">' . get_lang('Close').'</button>
             </div>
         </div>
     </div>';

main/gradebook/lib/GradebookUtils.php

Spacing +88 added lines, -88 removed lines

@@ -77,9 +77,9 @@ 
         $course_code = Database::escape_string($course_code);
         if (!empty($link_id)) {
             $link_id = intval($link_id);
-            $sql = 'UPDATE ' . Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK) . '
-                    SET weight = ' . "'" . Database::escape_string((float) $weight) . "'" . '
-                    WHERE course_code = "' . $course_code . '" AND id = ' . $link_id;
+            $sql = 'UPDATE '.Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK).'
+                    SET weight = ' . "'".Database::escape_string((float) $weight)."'".'
+                    WHERE course_code = "' . $course_code.'" AND id = '.$link_id;
             Database::query($sql);
         }
 
@@ -99,7 +99,7 @@ 
 
         // TODO find the corresponding category (the first one for this course, ordered by ID)
         $l = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-        $sql = "DELETE FROM $l WHERE id = ".(int)$link_id;
+        $sql = "DELETE FROM $l WHERE id = ".(int) $link_id;
         Database::query($sql);
 
         return true;
@@ -195,8 +195,8 @@ 
             $visibility_icon = ($cat->is_visible() == 0) ? 'invisible' : 'visible';
             $visibility_command = ($cat->is_visible() == 0) ? 'set_visible' : 'set_invisible';
 
-            $modify_icons .= '<a class="view_children" data-cat-id="' . $cat->get_id() . '" href="javascript:void(0);">' .
-                Display::return_icon('view_more_stats.gif', get_lang('Show'), '', ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '<a class="view_children" data-cat-id="'.$cat->get_id().'" href="javascript:void(0);">'.
+                Display::return_icon('view_more_stats.gif', get_lang('Show'), '', ICON_SIZE_SMALL).'</a>';
 
             if (!api_is_allowed_to_edit(null, true)) {
                 $modify_icons .= Display::url(
@@ -206,9 +206,9 @@ 
                         '',
                         ICON_SIZE_SMALL
                     ),
-                    'personal_stats.php?' . http_build_query([
+                    'personal_stats.php?'.http_build_query([
                         'selectcat' => $cat->get_id()
-                    ]) . '&' . api_get_cidreq(),
+                    ]).'&'.api_get_cidreq(),
                     [
                         'class' => 'ajax',
                         'data-title' => get_lang('FlatView')
@@ -224,16 +224,16 @@ 
                 if (api_get_setting('gradebook_locking_enabled') == 'true') {
                     if ($cat->is_locked()) {
                         if (api_is_platform_admin()) {
-                            $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\'' . addslashes(get_lang('ConfirmToUnlockElement')) . '\')) return false;" href="' . api_get_self() . '?' . api_get_cidreq() . '&category_id=' . $cat->get_id() . '&action=unlock">' .
-                                Display::return_icon('lock.png', get_lang('UnLockEvaluation'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\''.addslashes(get_lang('ConfirmToUnlockElement')).'\')) return false;" href="'.api_get_self().'?'.api_get_cidreq().'&category_id='.$cat->get_id().'&action=unlock">'.
+                                Display::return_icon('lock.png', get_lang('UnLockEvaluation'), '', ICON_SIZE_SMALL).'</a>';
                         } else {
-                            $modify_icons .= '&nbsp;<a href="#">' . Display::return_icon('lock_na.png', get_lang('GradebookLockedAlert'), '', ICON_SIZE_SMALL) . '</a>';
+                            $modify_icons .= '&nbsp;<a href="#">'.Display::return_icon('lock_na.png', get_lang('GradebookLockedAlert'), '', ICON_SIZE_SMALL).'</a>';
                         }
-                        $modify_icons .= '&nbsp;<a href="gradebook_flatview.php?export_pdf=category&selectcat=' . $cat->get_id() . '" >' . Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a href="gradebook_flatview.php?export_pdf=category&selectcat='.$cat->get_id().'" >'.Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\'' . addslashes(get_lang('ConfirmToLockElement')) . '\')) return false;" href="' . api_get_self() . '?' . api_get_cidreq() . '&category_id=' . $cat->get_id() . '&action=lock">' .
-                            Display::return_icon('unlock.png', get_lang('LockEvaluation'), '', ICON_SIZE_SMALL) . '</a>';
-                        $modify_icons .= '&nbsp;<a href="#" >' . Display::return_icon('pdf_na.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL) . '</a>';
+                        $modify_icons .= '&nbsp;<a onclick="javascript:if (!confirm(\''.addslashes(get_lang('ConfirmToLockElement')).'\')) return false;" href="'.api_get_self().'?'.api_get_cidreq().'&category_id='.$cat->get_id().'&action=lock">'.
+                            Display::return_icon('unlock.png', get_lang('LockEvaluation'), '', ICON_SIZE_SMALL).'</a>';
+                        $modify_icons .= '&nbsp;<a href="#" >'.Display::return_icon('pdf_na.png', get_lang('ExportToPDF'), '', ICON_SIZE_SMALL).'</a>';
                     }
                 }
 
@@ -241,44 +241,44 @@ 
                     if ($cat->is_locked() && !api_is_platform_admin()) {
                         $modify_icons .= Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
                     } else {
-                        $modify_icons .= '<a href="gradebook_edit_cat.php?editcat=' . $cat->get_id() . '&'.$courseParams.'">' .
+                        $modify_icons .= '<a href="gradebook_edit_cat.php?editcat='.$cat->get_id().'&'.$courseParams.'">'.
                             Display::return_icon(
                                 'edit.png',
                                 get_lang('Modify'),
                                 '',
                                 ICON_SIZE_SMALL
-                            ) . '</a>';
+                            ).'</a>';
                     }
                 }
 
-               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&' . $courseParams.'">' .
+               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat='.$cat->get_id().'&'.$courseParams.'">'.
                     Display::return_icon(
                         'percentage.png',
                         get_lang('EditAllWeights'),
                         '',
                         ICON_SIZE_SMALL
-                    ) . '</a>';
+                    ).'</a>';
 
-                $modify_icons .= '<a href="gradebook_flatview.php?selectcat=' .$cat->get_id() . '&' . $courseParams. '">' .
+                $modify_icons .= '<a href="gradebook_flatview.php?selectcat='.$cat->get_id().'&'.$courseParams.'">'.
                     Display::return_icon(
                         'stats.png',
                         get_lang('FlatView'),
                         '',
                         ICON_SIZE_SMALL
-                    ) . '</a>';
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() .'?visiblecat=' . $cat->get_id() . '&' .$visibility_command . '=&selectcat=' . $selectcat .'&' . $courseParams. '">' .
+                    ).'</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?visiblecat='.$cat->get_id().'&'.$visibility_command.'=&selectcat='.$selectcat.'&'.$courseParams.'">'.
                     Display::return_icon(
-                        $visibility_icon . '.png',
+                        $visibility_icon.'.png',
                         get_lang('Visible'),
                         '',
                         ICON_SIZE_SMALL
-                    ) . '</a>';
+                    ).'</a>';
 
                 if ($cat->is_locked() && !api_is_platform_admin()) {
                     $modify_icons .= Display::return_icon('delete_na.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL);
                 } else {
-                    $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletecat=' . $cat->get_id() . '&selectcat=' . $selectcat . '&' . $courseParams. '" onclick="return confirmation();">' .
-                        Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL) . '</a>';
+                    $modify_icons .= '&nbsp;<a href="'.api_get_self().'?deletecat='.$cat->get_id().'&selectcat='.$selectcat.'&'.$courseParams.'" onclick="return confirmation();">'.
+                        Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL).'</a>';
                 }
             }
 
@@ -307,22 +307,22 @@ 
             if ($is_locked && !api_is_platform_admin()) {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons = '<a href="gradebook_edit_eval.php?editeval=' . $eval->get_id() . '&' . $courseParams. '">' .
-                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons = '<a href="gradebook_edit_eval.php?editeval='.$eval->get_id().'&'.$courseParams.'">'.
+                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
             }
 
-            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visibleeval=' . $eval->get_id() . '&' . $visibility_command . '=&selectcat=' . $selectcat . '&'.$courseParams. ' ">' .
-                Display::return_icon($visibility_icon . '.png', get_lang('Visible'), '', ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?visibleeval='.$eval->get_id().'&'.$visibility_command.'=&selectcat='.$selectcat.'&'.$courseParams.' ">'.
+                Display::return_icon($visibility_icon.'.png', get_lang('Visible'), '', ICON_SIZE_SMALL).'</a>';
             if (api_is_allowed_to_edit(null, true)) {
-                $modify_icons .= '&nbsp;<a href="gradebook_showlog_eval.php?visiblelog=' . $eval->get_id() . '&selectcat=' . $selectcat . ' &' . $courseParams. '">' .
-                    Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="gradebook_showlog_eval.php?visiblelog='.$eval->get_id().'&selectcat='.$selectcat.' &'.$courseParams.'">'.
+                    Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL).'</a>';
             }
 
             if ($is_locked && !api_is_platform_admin()) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deleteeval=' . $eval->get_id() . '&selectcat=' . $selectcat . ' &' . $courseParams. '" onclick="return confirmation();">' .
-                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?deleteeval='.$eval->get_id().'&selectcat='.$selectcat.' &'.$courseParams.'" onclick="return confirmation();">'.
+                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
             }
             return $modify_icons;
         }
@@ -354,21 +354,21 @@ 
             if ($is_locked && !api_is_platform_admin()) {
                 $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons = '<a href="gradebook_edit_link.php?editlink=' . $link->get_id() . '&' . $courseParams.'">' .
-                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons = '<a href="gradebook_edit_link.php?editlink='.$link->get_id().'&'.$courseParams.'">'.
+                    Display::return_icon('edit.png', get_lang('Modify'), '', ICON_SIZE_SMALL).'</a>';
             }
-            $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblelink=' . $link->get_id() . '&' . $visibility_command . '=&selectcat=' . $selectcat . '&'.$courseParams. ' ">' .
-                Display::return_icon($visibility_icon . '.png', get_lang('Visible'), '', ICON_SIZE_SMALL) . '</a>';
-            $modify_icons .= '&nbsp;<a href="gradebook_showlog_link.php?visiblelink=' . $link->get_id() . '&selectcat=' . $selectcat . '&' . $courseParams. '">' .
-                Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL) . '</a>';
+            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?visiblelink='.$link->get_id().'&'.$visibility_command.'=&selectcat='.$selectcat.'&'.$courseParams.' ">'.
+                Display::return_icon($visibility_icon.'.png', get_lang('Visible'), '', ICON_SIZE_SMALL).'</a>';
+            $modify_icons .= '&nbsp;<a href="gradebook_showlog_link.php?visiblelink='.$link->get_id().'&selectcat='.$selectcat.'&'.$courseParams.'">'.
+                Display::return_icon('history.png', get_lang('GradebookQualifyLog'), '', ICON_SIZE_SMALL).'</a>';
 
             //If a work is added in a gradebook you can only delete the link in the work tool
 
             if ($is_locked && !api_is_platform_admin()) {
-                $modify_icons .= '&nbsp;' . Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
+                $modify_icons .= '&nbsp;'.Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
             } else {
-                $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletelink=' . $link->get_id() . '&selectcat=' . $selectcat . ' &' . $courseParams. '" onclick="return confirmation();">' .
-                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?deletelink='.$link->get_id().'&selectcat='.$selectcat.' &'.$courseParams.'" onclick="return confirmation();">'.
+                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
             }
             
             return $modify_icons;
@@ -391,8 +391,8 @@ 
         $sql = "SELECT * FROM $table l
                 WHERE
                     course_code = '$course_code' AND
-                    type = ".(int)$resource_type . " AND
-                    ref_id = " . (int)$resource_id;
+                    type = ".(int) $resource_type." AND
+                    ref_id = " . (int) $resource_id;
         $res = Database::query($sql);
 
         if (Database::num_rows($res) < 1) {
@@ -415,7 +415,7 @@ 
         }
         // TODO find the corresponding category (the first one for this course, ordered by ID)
         $l = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-        $sql = "SELECT * FROM $l WHERE id = " . (int) $link_id;
+        $sql = "SELECT * FROM $l WHERE id = ".(int) $link_id;
         $res = Database::query($sql);
         $row = array();
         if (Database::num_rows($res) > 0) {
@@ -433,10 +433,10 @@ 
     {
         $course_table = Database::get_main_table(TABLE_MAIN_COURSE);
         $tbl_grade_links = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-        $sql = 'SELECT c.id FROM ' . $course_table . ' c
-                INNER JOIN ' . $tbl_grade_links . ' l
+        $sql = 'SELECT c.id FROM '.$course_table.' c
+                INNER JOIN ' . $tbl_grade_links.' l
                 ON c.code = l.course_code
-                WHERE l.id=' . intval($id_link) . ' OR l.category_id=' . intval($id_link);
+                WHERE l.id=' . intval($id_link).' OR l.category_id='.intval($id_link);
         $res = Database::query($sql);
         $array = Database::fetch_array($res, 'ASSOC');
         return $array['id'];
@@ -545,7 +545,7 @@ 
     {
         $result = Result :: load($resid);
         if ($importscore > $eval_max) {
-            header('Location: gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '&overwritemax=');
+            header('Location: gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'&overwritemax=');
             exit;
         }
         $result[0]->set_score($importscore);
@@ -586,8 +586,8 @@ 
     {
         $table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
         $sql = 'SELECT COUNT(*) as count
-                FROM ' . $table . ' gc
-                WHERE gc.cat_id="' . intval($cat_id) . '" AND user_id="' . intval($user_id) . '" ';
+                FROM ' . $table.' gc
+                WHERE gc.cat_id="' . intval($cat_id).'" AND user_id="'.intval($user_id).'" ';
         $rs_exist = Database::query($sql);
         $row = Database::fetch_array($rs_exist);
         if ($row['count'] == 0) {
@@ -610,8 +610,8 @@ 
     public static function get_certificate_by_user_id($cat_id, $user_id)
     {
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
-        $sql = 'SELECT * FROM ' . $table_certificate . '
-                WHERE cat_id="' . intval($cat_id) . '" AND user_id="' . intval($user_id) . '"';
+        $sql = 'SELECT * FROM '.$table_certificate.'
+                WHERE cat_id="' . intval($cat_id).'" AND user_id="'.intval($user_id).'"';
 
         $result = Database::query($sql);
         $row = Database::fetch_array($result, 'ASSOC');
@@ -630,18 +630,18 @@ 
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
         $sql = 'SELECT DISTINCT u.user_id, u.lastname, u.firstname, u.username
-                FROM ' . $table_user . ' u
-                INNER JOIN ' . $table_certificate . ' gc
+                FROM ' . $table_user.' u
+                INNER JOIN ' . $table_certificate.' gc
                 ON u.user_id=gc.user_id ';
         if (!is_null($cat_id) && $cat_id > 0) {
-            $sql.=' WHERE cat_id=' . intval($cat_id);
+            $sql .= ' WHERE cat_id='.intval($cat_id);
         }
         if (!empty($userList)) {
             $userList = array_map('intval', $userList);
             $userListCondition = implode("','", $userList);
             $sql .= " AND u.user_id IN ('$userListCondition')";
         }
-        $sql.=' ORDER BY u.firstname';
+        $sql .= ' ORDER BY u.firstname';
         $rs = Database::query($sql);
 
         $list_users = array();
@@ -662,10 +662,10 @@ 
     {
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
         $sql = 'SELECT gc.score_certificate, gc.created_at, gc.path_certificate, gc.cat_id, gc.user_id, gc.id
-                FROM  ' . $table_certificate . ' gc
-                WHERE gc.user_id="' . intval($user_id) . '" ';
+                FROM  ' . $table_certificate.' gc
+                WHERE gc.user_id="' . intval($user_id).'" ';
         if (!is_null($cat_id) && $cat_id > 0) {
-            $sql.=' AND cat_id=' . intval($cat_id);
+            $sql .= ' AND cat_id='.intval($cat_id);
         }
 
         $rs = Database::query($sql);
@@ -703,12 +703,12 @@ 
             $variables = $content_html['variables'];
         }
 
-        $path_image = api_get_path(WEB_COURSE_PATH) . api_get_course_path($course_code) . '/document/images/gallery';
+        $path_image = api_get_path(WEB_COURSE_PATH).api_get_course_path($course_code).'/document/images/gallery';
         $new_content_html = str_replace('../images/gallery', $path_image, $new_content_html);
 
-        $path_image_in_default_course = api_get_path(WEB_CODE_PATH) . 'default_course_document';
+        $path_image_in_default_course = api_get_path(WEB_CODE_PATH).'default_course_document';
         $new_content_html = str_replace('/main/default_course_document', $path_image_in_default_course, $new_content_html);
-        $new_content_html = str_replace(SYS_CODE_PATH . 'img/', api_get_path(WEB_IMG_PATH), $new_content_html);
+        $new_content_html = str_replace(SYS_CODE_PATH.'img/', api_get_path(WEB_IMG_PATH), $new_content_html);
         $print = '';
 
         //add print header
@@ -720,7 +720,7 @@ 
         }
 
         // Add header
-        $new_content_html =  $contentHead. $print . '</head>' . $new_content_html;
+        $new_content_html = $contentHead.$print.'</head>'.$new_content_html;
 
         return array(
             'content' => $new_content_html,
@@ -742,9 +742,9 @@ 
             $session_id = api_get_session_id();
 
             $t = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
-            $sql = "SELECT * FROM $t WHERE course_code = '" . Database::escape_string($course_code) . "' ";
+            $sql = "SELECT * FROM $t WHERE course_code = '".Database::escape_string($course_code)."' ";
             if (!empty($session_id)) {
-                $sql .= " AND session_id = " . (int) $session_id;
+                $sql .= " AND session_id = ".(int) $session_id;
             } else {
                 $sql .= " AND (session_id IS NULL OR session_id = 0) ";
             }
@@ -756,7 +756,7 @@ 
                 if (!empty($session_id)) {
                     $my_session_id = api_get_session_id();
                     $s_name = api_get_session_name($my_session_id);
-                    $cat->set_name($course_code . ' - ' . get_lang('Session') . ' ' . $s_name);
+                    $cat->set_name($course_code.' - '.get_lang('Session').' '.$s_name);
                     $cat->set_session_id($session_id);
                 } else {
                     $cat->set_name($course_code);
@@ -878,13 +878,13 @@ 
 
         if ($use_grade_model) {
             if ($parent_id == 0) {
-                $title = api_strtoupper(get_lang('Average')) . '<br />' . get_lang('Detailed');
+                $title = api_strtoupper(get_lang('Average')).'<br />'.get_lang('Detailed');
             } else {
-                $title = api_strtoupper(get_lang('Average')) . '<br />' . $cat[0]->get_description() . ' - (' . $cat[0]->get_name() . ')';
+                $title = api_strtoupper(get_lang('Average')).'<br />'.$cat[0]->get_description().' - ('.$cat[0]->get_name().')';
             }
         } else {
             if ($parent_id == 0) {
-                $title = api_strtoupper(get_lang('Average')) . '<br />' . get_lang('Detailed');
+                $title = api_strtoupper(get_lang('Average')).'<br />'.get_lang('Detailed');
             } else {
                 $title = api_strtoupper(get_lang('Average'));
             }
@@ -938,11 +938,11 @@ 
         } else {
             $column = 0;
             $table->setCellContents($row, $column, get_lang('NoResults'));
-            $table->updateCellAttributes($row, $column, 'colspan="' . $columns . '" align="center" class="row_odd"');
+            $table->updateCellAttributes($row, $column, 'colspan="'.$columns.'" align="center" class="row_odd"');
         }
 
         $pdfParams = array(
-            'filename' => get_lang('FlatView') . '_' . api_get_utc_datetime(),
+            'filename' => get_lang('FlatView').'_'.api_get_utc_datetime(),
             'pdf_title' => $title,
             'course_code' => $course_code,
             'add_signatures' => true
@@ -1027,7 +1027,7 @@ 
         $a_students = array();
         while ($user = Database::fetch_array($result)) {
             if (!array_key_exists($user['user_id'], $a_students)) {
-                $a_current_student = array ();
+                $a_current_student = array();
                 $a_current_student[] = $user['user_id'];
                 $a_current_student[] = $user['username'];
                 $a_current_student[] = $user['lastname'];
@@ -1085,7 +1085,7 @@ 
         foreach ($links as $link) {
             // links are always in a course
             $coursecode = $link->get_course_code();
-            if (!array_key_exists($coursecode,$coursecodes)) {
+            if (!array_key_exists($coursecode, $coursecodes)) {
                 $coursecodes[$coursecode] = '1';
                 $users = array_merge($users, GradebookUtils::get_users_in_course($coursecode));
             }
@@ -1098,7 +1098,7 @@ 
      * Search students matching a given last name and/or first name
      * @author Bert Steppé
      */
-    public static function find_students($mask= '')
+    public static function find_students($mask = '')
     {
         // students shouldn't be here // don't search if mask empty
         if (!api_is_allowed_to_edit() || empty ($mask)) {
@@ -1109,23 +1109,23 @@ 
         $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
         $tbl_cru = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
         $sql = 'SELECT DISTINCT user.user_id, user.lastname, user.firstname, user.email, user.official_code
-                FROM ' . $tbl_user . ' user';
+                FROM ' . $tbl_user.' user';
         if (!api_is_platform_admin()) {
-            $sql .= ', ' . $tbl_cru . ' cru';
+            $sql .= ', '.$tbl_cru.' cru';
         }
 
-        $sql .= ' WHERE user.status = ' . STUDENT;
-        $sql .= ' AND (user.lastname LIKE '."'%" . $mask . "%'";
-        $sql .= ' OR user.firstname LIKE '."'%" . $mask . "%')";
+        $sql .= ' WHERE user.status = '.STUDENT;
+        $sql .= ' AND (user.lastname LIKE '."'%".$mask."%'";
+        $sql .= ' OR user.firstname LIKE '."'%".$mask."%')";
 
         if (!api_is_platform_admin()) {
             $sql .= ' AND user.user_id = cru.user_id AND
                       cru.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' AND
                       cru.c_id in (
-                            SELECT c_id FROM '.$tbl_cru . '
+                            SELECT c_id FROM '.$tbl_cru.'
                             WHERE
-                                user_id = ' . api_get_user_id() . ' AND
-                                status = ' . COURSEMANAGER . '
+                                user_id = ' . api_get_user_id().' AND
+                                status = ' . COURSEMANAGER.'
                         )
                     ';
         }
@@ -1168,7 +1168,7 @@ 
         $sql = 'SELECT ref_id FROM '.$table_link.'
                 WHERE id = '.$linkId.' AND type='.LINK_ATTENDANCE;
 
-        $rs_attendance  = Database::query($sql);
+        $rs_attendance = Database::query($sql);
         if (Database::num_rows($rs_attendance) > 0) {
             $row_attendance = Database::fetch_array($rs_attendance);
             $sql = 'UPDATE '.$tbl_attendance.' SET attendance_weight ='.$weight.'
@@ -1254,7 +1254,7 @@ 
                 'course' => $courseInfo['title'],
                 'score' => $certificateInfo['score_certificate'],
                 'date' => api_format_date($certificateInfo['created_at'], DATE_FORMAT_SHORT),
-                'link' => api_get_path(WEB_PATH) . "certificates/index.php?id={$certificateInfo['id']}"
+                'link' => api_get_path(WEB_PATH)."certificates/index.php?id={$certificateInfo['id']}"
             ];
         }
 
@@ -1318,7 +1318,7 @@ 
                     'course' => $course['title'],
                     'score' => $certificateInfo['score_certificate'],
                     'date' => api_format_date($certificateInfo['created_at'], DATE_FORMAT_SHORT),
-                    'link' => api_get_path(WEB_PATH) . "certificates/index.php?id={$certificateInfo['id']}"
+                    'link' => api_get_path(WEB_PATH)."certificates/index.php?id={$certificateInfo['id']}"
                 ];
             }
         }

main/gradebook/lib/gradebook_result.class.php

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
     /**
      * constructor of the class
      */
-    public function __construct($get_questions=false,$get_answers=false)
+    public function __construct($get_questions = false, $get_answers = false)
     {
     }
 
@@ -36,21 +36,21 @@ 
         //titles
 
         foreach ($dato[0] as $header_col) {
-            if(!empty($header_col)) {
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($header_col))).';';
+            if (!empty($header_col)) {
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($header_col))).';';
             }
         }
 
-        $data .="\r\n";
+        $data .= "\r\n";
         $cant_students = count($dato[1]);
         //print_r($data);		exit();
 
-        for($i=0;$i<$cant_students;$i++) {
+        for ($i = 0; $i < $cant_students; $i++) {
             $column = 0;
-            foreach($dato[1][$i] as $col_name) {
-                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($col_name))).';';
+            foreach ($dato[1][$i] as $col_name) {
+                $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($col_name))).';';
             }
-            $data .="\r\n";
+            $data .= "\r\n";
         }
 
         //output the results
@@ -101,7 +101,7 @@ 
         for ($i = 0; $i < $cant_students; $i++) {
             $column = 0;
             foreach ($data[1][$i] as $col_name) {
-                $worksheet->SetCellValueByColumnAndRow($line,$column, html_entity_decode(strip_tags($col_name)));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, html_entity_decode(strip_tags($col_name)));
                 $column++;
             }
             $line++;
@@ -121,7 +121,7 @@ 
      */
     public function exportCompleteReportDOC($data)
     {
-        $filename = 'gradebook_results_'.api_get_local_time() . '.docx';
+        $filename = 'gradebook_results_'.api_get_local_time().'.docx';
 
         $doc = new \PhpOffice\PhpWord\PhpWord();
         $section = $doc->addSection(['orientation' => 'landscape']);
@@ -140,7 +140,7 @@ 
             }
         }
 
-        $file = api_get_path(SYS_ARCHIVE_PATH) . api_replace_dangerous_char($filename);
+        $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $doc->save($file, 'Word2007');
 
         DocumentManager::file_send_for_download($file, true, $filename);