chamilo / chamilo-lms

news_list.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 $actions = '';
 if (api_is_platform_admin()) {
-	$actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
+    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
         Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
 }
 

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 }
 
 if (!isset($_GET['id']) || empty($_GET['id'])) {
-    $content =  SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
+    $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
 } else {
     $content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
 }

main/auth/openid/xrds.lib.php

Indentation +29 added lines, -29 removed lines

@@ -16,70 +16,70 @@
  * Main entry point for parsing XRDS documents
  */
 function xrds_parse($xml) {
-  global $xrds_services;
+    global $xrds_services;
 
-  $parser = xml_parser_create_ns();
-  xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
-  xml_set_character_data_handler($parser, '_xrds_cdata');
+    $parser = xml_parser_create_ns();
+    xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
+    xml_set_character_data_handler($parser, '_xrds_cdata');
 
-  xml_parse($parser, $xml);
-  xml_parser_free($parser);
+    xml_parse($parser, $xml);
+    xml_parser_free($parser);
 
-  return $xrds_services;
+    return $xrds_services;
 }
 
 /**
  * Parser callback functions
  */
 function _xrds_element_start(&$parser, $name, $attribs) {
-  global $xrds_open_elements;
+    global $xrds_open_elements;
 
-  $xrds_open_elements[] = _xrds_strip_namespace($name);
+    $xrds_open_elements[] = _xrds_strip_namespace($name);
 }
 
 function _xrds_element_end(&$parser, $name) {
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
 
-  $name = _xrds_strip_namespace($name);
-  if ($name == 'SERVICE') {
+    $name = _xrds_strip_namespace($name);
+    if ($name == 'SERVICE') {
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
-      $xrds_current_service['version'] = 2;
+        $xrds_current_service['version'] = 2;
     }
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
-      $xrds_current_service['version'] = 1;
+        $xrds_current_service['version'] = 1;
     }
     if (!empty($xrds_current_service['version'])) {
-      $xrds_services[] = $xrds_current_service;
+        $xrds_services[] = $xrds_current_service;
     }
     $xrds_current_service = array();
-  }
-  array_pop($xrds_open_elements);
+    }
+    array_pop($xrds_open_elements);
 }
 
 function _xrds_cdata(&$parser, $data) {
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
-  $path = strtoupper(implode('/', $xrds_open_elements));
-  switch ($path) {
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
+    $path = strtoupper(implode('/', $xrds_open_elements));
+    switch ($path) {
     case 'XRDS/XRD/SERVICE/TYPE':
       $xrds_current_service['types'][] = $data;
-      break;
+        break;
     case 'XRDS/XRD/SERVICE/URI':
       $xrds_current_service['uri'] = $data;
-      break;
+        break;
     case 'XRDS/XRD/SERVICE/DELEGATE':
       $xrds_current_service['delegate'] = $data;
-      break;
-  }
+        break;
+    }
 }
 
 function _xrds_strip_namespace($name) {
-  // Strip namespacing.
-  $pos = strrpos($name, ':');
-  if ($pos !== FALSE) {
+    // Strip namespacing.
+    $pos = strrpos($name, ':');
+    if ($pos !== FALSE) {
     $name = substr($name, $pos + 1, strlen($name));
-  }
+    }
 
-  return $name;
+    return $name;
 }

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 
   $name = _xrds_strip_namespace($name);
   if ($name == 'SERVICE') {
-    if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
-        in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
+    if (in_array(OPENID_NS_2_0.'/signon', $xrds_current_service['types']) ||
+        in_array(OPENID_NS_2_0.'/server', $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 2;
     }
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 2;
-    }
-    elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
+    } elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
       $xrds_current_service['version'] = 1;
     }

main/auth/openid/openid.lib.php

Spacing +23 added lines, -23 removed lines

@@ -9,10 +9,10 @@ 
  * Code
  */
 // Diffie-Hellman Key Exchange Default Value.
-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
-        '966915404479707795314057629378541917580651227423698188993727816152646631' .
-        '438561595825688188889951272158842675419950341258706556549803580104870537' .
-        '681476726513255747040765857479291291572334510643245094715007229621094194' .
+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
+        '966915404479707795314057629378541917580651227423698188993727816152646631'.
+        '438561595825688188889951272158842675419950341258706556549803580104870537'.
+        '681476726513255747040765857479291291572334510643245094715007229621094194'.
         '349783925984760375594985848253359305585439638443');
 
 // Constants for Diffie-Hellman key exchange computations.
@@ -32,10 +32,10 @@ 
 function openid_redirect_http($url, $message) {
     $query = array();
     foreach ($message as $key => $val) {
-        $query[] = $key . '=' . urlencode($val);
+        $query[] = $key.'='.urlencode($val);
     }
     $sep = (strpos($url, '?') === FALSE) ? '?' : '&';
-    header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
+    header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
     //exit;
 }
 
@@ -44,12 +44,12 @@ 
  * This function should be deprecated for 1.8.6.2 needs documentation
  */
 function openid_redirect($url, $message) {
-    $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
-    $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
+    $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
+    $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
     foreach ($message as $key => $value) {
-        $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
+        $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
     }
-    $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
+    $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
     $output .= '</form>';
     $output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
     $output .= "</body></html>";
@@ -94,7 +94,7 @@ 
     $normalized_url = $url;
 
     if (stristr($url, '://') === FALSE) {
-        $normalized_url = 'http://' . $url;
+        $normalized_url = 'http://'.$url;
     }
 
     if (substr_count($normalized_url, '/') < 3) {
@@ -133,7 +133,7 @@ 
             if ($encoded_message != '') {
                 $encoded_message .= '&';
             }
-            $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
+            $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
         }
     }
 
@@ -164,10 +164,10 @@ 
  */
 function _openid_nonce() {
     // YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
-    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
+    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
             chr(mt_rand(0, 25) + 65);
 }
 
@@ -176,7 +176,7 @@ 
  */
 function _openid_link_href($rel, $html) {
     $rel = preg_quote($rel);
-    preg_match('|<link\s+rel=["\'](.*)' . $rel . '(.*)["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<link\s+rel=["\'](.*)'.$rel.'(.*)["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[3])) {
         preg_match('|href=["\']([^"]+)["\']|iU', $matches[0], $href);
         return trim($href[1]);
@@ -188,7 +188,7 @@ 
  * Pull the http-equiv attribute out of an html meta element
  */
 function _openid_meta_httpequiv($equiv, $html) {
-    preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[1])) {
         preg_match('|content=["\']([^"]+)["\']|iU', $matches[1], $content);
         return $content[1];
@@ -209,8 +209,8 @@ 
     $sign_data = array();
 
     foreach ($keys_to_sign as $key) {
-        if (isset($message_array['openid.' . $key])) {
-            $sign_data[$key] = $message_array['openid.' . $key];
+        if (isset($message_array['openid.'.$key])) {
+            $sign_data[$key] = $message_array['openid.'.$key];
         }
     }
 
@@ -229,8 +229,8 @@ 
     $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
     $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
     $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
-    $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
-    $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
+    $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
+    $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
 
     return $hmac;
 }
@@ -337,7 +337,7 @@ 
     }
 
     do {
-        $bytes = "\x00" . _openid_get_bytes($nbytes);
+        $bytes = "\x00"._openid_get_bytes($nbytes);
         $n = _openid_dh_binary_to_long($bytes);
         // Keep looping if this value is in the low duplicated range.
     } while (bccomp($n, $duplicate) < 0);

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
  */
 function _openid_is_xri($identifier) {
     $firstchar = substr($identifier, 0, 1);
-    if ($firstchar == "@" || $firstchar == "=")
-        return TRUE;
+    if ($firstchar == "@" || $firstchar == "=") {
+            return TRUE;
+    }
 
     if (stristr($identifier, 'xri://') !== FALSE) {
         return TRUE;

Doc Comments +7 added lines

@@ -242,6 +242,9 @@ 
     return $hmac;
 }
 
+/**
+ * @param string|false $text
+ */
 function _openid_sha1($text) {
     $hex = sha1($text);
     $raw = '';
@@ -404,6 +407,10 @@ 
  */
 if (!function_exists('bcpowmod')) {
 
+    /**
+     * @param string $exp
+     * @param string $mod
+     */
     function bcpowmod($base, $exp, $mod) {
         $square = bcmod($base, $mod);
         $result = 1;

main/auth/set_temp_password.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 $user_id = api_get_user_id();
 

main/auth/profile.php

Indentation +1 added lines, -1 removed lines

@@ -684,7 +684,7 @@
 
     foreach ($user_data as $key => $value) {
         if (substr($key, 0, 6) == 'extra_') { //an extra field
-           continue;
+            continue;
         } elseif (strpos($key, 'remove_extra_') !== false) {
         } else {
             if (in_array($key, $available_values_to_modify)) {

Spacing +13 added lines, -13 removed lines

@@ -33,8 +33,8 @@ 
 $userGeolocalization = api_get_setting('enable_profile_user_address_geolocalization') == 'true';
 
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
-$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 type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>';
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
@@ -152,7 +152,7 @@ 
     $htmlHeadXtra[] = '<script>
     $(document).ready(function() {
 
-        var address = "' . $user_data['address'] . '";
+        var address = "' . $user_data['address'].'";
         initializeGeo(address, false);
 
         $("#geolocalization").on("click", function() {
@@ -184,7 +184,7 @@ 
             };
 
             var geoError = function(error) {
-                alert("Geocode ' . get_lang('Error') . ': " + error);
+                alert("Geocode ' . get_lang('Error').': " + error);
             };
 
             var geoOptions = {
@@ -235,11 +235,11 @@ 
                             infowindow.open(map, marker);
                         });
                     } else {
-                        alert("' . get_lang("NotFound") . '");
+                        alert("' . get_lang("NotFound").'");
                     }
 
                 } else {
-                    alert("Geocode ' . get_lang('Error') . ': " + status);
+                    alert("Geocode ' . get_lang('Error').': " + status);
                 }
             });
         }
@@ -269,10 +269,10 @@ 
 if (api_is_western_name_order()) {
     //    FIRST NAME and LAST NAME
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
 } else {
     //    LAST NAME and FIRST NAME
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
 }
 if (api_get_setting('profile', 'name') !== 'true') {
@@ -281,7 +281,7 @@ 
 $form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
 $form->applyFilter(array('lastname', 'firstname'), 'trim');
 $form->applyFilter(array('lastname', 'firstname'), 'html_filter');
-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 
 //    USERNAME
@@ -324,7 +324,7 @@ 
     $form->freeze('email');
 }
 
-if (api_get_setting('registration', 'email') == 'true' &&  api_get_setting('profile', 'email') == 'true') {
+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
     $form->applyFilter('email', 'stripslashes');
     $form->applyFilter('email', 'trim');
     $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
@@ -517,7 +517,7 @@ 
 
 // the $jquery_ready_content variable collects all functions that
 // will be load in the $(document).ready javascript function
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
 $(document).ready(function(){
     '.$jquery_ready_content.'
 });
@@ -673,7 +673,7 @@ 
 
             if (!check_user_email($user_data['email']) &&
                 empty($user_data['password0'])
-            ){
+            ) {
                 Display::addFlash(
                     Display:: return_message(
                         get_lang('ToChangeYourEmailMustTypeYourPassword'),
@@ -782,7 +782,7 @@ 
     $available_values_to_modify = array();
     foreach ($profile_list as $key => $status) {
         if ($status == 'true') {
-            switch($key) {
+            switch ($key) {
                 case 'login':
                     $available_values_to_modify[] = 'username';
                     break;

main/auth/cas/logout.php

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
 require_once('authcas.php');
 global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
 
-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
 phpCAS::logout();

main/auth/cas/logincas.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $firstpage = $_GET['firstpage'];
         setcookie("GotoCourse", $firstpage);
     }
-    if (!is_object($PHPCAS_CLIENT) ) {
+    if (!is_object($PHPCAS_CLIENT)) {
         phpCAS::client(
             $cas_auth_ver,
             $cas_auth_server,

main/auth/courses.php

Spacing +6 added lines, -6 removed lines

@@ -203,7 +203,7 @@ 
                 $limit
             );
         } else {
-            header('Location: ' . api_get_self());
+            header('Location: '.api_get_self());
         }
         break;
     case 'display_random_courses':
@@ -278,7 +278,7 @@ 
                 $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
 
                 if (!$continueWithSubscription) {
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
+                    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/courses.php');
                     exit;
                 }
             }
@@ -296,16 +296,16 @@ 
 
             if ($count <= 0) {
                 // no course in session -> return to catalog
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
+                $url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
             } elseif ($count == 1) {
                 // only one course, so redirect directly to this course
                 foreach ($coursesList as $course) {
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                    $url = api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.intval($_GET['session_id']);
                 }
             } else {
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
+                $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.intval($_GET['session_id']);
             }
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit;
         }
         //else show error message?

Switch Indentation +135 added lines, -135 removed lines

@@ -171,28 +171,52 @@ 
 }
 
 switch ($action) {
-    case 'subscribe_user_with_password':
-        $courses_controller->subscribe_user(
-            isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
-            isset($_POST['search_term']) ? $_POST['search_term'] : '',
-            isset($_POST['category_code']) ? $_POST['category_code'] : ''
-        );
-        break;
-    case 'createcoursecategory':
-        $courses_controller->categories_list($action);
-        break;
-    case 'deletecoursecategory':
-        $courses_controller->courses_list($action);
-        break;
-    case 'sortmycourses':
-        $courses_controller->courses_list($action);
-        break;
-    case 'subscribe':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
+        case 'subscribe_user_with_password':
+            $courses_controller->subscribe_user(
+                isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
+                isset($_POST['search_term']) ? $_POST['search_term'] : '',
+                isset($_POST['category_code']) ? $_POST['category_code'] : ''
+            );
+            break;
+        case 'createcoursecategory':
+            $courses_controller->categories_list($action);
+            break;
+        case 'deletecoursecategory':
+            $courses_controller->courses_list($action);
+            break;
+        case 'sortmycourses':
+            $courses_controller->courses_list($action);
+            break;
+        case 'subscribe':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
+                $courses_controller->courses_categories(
+                    $action,
+                    $categoryCode,
+                    null,
+                    null,
+                    null,
+                    $limit
+                );
+            } else {
+                header('Location: ' . api_get_self());
+            }
+            break;
+        case 'display_random_courses':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->courses_categories($action);
+            break;
+        case 'display_courses':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
             $courses_controller->courses_categories(
                 $action,
                 $categoryCode,
@@ -201,126 +225,102 @@ 
                 null,
                 $limit
             );
-        } else {
-            header('Location: ' . api_get_self());
-        }
-        break;
-    case 'display_random_courses':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->courses_categories($action);
-        break;
-    case 'display_courses':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->courses_categories(
-            $action,
-            $categoryCode,
-            null,
-            null,
-            null,
-            $limit
-        );
-        break;
-    case 'display_sessions':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionsList($action, $nameTools, $limit);
-        break;
-    case 'subscribe_to_session':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $userId = api_get_user_id();
-        $confirmed = isset($_GET['confirm']);
-        $sessionId = intval($_GET['session_id']);
-
-        if (empty($userId)) {
-            api_not_allowed();
-            exit;
-        }
-
-        if (!$confirmed) {
-            $template = new Template(null, false, false, false, false, false);
-            $template->assign('session_id', $sessionId);
-
-            $layout = $template->get_template('auth/confirm_session_subscription.tpl');
-
-            echo $template->fetch($layout);
-            exit;
-        }
-
-        $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
-        if ($registrationAllowed === 'true') {
-            $entityManager = Database::getManager();
-            $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
-
-            $sequences = $repository->getRequirements(
-                $sessionId,
-                SequenceResource::SESSION_TYPE
-            );
+            break;
+        case 'display_sessions':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionsList($action, $nameTools, $limit);
+            break;
+        case 'subscribe_to_session':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $userId = api_get_user_id();
+            $confirmed = isset($_GET['confirm']);
+            $sessionId = intval($_GET['session_id']);
 
-            if (count($sequences) > 0) {
-                $requirementsData = SequenceResourceManager::checkRequirementsForUser(
-                    $sequences,
-                    SequenceResource::SESSION_TYPE,
-                    $userId
+            if (empty($userId)) {
+                api_not_allowed();
+                exit;
+            }
+
+            if (!$confirmed) {
+                $template = new Template(null, false, false, false, false, false);
+                $template->assign('session_id', $sessionId);
+
+                $layout = $template->get_template('auth/confirm_session_subscription.tpl');
+
+                echo $template->fetch($layout);
+                exit;
+            }
+
+            $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
+            if ($registrationAllowed === 'true') {
+                $entityManager = Database::getManager();
+                $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
+
+                $sequences = $repository->getRequirements(
+                    $sessionId,
+                    SequenceResource::SESSION_TYPE
                 );
 
-                $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
+                if (count($sequences) > 0) {
+                    $requirementsData = SequenceResourceManager::checkRequirementsForUser(
+                        $sequences,
+                        SequenceResource::SESSION_TYPE,
+                        $userId
+                    );
+
+                    $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
 
-                if (!$continueWithSubscription) {
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
-                    exit;
+                    if (!$continueWithSubscription) {
+                        header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
+                        exit;
+                    }
                 }
-            }
 
-            SessionManager::suscribe_users_to_session(
-                $_GET['session_id'],
-                array($userId),
-                SESSION_VISIBLE_READ_ONLY,
-                false
-            );
+                SessionManager::suscribe_users_to_session(
+                    $_GET['session_id'],
+                    array($userId),
+                    SESSION_VISIBLE_READ_ONLY,
+                    false
+                );
 
-            $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
-            $count = count($coursesList);
-            $url = '';
-
-            if ($count <= 0) {
-                // no course in session -> return to catalog
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
-            } elseif ($count == 1) {
-                // only one course, so redirect directly to this course
-                foreach ($coursesList as $course) {
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
+                $count = count($coursesList);
+                $url = '';
+
+                if ($count <= 0) {
+                    // no course in session -> return to catalog
+                    $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
+                } elseif ($count == 1) {
+                    // only one course, so redirect directly to this course
+                    foreach ($coursesList as $course) {
+                        $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                    }
+                } else {
+                    $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
                 }
-            } else {
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
+                header('Location: ' . $url);
+                exit;
             }
-            header('Location: ' . $url);
-            exit;
-        }
-        //else show error message?
-        break;
-    case 'search_tag':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionsListByCoursesTag($limit);
-        break;
-    case 'search_session':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionListBySearch($limit);
-        break;
+            //else show error message?
+            break;
+        case 'search_tag':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionsListByCoursesTag($limit);
+            break;
+        case 'search_session':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionListBySearch($limit);
+            break;
 }

main/auth/gotocourse.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 

     $msg .= '<div class="well_login">';

     $msg .= $form->return_form();

-    $msg .='</div>';

+    $msg .= '</div>';

     if (api_is_cas_activated()) {

         $msg .= "</div>";

     }