Fix PHP warnings.

main/inc/lib/course_category.lib.php

@@ -958,7 +958,6 @@ function getCataloguePagination($pageCurrent, $pageLength, $pageTotal)
     return $pageDiv;
 }
 
-
 /**
  * Return URL to course catalog
  * @param int $pageCurrent
@@ -975,23 +974,25 @@ function getCataloguePagination($pageCurrent, $pageLength, $pageTotal)
     $hiddenLinks = null,
     $action = null
 ) {
-        $action = isset($action) ? Security::remove_XSS($action) : Security::remove_XSS($_REQUEST['action']);
+    $requestAction = isset($_REQUEST['action']) ? Security::remove_XSS($_REQUEST['action']) : null;
+    $action = isset($action) ? Security::remove_XSS($action) : $requestAction;
     $searchTerm = isset($_REQUEST['search_term']) ? Security::remove_XSS($_REQUEST['search_term']) : null;
 
+    $categoryCodeRequest = isset($_REQUEST['category_code']) ? Security::remove_XSS($_REQUEST['category_code']) : null;
+    $categoryCode = isset($categoryCode) ? Security::remove_XSS($categoryCode) : $categoryCodeRequest;
+
+    $hiddenLinksRequest = isset($_REQUEST['hidden_links']) ? Security::remove_XSS($_REQUEST['hidden_links']) : null;
+    $hiddenLinks = isset($hiddenLinks) ? Security::remove_XSS($hiddenLinksRequest) : $categoryCodeRequest;
+
         // Start URL with params
     $pageUrl = api_get_self() .
         '?action=' . $action .
-            '&category_code=' . (
-            isset($categoryCode) ? $categoryCode :
-                Security::remove_XSS($_REQUEST['category_code'])
-            ) .
-            '&hidden_links=' . (
-            isset($hiddenLinks) ? $hiddenLinks :
-                Security::remove_XSS($_REQUEST['hidden_links'])
-            ).
+        '&category_code=' .$categoryCode.
+        '&hidden_links=' .$hiddenLinks.
         '&pageCurrent=' . $pageCurrent .
         '&pageLength=' . $pageLength
     ;
+
     switch ($action) {
         case 'subscribe' :
             // for search
@@ -1027,7 +1028,7 @@ function getPageNumberItem($pageNumber, $pageLength, $liAttributes = array(), $c
     );
 
     // If is current page ('active' class) clear URL
-    if (isset($liAttributes) && is_array($liAttributes)) {
+    if (isset($liAttributes) && is_array($liAttributes) && isset($liAttributes['class'])) {
         if (strpos('active', $liAttributes['class']) !== false) {
             $url = '';
         }