Inspection of "Revert "Fix ExtraField call in session manager"" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — 1.11.x (#1312)

by José

created 2016-07-22 16:05 UTC

Status

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -9,10 +9,10 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
     }
 
     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);

Please login to merge, or discard this patch.

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -61,8 +61,9 @@
 block discarded – undo
  */
 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;

Please login to merge, or discard this patch.

Doc Comments +7 added lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

main/auth/set_temp_password.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@
 block discarded – undo
 $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();
 

Please login to merge, or discard this patch.

main/auth/profile.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -684,7 +684,7 @@
 block discarded – undo
 
     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)) {

Please login to merge, or discard this patch.

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -33,8 +33,8 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
             };
 
             var geoError = function(error) {
-                alert("Geocode ' . get_lang('Error') . ': " + error);
+                alert("Geocode ' . get_lang('Error').': " + error);
             };
 
             var geoOptions = {
@@ -235,11 +235,11 @@  discard block
 block discarded – undo
                             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 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
 
             if (!check_user_email($user_data['email']) &&
                 empty($user_data['password0'])
-            ){
+            ) {
                 Display::addFlash(
                     Display:: return_message(
                         get_lang('ToChangeYourEmailMustTypeYourPassword'),
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
     $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;

Please login to merge, or discard this patch.

main/auth/cas/logout.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -9,5 +9,5 @@
 block discarded – undo
 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();

Please login to merge, or discard this patch.

main/auth/cas/logincas.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

main/auth/courses.php 2 patches

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -203,7 +203,7 @@  discard block
 block discarded – undo
                 $limit
             );
         } else {
-            header('Location: ' . api_get_self());
+            header('Location: '.api_get_self());
         }
         break;
     case 'display_random_courses':
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
 
             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?

Please login to merge, or discard this patch.

Switch Indentation +135 added lines, -135 removed lines patch added patch discarded remove patch

@@ -171,28 +171,52 @@  discard block
 block discarded – undo
 }
 
 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 @@  discard block
 block discarded – undo
                 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;
 }

Please login to merge, or discard this patch.

main/auth/gotocourse.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@
 block discarded – undo
 
     $msg .= '<div class="well_login">';
     $msg .= $form->return_form();
-    $msg .='</div>';
+    $msg .= '</div>';
     if (api_is_cas_activated()) {
         $msg .= "</div>";
     }

Please login to merge, or discard this patch.

main/auth/conditional_login/complete_phone_number.php 3 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@
 block discarded – undo
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
 if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
+    die("Not Authorised");
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -2,9 +2,9 @@  discard block
 block discarded – undo
 /* For licensing terms, see /license.txt */
 
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
-$url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
+$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
-if (! isset($_SESSION['conditional_login']['uid']))
+if (!isset($_SESSION['conditional_login']['uid']))
   die("Not Authorised");
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
   </body>
 </html>
 <?php
-if (isset($_POST['submit'])){
+if (isset($_POST['submit'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
     $u['phone'] = $_POST['phone_number'];
     $password = null; // we don't want to change the password

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -4,8 +4,9 @@
 block discarded – undo
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
-if (! isset($_SESSION['conditional_login']['uid']))
+if (! isset($_SESSION['conditional_login']['uid'])) {
   die("Not Authorised");
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">

Please login to merge, or discard this patch.

main/auth/my_progress.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -54,16 +54,16 @@  discard block
 block discarded – undo
         }
         $course_info = api_get_course_info_by_id($result['c_id']);
         $course_image = '<img src="'.$course_info['course_image_large'].'">';
-        $dates .= '<li><a href="#'.$login.'">' . api_convert_and_format_date($login, DATE_FORMAT_SHORT) . '</a></li>';
+        $dates .= '<li><a href="#'.$login.'">'.api_convert_and_format_date($login, DATE_FORMAT_SHORT).'</a></li>';
         $issues .= '<li id ="'.$login.'">';
         $issues .= '<div class="img-course">'.$course_image.'</div>';
         
         $issues .= '<div class="text-course">';
-        $issues .= '<p>' . sprintf(
+        $issues .= '<p>'.sprintf(
                 get_lang('YouHaveEnteredTheCourseXInY'),
-                '" '. $courseInfo['name'] .' "',
+                '" '.$courseInfo['name'].' "',
                 api_convert_and_format_date($login, DATE_TIME_FORMAT_LONG) 
-                ) . '</p>';
+                ).'</p>';
         $issues .= '</div>'; 
         $issues .= '</li>';
         $count++;
@@ -82,8 +82,8 @@  discard block
 block discarded – undo
     $content .= '<div class="row">';
     $content .= '<div class="col-md-12">';
     $content .= '<div id="my_timeline">';
-    $content .= '<ul id="dates">' . $dates . '</ul>';
-    $content .= '<ul id="issues">' . $issues . '</ul>';
+    $content .= '<ul id="dates">'.$dates.'</ul>';
+    $content .= '<ul id="issues">'.$issues.'</ul>';
     $content .= '<div id="grad_left"></div>';
     $content .= '<div id="grad_right"></div>';
     $content .= '<a href="#" id="prev"></a>';

Please login to merge, or discard this patch.

		@@ -9,10 +9,10 @@ discard block
		block discarded – undo
9	9	* Code
10	10	*/
11	11	// Diffie-Hellman Key Exchange Default Value.
12		-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
13		- '966915404479707795314057629378541917580651227423698188993727816152646631' .
14		- '438561595825688188889951272158842675419950341258706556549803580104870537' .
15		- '681476726513255747040765857479291291572334510643245094715007229621094194' .
	12	+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
	13	+ '966915404479707795314057629378541917580651227423698188993727816152646631'.
	14	+ '438561595825688188889951272158842675419950341258706556549803580104870537'.
	15	+ '681476726513255747040765857479291291572334510643245094715007229621094194'.
16	16	'349783925984760375594985848253359305585439638443');
17	17
18	18	// Constants for Diffie-Hellman key exchange computations.
		@@ -32,10 +32,10 @@ discard block
		block discarded – undo
32	32	function openid_redirect_http($url, $message) {
33	33	$query = array();
34	34	foreach ($message as $key => $val) {
35		- $query[] = $key . '=' . urlencode($val);
	35	+ $query[] = $key.'='.urlencode($val);
36	36	}
37	37	$sep = (strpos($url, '?') === FALSE) ? '?' : '&';
38		- header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
	38	+ header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
39	39	//exit;
40	40	}
41	41
		@@ -44,12 +44,12 @@ discard block
		block discarded – undo
44	44	* This function should be deprecated for 1.8.6.2 needs documentation
45	45	*/
46	46	function openid_redirect($url, $message) {
47		- $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
48		- $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
	47	+ $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
	48	+ $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
49	49	foreach ($message as $key => $value) {
50		- $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
	50	+ $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
51	51	}
52		- $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
	52	+ $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
53	53	$output .= '</form>';
54	54	$output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
55	55	$output .= "</body></html>";
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	$normalized_url = $url;
95	95
96	96	if (stristr($url, '://') === FALSE) {
97		- $normalized_url = 'http://' . $url;
	97	+ $normalized_url = 'http://'.$url;
98	98	}
99	99
100	100	if (substr_count($normalized_url, '/') < 3) {
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	if ($encoded_message != '') {
134	134	$encoded_message .= '&';
135	135	}
136		- $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
	136	+ $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
137	137	}
138	138	}
139	139
		@@ -164,10 +164,10 @@ discard block
		block discarded – undo
164	164	*/
165	165	function _openid_nonce() {
166	166	// YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
167		- return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
168		- chr(mt_rand(0, 25) + 65) .
169		- chr(mt_rand(0, 25) + 65) .
170		- chr(mt_rand(0, 25) + 65) .
	167	+ return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
	168	+ chr(mt_rand(0, 25) + 65).
	169	+ chr(mt_rand(0, 25) + 65).
	170	+ chr(mt_rand(0, 25) + 65).
171	171	chr(mt_rand(0, 25) + 65);
172	172	}
173	173
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	*/
177	177	function _openid_link_href($rel, $html) {
178	178	$rel = preg_quote($rel);
179		- preg_match('\|<link\s+rel=["\'](.)' . $rel . '(.)["\'](.*)/?>\|iU', $html, $matches);
	179	+ preg_match('\|<link\s+rel=["\'](.)'.$rel.'(.)["\'](.*)/?>\|iU', $html, $matches);
180	180	if (isset($matches[3])) {
181	181	preg_match('\|href=["\']([^"]+)["\']\|iU', $matches[0], $href);
182	182	return trim($href[1]);
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	* Pull the http-equiv attribute out of an html meta element
189	189	*/
190	190	function _openid_meta_httpequiv($equiv, $html) {
191		- preg_match('\|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>\|iU', $html, $matches);
	191	+ preg_match('\|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>\|iU', $html, $matches);
192	192	if (isset($matches[1])) {
193	193	preg_match('\|content=["\']([^"]+)["\']\|iU', $matches[1], $content);
194	194	return $content[1];
		@@ -209,8 +209,8 @@ discard block
		block discarded – undo
209	209	$sign_data = array();
210	210
211	211	foreach ($keys_to_sign as $key) {
212		- if (isset($message_array['openid.' . $key])) {
213		- $sign_data[$key] = $message_array['openid.' . $key];
	212	+ if (isset($message_array['openid.'.$key])) {
	213	+ $sign_data[$key] = $message_array['openid.'.$key];
214	214	}
215	215	}
216	216
		@@ -229,8 +229,8 @@ discard block
		block discarded – undo
229	229	$key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
230	230	$ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
231	231	$opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
232		- $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
233		- $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
	232	+ $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
	233	+ $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
234	234
235	235	return $hmac;
236	236	}
		@@ -337,7 +337,7 @@ discard block
		block discarded – undo
337	337	}
338	338
339	339	do {
340		- $bytes = "\x00" . _openid_get_bytes($nbytes);
	340	+ $bytes = "\x00"._openid_get_bytes($nbytes);
341	341	$n = _openid_dh_binary_to_long($bytes);
342	342	// Keep looping if this value is in the low duplicated range.
343	343	} while (bccomp($n, $duplicate) < 0);

		@@ -61,8 +61,9 @@
		block discarded – undo
61	61	*/
62	62	function _openid_is_xri($identifier) {
63	63	$firstchar = substr($identifier, 0, 1);
64		- if ($firstchar == "@" \|\| $firstchar == "=")
65		- return TRUE;
	64	+ if ($firstchar == "@" \|\| $firstchar == "=") {
	65	+ return TRUE;
	66	+ }
66	67
67	68	if (stristr($identifier, 'xri://') !== FALSE) {
68	69	return TRUE;

		@@ -242,6 +242,9 @@ discard block
		block discarded – undo
242	242	return $hmac;
243	243	}
244	244
	245	+/**
	246	+ * @param string\|false $text
	247	+ */
245	248	function _openid_sha1($text) {
246	249	$hex = sha1($text);
247	250	$raw = '';
		@@ -404,6 +407,10 @@ discard block
		block discarded – undo
404	407	*/
405	408	if (!function_exists('bcpowmod')) {
406	409
	410	+ /**
	411	+ * @param string $exp
	412	+ * @param string $mod
	413	+ */
407	414	function bcpowmod($base, $exp, $mod) {
408	415	$square = bcmod($base, $mod);
409	416	$result = 1;

		@@ -11,7 +11,7 @@
		block discarded – undo
11	11	$cidReset = true;
12	12	require_once '../inc/global.inc.php';
13	13	$this_section = SECTION_COURSES;
14		-$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
	14	+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
15	15	$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
16	16	$user_id = api_get_user_id();
17	17

		@@ -684,7 +684,7 @@
		block discarded – undo
684	684
685	685	foreach ($user_data as $key => $value) {
686	686	if (substr($key, 0, 6) == 'extra_') { //an extra field
687		- continue;
	687	+ continue;
688	688	} elseif (strpos($key, 'remove_extra_') !== false) {
689	689	} else {
690	690	if (in_array($key, $available_values_to_modify)) {

		@@ -33,8 +33,8 @@ discard block
		block discarded – undo
33	33	$userGeolocalization = api_get_setting('enable_profile_user_address_geolocalization') == 'true';
34	34
35	35	$htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
36		-$htmlHeadXtra[] = '<link href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
37		-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
	36	+$htmlHeadXtra[] = '<link href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
	37	+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
38	38	$htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>';
39	39	$htmlHeadXtra[] = '<script>
40	40	$(document).ready(function() {
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	$htmlHeadXtra[] = '<script>
153	153	$(document).ready(function() {
154	154
155		- var address = "' . $user_data['address'] . '";
	155	+ var address = "' . $user_data['address'].'";
156	156	initializeGeo(address, false);
157	157
158	158	$("#geolocalization").on("click", function() {
		@@ -184,7 +184,7 @@ discard block
		block discarded – undo
184	184	};
185	185
186	186	var geoError = function(error) {
187		- alert("Geocode ' . get_lang('Error') . ': " + error);
	187	+ alert("Geocode ' . get_lang('Error').': " + error);
188	188	};
189	189
190	190	var geoOptions = {
		@@ -235,11 +235,11 @@ discard block
		block discarded – undo
235	235	infowindow.open(map, marker);
236	236	});
237	237	} else {
238		- alert("' . get_lang("NotFound") . '");
	238	+ alert("' . get_lang("NotFound").'");
239	239	}
240	240
241	241	} else {
242		- alert("Geocode ' . get_lang('Error') . ': " + status);
	242	+ alert("Geocode ' . get_lang('Error').': " + status);
243	243	}
244	244	});
245	245	}
		@@ -269,10 +269,10 @@ discard block
		block discarded – undo
269	269	if (api_is_western_name_order()) {
270	270	// FIRST NAME and LAST NAME
271	271	$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
272		- $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
	272	+ $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
273	273	} else {
274	274	// LAST NAME and FIRST NAME
275		- $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
	275	+ $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
276	276	$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
277	277	}
278	278	if (api_get_setting('profile', 'name') !== 'true') {
		@@ -281,7 +281,7 @@ discard block
		block discarded – undo
281	281	$form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
282	282	$form->applyFilter(array('lastname', 'firstname'), 'trim');
283	283	$form->applyFilter(array('lastname', 'firstname'), 'html_filter');
284		-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
	284	+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
285	285	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
286	286
287	287	// USERNAME
		@@ -324,7 +324,7 @@ discard block
		block discarded – undo
324	324	$form->freeze('email');
325	325	}
326	326
327		-if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
	327	+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
328	328	$form->applyFilter('email', 'stripslashes');
329	329	$form->applyFilter('email', 'trim');
330	330	$form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
		@@ -517,7 +517,7 @@ discard block
		block discarded – undo
517	517
518	518	// the $jquery_ready_content variable collects all functions that
519	519	// will be load in the $(document).ready javascript function
520		-$htmlHeadXtra[] ='<script>
	520	+$htmlHeadXtra[] = '<script>
521	521	$(document).ready(function(){
522	522	'.$jquery_ready_content.'
523	523	});
		@@ -673,7 +673,7 @@ discard block
		block discarded – undo
673	673
674	674	if (!check_user_email($user_data['email']) &&
675	675	empty($user_data['password0'])
676		- ){
	676	+ ) {
677	677	Display::addFlash(
678	678	Display:: return_message(
679	679	get_lang('ToChangeYourEmailMustTypeYourPassword'),
		@@ -782,7 +782,7 @@ discard block
		block discarded – undo
782	782	$available_values_to_modify = array();
783	783	foreach ($profile_list as $key => $status) {
784	784	if ($status == 'true') {
785		- switch($key) {
	785	+ switch ($key) {
786	786	case 'login':
787	787	$available_values_to_modify[] = 'username';
788	788	break;

		@@ -9,5 +9,5 @@
		block discarded – undo
9	9	require_once('authcas.php');
10	10	global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
11	11
12		-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
	12	+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
13	13	phpCAS::logout();

		@@ -39,7 +39,7 @@
		block discarded – undo
39	39	$firstpage = $_GET['firstpage'];
40	40	setcookie("GotoCourse", $firstpage);
41	41	}
42		- if (!is_object($PHPCAS_CLIENT) ) {
	42	+ if (!is_object($PHPCAS_CLIENT)) {
43	43	phpCAS::client(
44	44	$cas_auth_ver,
45	45	$cas_auth_server,

		@@ -203,7 +203,7 @@ discard block
		block discarded – undo
203	203	$limit
204	204	);
205	205	} else {
206		- header('Location: ' . api_get_self());
	206	+ header('Location: '.api_get_self());
207	207	}
208	208	break;
209	209	case 'display_random_courses':
		@@ -278,7 +278,7 @@ discard block
		block discarded – undo
278	278	$continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
279	279
280	280	if (!$continueWithSubscription) {
281		- header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
	281	+ header('Location: '.api_get_path(WEB_CODE_PATH).'auth/courses.php');
282	282	exit;
283	283	}
284	284	}
		@@ -296,16 +296,16 @@ discard block
		block discarded – undo
296	296
297	297	if ($count <= 0) {
298	298	// no course in session -> return to catalog
299		- $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
	299	+ $url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
300	300	} elseif ($count == 1) {
301	301	// only one course, so redirect directly to this course
302	302	foreach ($coursesList as $course) {
303		- $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
	303	+ $url = api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.intval($_GET['session_id']);
304	304	}
305	305	} else {
306		- $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
	306	+ $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.intval($_GET['session_id']);
307	307	}
308		- header('Location: ' . $url);
	308	+ header('Location: '.$url);
309	309	exit;
310	310	}
311	311	//else show error message?

		@@ -171,28 +171,52 @@ discard block
		block discarded – undo
171	171	}
172	172
173	173	switch ($action) {
174		- case 'subscribe_user_with_password':
175		- $courses_controller->subscribe_user(
176		- isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
177		- isset($_POST['search_term']) ? $_POST['search_term'] : '',
178		- isset($_POST['category_code']) ? $_POST['category_code'] : ''
179		- );
180		- break;
181		- case 'createcoursecategory':
182		- $courses_controller->categories_list($action);
183		- break;
184		- case 'deletecoursecategory':
185		- $courses_controller->courses_list($action);
186		- break;
187		- case 'sortmycourses':
188		- $courses_controller->courses_list($action);
189		- break;
190		- case 'subscribe':
191		- if (!$user_can_view_page) {
192		- api_not_allowed(true);
193		- }
194		-
195		- if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
	174	+ case 'subscribe_user_with_password':
	175	+ $courses_controller->subscribe_user(
	176	+ isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
	177	+ isset($_POST['search_term']) ? $_POST['search_term'] : '',
	178	+ isset($_POST['category_code']) ? $_POST['category_code'] : ''
	179	+ );
	180	+ break;
	181	+ case 'createcoursecategory':
	182	+ $courses_controller->categories_list($action);
	183	+ break;
	184	+ case 'deletecoursecategory':
	185	+ $courses_controller->courses_list($action);
	186	+ break;
	187	+ case 'sortmycourses':
	188	+ $courses_controller->courses_list($action);
	189	+ break;
	190	+ case 'subscribe':
	191	+ if (!$user_can_view_page) {
	192	+ api_not_allowed(true);
	193	+ }
	194	+
	195	+ if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
	196	+ $courses_controller->courses_categories(
	197	+ $action,
	198	+ $categoryCode,
	199	+ null,
	200	+ null,
	201	+ null,
	202	+ $limit
	203	+ );
	204	+ } else {
	205	+ header('Location: ' . api_get_self());
	206	+ }
	207	+ break;
	208	+ case 'display_random_courses':
	209	+ if (!$user_can_view_page) {
	210	+ api_not_allowed(true);
	211	+ }
	212	+
	213	+ $courses_controller->courses_categories($action);
	214	+ break;
	215	+ case 'display_courses':
	216	+ if (!$user_can_view_page) {
	217	+ api_not_allowed(true);
	218	+ }
	219	+
196	220	$courses_controller->courses_categories(
197	221	$action,
198	222	$categoryCode,
		@@ -201,126 +225,102 @@ discard block
		block discarded – undo
201	225	null,
202	226	$limit
203	227	);
204		- } else {
205		- header('Location: ' . api_get_self());
206		- }
207		- break;
208		- case 'display_random_courses':
209		- if (!$user_can_view_page) {
210		- api_not_allowed(true);
211		- }
212		-
213		- $courses_controller->courses_categories($action);
214		- break;
215		- case 'display_courses':
216		- if (!$user_can_view_page) {
217		- api_not_allowed(true);
218		- }
219		-
220		- $courses_controller->courses_categories(
221		- $action,
222		- $categoryCode,
223		- null,
224		- null,
225		- null,
226		- $limit
227		- );
228		- break;
229		- case 'display_sessions':
230		- if (!$user_can_view_page) {
231		- api_not_allowed(true);
232		- }
233		-
234		- $courses_controller->sessionsList($action, $nameTools, $limit);
235		- break;
236		- case 'subscribe_to_session':
237		- if (!$user_can_view_page) {
238		- api_not_allowed(true);
239		- }
240		-
241		- $userId = api_get_user_id();
242		- $confirmed = isset($_GET['confirm']);
243		- $sessionId = intval($_GET['session_id']);
244		-
245		- if (empty($userId)) {
246		- api_not_allowed();
247		- exit;
248		- }
249		-
250		- if (!$confirmed) {
251		- $template = new Template(null, false, false, false, false, false);
252		- $template->assign('session_id', $sessionId);
253		-
254		- $layout = $template->get_template('auth/confirm_session_subscription.tpl');
255		-
256		- echo $template->fetch($layout);
257		- exit;
258		- }
259		-
260		- $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
261		- if ($registrationAllowed === 'true') {
262		- $entityManager = Database::getManager();
263		- $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
264		-
265		- $sequences = $repository->getRequirements(
266		- $sessionId,
267		- SequenceResource::SESSION_TYPE
268		- );
	228	+ break;
	229	+ case 'display_sessions':
	230	+ if (!$user_can_view_page) {
	231	+ api_not_allowed(true);
	232	+ }
	233	+
	234	+ $courses_controller->sessionsList($action, $nameTools, $limit);
	235	+ break;
	236	+ case 'subscribe_to_session':
	237	+ if (!$user_can_view_page) {
	238	+ api_not_allowed(true);
	239	+ }
	240	+
	241	+ $userId = api_get_user_id();
	242	+ $confirmed = isset($_GET['confirm']);
	243	+ $sessionId = intval($_GET['session_id']);
269	244
270		- if (count($sequences) > 0) {
271		- $requirementsData = SequenceResourceManager::checkRequirementsForUser(
272		- $sequences,
273		- SequenceResource::SESSION_TYPE,
274		- $userId
	245	+ if (empty($userId)) {
	246	+ api_not_allowed();
	247	+ exit;
	248	+ }
	249	+
	250	+ if (!$confirmed) {
	251	+ $template = new Template(null, false, false, false, false, false);
	252	+ $template->assign('session_id', $sessionId);
	253	+
	254	+ $layout = $template->get_template('auth/confirm_session_subscription.tpl');
	255	+
	256	+ echo $template->fetch($layout);
	257	+ exit;
	258	+ }
	259	+
	260	+ $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
	261	+ if ($registrationAllowed === 'true') {
	262	+ $entityManager = Database::getManager();
	263	+ $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
	264	+
	265	+ $sequences = $repository->getRequirements(
	266	+ $sessionId,
	267	+ SequenceResource::SESSION_TYPE
275	268	);
276	269
277		- $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
	270	+ if (count($sequences) > 0) {
	271	+ $requirementsData = SequenceResourceManager::checkRequirementsForUser(
	272	+ $sequences,
	273	+ SequenceResource::SESSION_TYPE,
	274	+ $userId
	275	+ );
	276	+
	277	+ $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
278	278
279		- if (!$continueWithSubscription) {
280		- header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
281		- exit;
	279	+ if (!$continueWithSubscription) {
	280	+ header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
	281	+ exit;
	282	+ }
282	283	}
283		- }
284	284
285		- SessionManager::suscribe_users_to_session(
286		- $_GET['session_id'],
287		- array($userId),
288		- SESSION_VISIBLE_READ_ONLY,
289		- false
290		- );
	285	+ SessionManager::suscribe_users_to_session(
	286	+ $_GET['session_id'],
	287	+ array($userId),
	288	+ SESSION_VISIBLE_READ_ONLY,
	289	+ false
	290	+ );
291	291
292		- $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
293		- $count = count($coursesList);
294		- $url = '';
295		-
296		- if ($count <= 0) {
297		- // no course in session -> return to catalog
298		- $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
299		- } elseif ($count == 1) {
300		- // only one course, so redirect directly to this course
301		- foreach ($coursesList as $course) {
302		- $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
	292	+ $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
	293	+ $count = count($coursesList);
	294	+ $url = '';
	295	+
	296	+ if ($count <= 0) {
	297	+ // no course in session -> return to catalog
	298	+ $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
	299	+ } elseif ($count == 1) {
	300	+ // only one course, so redirect directly to this course
	301	+ foreach ($coursesList as $course) {
	302	+ $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
	303	+ }
	304	+ } else {
	305	+ $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
303	306	}
304		- } else {
305		- $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
	307	+ header('Location: ' . $url);
	308	+ exit;
306	309	}
307		- header('Location: ' . $url);
308		- exit;
309		- }
310		- //else show error message?
311		- break;
312		- case 'search_tag':
313		- if (!$user_can_view_page) {
314		- api_not_allowed(true);
315		- }
316		-
317		- $courses_controller->sessionsListByCoursesTag($limit);
318		- break;
319		- case 'search_session':
320		- if (!$user_can_view_page) {
321		- api_not_allowed(true);
322		- }
323		-
324		- $courses_controller->sessionListBySearch($limit);
325		- break;
	310	+ //else show error message?
	311	+ break;
	312	+ case 'search_tag':
	313	+ if (!$user_can_view_page) {
	314	+ api_not_allowed(true);
	315	+ }
	316	+
	317	+ $courses_controller->sessionsListByCoursesTag($limit);
	318	+ break;
	319	+ case 'search_session':
	320	+ if (!$user_can_view_page) {
	321	+ api_not_allowed(true);
	322	+ }
	323	+
	324	+ $courses_controller->sessionListBySearch($limit);
	325	+ break;
326	326	}

		@@ -41,7 +41,7 @@
		block discarded – undo
41	41
42	42	$msg .= '<div class="well_login">';
43	43	$msg .= $form->return_form();
44		- $msg .='</div>';
	44	+ $msg .= '</div>';
45	45	if (api_is_cas_activated()) {
46	46	$msg .= "</div>";
47	47	}

		@@ -5,7 +5,7 @@
		block discarded – undo
5	5	$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
6	6
7	7	if (! isset($_SESSION['conditional_login']['uid']))
8		- die("Not Authorised");
	8	+ die("Not Authorised");
9	9	?>
10	10	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
11	11	<html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">

		@@ -2,9 +2,9 @@ discard block
		block discarded – undo
2	2	/* For licensing terms, see /license.txt */
3	3
4	4	require_once dirname(__FILE__).'/../../inc/global.inc.php';
5		-$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
	5	+$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
6	6
7		-if (! isset($_SESSION['conditional_login']['uid']))
	7	+if (!isset($_SESSION['conditional_login']['uid']))
8	8	die("Not Authorised");
9	9	?>
10	10	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	</body>
21	21	</html>
22	22	<?php
23		-if (isset($_POST['submit'])){
	23	+if (isset($_POST['submit'])) {
24	24	$u = api_get_user_info($_SESSION['conditional_login']['uid']);
25	25	$u['phone'] = $_POST['phone_number'];
26	26	$password = null; // we don't want to change the password

		@@ -4,8 +4,9 @@
		block discarded – undo
4	4	require_once dirname(__FILE__).'/../../inc/global.inc.php';
5	5	$url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
6	6
7		-if (! isset($_SESSION['conditional_login']['uid']))
	7	+if (! isset($_SESSION['conditional_login']['uid'])) {
8	8	die("Not Authorised");
	9	+}
9	10	?>
10	11	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
11	12	<html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">

		@@ -54,16 +54,16 @@ discard block
		block discarded – undo
54	54	}
55	55	$course_info = api_get_course_info_by_id($result['c_id']);
56	56	$course_image = '<img src="'.$course_info['course_image_large'].'">';
57		- $dates .= '<li><a href="#'.$login.'">' . api_convert_and_format_date($login, DATE_FORMAT_SHORT) . '</a></li>';
	57	+ $dates .= '<li><a href="#'.$login.'">'.api_convert_and_format_date($login, DATE_FORMAT_SHORT).'</a></li>';
58	58	$issues .= '<li id ="'.$login.'">';
59	59	$issues .= '<div class="img-course">'.$course_image.'</div>';
60	60
61	61	$issues .= '<div class="text-course">';
62		- $issues .= '<p>' . sprintf(
	62	+ $issues .= '<p>'.sprintf(
63	63	get_lang('YouHaveEnteredTheCourseXInY'),
64		- '" '. $courseInfo['name'] .' "',
	64	+ '" '.$courseInfo['name'].' "',
65	65	api_convert_and_format_date($login, DATE_TIME_FORMAT_LONG)
66		- ) . '</p>';
	66	+ ).'</p>';
67	67	$issues .= '</div>';
68	68	$issues .= '</li>';
69	69	$count++;
		@@ -82,8 +82,8 @@ discard block
		block discarded – undo
82	82	$content .= '<div class="row">';
83	83	$content .= '<div class="col-md-12">';
84	84	$content .= '<div id="my_timeline">';
85		- $content .= '<ul id="dates">' . $dates . '</ul>';
86		- $content .= '<ul id="issues">' . $issues . '</ul>';
	85	+ $content .= '<ul id="dates">'.$dates.'</ul>';
	86	+ $content .= '<ul id="issues">'.$issues.'</ul>';
87	87	$content .= '<div id="grad_left"></div>';
88	88	$content .= '<div id="grad_right"></div>';
89	89	$content .= '<a href="#" id="prev"></a>';

chamilo / chamilo-lms

Pull Request — 1.11.x (#1312)

Status

Category

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Doc Comments +7 added lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Switch Indentation +135 added lines, -135 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch