Minor - code style changes

12 years ago · ea660a2eb2
parent 4bc0525d3e
commit ea660a2eb2
3 changed files with 253 additions and 241 deletions
--- a/index.php
+++ b/index.php
@ -4,7 +4,6 @@
 /**
 * @package chamilo.main
 */
-
 define('CHAMILO_HOMEPAGE', true);

 $language_file = array('courses', 'index');
@ -44,7 +43,9 @@ use Symfony\Component\HttpFoundation\Response;

 class IndexController
 {
-    public function indexAction(Application $app) {
+
+    public function indexAction(Application $app)
+    {
        $request = $app['request'];

        //Actions
@ -56,12 +57,9 @@ class IndexController

        //$article = $app['orm.em']->getRepository('Entity\EntityCourse');
        //$courses_query = $app['orm.em']->createQuery('SELECT a FROM Entity\EntityCourse a');
-
        //$a = new EntityCourse();
-//require_once '/var/www/chamilo11/main/inc/Entity/EntityCourse.php';
        //$article = $app['orm.em']->getRepository('EntityCourse');
        //var_dump($article);
-
        //$courses_query = $app['orm.em']->createQuery('SELECT a FROM Entity\EntityCourse a');
        /*
          $paginator = new Doctrine\ORM\Tools\Pagination\Paginator($courses_query, $fetchJoinCollection = true);
@ -73,11 +71,8 @@ class IndexController

        //$app['orm.em']->find('EntityCourse', 1);
        //var_dump($app['orm.ems']['mysql']);
-
-
        // Defines wether or not anonymous visitors can see a list of the courses on the Chamilo homepage that are open to the world.
        //$_setting['display_courses_to_anonymous_users'] = 'true';
-
        // Delete session neccesary for legal terms
        if (api_get_setting('allow_terms_conditions') == 'true') {
            unset($_SESSION['term_and_condition']);
@ -162,7 +157,8 @@ class IndexController
     *       on api_get_setting('page_after_login').
     * @deprecated seems not to be used
     */
-    function check_last_login() {
+    function check_last_login()
+    {
        if (!empty($_POST['submitAuth'])) {
            // The user has been already authenticated, we are now to find the last login of the user.
            if (!empty($this->user_id)) {
@ -194,7 +190,8 @@ class IndexController
        }
    }

-    function set_login_form(Application $app) {
+    function set_login_form(Application $app)
+    {
        $user_id = api_get_user_id();
        $login_form = null;
        if (!$user_id || api_is_anonymous($user_id)) {
@ -219,12 +216,14 @@ class IndexController
        }
    }

-    function logout() {
+    function logout()
+    {
        $user_id = api_get_user_id();
        online_logout($user_id, true);
    }

-    function display_login_form(Application $app) {
+    function display_login_form(Application $app)
+    {
        /* {{ form_widget(form) }}
          $form = $app['form.factory']->createBuilder('form')
          ->add('name')
@ -249,7 +248,6 @@ class IndexController
        return $html;
    }
 }
-
 $app->match('/', 'IndexController::indexAction', 'POST|GET');
 $app->run();
 //$app['http_cache']->run();
--- a/news_list.php
+++ b/news_list.php
@ -22,6 +22,5 @@ $content =  SystemAnnouncementManager ::display_announcements_slider($visibility

 $tpl = new Template($tool_name);
 $tpl->assign('actions', $actions);
-//$tpl->assign('message', $message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();
--- a/user_portal.php
+++ b/user_portal.php
@ -18,7 +18,6 @@
 /**
 * INIT SECTION
 */
-
 // Language files that should be included.

 use \ChamiloSession as Session;
@ -85,6 +84,7 @@ use Symfony\Component\HttpFoundation\Response;

 class UserPortalController
 {
+
    function indexAction(Application $app)
    {
        // Check if a user is enrolled only in one course for going directly to the course after the login.
@ -202,15 +202,14 @@ class UserPortalController
        return new Response($response, 200, array());
    }

-
-    function check_last_login() {
+    function check_last_login()
+    {
        /**
         * @todo This piece of code should probably move to local.inc.php where the actual login procedure is handled.
         * @todo Check if this code is used. I think this code is never executed because after clicking the submit button
         *       the code does the stuff in local.inc.php and then redirects to index.php or user_portal.php depending
         *       on api_get_setting('page_after_login').
         */
-
        if (!empty($_POST['submitAuth'])) {
            // The user has been already authenticated, we are now to find the last login of the user.
            if (!empty($this->user_id)) {
@ -242,7 +241,8 @@ class UserPortalController
        }
    }

-	function set_login_form() {
+    function set_login_form()
+    {
        global $loginFailed;

        $login_form = '';
@ -274,7 +274,8 @@ class UserPortalController
    /**
     * Alias for the online_logout() function
     */
-	function logout() {
+    function logout()
+    {
        online_logout($this->user_id, true);
    }

@ -284,7 +285,8 @@ class UserPortalController
     * @param string $category
     * @return boolean
     */
-	function category_has_open_courses($category) {
+    function category_has_open_courses($category)
+    {
        $setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 'true';
        $main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
        $category = Database::escape_string($category);
@ -310,7 +312,8 @@ class UserPortalController
     *
     * @version 1.0.1
     */
-	function handle_login_failed() {
+    function handle_login_failed()
+    {
        $message = get_lang('InvalidId');

        if (!isset($_GET['error'])) {
@ -350,7 +353,8 @@ class UserPortalController
     * @param int $user_id: the id of the user
     * @return array an array containing all the information of the courses of the given user
     */
-	function get_courses_of_user($user_id) {
+    function get_courses_of_user($user_id)
+    {
        $table_course = Database::get_main_table(TABLE_MAIN_COURSE);
        $table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
        // Secondly we select the courses that are in a category (user_course_cat <> 0) and sort these according to the sort of the category
@ -368,12 +372,23 @@ class UserPortalController
        $courses = array();
        while ($row = Database::fetch_array($result)) {
            // We only need the database name of the course.
-	        $courses[$row['k']] = array('db' => $row['db'], 'code' => $row['k'], 'visual_code' => $row['vc'], 'title' => $row['i'], 'directory' => $row['dir'], 'status' => $row['status'], 'tutor' => $row['t'], 'subscribe' => $row['subscr'], 'unsubscribe' => $row['unsubscr'], 'sort' => $row['sort'], 'user_course_category' => $row['user_course_cat']);
+            $courses[$row['k']] = array(
+                'db' => $row['db'],
+                'code' => $row['k'],
+                'visual_code' => $row['vc'],
+                'title' => $row['i'],
+                'directory' => $row['dir'],
+                'status' => $row['status'],
+                'tutor' => $row['t'],
+                'subscribe' => $row['subscr'],
+                'unsubscribe' => $row['unsubscr'],
+                'sort' => $row['sort'],
+                'user_course_category' => $row['user_course_cat']
+            );
        }
        return $courses;
    }
 }
-
 $app->get('/', 'UserPortalController::indexAction');
 $app->run();
 //$app['http_cache']->run();