chamilo / chamilo-lms

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_controller.php

Spacing +17 added lines, -18 removed lines

@@ -61,7 +61,7 @@ 
      * @param string   $message confirmation message(optional)
      * @param string   $error error message(optional)
      */
-    public function categories_list($action, $message='', $error='')
+    public function categories_list($action, $message = '', $error = '')
     {
         $data = array();
         $data['user_course_categories'] = $this->model->get_user_course_categories();
@@ -116,7 +116,7 @@ 
 
         // we need only the course codes as these will be used to match against the courses of the category
         if ($user_courses != '') {
-            foreach($user_courses as $key => $value) {
+            foreach ($user_courses as $key => $value) {
                 $user_coursecodes[] = $value['code'];
             }
         }
@@ -385,13 +385,13 @@ 
                     $html .= '</strong>';
                 } else {
                     if (!empty($categoryCourses)) {
-                        $html .= '<a href="' . getCourseCategoryUrl(
+                        $html .= '<a href="'.getCourseCategoryUrl(
                                 1,
                                 $limit['length'],
                                 $categoryCode,
                                 $hiddenLinks,
                                 $action
-                            ) . '">';
+                            ).'">';
                         $html .= "$categoryName ($categoryCourses)";
                         $html .= '</a>';
                     } else {
@@ -412,13 +412,13 @@ 
                         if ($code == $subCategory1Code) {
                             $html .= "<strong>$subCategory1Name ($subCategory1Courses)</strong>";
                         } else {
-                            $html .= '<a href="' . getCourseCategoryUrl(
+                            $html .= '<a href="'.getCourseCategoryUrl(
                                     1,
                                     $limit['length'],
                                     $categoryCode,
                                     $hiddenLinks,
                                     $action
-                                ) . '">';
+                                ).'">';
                             $html .= "$subCategory1Name ($subCategory1Courses)";
                             $html .= '</a>';
                         }
@@ -436,13 +436,13 @@ 
                                 if ($code == $subCategory2Code) {
                                     $html .= "<strong>$subCategory2Name ($subCategory2Courses)</strong>";
                                 } else {
-                                    $html .= '<a href="' . getCourseCategoryUrl(
+                                    $html .= '<a href="'.getCourseCategoryUrl(
                                             1,
                                             $limit['length'],
                                             $categoryCode,
                                             $hiddenLinks,
                                             $action
-                                        ) . '">';
+                                        ).'">';
                                     $html .= "$subCategory2Name ($subCategory2Courses)";
                                     $html .= '</a>';
                                 }
@@ -460,13 +460,13 @@ 
                                         if ($code == $subCategory3Code) {
                                             $html .= "<strong>$subCategory3Name ($subCategory3Courses)</strong>";
                                         } else {
-                                            $html .= '<a href="' . getCourseCategoryUrl(
+                                            $html .= '<a href="'.getCourseCategoryUrl(
                                                     1,
                                                     $limit['length'],
                                                     $categoryCode,
                                                     $hiddenLinks,
                                                     $action
-                                                ) . '">';
+                                                ).'">';
                                             $html .= "$subCategory3Name ($subCategory3Courses)";
                                             $html .= '</a>';
                                         }
@@ -593,7 +593,7 @@ 
         $icon = '<em class="fa fa-smile-o"></em>';
 
         return Display::div(
-            $icon . ' ' . get_lang("AlreadyRegisteredToSession"),
+            $icon.' '.get_lang("AlreadyRegisteredToSession"),
             array('class' => 'info-catalog')
         );
     }
@@ -605,7 +605,7 @@ 
      */
     public function getSessionIcon($sessionName)
     {
-        return Display::return_icon('window_list.png', $sessionName, null,ICON_SIZE_MEDIUM);
+        return Display::return_icon('window_list.png', $sessionName, null, ICON_SIZE_MEDIUM);
     }
 
     /**
@@ -626,8 +626,7 @@ 
         $pageTotal = intval(ceil(intval($countSessions) / $limit['length']));
         // Do NOT show pagination if only one page or less
         $cataloguePagination = $pageTotal > 1 ?
-            getCataloguePagination($limit['current'], $limit['length'], $pageTotal) :
-            '';
+            getCataloguePagination($limit['current'], $limit['length'], $pageTotal) : '';
         $sessionsBlocks = $this->getFormatedSessionsBlock($sessions);
 
         // Get session list catalogue URL
@@ -638,13 +637,13 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('catalog_pagination', $cataloguePagination);
         $tpl->assign('hidden_links', $hiddenLinks);
         $tpl->assign('search_token', Security::get_token());
         $tpl->assign('search_date', $date);
-        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH) . 'course.ajax.php');
+        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH).'course.ajax.php');
         $tpl->assign('sessions', $sessionsBlocks);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
 
@@ -671,7 +670,7 @@ 
 
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);
@@ -702,7 +701,7 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);

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/facebook-php-sdk/src/Facebook/FacebookSignedRequestFromInputHelper.php

Indentation +104 added lines, -104 removed lines

@@ -32,135 +32,135 @@
 abstract class FacebookSignedRequestFromInputHelper
 {
 
-  /**
-   * @var \Facebook\Entities\SignedRequest|null
-   */
-  protected $signedRequest;
-
-  /**
-   * @var string the app id
-   */
-  protected $appId;
-
-  /**
-   * @var string the app secret
-   */
-  protected $appSecret;
-
-  /**
-   * @var string|null Random string to prevent CSRF.
-   */
-  public $state = null;
-
-  /**
-   * Initialize the helper and process available signed request data.
-   *
-   * @param string|null $appId
-   * @param string|null $appSecret
-   */
-  public function __construct($appId = null, $appSecret = null)
-  {
+    /**
+     * @var \Facebook\Entities\SignedRequest|null
+     */
+    protected $signedRequest;
+
+    /**
+     * @var string the app id
+     */
+    protected $appId;
+
+    /**
+     * @var string the app secret
+     */
+    protected $appSecret;
+
+    /**
+     * @var string|null Random string to prevent CSRF.
+     */
+    public $state = null;
+
+    /**
+     * Initialize the helper and process available signed request data.
+     *
+     * @param string|null $appId
+     * @param string|null $appSecret
+     */
+    public function __construct($appId = null, $appSecret = null)
+    {
     $this->appId = FacebookSession::_getTargetAppId($appId);
     $this->appSecret = FacebookSession::_getTargetAppSecret($appSecret);
 
     $this->instantiateSignedRequest();
-  }
-
-  /**
-   * Instantiates a new SignedRequest entity.
-   *
-   * @param string|null
-   */
-  public function instantiateSignedRequest($rawSignedRequest = null)
-  {
+    }
+
+    /**
+     * Instantiates a new SignedRequest entity.
+     *
+     * @param string|null
+     */
+    public function instantiateSignedRequest($rawSignedRequest = null)
+    {
     $rawSignedRequest = $rawSignedRequest ?: $this->getRawSignedRequest();
 
     if (!$rawSignedRequest) {
-      return;
+        return;
     }
 
     $this->signedRequest = new SignedRequest($rawSignedRequest, $this->state, $this->appSecret);
-  }
-
-  /**
-   * Instantiates a FacebookSession from the signed request from input.
-   *
-   * @return FacebookSession|null
-   */
-  public function getSession()
-  {
+    }
+
+    /**
+     * Instantiates a FacebookSession from the signed request from input.
+     *
+     * @return FacebookSession|null
+     */
+    public function getSession()
+    {
     if ($this->signedRequest && $this->signedRequest->hasOAuthData()) {
-      return FacebookSession::newSessionFromSignedRequest($this->signedRequest);
+        return FacebookSession::newSessionFromSignedRequest($this->signedRequest);
     }
     return null;
-  }
-
-  /**
-   * Returns the SignedRequest entity.
-   *
-   * @return \Facebook\Entities\SignedRequest|null
-   */
-  public function getSignedRequest()
-  {
+    }
+
+    /**
+     * Returns the SignedRequest entity.
+     *
+     * @return \Facebook\Entities\SignedRequest|null
+     */
+    public function getSignedRequest()
+    {
     return $this->signedRequest;
-  }
-
-  /**
-   * Returns the user_id if available.
-   *
-   * @return string|null
-   */
-  public function getUserId()
-  {
+    }
+
+    /**
+     * Returns the user_id if available.
+     *
+     * @return string|null
+     */
+    public function getUserId()
+    {
     return $this->signedRequest ? $this->signedRequest->getUserId() : null;
-  }
-
-  /**
-   * Get raw signed request from input.
-   *
-   * @return string|null
-   */
-  abstract public function getRawSignedRequest();
-
-  /**
-   * Get raw signed request from GET input.
-   *
-   * @return string|null
-   */
-  public function getRawSignedRequestFromGet()
-  {
+    }
+
+    /**
+     * Get raw signed request from input.
+     *
+     * @return string|null
+     */
+    abstract public function getRawSignedRequest();
+
+    /**
+     * Get raw signed request from GET input.
+     *
+     * @return string|null
+     */
+    public function getRawSignedRequestFromGet()
+    {
     if (isset($_GET['signed_request'])) {
-      return $_GET['signed_request'];
+        return $_GET['signed_request'];
     }
 
     return null;
-  }
-
-  /**
-   * Get raw signed request from POST input.
-   *
-   * @return string|null
-   */
-  public function getRawSignedRequestFromPost()
-  {
+    }
+
+    /**
+     * Get raw signed request from POST input.
+     *
+     * @return string|null
+     */
+    public function getRawSignedRequestFromPost()
+    {
     if (isset($_POST['signed_request'])) {
-      return $_POST['signed_request'];
+        return $_POST['signed_request'];
     }
 
     return null;
-  }
-
-  /**
-   * Get raw signed request from cookie set from the Javascript SDK.
-   *
-   * @return string|null
-   */
-  public function getRawSignedRequestFromCookie()
-  {
+    }
+
+    /**
+     * Get raw signed request from cookie set from the Javascript SDK.
+     *
+     * @return string|null
+     */
+    public function getRawSignedRequestFromCookie()
+    {
     if (isset($_COOKIE['fbsr_' . $this->appId])) {
-      return $_COOKIE['fbsr_' . $this->appId];
+        return $_COOKIE['fbsr_' . $this->appId];
     }
     return null;
-  }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -157,8 +157,8 @@
    */
   public function getRawSignedRequestFromCookie()
   {
-    if (isset($_COOKIE['fbsr_' . $this->appId])) {
-      return $_COOKIE['fbsr_' . $this->appId];
+    if (isset($_COOKIE['fbsr_'.$this->appId])) {
+      return $_COOKIE['fbsr_'.$this->appId];
     }
     return null;
   }

main/auth/external_login/facebook-php-sdk/src/Facebook/GraphPage.php

Indentation +24 added lines, -24 removed lines

@@ -31,34 +31,34 @@
 class GraphPage extends GraphObject
 {
 
-  /**
-   * Returns the ID for the user's page as a string if present.
-   *
-   * @return string|null
-   */
-  public function getId()
-  {
+    /**
+     * Returns the ID for the user's page as a string if present.
+     *
+     * @return string|null
+     */
+    public function getId()
+    {
     return $this->getProperty('id');
-  }
+    }
 
-  /**
-   * Returns the Category for the user's page as a string if present.
-   *
-   * @return string|null
-   */
-  public function getCategory()
-  {
+    /**
+     * Returns the Category for the user's page as a string if present.
+     *
+     * @return string|null
+     */
+    public function getCategory()
+    {
     return $this->getProperty('category');
-  }
+    }
 
-  /**
-   * Returns the Name of the user's page as a string if present.
-   *
-   * @return string|null
-   */
-  public function getName()
-  {
+    /**
+     * Returns the Name of the user's page as a string if present.
+     *
+     * @return string|null
+     */
+    public function getName()
+    {
     return $this->getProperty('name');
-  }
+    }
 
 }
\ No newline at end of file

main/auth/external_login/facebook-php-sdk/src/Facebook/FacebookRedirectLoginHelper.php

Indentation +185 added lines, -185 removed lines

@@ -32,293 +32,293 @@
 class FacebookRedirectLoginHelper
 {
 
-  /**
-   * @var string The application id
-   */
-  private $appId;
+    /**
+     * @var string The application id
+     */
+    private $appId;
 
-  /**
-   * @var string The application secret
-   */
-  private $appSecret;
+    /**
+     * @var string The application secret
+     */
+    private $appSecret;
 
-  /**
-   * @var string The redirect URL for the application
-   */
-  private $redirectUrl;
+    /**
+     * @var string The redirect URL for the application
+     */
+    private $redirectUrl;
 
-  /**
-   * @var string Prefix to use for session variables
-   */
-  private $sessionPrefix = 'FBRLH_';
+    /**
+     * @var string Prefix to use for session variables
+     */
+    private $sessionPrefix = 'FBRLH_';
 
-  /**
-   * @var string State token for CSRF validation
-   */
-  protected $state;
+    /**
+     * @var string State token for CSRF validation
+     */
+    protected $state;
 
-  /**
-   * @var boolean Toggle for PHP session status check
-   */
-  protected $checkForSessionStatus = true;
+    /**
+     * @var boolean Toggle for PHP session status check
+     */
+    protected $checkForSessionStatus = true;
 
-  /**
-   * Constructs a RedirectLoginHelper for a given appId and redirectUrl.
-   *
-   * @param string $redirectUrl The URL Facebook should redirect users to
-   *                            after login
-   * @param string $appId The application id
-   * @param string $appSecret The application secret
-   */
-  public function __construct($redirectUrl, $appId = null, $appSecret = null)
-  {
+    /**
+     * Constructs a RedirectLoginHelper for a given appId and redirectUrl.
+     *
+     * @param string $redirectUrl The URL Facebook should redirect users to
+     *                            after login
+     * @param string $appId The application id
+     * @param string $appSecret The application secret
+     */
+    public function __construct($redirectUrl, $appId = null, $appSecret = null)
+    {
     $this->appId = FacebookSession::_getTargetAppId($appId);
     $this->appSecret = FacebookSession::_getTargetAppSecret($appSecret);
     $this->redirectUrl = $redirectUrl;
-  }
+    }
 
-  /**
-   * Stores CSRF state and returns a URL to which the user should be sent to
-   *   in order to continue the login process with Facebook.  The
-   *   provided redirectUrl should invoke the handleRedirect method.
-   *
-   * @param array $scope List of permissions to request during login
-   * @param string $version Optional Graph API version if not default (v2.0)
-   * @param boolean $displayAsPopup Indicate if the page will be displayed as a popup
-   *
-   * @return string
-   */
-  public function getLoginUrl($scope = array(), $version = null, $displayAsPopup = false)
-  {
+    /**
+     * Stores CSRF state and returns a URL to which the user should be sent to
+     *   in order to continue the login process with Facebook.  The
+     *   provided redirectUrl should invoke the handleRedirect method.
+     *
+     * @param array $scope List of permissions to request during login
+     * @param string $version Optional Graph API version if not default (v2.0)
+     * @param boolean $displayAsPopup Indicate if the page will be displayed as a popup
+     *
+     * @return string
+     */
+    public function getLoginUrl($scope = array(), $version = null, $displayAsPopup = false)
+    {
 
     $version = ($version ?: FacebookRequest::GRAPH_API_VERSION);
     $this->state = $this->random(16);
     $this->storeState($this->state);
 
     $params = array(
-      'client_id' => $this->appId,
-      'redirect_uri' => $this->redirectUrl,
-      'state' => $this->state,
-      'sdk' => 'php-sdk-' . FacebookRequest::VERSION,
-      'scope' => implode(',', $scope)
+        'client_id' => $this->appId,
+        'redirect_uri' => $this->redirectUrl,
+        'state' => $this->state,
+        'sdk' => 'php-sdk-' . FacebookRequest::VERSION,
+        'scope' => implode(',', $scope)
     );
     
     if ($displayAsPopup)
     {
-      $params['display'] = 'popup';
+        $params['display'] = 'popup';
     }
     
     return 'https://www.facebook.com/' . $version . '/dialog/oauth?' .
-      http_build_query($params, null, '&');
-  }
+        http_build_query($params, null, '&');
+    }
 
-  /**
-   * Returns a URL to which the user should be sent to re-request permissions.
-   *
-   * @param array $scope List of permissions to re-request
-   * @param string $version Optional Graph API version if not default (v2.0)
-   *
-   * @return string
-   */
-  public function getReRequestUrl($scope = array(), $version = null)
-  {
+    /**
+     * Returns a URL to which the user should be sent to re-request permissions.
+     *
+     * @param array $scope List of permissions to re-request
+     * @param string $version Optional Graph API version if not default (v2.0)
+     *
+     * @return string
+     */
+    public function getReRequestUrl($scope = array(), $version = null)
+    {
     $version = ($version ?: FacebookRequest::GRAPH_API_VERSION);
     $this->state = $this->random(16);
     $this->storeState($this->state);
     $params = array(
-      'client_id' => $this->appId,
-      'redirect_uri' => $this->redirectUrl,
-      'state' => $this->state,
-      'sdk' => 'php-sdk-' . FacebookRequest::VERSION,
-      'auth_type' => 'rerequest',
-      'scope' => implode(',', $scope)
+        'client_id' => $this->appId,
+        'redirect_uri' => $this->redirectUrl,
+        'state' => $this->state,
+        'sdk' => 'php-sdk-' . FacebookRequest::VERSION,
+        'auth_type' => 'rerequest',
+        'scope' => implode(',', $scope)
     );
     return 'https://www.facebook.com/' . $version . '/dialog/oauth?' .
-      http_build_query($params, null, '&');
-  }
+        http_build_query($params, null, '&');
+    }
 
-  /**
-   * Returns the URL to send the user in order to log out of Facebook.
-   *
-   * @param FacebookSession $session The session that will be logged out
-   * @param string $next The url Facebook should redirect the user to after
-   *   a successful logout
-   *
-   * @return string
-   *
-   * @throws FacebookSDKException
-   */
-  public function getLogoutUrl(FacebookSession $session, $next)
-  {
+    /**
+     * Returns the URL to send the user in order to log out of Facebook.
+     *
+     * @param FacebookSession $session The session that will be logged out
+     * @param string $next The url Facebook should redirect the user to after
+     *   a successful logout
+     *
+     * @return string
+     *
+     * @throws FacebookSDKException
+     */
+    public function getLogoutUrl(FacebookSession $session, $next)
+    {
     if ($session->getAccessToken()->isAppSession()) {
-      throw new FacebookSDKException(
+        throw new FacebookSDKException(
         'Cannot generate a Logout URL with an App Session.', 722
-      );
+        );
     }
     $params = array(
-      'next' => $next,
-      'access_token' => $session->getToken()
+        'next' => $next,
+        'access_token' => $session->getToken()
     );
     return 'https://www.facebook.com/logout.php?' . http_build_query($params, null, '&');
-  }
+    }
 
-  /**
-   * Handles a response from Facebook, including a CSRF check, and returns a
-   *   FacebookSession.
-   *
-   * @return FacebookSession|null
-   */
-  public function getSessionFromRedirect()
-  {
+    /**
+     * Handles a response from Facebook, including a CSRF check, and returns a
+     *   FacebookSession.
+     *
+     * @return FacebookSession|null
+     */
+    public function getSessionFromRedirect()
+    {
     $this->loadState();
     if ($this->isValidRedirect()) {
 	
-      $params = array(
+        $params = array(
         'client_id' => FacebookSession::_getTargetAppId($this->appId),
         'redirect_uri' => $this->redirectUrl,
         'client_secret' =>
-          FacebookSession::_getTargetAppSecret($this->appSecret),
+            FacebookSession::_getTargetAppSecret($this->appSecret),
         'code' => $this->getCode()
-      );
+        );
 
-      $response = (new FacebookRequest(
+        $response = (new FacebookRequest(
         FacebookSession::newAppSession($this->appId, $this->appSecret),
         'GET',
         '/oauth/access_token',
         $params
-      ))->execute()->getResponse();
+        ))->execute()->getResponse();
 		
-      if (isset($response['access_token'])) {
+        if (isset($response['access_token'])) {
         return new FacebookSession($response['access_token']);
-      }
+        }
     }
     return null;
-  }
+    }
 
-  /**
-   * Check if a redirect has a valid state.
-   *
-   * @return bool
-   */
-  protected function isValidRedirect()
-  {
+    /**
+     * Check if a redirect has a valid state.
+     *
+     * @return bool
+     */
+    protected function isValidRedirect()
+    {
     return $this->getCode() && isset($_GET['state'])
         && $_GET['state'] == $this->state;
-  }
+    }
 
-  /**
-   * Return the code.
-   *
-   * @return string|null
-   */
-  protected function getCode()
-  {
+    /**
+     * Return the code.
+     *
+     * @return string|null
+     */
+    protected function getCode()
+    {
 
     return isset($_GET['code']) ? $_GET['code'] : null;
-  }
+    }
 
-  /**
-   * Stores a state string in session storage for CSRF protection.
-   * Developers should subclass and override this method if they want to store
-   *   this state in a different location.
-   *
-   * @param string $state
-   *
-   * @throws FacebookSDKException
-   */
-  protected function storeState($state)
-  {
+    /**
+     * Stores a state string in session storage for CSRF protection.
+     * Developers should subclass and override this method if they want to store
+     *   this state in a different location.
+     *
+     * @param string $state
+     *
+     * @throws FacebookSDKException
+     */
+    protected function storeState($state)
+    {
     if ($this->checkForSessionStatus === true
       && session_status() !== PHP_SESSION_ACTIVE) {
-      throw new FacebookSDKException(
+        throw new FacebookSDKException(
         'Session not active, could not store state.', 720
-      );
+        );
     }
     $_SESSION[$this->sessionPrefix . 'state'] = $state;
-  }
+    }
 
-  /**
-   * Loads a state string from session storage for CSRF validation.  May return
-   *   null if no object exists.  Developers should subclass and override this
-   *   method if they want to load the state from a different location.
-   *
-   * @return string|null
-   *
-   * @throws FacebookSDKException
-   */
-  protected function loadState()
-  {
+    /**
+     * Loads a state string from session storage for CSRF validation.  May return
+     *   null if no object exists.  Developers should subclass and override this
+     *   method if they want to load the state from a different location.
+     *
+     * @return string|null
+     *
+     * @throws FacebookSDKException
+     */
+    protected function loadState()
+    {
 	
     if ($this->checkForSessionStatus === true
       && session_status() !== PHP_SESSION_ACTIVE) {
-      throw new FacebookSDKException(
+        throw new FacebookSDKException(
         'Session not active, could not load state.', 721
-      );
+        );
     }
     if (isset($_SESSION[$this->sessionPrefix . 'state'])) {
-      $this->state = $_SESSION[$this->sessionPrefix . 'state'];
-      return $this->state;
+        $this->state = $_SESSION[$this->sessionPrefix . 'state'];
+        return $this->state;
     }
     return null;
-  }
+    }
   
-  /**
-   * Generate a cryptographically secure pseudrandom number
-   * 
-   * @param integer $bytes - number of bytes to return
-   * 
-   * @return string
-   * 
-   * @throws FacebookSDKException
-   * 
-   * @todo Support Windows platforms
-   */
-  public function random($bytes)
-  {
+    /**
+     * Generate a cryptographically secure pseudrandom number
+     * 
+     * @param integer $bytes - number of bytes to return
+     * 
+     * @return string
+     * 
+     * @throws FacebookSDKException
+     * 
+     * @todo Support Windows platforms
+     */
+    public function random($bytes)
+    {
     if (!is_numeric($bytes)) {
-      throw new FacebookSDKException(
+        throw new FacebookSDKException(
         "random() expects an integer"
-      );
+        );
     }
     if ($bytes < 1) {
-      throw new FacebookSDKException(
+        throw new FacebookSDKException(
         "random() expects an integer greater than zero"
-      );
+        );
     }
     $buf = '';
     // http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/
     if (!ini_get('open_basedir')
       && is_readable('/dev/urandom')) {
-      $fp = fopen('/dev/urandom', 'rb');
-      if ($fp !== FALSE) {
+        $fp = fopen('/dev/urandom', 'rb');
+        if ($fp !== FALSE) {
         $buf = fread($fp, $bytes);
         fclose($fp);
         if($buf !== FALSE) {
-          return bin2hex($buf);
+            return bin2hex($buf);
+        }
         }
-      }
     }
 
     if (function_exists('mcrypt_create_iv')) {
         $buf = mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
         if ($buf !== FALSE) {
-          return bin2hex($buf);
+            return bin2hex($buf);
         }
     }
     
     while (strlen($buf) < $bytes) {
-      $buf .= md5(uniqid(mt_rand(), true), true); 
-      // We are appending raw binary
+        $buf .= md5(uniqid(mt_rand(), true), true); 
+        // We are appending raw binary
     }
     return bin2hex(substr($buf, 0, $bytes));
-  }
+    }
 
-  /**
-   * Disables the session_status() check when using $_SESSION
-   */
-  public function disableSessionStatusCheck()
-  {
+    /**
+     * Disables the session_status() check when using $_SESSION
+     */
+    public function disableSessionStatusCheck()
+    {
     $this->checkForSessionStatus = false;
-  }
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -99,7 +99,7 @@ 
       'client_id' => $this->appId,
       'redirect_uri' => $this->redirectUrl,
       'state' => $this->state,
-      'sdk' => 'php-sdk-' . FacebookRequest::VERSION,
+      'sdk' => 'php-sdk-'.FacebookRequest::VERSION,
       'scope' => implode(',', $scope)
     );
     
@@ -108,7 +108,7 @@ 
       $params['display'] = 'popup';
     }
     
-    return 'https://www.facebook.com/' . $version . '/dialog/oauth?' .
+    return 'https://www.facebook.com/'.$version.'/dialog/oauth?'.
       http_build_query($params, null, '&');
   }
 
@@ -129,11 +129,11 @@ 
       'client_id' => $this->appId,
       'redirect_uri' => $this->redirectUrl,
       'state' => $this->state,
-      'sdk' => 'php-sdk-' . FacebookRequest::VERSION,
+      'sdk' => 'php-sdk-'.FacebookRequest::VERSION,
       'auth_type' => 'rerequest',
       'scope' => implode(',', $scope)
     );
-    return 'https://www.facebook.com/' . $version . '/dialog/oauth?' .
+    return 'https://www.facebook.com/'.$version.'/dialog/oauth?'.
       http_build_query($params, null, '&');
   }
 
@@ -159,7 +159,7 @@ 
       'next' => $next,
       'access_token' => $session->getToken()
     );
-    return 'https://www.facebook.com/logout.php?' . http_build_query($params, null, '&');
+    return 'https://www.facebook.com/logout.php?'.http_build_query($params, null, '&');
   }
 
   /**
@@ -234,7 +234,7 @@ 
         'Session not active, could not store state.', 720
       );
     }
-    $_SESSION[$this->sessionPrefix . 'state'] = $state;
+    $_SESSION[$this->sessionPrefix.'state'] = $state;
   }
 
   /**
@@ -255,8 +255,8 @@ 
         'Session not active, could not load state.', 721
       );
     }
-    if (isset($_SESSION[$this->sessionPrefix . 'state'])) {
-      $this->state = $_SESSION[$this->sessionPrefix . 'state'];
+    if (isset($_SESSION[$this->sessionPrefix.'state'])) {
+      $this->state = $_SESSION[$this->sessionPrefix.'state'];
       return $this->state;
     }
     return null;
@@ -293,7 +293,7 @@ 
       if ($fp !== FALSE) {
         $buf = fread($fp, $bytes);
         fclose($fp);
-        if($buf !== FALSE) {
+        if ($buf !== FALSE) {
           return bin2hex($buf);
         }
       }