chamilo / chamilo-lms

main/auth/cas/lib/CAS/languages/english.php

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  */

 

 $this->_strings = array(

- CAS_STR_USING_SERVER 

- => 'using server',

- CAS_STR_AUTHENTICATION_WANTED 

- => 'CAS Authentication wanted!',

- CAS_STR_LOGOUT 

- => 'CAS logout wanted!',

- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

- => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',

- CAS_STR_AUTHENTICATION_FAILED 

- => 'CAS Authentication failed!',

- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

- => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',

- CAS_STR_SERVICE_UNAVAILABLE

- => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'

+    CAS_STR_USING_SERVER 

+    => 'using server',

+    CAS_STR_AUTHENTICATION_WANTED 

+    => 'CAS Authentication wanted!',

+    CAS_STR_LOGOUT 

+    => 'CAS logout wanted!',

+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

+    => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',

+    CAS_STR_AUTHENTICATION_FAILED 

+    => 'CAS Authentication failed!',

+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

+    => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',

+    CAS_STR_SERVICE_UNAVAILABLE

+    => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'

 );

 

 ?>
\ No newline at end of file

main/auth/cas/lib/CAS/languages/japanese.php

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  **/
 
 $this->_strings = array(
- CAS_STR_USING_SERVER 
- => 'using server',
- CAS_STR_AUTHENTICATION_WANTED 
- => 'CAS�ˤ��ǧ�ڤ�Ԥ��ޤ�',
- CAS_STR_LOGOUT 
- => 'CAS����?�����Ȥ��ޤ�!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 
- => 'CAS�����Ф˹Ԥ�ɬ�פ�����ޤ�����ưŪ��ž������ʤ����� <a href="%s">������</a> �

main/auth/cas/lib/CAS/languages/languages.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@
 /**

  * a phpCAS string index

  */

-define("CAS_STR_USING_SERVER",                1);

-define("CAS_STR_AUTHENTICATION_WANTED",       2);

-define("CAS_STR_LOGOUT",                      3);

+define("CAS_STR_USING_SERVER", 1);

+define("CAS_STR_AUTHENTICATION_WANTED", 2);

+define("CAS_STR_LOGOUT", 3);

 define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);

-define("CAS_STR_AUTHENTICATION_FAILED",       5);

-define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED",  6);

-define("CAS_STR_SERVICE_UNAVAILABLE",         7);

+define("CAS_STR_AUTHENTICATION_FAILED", 5);

+define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6);

+define("CAS_STR_SERVICE_UNAVAILABLE", 7);

 //@}

 

 ?>
\ No newline at end of file

main/auth/cas/lib/CAS/languages/greek.php

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  */

 

 $this->_strings = array(

- CAS_STR_USING_SERVER 

- => '��������������� � ������������',

- CAS_STR_AUTHENTICATION_WANTED 

- => '���������� � ����������� CAS!',

- CAS_STR_LOGOUT 

- => '���������� � ���������� ��� CAS!',

- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

- => '�� ������ �� ������ �������������� ���� ����������� CAS. ����� ���� <a href="%s">���</a> ��� �� ����������.',

- CAS_STR_AUTHENTICATION_FAILED 

- => '� ����������� CAS �������!',

- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

- => '<p>��� ���������������.</p><p>�������� �� ����������������, �������� ���� <a href="%s">���</a>.</p><p>��� �� �������� ���������, ����� �� ����� �� ��� <a href="mailto:%s">�����������</a>.</p>',

- CAS_STR_SERVICE_UNAVAILABLE

- => '� �������� `<b>%s</b>\' ��� ����� ��������� (<b>%s</b>).'

+    CAS_STR_USING_SERVER 

+    => '��������������� � ������������',

+    CAS_STR_AUTHENTICATION_WANTED 

+    => '���������� � ����������� CAS!',

+    CAS_STR_LOGOUT 

+    => '���������� � ���������� ��� CAS!',

+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

+    => '�� ������ �� ������ �������������� ���� ����������� CAS. ����� ���� <a href="%s">���</a> ��� �� ����������.',

+    CAS_STR_AUTHENTICATION_FAILED 

+    => '� ����������� CAS �������!',

+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

+    => '<p>��� ���������������.</p><p>�������� �� ����������������, �������� ���� <a href="%s">���</a>.</p><p>��� �� �������� ���������, ����� �� ����� �� ��� <a href="mailto:%s">�����������</a>.</p>',

+    CAS_STR_SERVICE_UNAVAILABLE

+    => '� �������� `<b>%s</b>\' ��� ����� ��������� (<b>%s</b>).'

 );

 

 ?>
\ No newline at end of file

main/auth/cas/lib/CAS/languages/french.php

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  */

 

 $this->_strings = array(

- CAS_STR_USING_SERVER 

- => 'utilisant le serveur',

- CAS_STR_AUTHENTICATION_WANTED 

- => 'Authentication CAS n�cessaire !',

- CAS_STR_LOGOUT 

- => 'D�connexion demand�e !',

- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

- => 'Vous auriez du etre redirig�(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',

- CAS_STR_AUTHENTICATION_FAILED 

- => 'Authentification CAS infructueuse&nbsp;!',

- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

- => '<p>Vous n\'avez pas �t� authentifi�(e).</p><p>Vous pouvez soumettre votre requete � nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le probl�me persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',

- CAS_STR_SERVICE_UNAVAILABLE

- => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'

+    CAS_STR_USING_SERVER 

+    => 'utilisant le serveur',

+    CAS_STR_AUTHENTICATION_WANTED 

+    => 'Authentication CAS n�cessaire&nbsp;!',

+    CAS_STR_LOGOUT 

+    => 'D�connexion demand�e&nbsp;!',

+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

+    => 'Vous auriez du etre redirig�(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',

+    CAS_STR_AUTHENTICATION_FAILED 

+    => 'Authentification CAS infructueuse&nbsp;!',

+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

+    => '<p>Vous n\'avez pas �t� authentifi�(e).</p><p>Vous pouvez soumettre votre requete � nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le probl�me persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',

+    CAS_STR_SERVICE_UNAVAILABLE

+    => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'

 

 );

 

main/auth/cas/lib/CAS/languages/spanish.php

Indentation +14 added lines, -14 removed lines

@@ -8,20 +8,20 @@
  */

 

 $this->_strings = array(

- CAS_STR_USING_SERVER 

- => 'usando servidor',

- CAS_STR_AUTHENTICATION_WANTED 

- => '¡Autentificación CAS necesaria!',

- CAS_STR_LOGOUT 

- => '¡Salida CAS necesaria!',

- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

- => 'Ya debería haber sido redireccionado al servidor CAS. Haga click <a href="%s">aquí</a> para continuar.',

- CAS_STR_AUTHENTICATION_FAILED 

- => '¡Autentificación CAS fallida!',

- CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

- => '<p>No estás autentificado.</p><p>Puedes volver a intentarlo haciendo click <a href="%s">aquí</a>.</p><p>Si el problema persiste debería contactar con el <a href="mailto:%s">administrador de este sitio</a>.</p>',

- CAS_STR_SERVICE_UNAVAILABLE

- => 'El servicio `<b>%s</b>\' no está disponible (<b>%s</b>).'

+    CAS_STR_USING_SERVER 

+    => 'usando servidor',

+    CAS_STR_AUTHENTICATION_WANTED 

+    => '¡Autentificación CAS necesaria!',

+    CAS_STR_LOGOUT 

+    => '¡Salida CAS necesaria!',

+    CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED 

+    => 'Ya debería haber sido redireccionado al servidor CAS. Haga click <a href="%s">aquí</a> para continuar.',

+    CAS_STR_AUTHENTICATION_FAILED 

+    => '¡Autentificación CAS fallida!',

+    CAS_STR_YOU_WERE_NOT_AUTHENTICATED 

+    => '<p>No estás autentificado.</p><p>Puedes volver a intentarlo haciendo click <a href="%s">aquí</a>.</p><p>Si el problema persiste debería contactar con el <a href="mailto:%s">administrador de este sitio</a>.</p>',

+    CAS_STR_SERVICE_UNAVAILABLE

+    => 'El servicio `<b>%s</b>\' no está disponible (<b>%s</b>).'

 );

 

 ?>

main/auth/courses.php

Switch Indentation +131 added lines, -131 removed lines

@@ -171,29 +171,53 @@ 
 }
 
 switch ($action) {
-    case 'subscribe_user_with_password':
-        $courses_controller->subscribe_user(
-            $_POST['subscribe_user_with_password'],
-            $_POST['search_term'],
-            $_POST['category_code']
-        );
-        exit;
-        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(
+                $_POST['subscribe_user_with_password'],
+                $_POST['search_term'],
+                $_POST['category_code']
+            );
+            exit;
+            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,
@@ -202,126 +226,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;
-        }
+            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);
+            }
 
-        if (!$confirmed) {
-            $template = new Template(null, false, false, false, false, false);
-            $template->assign('session_id', $sessionId);
+            $userId = api_get_user_id();
+            $confirmed = isset($_GET['confirm']);
+            $sessionId = intval($_GET['session_id']);
 
-            $layout = $template->get_template('auth/confirm_session_subscription.tpl');
+            if (empty($userId)) {
+                api_not_allowed();
+                exit;
+            }
 
-            echo $template->fetch($layout);
-            exit;
-        }
+            if (!$confirmed) {
+                $template = new Template(null, false, false, false, false, false);
+                $template->assign('session_id', $sessionId);
 
-        $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
-        if ($registrationAllowed === 'true') {
-            $entityManager = Database::getManager();
-            $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
+                $layout = $template->get_template('auth/confirm_session_subscription.tpl');
 
-            $sequences = $repository->getRequirements(
-                $sessionId,
-                SequenceResource::SESSION_TYPE
-            );
+                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');
 
-            if (count($sequences) > 0) {
-                $requirementsData = SequenceResourceManager::checkRequirementsForUser(
-                    $sequences,
-                    SequenceResource::SESSION_TYPE,
-                    $userId
+                $sequences = $repository->getRequirements(
+                    $sessionId,
+                    SequenceResource::SESSION_TYPE
                 );
 
-                $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
+                if (count($sequences) > 0) {
+                    $requirementsData = SequenceResourceManager::checkRequirementsForUser(
+                        $sequences,
+                        SequenceResource::SESSION_TYPE,
+                        $userId
+                    );
 
-                if (!$continueWithSubscription) {
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
-                    exit;
+                    $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
+
+                    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;
 }

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?

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