chamilo / chamilo-lms

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>";

     }

main/auth/conditional_login/complete_phone_number.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 $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">

Spacing +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@ 
 /* 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 @@ 
   </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

Braces +2 added lines, -1 removed lines

@@ -4,8 +4,9 @@
 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">

main/auth/my_progress.php

Spacing +6 added lines, -6 removed lines

@@ -54,16 +54,16 @@ 
         }
         $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 @@ 
     $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>';

main/auth/external_login/login.ws.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 $wsUrl = '';
 
 // include common authentication functions
-require_once dirname(__FILE__) . '/functions.inc.php';
+require_once dirname(__FILE__).'/functions.inc.php';
 // call the login checker (defined below)
 $isValid = loginWSAuthenticate($login, $password, $wsUrl);
 
@@ -61,8 +61,8 @@ 
     $key = '-+*%$({[]})$%*+-';
     // Complete password con PKCS7-specific padding
     $blockSize = 16;
-    $padding = $blockSize - (strlen($password)%$blockSize);
-    $password .= str_repeat(chr($padding),$padding);
+    $padding = $blockSize - (strlen($password) % $blockSize);
+    $password .= str_repeat(chr($padding), $padding);
     $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
     $cipher->setKeyLength(128);
     $cipher->setKey($key);

main/auth/external_login/updateUser.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 use ChamiloSession as Session;
 
-require_once(dirname(__FILE__) . '/functions.inc.php');
+require_once(dirname(__FILE__).'/functions.inc.php');
 
 //MAIN CODE
 //$uData variable is set in local.inc.php
@@ -36,6 +36,6 @@ 
     //User cannot login
     $loginFailed = true;
     Session::erase('_uid');
-    header('Location: ' . api_get_path(WEB_PATH) . 'index.php?loginFailed=1&error=user_password_incorrect');
+    header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=user_password_incorrect');
     exit;
 }