chamilo / chamilo-lms

main/template/default/auth/courses_categories.php

Spacing +21 added lines, -21 removed lines

@@ -19,7 +19,7 @@ 
 $pageLength = isset($pageLength) ? $pageLength : isset($_GET['pageLength']) ? intval($_GET['pageLength']) : 12;
 $pageTotal = intval(ceil(intval($countCoursesInCategory) / $pageLength));
 $cataloguePagination = $pageTotal > 1 ? getCataloguePagination($pageCurrent, $pageLength, $pageTotal) : '';
-$search_term = isset($search_term) ? $search_term :null;
+$search_term = isset($search_term) ? $search_term : null;
 
 if ($showSessions && isset($_POST['date'])) {
     $date = $_POST['date'];
@@ -60,7 +60,7 @@ 
             $el.prepend('<?php echo Display::display_icon('nolines_minus.gif'); ?>');
 
             $.ajax({
-                url: '<?php echo api_get_path(WEB_AJAX_PATH) . 'course.ajax.php' ?>',
+                url: '<?php echo api_get_path(WEB_AJAX_PATH).'course.ajax.php' ?>',
                 type: 'GET',
                 dataType: 'json',
                 data: {
@@ -124,13 +124,13 @@ 
         <?php
 
             $webAction = api_get_path(WEB_CODE_PATH).'auth/courses.php';
-            $action = (!empty($_REQUEST['action'])?Security::remove_XSS($_REQUEST['action']):'display_courses');
-            $pageLength = (!empty($_REQUEST['pageLength'])?intval($_REQUEST['pageLength']):10);
-            $pageCurrent = (!empty($_REQUEST['pageCurrent'])?intval($_REQUEST['pageCurrent']):1);
+            $action = (!empty($_REQUEST['action']) ? Security::remove_XSS($_REQUEST['action']) : 'display_courses');
+            $pageLength = (!empty($_REQUEST['pageLength']) ? intval($_REQUEST['pageLength']) : 10);
+            $pageCurrent = (!empty($_REQUEST['pageCurrent']) ? intval($_REQUEST['pageCurrent']) : 1);
             $form = '<form action="'.$webAction.'" method="GET" class="form-horizontal">';
-            $form .= '<input type="hidden" name="action" value="' . $action . '">';
-            $form .= '<input type="hidden" name="pageCurrent" value="' . $pageCurrent . '">';
-            $form .= '<input type="hidden" name="pageLength" value="' . $pageLength . '">';
+            $form .= '<input type="hidden" name="action" value="'.$action.'">';
+            $form .= '<input type="hidden" name="pageCurrent" value="'.$pageCurrent.'">';
+            $form .= '<input type="hidden" name="pageLength" value="'.$pageLength.'">';
             $form .= '<div class="form-group">';
             $form .= '<div class="col-sm-12">';
             $form .= '<select name="category_code" onchange="submit();" class="selectpicker show-tick form-control">';
@@ -139,11 +139,11 @@ 
                 $categoryCode = $category['code'];
                 $countCourse = $category['count_courses'];
 
-                $form .= '<option '. ($categoryCode == $codeType? 'selected="selected" ':'') .' value="' . $category['code'] . '">' . $category['name'] . ' ( '. $countCourse .' ) </option>';
+                $form .= '<option '.($categoryCode == $codeType ? 'selected="selected" ' : '').' value="'.$category['code'].'">'.$category['name'].' ( '.$countCourse.' ) </option>';
                 if (!empty($browse_course_categories[$categoryCode])) {
-                    foreach ($browse_course_categories[$categoryCode] as $subCategory){
+                    foreach ($browse_course_categories[$categoryCode] as $subCategory) {
                         $subCategoryCode = $subCategory['code'];
-                        $form .= '<option '. ($subCategoryCode == $codeType ? 'selected="selected" ':'') .' value="' . $subCategory['code'] . '"> ---' . $subCategory['name'] . ' ( '. $subCategory['count_courses'] .' ) </option>';
+                        $form .= '<option '.($subCategoryCode == $codeType ? 'selected="selected" ' : '').' value="'.$subCategory['code'].'"> ---'.$subCategory['name'].' ( '.$subCategory['count_courses'].' ) </option>';
                     }
                 }
             }
@@ -206,7 +206,7 @@ 
             $course_subscribe_allowed = ($course['subscribe'] == 1);
             $course_unsubscribe_allowed = ($course['unsubscribe'] == 1);
             $count_connections = $course['count_connections'];
-            $creation_date = substr($course['creation_date'],0,10);
+            $creation_date = substr($course['creation_date'], 0, 10);
 
             $icon_title = null;
             $html = null;
@@ -323,9 +323,9 @@ 
     $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
     $teachers = CourseManager::get_teacher_list_from_course_code_to_string($course['code']);
     $rating = Display::return_rating_system('star_'.$course['real_id'], $ajax_url.'&course_id='.$course['real_id'], $course['point_info']);
-    $html .=  '<h4 class="title"><a href="' . $linkCourse . '">' . cut($title, 60) . '</a></h4>';
+    $html .= '<h4 class="title"><a href="'.$linkCourse.'">'.cut($title, 60).'</a></h4>';
     $html .= '<div class="teachers">'.$teachers.'</div>';
-    $html .= '<div class="ranking">'. $rating . '</div>';
+    $html .= '<div class="ranking">'.$rating.'</div>';
 
     return $html;
 }
@@ -340,8 +340,8 @@ 
     $title = $course['title'];
     $html = '';
     if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-        $html = '<a data-title="' . $title . '" class="ajax btn btn-default btn-sm" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&code='.$course['code'].'" title="' . get_lang('Description') . '">' .
-        Display::returnFontAwesomeIcon('info-circle') . '</a>';
+        $html = '<a data-title="'.$title.'" class="ajax btn btn-default btn-sm" href="'.api_get_path(WEB_CODE_PATH).'inc/ajax/course_home.ajax.php?a=show_course_information&code='.$course['code'].'" title="'.get_lang('Description').'">'.
+        Display::returnFontAwesomeIcon('info-circle').'</a>';
     }
 
     return $html;
@@ -353,7 +353,7 @@ 
  */
 function return_goto_button($course)
 {
-    $html = ' <a class="btn btn-default btn-sm" title="' . get_lang('GoToCourse') . '" href="'.api_get_course_url($course['code']).'">'.
+    $html = ' <a class="btn btn-default btn-sm" title="'.get_lang('GoToCourse').'" href="'.api_get_course_url($course['code']).'">'.
     Display::returnFontAwesomeIcon('share').'</a>';
 
     return $html;
@@ -387,8 +387,8 @@ 
  */
 function return_register_button($course, $stok, $code, $search_term)
 {
-    $html = ' <a class="btn btn-success btn-sm" title="' . get_lang('Subscribe') . '" href="'.api_get_self().'?action=subscribe_course&sec_token='.$stok.'&subscribe_course='.$course['code'].'&search_term='.$search_term.'&category_code='.$code.'">' .
-    Display::returnFontAwesomeIcon('sign-in') . '</a>';
+    $html = ' <a class="btn btn-success btn-sm" title="'.get_lang('Subscribe').'" href="'.api_get_self().'?action=subscribe_course&sec_token='.$stok.'&subscribe_course='.$course['code'].'&search_term='.$search_term.'&category_code='.$code.'">'.
+    Display::returnFontAwesomeIcon('sign-in').'</a>';
     return $html;
 }
 
@@ -401,7 +401,7 @@ 
  */
 function return_unregister_button($course, $stok, $search_term, $code)
 {
-    $html = ' <a class="btn btn-danger btn-sm" title="' . get_lang('Unsubscribe') . '" href="'. api_get_self().'?action=unsubscribe&sec_token='.$stok.'&unsubscribe='.$course['code'].'&search_term='.$search_term.'&category_code='.$code.'">' .
-    Display::returnFontAwesomeIcon('sign-out') . '</a>';
+    $html = ' <a class="btn btn-danger btn-sm" title="'.get_lang('Unsubscribe').'" href="'.api_get_self().'?action=unsubscribe&sec_token='.$stok.'&unsubscribe='.$course['code'].'&search_term='.$search_term.'&category_code='.$code.'">'.
+    Display::returnFontAwesomeIcon('sign-out').'</a>';
     return $html;
 }

main/inc/lib/course_category.lib.php

Spacing +32 added lines, -34 removed lines

@@ -68,7 +68,7 @@ 
 
     $parentIdCondition = " AND (t1.parent_id IS NULL OR t1.parent_id = '' )";
     if (!empty($category)) {
-        $parentIdCondition =  " AND t1.parent_id  = '$category' ";
+        $parentIdCondition = " AND t1.parent_id  = '$category' ";
     }
 
     $sql = "SELECT
@@ -99,7 +99,7 @@ 
 
     $categories = Database::store_result($result);
     foreach ($categories as $category) {
-        $category['nbr_courses'] =  1;
+        $category['nbr_courses'] = 1;
     }
 
     return $categories;
@@ -196,13 +196,13 @@ 
     if ($row = Database::fetch_array($result)) {
         if (!empty($row['parent_id'])) {
             Database::query("UPDATE $tbl_course SET category_code = '".$row['parent_id']."' WHERE category_code='$node'");
-            Database::query("UPDATE $tbl_category SET parent_id='" . $row['parent_id'] . "' WHERE parent_id='$node'");
+            Database::query("UPDATE $tbl_category SET parent_id='".$row['parent_id']."' WHERE parent_id='$node'");
         } else {
             Database::query("UPDATE $tbl_course SET category_code='' WHERE category_code='$node'");
             Database::query("UPDATE $tbl_category SET parent_id=NULL WHERE parent_id='$node'");
         }
 
-        Database::query("UPDATE $tbl_category SET tree_pos=tree_pos-1 WHERE tree_pos > '" . $row['tree_pos'] . "'");
+        Database::query("UPDATE $tbl_category SET tree_pos=tree_pos-1 WHERE tree_pos > '".$row['tree_pos']."'");
         Database::query("DELETE FROM $tbl_category WHERE code='$node'");
 
         if (!empty($row['parent_id'])) {
@@ -291,13 +291,13 @@ 
     }
 
     $sql = "UPDATE $tbl_category
-            SET tree_pos ='" . $row['tree_pos'] . "'
+            SET tree_pos ='".$row['tree_pos']."'
             WHERE code='$code'";
     Database::query($sql);
 
     $sql = "UPDATE $tbl_category
             SET tree_pos = '$tree_pos'
-            WHERE code= '" . $row['code'] . "'";
+            WHERE code= '".$row['code']."'";
     Database::query($sql);
 
     return true;
@@ -423,12 +423,12 @@ 
 
         $editIcon = Display::return_icon('edit.png', get_lang('EditNode'), null, ICON_SIZE_SMALL);
         $deleteIcon = Display::return_icon('delete.png', get_lang('DeleteNode'), null, ICON_SIZE_SMALL);
-        $moveIcon =  Display::return_icon('up.png', get_lang('UpInSameLevel'), null, ICON_SIZE_SMALL);
+        $moveIcon = Display::return_icon('up.png', get_lang('UpInSameLevel'), null, ICON_SIZE_SMALL);
 
         foreach ($categories as $category) {
 
             $editUrl = $mainUrl.'&id='.$category['code'].'&action=edit';
-            $moveUrl  = $mainUrl.'&id='.$category['code'].'&action=moveUp&tree_pos='.$category['tree_pos'];
+            $moveUrl = $mainUrl.'&id='.$category['code'].'&action=moveUp&tree_pos='.$category['tree_pos'];
             $deleteUrl = $mainUrl.'&id='.$category['code'].'&action=delete';
 
             $actions = Display::url($editIcon, $editUrl).Display::url($moveIcon, $moveUrl).Display::url($deleteIcon, $deleteUrl);
@@ -562,12 +562,12 @@ 
 
     $count_courses = countCoursesInCategory();
 
-    $categories[0][count($categories[0])+1] = array(
+    $categories[0][count($categories[0]) + 1] = array(
         'id' =>0,
         'name' => get_lang('None'),
         'code' => 'NONE',
         'parent_id' => null,
-        'tree_pos' => $row['tree_pos']+1,
+        'tree_pos' => $row['tree_pos'] + 1,
         'children_count' => 0,
         'auth_course_child' => true,
         'auth_cat_child' => true,
@@ -582,7 +582,7 @@ 
  * @param string $searchTerm
  * @return int
  */
-function countCoursesInCategory($category_code="", $searchTerm = '')
+function countCoursesInCategory($category_code = "", $searchTerm = '')
 {
     $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
     $categoryCode = Database::escape_string($category_code);
@@ -594,7 +594,7 @@ 
 
     $without_special_courses = '';
     if (!empty($specialCourseList)) {
-        $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+        $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $specialCourseList).'")';
     }
 
     $visibilityCondition = null;
@@ -608,15 +608,15 @@ 
     if ($categoryCode == 'ALL') {
         // Nothing to do
     } elseif ($categoryCode == 'NONE') {
-        $categoryFilter =  ' AND category_code = "" ';
+        $categoryFilter = ' AND category_code = "" ';
     } else {
-        $categoryFilter =  ' AND category_code = "' . $categoryCode . '" ';
+        $categoryFilter = ' AND category_code = "'.$categoryCode.'" ';
     }
 
     if (!empty($searchTerm)) {
-        $searchFilter = ' AND (code LIKE "%' . $searchTerm . '%"
-            OR title LIKE "%' . $searchTerm . '%"
-            OR tutor_name LIKE "%' . $searchTerm . '%") ';
+        $searchFilter = ' AND (code LIKE "%'.$searchTerm.'%"
+            OR title LIKE "%' . $searchTerm.'%"
+            OR tutor_name LIKE "%' . $searchTerm.'%") ';
     }
 
     $sql = "SELECT * FROM $tbl_course
@@ -667,7 +667,7 @@ 
 
     $without_special_courses = '';
     if (!empty($specialCourseList)) {
-        $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+        $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $specialCourseList).'")';
     }
     $visibilityCondition = null;
     $hidePrivate = api_get_setting('course_catalog_hide_private');
@@ -715,7 +715,7 @@ 
         $id_in = null;
         while (list($id) = Database::fetch_row($result)) {
             if ($id_in) {
-                $id_in.=",$id";
+                $id_in .= ",$id";
             } else {
                 $id_in = "$id";
             }
@@ -936,11 +936,9 @@ 
 function getLimitArray()
 {
     $pageCurrent = isset($_REQUEST['pageCurrent']) ?
-        intval($_GET['pageCurrent']) :
-        1;
+        intval($_GET['pageCurrent']) : 1;
     $pageLength = isset($_REQUEST['pageLength']) ?
-        intval($_GET['pageLength']) :
-        12;
+        intval($_GET['pageLength']) : 12;
     return array(
         'start' => ($pageCurrent - 1) * $pageLength,
         'current' => $pageCurrent,
@@ -959,7 +957,7 @@ 
     if (!empty($limit) && is_array($limit)) {
         $limitStart = isset($limit['start']) ? $limit['start'] : 0;
         $limitLength = isset($limit['length']) ? $limit['length'] : 10;
-        $limitFilter = 'LIMIT ' . $limitStart . ', ' . $limitLength;
+        $limitFilter = 'LIMIT '.$limitStart.', '.$limitLength;
     }
 
     return $limitFilter;
@@ -976,7 +974,7 @@ 
 {
     // Start empty html
     $pageDiv = '';
-    $html='';
+    $html = '';
     $pageBottom = max(1, $pageCurrent - 3);
     $pageTop = min($pageTotal, $pageCurrent + 3);
 
@@ -1051,21 +1049,21 @@ 
     $hiddenLinks = isset($hiddenLinks) ? Security::remove_XSS($hiddenLinksRequest) : $categoryCodeRequest;
 
         // Start URL with params
-    $pageUrl = api_get_self() .
-        '?action=' . $action .
-        '&category_code=' .$categoryCode.
-        '&hidden_links=' .$hiddenLinks.
-        '&pageCurrent=' . $pageCurrent .
-        '&pageLength=' . $pageLength
+    $pageUrl = api_get_self().
+        '?action='.$action.
+        '&category_code='.$categoryCode.
+        '&hidden_links='.$hiddenLinks.
+        '&pageCurrent='.$pageCurrent.
+        '&pageLength='.$pageLength
     ;
 
     switch ($action) {
         case 'subscribe' :
             // for search
             $pageUrl .=
-                '&search_term=' . $searchTerm .
-                '&search_course=1' .
-                '&sec_token=' . $_SESSION['sec_token'];
+                '&search_term='.$searchTerm.
+                '&search_course=1'.
+                '&sec_token='.$_SESSION['sec_token'];
             break;
         case 'display_courses' :
             // No break