Adding cidReset function in new controllers

main/inc/lib/template.lib.php

@@ -1,12 +1,13 @@
 <?php
-
 /* For licensing terms, see /license.txt */
+
 /**
  * @author Julio Montoya <gugli100@gmail.com>
  * @todo better organization of the class, methods and variables
  *
  * */
 use \ChamiloSession as Session;
+use Silex\Application;
 
 class Template
 {
@@ -34,7 +35,7 @@ class Template
      * @param string $title
      * @param Application $app
      */
-    public function __construct($title = null, $app = null)
+    public function __construct($title = null, Application $app = null)
     {
         if (empty($app)) {
             global $app;
@@ -48,15 +49,10 @@ class Template
 
         $this->navigation_array = $this->returnNavigationArray();
 
-        $show_header = $app['template.show_header'];
-        $show_footer = $app['template.show_footer'];
-        $show_learnpath = $app['template.show_learnpath'];
-        $load_plugins = $app['template.load_plugins'];
-
         //Page title
         $this->title = $title;
-        $this->show_learnpath = $show_learnpath;
-        $this->load_plugins = $load_plugins;
+        $this->show_learnpath = $app['template.show_learnpath'];
+        $this->load_plugins = $app['template.load_plugins'];
 
         // Current themes: cupertino, smoothness, ui-lightness. Find the themes folder in main/inc/lib/javascript/jquery-ui
         $this->jquery_ui_theme = 'smoothness';
@@ -64,16 +60,32 @@ class Template
         //Setting system variables
         $this->set_system_parameters();
 
-       //Setting user variables
-       $this->setUserParameters();
+        //Setting user variables
+        $this->setUserParameters();
 
         //Setting course variables
         $this->setCourseParameters();
 
+        //Using global because all scripts have this variable
+        global $interbreadcrumb;
+
+        if (isset($this->app['breadcrumb']) && !empty($this->app['breadcrumb'])) {
+            if (empty($interbreadcrumb)) {
+                $interbreadcrumb = $this->app['breadcrumb'];
+            } else {
+                $interbreadcrumb = array_merge($interbreadcrumb, $this->app['breadcrumb']);
+            }
+        }
+
+        if (!empty($interbreadcrumb)) {
+            $this->app['breadcrumb'] = $interbreadcrumb;
+        }
+
+
         //header and footer are showed by default
-        $this->setFooter($show_footer);
+        $this->setFooter($app['template.show_footer']);
 
-        $this->setHeader($show_header);
+        $this->setHeader($app['template.show_header']);
 
         $this->setHeaderParameters();
         $this->setFooterParameters();
@@ -106,6 +118,7 @@ class Template
      * Get icon path
      * @param string $image
      * @param int $size
+     *
      * @return string
      */
     public static function get_icon_path($image, $size = ICON_SIZE_SMALL)
@@ -117,6 +130,7 @@ class Template
      * Format date
      * @param string $timestamp
      * @param string $format
+     *
      * @return string
      */
     public static function format_date($timestamp, $format = null)
@@ -262,7 +276,9 @@ class Template
         $this->course_id = api_get_course_int_id();
     }
 
-    /** Set user parameters */
+    /**
+     * Set user parameters
+     */
     private function setUserParameters()
     {
         $user_info = array();
@@ -406,6 +422,9 @@ class Template
         $this->assign('logo', $logo);
     }
 
+    /**
+     *
+     */
     private function set_js_files()
     {
         global $disable_js_and_css_files, $htmlHeadXtra;
@@ -471,15 +490,7 @@ class Template
      * Set header parameters
      */
     private function setHeaderParameters() {
-        global $interbreadcrumb;
 
-        if (isset($this->app['breadcrumb']) && !empty($this->app['breadcrumb'])) {
-            if (empty($interbreadcrumb)) {
-                $interbreadcrumb = $this->app['breadcrumb'];
-            } else {
-                $interbreadcrumb = array_merge($interbreadcrumb, $this->app['breadcrumb']);
-            }
-        }
         $_course = api_get_course_info();
         $_configuration = $this->app['configuration'];
         $this_section = $this->app['this_section'];
@@ -490,7 +501,6 @@ class Template
         $this->menu_navigation = $navigation['menu_navigation'];
 
         $this->assign('system_charset', api_get_system_encoding());
-
         $this->assign('online_button', Display::return_icon('online.png'));
         $this->assign('offline_button', Display::return_icon('offline.png'));
 
@@ -600,7 +610,8 @@ class Template
         $this->assign('menu', $menu);
 
         //Breadcrumb
-        $breadcrumb = $this->returnBreadcrumb($interbreadcrumb, $nameTools);
+        $breadcrumb = $this->returnBreadcrumb();
+
         $this->assign('breadcrumb', $breadcrumb);
 
         //Extra content
@@ -1057,7 +1068,7 @@ class Template
                     'users'
                 ) == 'true' AND $user_id)
                 ) {
-                    $html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonline.php" target="_top" title="'.get_lang(
+                    $html .= '<li><a href="'.SocialManager::getUserOnlineLink().'" target="_top" title="'.get_lang(
                         'UsersOnline'
                     ).'" >'.
                         Display::return_icon(
@@ -1076,9 +1087,7 @@ class Template
                     'course'
                 ) == 'true' AND isset($_course['sysCode'])
                 ) {
-                    $html .= '<li><a href="'.api_get_path(
-                        WEB_PATH
-                    ).'whoisonline.php?cidReq='.$_course['sysCode'].'" target="_top">'.
+                    $html .= '<li><a href="'.SocialManager::getUserOnlineLink($_course['sysCode']).'" target="_top">'.
                         Display::return_icon(
                             'course.png',
                             get_lang('UsersOnline').' '.get_lang('InThisCourse'),
@@ -1091,9 +1100,7 @@ class Template
             // Display the who's online for the session
             if (isset($user_id) && api_get_session_id() != 0) {
                 if (api_is_allowed_to_edit()) {
-                    $html .= '<li><a href="'.api_get_path(
-                        WEB_PATH
-                    ).'whoisonlinesession.php?session_id='.api_get_session_id().'&id_coach='.$user_id.'" >'.
+                    $html .= '<li><a href="'.SocialManager::getUserOnlineLink(null, api_get_session_id()).'&id_coach='.$user_id.'" >'.
                         Display::return_icon(
                             'session.png',
                             get_lang('UsersConnectedToMySessions'),
@@ -1246,8 +1253,9 @@ class Template
      * @param array $interbreadcrumb
      * @return string
      */
-    public function returnBreadcrumb($interbreadcrumb)
+    public function returnBreadcrumb()
     {
+        $interbreadcrumb = $this->app['breadcrumb'];
         $session_id = api_get_session_id();
         $session_name = api_get_session_name($session_id);
         $_course = api_get_course_info();

src/ChamiloLMS/Controller/CommonController.php

@@ -0,0 +1,67 @@
+<?php
+/* For licensing terms, see /license.txt */
+namespace ChamiloLMS\Controller;
+
+use \ChamiloSession as Session;
+
+/**
+ * @package ChamiloLMS.CommonController
+ * @author Julio Montoya <gugli100@gmail.com>
+ */
+class CommonController
+{
+
+    public $languageFiles = array();
+    /**
+     *
+    */
+    public function __construct()
+    {
+    /*
+        if (!empty($this->language_files)) {
+            $language_interface = api_get_language_interface();
+            $langPath = api_get_path(SYS_LANG_PATH);
+
+            $language_files =  $this->language_files;
+            foreach ($language_files as $index => $language_file) {
+                // include English
+                include $langPath.'english/'.$language_file.'.inc.php';
+                // prepare string for current language
+                $langFile = $langPath.$language_interface.'/'.$language_file.'.inc.php';
+                if (file_exists($langFile)) {
+                    include $langFile;
+                }
+            }
+        }*/
+    }
+
+    /**
+     *
+     */
+    public function cidReset()
+    {
+        Session::erase('_cid');
+        Session::erase('_real_cid');
+        Session::erase('_course');
+
+        if (!empty($_SESSION)) {
+            foreach ($_SESSION as $key => $item) {
+                if (strpos($key,'lp_autolunch_') === false) {
+                    continue;
+                } else {
+                    if (isset($_SESSION[$key])) {
+                        Session::erase($key);
+                    }
+                }
+            }
+        }
+        //Deleting session info
+        if (api_get_session_id()) {
+            Session::erase('id_session');
+            Session::erase('session_name');
+        }
+        if (api_get_group_id()) {
+            Session::erase('_gid');
+        }
+    }
+}

src/ChamiloLMS/Controller/Controller.php

@@ -1,29 +0,0 @@
-<?php
-/* For licensing terms, see /license.txt */
-namespace ChamiloLMS\Controller;
-
-/**
- * @package ChamiloLMS.Controller
- * @author Julio Montoya <gugli100@gmail.com>
- */
-class Controller {
-    public $language_files = array();
-
-    public function __construct() {/*
-        if (!empty($this->language_files)) {
-            $language_interface = api_get_language_interface();
-            $langPath = api_get_path(SYS_LANG_PATH);
-
-            $language_files =  $this->language_files;
-            foreach ($language_files as $index => $language_file) {
-                // include English
-                include $langPath.'english/'.$language_file.'.inc.php';
-                // prepare string for current language
-                $langFile = $langPath.$language_interface.'/'.$language_file.'.inc.php';
-                if (file_exists($langFile)) {
-                    include $langFile;
-                }
-            }
-        }*/
-    }
-}

src/ChamiloLMS/Controller/IndexController.php

@@ -12,12 +12,16 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
  * @package ChamiloLMS.Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
-class IndexController// extends Controller
+class IndexController extends CommonController
 {
     public $section;
-    public $language_files = array('courses', 'index', 'admin');
+    public $languageFiles = array('courses', 'index', 'admin');
 
-    function logoutAction(Application $app)
+    /**
+     * Logouts a user
+     * @param Application $app
+     */
+    public function logoutAction(Application $app)
     {
         $userId = api_get_user_id();
         \Online::logout($userId, true);
@@ -31,6 +35,8 @@ class IndexController// extends Controller
      */
     public function indexAction(Application $app)
     {
+        $this->cidReset();
+
         $extraJS = array();
         //@todo improve this JS includes should be added using twig
         $extraJS[] = api_get_jquery_libraries_js(array('bxslider'));
@@ -50,7 +56,6 @@ class IndexController// extends Controller
         $app['extraJS'] = $extraJS;
         $request = $app['request'];
         $app['languages_file'] = array('courses', 'index', 'admin');
-        $app['cidReset'] = true;
 
         // Testing translation using translator
         //echo $app['translator']->trans('Wiki Search Results');

src/ChamiloLMS/Controller/UserController.php

@@ -15,7 +15,7 @@ class UserController
 {
     /**
      *
-     * @return string
+     * @return Response
      */
     public function indexAction(Application $app, $username)
     {
@@ -26,4 +26,39 @@ class UserController
 
         return new Response($response, 200, array());
     }
+
+    /**
+     * @param Application $app
+     *
+     * @return Response
+     */
+    public function onlineAction(Application $app)
+    {
+
+        $response = $app['template']->render_layout('layout_1_col.tpl');
+
+        return new Response($response, 200, array());
+    }
+
+    /**
+     * @param Application $app
+     *
+     * @return Response
+     */
+    public function onlineInCourseAction(Application $app)
+    {
+
+    }
+
+    /**
+     * @param Application $app
+     * @return Response
+     */
+    public function onlineInSessionAction(Application $app)
+    {
+
+    }
+
+
+
 }

src/ChamiloLMS/Controller/UserPortalController.php

@@ -12,16 +12,20 @@ use Symfony\Component\HttpFoundation\Response;
  * @package ChamiloLMS\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
-class UserPortalController
+class UserPortalController extends CommonController
 {
     /**
      * @param Application $app
      * @param string $type courses|sessions|mycoursecategories
      * @param string $filter for the userportal courses page. Only works when setting 'history'
+     * @param int $page
+     *
      * @return Response|void
      */
     function indexAction(Application $app, $type = 'courses', $filter = 'current', $page = 1)
     {
+        $this->cidReset();
+
         //@todo Use filters like "after/before|finish" to manage user access
         api_block_anonymous_users();
 
@@ -93,6 +97,9 @@ class UserPortalController
         return new Response($response, 200, array());
     }
 
+    /**
+     * Redirects after login
+     */
     function redirectAfterLogin()
     {
         // Get the courses list