Moving UserBundle inside the Chamilo namespace.

app/AppKernel.php

@@ -1,8 +1,12 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
+/**
+ * Class AppKernel
+ */
 class AppKernel extends Kernel
 {
     /**
@@ -45,7 +49,7 @@ class AppKernel extends Kernel
             // User
             new FOS\UserBundle\FOSUserBundle(),
             new Sonata\UserBundle\SonataUserBundle('FOSUserBundle'),
-            new Application\Sonata\UserBundle\ApplicationSonataUserBundle(),
+            new Chamilo\UserBundle\ChamiloUserBundle(),
 
             // Page
             new Sonata\PageBundle\SonataPageBundle(),
@@ -158,6 +162,7 @@ class AppKernel extends Kernel
             $bundles[] = new Bazinga\Bundle\FakerBundle\BazingaFakerBundle();
             $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
             $bundles[] = new Elao\WebProfilerExtraBundle\WebProfilerExtraBundle();
+            $bundles[] = new Jns\Bundle\XhprofBundle\JnsXhprofBundle();
         }
 
         return $bundles;

app/bootstrap.php.cache

@@ -367,12 +367,12 @@ $authorizationHeader = $this->parameters['HTTP_AUTHORIZATION'];
 $authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION'];
 }
 if (null !== $authorizationHeader) {
-if (0 === stripos($authorizationHeader,'basic')) {
-$exploded = explode(':', base64_decode(substr($authorizationHeader, 6)));
+if (0 === stripos($authorizationHeader,'basic ')) {
+$exploded = explode(':', base64_decode(substr($authorizationHeader, 6)), 2);
 if (count($exploded) == 2) {
 list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded;
 }
-} elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader,'digest'))) {
+} elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader,'digest '))) {
 $headers['PHP_AUTH_DIGEST'] = $authorizationHeader;
 $this->parameters['PHP_AUTH_DIGEST'] = $authorizationHeader;
 }
@@ -594,6 +594,7 @@ $this->getContent();
 }
 public function overrideGlobals()
 {
+$this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), null,'&')));
 $_GET = $this->query->all();
 $_POST = $this->request->all();
 $_SERVER = $this->server->all();
@@ -843,7 +844,7 @@ $host = $this->server->get('SERVER_ADDR','');
 }
 }
 $host = strtolower(preg_replace('/:\d+$/','', trim($host)));
-if ($host && !preg_match('/^\[?(?:[a-zA-Z0-9-:\]_]+\.?)+$/', $host)) {
+if ($host &&''!== preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/','', $host)) {
 throw new \UnexpectedValueException(sprintf('Invalid Host "%s"', $host));
 }
 if (count(self::$trustedHostPatterns) > 0) {
@@ -933,6 +934,10 @@ if (null === $this->locale) {
 $this->setPhpDefaultLocale($locale);
 }
 }
+public function getDefaultLocale()
+{
+return $this->defaultLocale;
+}
 public function setLocale($locale)
 {
 $this->setPhpDefaultLocale($this->locale = $locale);
@@ -2257,11 +2262,11 @@ protected $booted = false;
 protected $name;
 protected $startTime;
 protected $loadClassCache;
-const VERSION ='2.5.3';
-const VERSION_ID ='20503';
+const VERSION ='2.5.4';
+const VERSION_ID ='20504';
 const MAJOR_VERSION ='2';
 const MINOR_VERSION ='5';
-const RELEASE_VERSION ='3';
+const RELEASE_VERSION ='4';
 const EXTRA_VERSION ='';
 public function __construct($environment, $debug)
 {

app/config/config_dev.yml

@@ -47,3 +47,7 @@ web_profiler_extra:
     twig:
         enabled:        true
         display_in_wdt: true
+
+jns_xhprof:
+    location_web: http://localhost/xhprof/xhprof_html
+    enabled: false

app/config/fos/fos_user.yml

@@ -3,10 +3,10 @@ fos_user:
     firewall_name:  main
 
     # if you change the class configuration, please also alter the sonata_user.yml file
-    user_class:     Application\Sonata\UserBundle\Entity\User
+    user_class:     Chamilo\UserBundle\Entity\User
 
     group:
-        group_class:   Application\Sonata\UserBundle\Entity\Group
+        group_class:   Chamilo\UserBundle\Entity\Group
         group_manager: sonata.user.orm.group_manager
 
     service:

app/config/sonata/sonata_user.yml

@@ -5,16 +5,16 @@ doctrine:
             default:
                 mappings:
                     FOSUserBundle: ~
-                    ApplicationSonataUserBundle: ~
+                    ChamiloUserBundle: ~
                     SonataUserBundle: ~
 sonata_user:
     #admin:
       #user:
-        #class:      Application\Sonata\UserBundle\Admin\UserAdmin
+        #class:      Chamilo\UserBundle\Admin\UserAdmin
 
     class:                  # Entity Classes
-        user:               Application\Sonata\UserBundle\Entity\User
-        group:              Application\Sonata\UserBundle\Entity\Group
+        user:               Chamilo\UserBundle\Entity\User
+        group:              Chamilo\UserBundle\Entity\Group
 
     security_acl:             false
     table:

main/admin/course_edit.php

@@ -55,7 +55,7 @@ while ($obj = Database::fetch_object($res)) {
             status = 1 or status = 2 ".$order_clause;*/
 /** @var Doctrine\ORM\EntityManager $em */
 /*$em = $this->getDoctrine()->getManager();
-$userManager = $em->getRepository('ApplicationSonataUserBundle:User');
+$userManager = $em->getRepository('ChamiloUserBundle:User');
 var_dump($userManager->getTeachers());*/
 //$userManager->get
 

main/inc/lib/api.lib.php

@@ -10,7 +10,7 @@
 
 use \ChamiloSession as Session;
 use Symfony\Component\Validator\Constraints as Assert;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Framework\Container;
 
@@ -6784,13 +6784,22 @@ function api_get_language_interface()
  */
 function api_get_user_roles()
 {
-    $em = Database::getManager();
-    //var_dump(Session::getSecurity()->getToken()->getRoles());
-    $roles = $em->getRepository('ChamiloCoreBundle:Role')->findBy(array(), array('name'=>'asc'));
+    //$em = Database::getManager();
+    $roles = Container::getRoles();
+
+    var_dump($roles );
+
+    //$roles = $roleHierarchy->getReachableRoles();
+
+    //var_dump(Container::getSecurity()->getToken()->getRoles());
+    //$roles = $em->getRepository('ChamiloCoreBundle:Role')->findBy(array(), array('name'=>'asc'));
     $userRoles = array();
     foreach ($roles as $role) {
+
+        var_dump($role);
         $userRoles[$role->getId()] = $role->getName();
     }
+    var_dump($userRoles);
     return $userRoles;
 
     // Status

main/inc/lib/course.lib.php

@@ -4334,11 +4334,10 @@ class CourseManager
         $visible_for_course_admin = 0;
         $visible_for_platform_admin = 2;
 
-        // Move this in a doctrine  listener
+        // Move this in a doctrine listener
         $toolList = self::getToolList();
         $toolList = $toolList->getTools();
 
-
         /** @var Course $course */
         $entityManager = Database::getManager();
         $course = $entityManager->getRepository('ChamiloCoreBundle:Course')->find($course_id);
@@ -4432,9 +4431,6 @@ class CourseManager
         Database::query("INSERT INTO $TABLETOOLDOCUMENT (c_id, path,title,filetype,size) VALUES ($course_id,'/shared_folder','".get_lang('UserFolders')."','folder','0')");
         $example_doc_id = Database :: insert_id();
 
-
-
-
         Database::query("INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility)
                          VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
 

main/inc/lib/course_home.lib.php

@@ -1,5 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
+use Chamilo\CoreBundle\Framework\Container;
 
 /**
  * Class CourseHome
@@ -415,9 +416,12 @@ class CourseHome
         // Condition for the session
         $session_id 			= api_get_session_id();
         $course_id              = api_get_course_int_id();
+        var_dump($course_id);
         $condition_session = api_get_session_condition($session_id, true, true);
 
-        $studentView = isset($_SESSION['studentview']) ? $_SESSION['studentview'] : null;
+        //$studentView = isset($_SESSION['studentview']) ? $_SESSION['studentview'] : null;
+        $studentView = Container::getSession()->get('studentview');
+        //var_dump($studentView);
 
         switch ($course_tool_category) {
             case TOOL_STUDENT_VIEW:
@@ -436,7 +440,6 @@ class CourseHome
                             c_id = $course_id
                             $condition_session
                         ORDER BY id";
-
                 $result = Database::query($sql);
                 $col_link ="##003399";
                 break;

main/inc/lib/events.lib.inc.php

@@ -12,7 +12,7 @@
  *
  * @package chamilo.library
  */
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 
 class Event
 {

src/Chamilo/CoreBundle/Admin/CourseAdmin.php

@@ -62,7 +62,7 @@ class CourseAdmin extends Admin
                     'admin_code'        => 'sonata.admin.course_rel_user'
                 )
             )
-            //->add('users', 'entity', array('class' => 'Application\Sonata\UserBundle\Entity\User', 'label' => 'Cliente'))
+            //->add('users', 'entity', array('class' => 'Chamilo\UserBundle\Entity\User', 'label' => 'Cliente'))
         ;
     }
 

src/Chamilo/CoreBundle/Component/DataFilesystem/DataFilesystem.php

@@ -10,7 +10,7 @@ use Symfony\Component\Console;
 use Sunra\PhpSimple\HtmlDomParser;
 use Chamilo\CoreBundle\Component\Editor\Connector;
 use Chamilo\CoreBundle\Component\Editor\Driver\CourseDriver;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 use MediaAlchemyst\Alchemyst;
 use Unoconv\Unoconv;
 use Symfony\Component\Console\Output\OutputInterface;

src/Chamilo/CoreBundle/Component/Editor/Connector.php

@@ -4,7 +4,7 @@
 namespace Chamilo\CoreBundle\Component\Editor;
 
 use Doctrine\ORM\EntityManager;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\Course;
 
 use Symfony\Component\Translation\Translator;

src/Chamilo/CoreBundle/Controller/Admin/Administrator/JuryController.php

@@ -96,7 +96,7 @@ class JuryController
 
         $role = $request->get('role');
         /** @var \Chamilo\CoreBundle\Entity\Repository\UserRepository $repo */
-        $repo = $this->getManager()->getRepository('Application\Sonata\UserBundle\Entity\User');
+        $repo = $this->getManager()->getRepository('Chamilo\UserBundle\Entity\User');
 
         if (empty($role)) {
             $entities = $repo->searchUserByKeyword($keyword);

src/Chamilo/CoreBundle/Controller/BranchAdminController.php

@@ -108,7 +108,7 @@ class BranchAdminController extends Controller
 
                 $userIdList = $item->getUserId();
                 $userId = ($userIdList[0]);
-                $user = $this->getManager()->getRepository('Application\Sonata\UserBundle\Entity\User')->find($userId);
+                $user = $this->getManager()->getRepository('Chamilo\UserBundle\Entity\User')->find($userId);
                 if (!$user) {
                     throw new \Exception('Unable to found User');
                 }

src/Chamilo/CoreBundle/Controller/User/ProfileController.php

@@ -16,22 +16,6 @@ use Symfony\Component\HttpFoundation\Response;
  */
 class ProfileController extends BaseController
 {
-    /**
-     * @Route("/{username}")
-     * @Method({"GET"})
-     */
-    public function indexAction($username)
-    {
-        $userId = \UserManager::get_user_id_from_username($username);
-        $userInfo = api_get_user_info($userId);
-
-        $this->getTemplate()->assign('user', $userInfo);
-        $this->getTemplate()->assign('form_send_message', \MessageManager::generate_message_form('send_message'));
-        $this->getTemplate()->assign('form_send_invitation', \MessageManager::generate_invitation_form('send_invitation'));
-
-        $response = $this->getTemplate()->renderTemplate($this->getTemplatePath().'profile.tpl');
-        return new Response($response, 200, array());
-    }
 
     /**
      * My files

src/Chamilo/CoreBundle/Controller/User/UserController.php

@@ -3,13 +3,11 @@
 
 namespace Chamilo\CoreBundle\Controller\User;
 
-use Silex\Application;
-
 use Symfony\Component\HttpFoundation\Response;
 use Chamilo\CoreBundle\Controller\BaseController;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
 /**
  * Class UserController
@@ -31,6 +29,23 @@ class UserController extends BaseController
         return new Response($response, 200, array());
     }
 
+    /**
+     * @Route("/{username}")
+     * @Method({"GET"})
+     * @Template("ChamiloCoreBundle:User:profile.html.twig")
+     */
+    public function profileAction($username)
+    {
+        $userId = \UserManager::get_user_id_from_username($username);
+        $userInfo = api_get_user_info($userId);
+
+        return array(
+            'user' =>  $userInfo,
+            'form_send_message' => \MessageManager::generate_message_form('send_message'),
+            'form_send_invitation' => \MessageManager::generate_invitation_form('send_invitation')
+        );
+    }
+
     /**
      * @Route("/online")
      * @Method({"GET"})
@@ -44,7 +59,7 @@ class UserController extends BaseController
     /**
      * {@inheritdoc}
      */
-    protected function getTemplatePath()
+    public function getTemplatePath()
     {
         return 'user/';
     }

src/Chamilo/CoreBundle/Entity/CourseRelUser.php

@@ -93,7 +93,7 @@ class CourseRelUser
     //protected $cId;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User", inversedBy="courses", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="courses", cascade={"persist"})
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
      */
     protected $user;

src/Chamilo/CoreBundle/Entity/CurriculumItem.php

@@ -4,7 +4,7 @@ namespace Chamilo\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 
 /**
  * CurriculumItem

src/Chamilo/CoreBundle/Entity/CurriculumItemRelUser.php

@@ -3,7 +3,7 @@
 namespace Chamilo\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 
 /**
  * CurriculumItemRelUser
@@ -51,7 +51,7 @@ class CurriculumItemRelUser
     private $description;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User", inversedBy="curriculumItems"))
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="curriculumItems"))
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=true)
      */
     private $user;

src/Chamilo/CoreBundle/Entity/JuryMembers.php

@@ -4,7 +4,7 @@ namespace Chamilo\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 
 /**
  * JuryMembers

src/Chamilo/CoreBundle/Entity/Message.php

@@ -30,7 +30,7 @@ class Message extends BaseMessage implements ThemeMessage
     protected $thread;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @var ParticipantInterface
      */
     protected $sender;

src/Chamilo/CoreBundle/Entity/MessageMetadata.php

@@ -30,7 +30,7 @@ class MessageMetadata extends BaseMessageMetadata
     protected $message;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @var ParticipantInterface
      */
     protected $participant;

src/Chamilo/CoreBundle/Entity/Repository/CourseRepository.php

@@ -27,7 +27,7 @@ class CourseRepository extends EntityRepository
         $queryBuilder->select('DISTINCT u');
 
         // Loading EntityUser.
-        $queryBuilder->from('Application\Sonata\UserBundle\Entity\User', 'u');
+        $queryBuilder->from('Chamilo\UserBundle\Entity\User', 'u');
 
         // Selecting courses for users.
         $queryBuilder->innerJoin('u.courses', 'c');

src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php

@@ -204,7 +204,7 @@ class ItemPropertyRepository extends EntityRepository
     public function subscribeUsersToItem($tool, Course $course, Session $session = null, $itemId, $newUserList = array())
     {
         $em = $this->getEntityManager();
-        $user = $em->getRepository('Application\Sonata\UserBundle\Entity\User');
+        $user = $em->getRepository('Chamilo\UserBundle\Entity\User');
 
         $usersSubscribedToItem = $this->getUsersSubscribedToItem($tool, $itemId, $course, $session);
 

src/Chamilo/CoreBundle/Entity/Resource/AbstractResource.php

@@ -6,7 +6,7 @@ namespace Chamilo\CoreBundle\Entity\Resource;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Validator\Constraints as Assert;
 use Doctrine\ORM\Mapping as ORM;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**

src/Chamilo/CoreBundle/Entity/Resource/ResourceLink.php

@@ -6,7 +6,7 @@ namespace Chamilo\CoreBundle\Entity\Resource;
 use Chamilo\CourseBundle\Entity\CGroupInfo;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Session;
 
@@ -69,7 +69,7 @@ class ResourceLink
     protected $session;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
      **/
     protected $user;

src/Chamilo/CoreBundle/Entity/Resource/ResourceNode.php

@@ -6,7 +6,7 @@ namespace Chamilo\CoreBundle\Entity\Resource;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Validator\Constraints as Assert;
 use Doctrine\ORM\Mapping as ORM;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
 
@@ -45,7 +45,7 @@ class ResourceNode
 
     /**
      * @ORM\ManyToOne(
-     *     targetEntity="Application\Sonata\UserBundle\Entity\User",
+     *     targetEntity="Chamilo\UserBundle\Entity\User",
      *     inversedBy="resourceNodes",
      *     cascade={"persist"}
      * )

src/Chamilo/CoreBundle/Entity/Session.php

@@ -133,7 +133,7 @@ class Session
     //private $items;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User", inversedBy="sessionAsGeneralCoach")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="sessionAsGeneralCoach")
      * @ORM\JoinColumn(name="id_coach", referencedColumnName="id")
      **/
     private $generalCoach;

src/Chamilo/CoreBundle/Entity/Thread.php

@@ -20,7 +20,7 @@ class Thread extends BaseThread
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      */
     protected $createdBy;
 

src/Chamilo/CoreBundle/Entity/ThreadMetadata.php

@@ -28,7 +28,7 @@ class ThreadMetadata extends BaseThreadMetadata
     protected $thread;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @var ParticipantInterface
      */
     protected $participant;

src/Chamilo/CoreBundle/Entity/TrackEExercices.php

@@ -167,7 +167,7 @@ class TrackEExercices
     private $attempt;
 
      /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @ORM\JoinColumn(name="exe_user_id", referencedColumnName="id")
      */
     private $user;

src/Chamilo/CoreBundle/Entity/UserCourseSessionGroup.php

@@ -17,7 +17,7 @@ class UserCourseSessionGroup
     private $course;
 
     /**
-     * @ORM\@ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User", inversedBy="userCourseSessionGroup")
+     * @ORM\@ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="userCourseSessionGroup")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
      */
     private $user;

src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php

@@ -3,7 +3,7 @@
 namespace Chamilo\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 
 /**
  * UsergroupRelUser
@@ -25,7 +25,7 @@ class UsergroupRelUser
     /**
      * @var \User
      *
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User", inversedBy="classes")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="classes")
      * @ORM\JoinColumns({
      *   @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=true)
      * })

src/Chamilo/CoreBundle/EventListener/LegacyListener.php

@@ -18,6 +18,7 @@ use Chamilo\CoreBundle\Framework\Container;
  */
 class LegacyListener
 {
+    /** @var ContainerInterface */
     protected $container;
 
     /**
@@ -36,6 +37,7 @@ class LegacyListener
         $kernel = $event->getKernel();
         $request = $event->getRequest();
         $session = $request->getSession();
+        /** @var ContainerInterface $container */
         $container = $this->container;
 
         // Setting session.
@@ -45,13 +47,13 @@ class LegacyListener
         $dbConnection = $container->get('database_connection');
 
         // Setting DB connection and Doctrine Manager.
-        $database  = new \Database();
+        $database = new \Database();
         $database->setConnection($dbConnection);
         $database->setManager($container->get('doctrine')->getManager());
 
         // Setting course tool chain (in order to create tools to a course)
         \CourseManager::setToolList($container->get('chamilo_course.tool_chain'));
-        //\CourseManager::setCourseSettingsManager($container->get('chamilo_course.settings.manager'));
+        \CourseManager::setCourseSettingsManager($container->get('chamilo_course.settings.manager'));
 
         // Setting legacy properties.
         Container::$urlGenerator = $container->get('router');
@@ -66,6 +68,7 @@ class LegacyListener
         Container::$courseDir = $container->get('kernel')->getDataDir();
         //Container::$configDir = $container->get('kernel')->getConfigDir();
         Container::$assets = $container->get('templating.helper.assets');
+        Container::$roles = $container->get('security.role_hierarchy');
 
         // Setting editor
         Container::$htmlEditor = $container->get('chamilo_core.html_editor');

src/Chamilo/CoreBundle/Framework/Container.php

@@ -1,8 +1,10 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Framework;
 
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\Security\Core\Role\RoleHierarchy;
 use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
@@ -11,6 +13,7 @@ use Chamilo\CoreBundle\Component\Editor\Editor;
 
 /**
  * Class Container
+ * This class is a way to access Symfony2 services in legacy Chamilo code.
  * @package Chamilo\CoreBundle\Framework
  */
 class Container
@@ -30,6 +33,7 @@ class Container
     public static $assets;
     public static $htmlEditor;
     public static $twig;
+    public static $roles;
 
     /**
      * @return string
@@ -39,6 +43,14 @@ class Container
         return self::$configDir;
     }
 
+    /**
+     * @return RoleHierarchy
+     */
+    public static function getRoles()
+    {
+        return self::$roles;
+    }
+
     /**
      * @return string
      */
@@ -142,4 +154,6 @@ class Container
     {
         return self::$assets;
     }
+
+    //public static function get
 }

src/Chamilo/CoreBundle/Menu/MainMenuBuilder.php

@@ -118,7 +118,7 @@ class MainMenuBuilder extends ContainerAware
                     'class' => 'dropdown'*/
                 ))
             ;
-            //$logoutLink->addChild($this->templating->render('ApplicationSonataUserBundle:Security:login_options.html.twig'));
+            //$logoutLink->addChild($this->templating->render('ChamiloUserBundle:Security:login_options.html.twig'));
 
         }
 

src/Chamilo/CoreBundle/Resources/config/services.yml

@@ -124,7 +124,7 @@ services:
             - { name: sonata.breadcrumb }
 
     chamilo_core.encoder:
-        class: Application\Sonata\UserBundle\Security\Encoder
+        class: Chamilo\UserBundle\Security\Encoder
 
     # Settings
     chamilo_core.settings_schema.platform:

src/Chamilo/CourseBundle/Controller/Curriculum/CurriculumUserController.php

@@ -207,7 +207,7 @@ class CurriculumUserController
                 }
 
                 // @todo check this
-                $user = $this->get('orm.em')->getRepository('Application\Sonata\UserBundle\Entity\User')->find($user->getUserId());
+                $user = $this->get('orm.em')->getRepository('Chamilo\UserBundle\Entity\User')->find($user->getUserId());
 
                 $counter = 1;
                 $parsed = array();

src/Chamilo/CourseBundle/Controller/Home/HomeController.php

@@ -93,13 +93,16 @@ class HomeController extends ToolBaseController
             }
         }
 
-        if (api_get_setting('homepage_view') == 'activity' || api_get_setting('homepage_view') == 'activity_big') {
+        $homeView = api_get_setting('homepage_view');
+        $homeView = 'activity_big';
+
+        if ($homeView == 'activity' || $homeView == 'activity_big') {
             $result = $this->renderActivityView();
-        } elseif (api_get_setting('homepage_view') == '2column') {
+        } elseif ($homeView == '2column') {
             $result = $this->render2ColumnView();
-        } elseif (api_get_setting('homepage_view') == '3column') {
+        } elseif ($homeView == '3column') {
             $result = $this->render3ColumnView();
-        } elseif (api_get_setting('homepage_view') == 'vertical_activity') {
+        } elseif ($homeView == 'vertical_activity') {
             $result = $this->renderVerticalActivityView();
         }
 
@@ -110,6 +113,7 @@ class HomeController extends ToolBaseController
             TOOL_COURSE_HOMEPAGE,
             $toolList
         );
+
         $sessionInfo = null;
         if (api_get_setting('show_session_data') == 'true' && $sessionId) {
             $sessionInfo = CourseHome::show_session_data($sessionId);
@@ -132,6 +136,7 @@ class HomeController extends ToolBaseController
         return $this->render(
             'ChamiloCourseBundle:Home:index.html.twig',
             array(
+                'course' => $course,
                 'session_info' => $sessionInfo,
                 'icons' => $result['content'],
                 'edit_icons' => $editIcons,
@@ -151,6 +156,9 @@ class HomeController extends ToolBaseController
         return $html;
     }
 
+    /**
+     * @return array
+     */
     private function renderActivityView()
     {
         $session_id = api_get_session_id();

src/Chamilo/CourseBundle/Entity/CDropboxFile.php

@@ -111,7 +111,7 @@ class CDropboxFile
     private $file;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User", inversedBy="dropBoxSentFiles")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="dropBoxSentFiles")
      * @ORM\JoinColumn(name="uploader_id", referencedColumnName="id")
      **/
     private $userSent;

src/Chamilo/CourseBundle/Entity/CDropboxPost.php

@@ -72,7 +72,7 @@ class CDropboxPost
 
     /**
      *
-     * @ORM\ManyToOne(targetEntity="Application\Sonata\UserBundle\Entity\User", inversedBy="dropBoxReceivedFiles")
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="dropBoxReceivedFiles")
      * @ORM\JoinColumn(name="dest_user_id", referencedColumnName="id")
      **/
     private $user;

src/Chamilo/CourseBundle/Entity/ItemManager.php

@@ -8,7 +8,7 @@ use Chamilo\CoreBundle\Entity\Course;
 
 use Sonata\CoreBundle\Model\BaseEntityManager;
 use Chamilo\CourseBundle\Tool\BaseTool;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 
 /**
  * Class CourseManager

src/Chamilo/CourseBundle/Migrations/Schema/v10/CourseBundle.php

@@ -60,7 +60,9 @@ class CourseBundle implements Migration
         $queries->addQuery("CREATE TABLE c_thematic_advance (iid INT AUTO_INCREMENT NOT NULL, c_id INT NOT NULL, id INT NOT NULL, thematic_id INT NOT NULL, attendance_id INT NOT NULL, content LONGTEXT DEFAULT NULL, start_date DATETIME NOT NULL, duration INT NOT NULL, done_advance TINYINT(1) NOT NULL, INDEX thematic_id (thematic_id), PRIMARY KEY(iid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
         $queries->addQuery("CREATE TABLE c_attendance_result (iid INT AUTO_INCREMENT NOT NULL, c_id INT NOT NULL, id INT NOT NULL, user_id INT NOT NULL, attendance_id INT NOT NULL, score INT NOT NULL, INDEX attendance_id (attendance_id), INDEX user_id (user_id), UNIQUE INDEX c_id (c_id, id), PRIMARY KEY(iid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
         $queries->addQuery("CREATE TABLE c_document (iid INT AUTO_INCREMENT NOT NULL, id INT NOT NULL, c_id INT NOT NULL, path VARCHAR(255) NOT NULL, comment LONGTEXT DEFAULT NULL, title VARCHAR(255) DEFAULT NULL, filetype VARCHAR(255) NOT NULL, size INT NOT NULL, readonly TINYINT(1) NOT NULL, session_id INT NOT NULL, PRIMARY KEY(iid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
+
         $queries->addQuery("CREATE TABLE c_item_property (iid INT AUTO_INCREMENT NOT NULL, to_user_id INT DEFAULT NULL, c_id INT NOT NULL, to_group_id INT DEFAULT NULL, id_session INT NOT NULL, id INT NOT NULL, tool VARCHAR(100) NOT NULL, insert_user_id INT NOT NULL, insert_date DATETIME NOT NULL, lastedit_date DATETIME NOT NULL, ref INT NOT NULL, lastedit_type VARCHAR(100) NOT NULL, lastedit_user_id INT NOT NULL, visibility TINYINT(1) NOT NULL, start_visible DATETIME DEFAULT NULL, end_visible DATETIME DEFAULT NULL, INDEX IDX_1D84C18129F6EE60 (to_user_id), INDEX IDX_1D84C18191D79BD3 (c_id), INDEX IDX_1D84C181330D47E9 (to_group_id), INDEX IDX_1D84C181ED97CA4 (id_session), INDEX idx_item_property_toolref (tool, ref), INDEX idx_item_property_tooliuid (tool, insert_user_id), PRIMARY KEY(iid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
+
         $queries->addQuery("CREATE TABLE c_attendance (iid INT AUTO_INCREMENT NOT NULL, c_id INT NOT NULL, id INT NOT NULL, name LONGTEXT NOT NULL, description LONGTEXT DEFAULT NULL, active TINYINT(1) NOT NULL, attendance_qualify_title VARCHAR(255) DEFAULT NULL, attendance_qualify_max INT NOT NULL, attendance_weight DOUBLE PRECISION NOT NULL, session_id INT NOT NULL, locked INT NOT NULL, INDEX session_id (session_id), INDEX active (active), UNIQUE INDEX c_id (c_id, id), PRIMARY KEY(iid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
         $queries->addQuery("CREATE TABLE c_online_connected (iid INT AUTO_INCREMENT NOT NULL, c_id INT NOT NULL, user_id INT NOT NULL, last_connection DATETIME NOT NULL, PRIMARY KEY(iid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
         $queries->addQuery("CREATE TABLE c_thematic_plan (iid INT AUTO_INCREMENT NOT NULL, c_id INT NOT NULL, id INT NOT NULL, thematic_id INT NOT NULL, title VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, description_type INT NOT NULL, INDEX thematic_id (thematic_id, description_type), PRIMARY KEY(iid)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");

src/Chamilo/InstallerBundle/Command/InstallCommand.php

@@ -280,10 +280,10 @@ class InstallCommand extends ContainerAwareCommand
     protected function setupAdmin(OutputInterface $output)
     {
         $dialog = $this->getHelperSet()->get('dialog');
-        //$user = new \Application\Sonata\UserBundle\Entity\User();
+        //$user = new \Chamilo\UserBundle\Entity\User();
         $em = $this->getApplication()->getKernel()->getContainer()->get('doctrine')->getManager();
-        /** @var \Application\Sonata\UserBundle\Entity\User $user */
-        $user = $em->getRepository('ApplicationSonataUserBundle:User')->findOneById(1);
+        /** @var \Chamilo\UserBundle\Entity\User $user */
+        $user = $em->getRepository('ChamiloUserBundle:User')->findOneById(1);
 
         $user->setUsername($dialog->ask($output, '<question>Username</question>(admin):', 'admin'));
         $user->setPlainPassword($dialog->ask($output, '<question>Password</question>(admin):', 'admin'));

src/Chamilo/InstallerBundle/Process/Step/SetupStep.php

@@ -8,7 +8,7 @@ use Chamilo\CoreBundle\Migrations\Data\ORM\LoadAdminUserData;
 //use Oro\Bundle\ConfigBundle\Config\ConfigManager;
 use Sylius\Bundle\SettingsBundle\Manager\SettingsManager;
 use Symfony\Component\HttpFoundation\Response;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 
 /**
  * Class SetupStep
@@ -52,7 +52,7 @@ class SetupStep extends AbstractStep
     {
         $adminUser = $this
             ->getDoctrine()
-            ->getRepository('ApplicationSonataUserBundle:User')
+            ->getRepository('ChamiloUserBundle:User')
             ->findOneBy(array('username' => LoadAdminUserData::DEFAULT_ADMIN_USERNAME));
 
         if (!$adminUser) {

src/Chamilo/InstallerBundle/Resources/config/form.yml

@@ -38,7 +38,7 @@ services:
     chamilo_installer.form.type.setup.admin:
         class:                                            %chamilo_installer.form.type.setup.admin.class%
         arguments:
-            - Application\Sonata\UserBundle\Entity\User
+            - Chamilo\UserBundle\Entity\User
         tags:
             - { name: form.type, alias: chamilo_installer_setup_admin }
 

src/Chamilo/NotebookBundle/Entity/CNotebookRepository.php

@@ -7,7 +7,7 @@ use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CourseBundle\Entity\CGroupInfo;
-use Application\Sonata\UserBundle\Entity\User;
+use Chamilo\UserBundle\Entity\User;
 use Chamilo\NotebookBundle\Entity\CNotebook;
 use Chamilo\CourseBundle\Tool\BaseTool;
 use Chamilo\CoreBundle\Entity\Resource\AbstractResource;

src/Chamilo/UserBundle/ChamiloUserBundle.php

@@ -1,15 +1,15 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace Application\Sonata\UserBundle;
+namespace Chamilo\UserBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * Class ApplicationSonataUserBundle
- * @package Application\Sonata\UserBundle
+ * Class ChamiloUserBundle
+ * @package Chamilo\UserBundle
  */
-class ApplicationSonataUserBundle extends Bundle
+class ChamiloUserBundle extends Bundle
 {
     /**
      * {@inheritdoc}

src/Chamilo/UserBundle/Document/Group.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Application\Sonata\UserBundle\Document;
+namespace Chamilo\UserBundle\Document;
 
 use Sonata\UserBundle\Document\BaseGroup as BaseGroup;
 
@@ -37,4 +37,4 @@ class Group extends BaseGroup
     {
         return $this->id;
     }
-}
+}

src/Chamilo/UserBundle/Document/User.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Application\Sonata\UserBundle\Document;
+namespace Chamilo\UserBundle\Document;
 
 use Sonata\UserBundle\Document\BaseUser as BaseUser;
 
@@ -37,4 +37,4 @@ class User extends BaseUser
     {
         return $this->id;
     }
-}
+}

src/Chamilo/UserBundle/Entity/Group.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Application\Sonata\UserBundle\Entity;
+namespace Chamilo\UserBundle\Entity;
 
 use Sonata\UserBundle\Entity\BaseGroup as BaseGroup;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass="Application\Sonata\UserBundle\Repository\GroupRepository")
+ * @ORM\Entity(repositoryClass="Chamilo\UserBundle\Repository\GroupRepository")
  * @ORM\Table(name="fos_group")
  */
 class Group extends BaseGroup

src/Chamilo/UserBundle/Entity/User.php

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace Application\Sonata\UserBundle\Entity;
+namespace Chamilo\UserBundle\Entity;
 
 use Sonata\UserBundle\Entity\BaseUser as BaseUser;
 use Doctrine\ORM\Mapping as ORM;
@@ -23,7 +23,7 @@ use Avanzu\AdminThemeBundle\Model\UserInterface as ThemeUser;
 /**
  *
  * @ORM\Table(name="user")
- * @ORM\Entity(repositoryClass = "Application\Sonata\UserBundle\Repository\UserRepository")
+ * @ORM\Entity(repositoryClass = "Chamilo\UserBundle\Repository\UserRepository")
  * @ORM\AttributeOverrides({
  *      @ORM\AttributeOverride(name="email",
  *         column=@ORM\Column(

src/Chamilo/UserBundle/Repository/GroupRepository.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Application\Sonata\UserBundle\Repository;
+namespace Chamilo\UserBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\NoResultException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Application\Sonata\UserBundle\Entity\User as User;
+use Chamilo\UserBundle\Entity\User as User;
 
 /**
  * Class UserRepository

src/Chamilo/UserBundle/Repository/UserRepository.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Application\Sonata\UserBundle\Repository;
+namespace Chamilo\UserBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\NoResultException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Application\Sonata\UserBundle\Entity\User as User;
+use Chamilo\UserBundle\Entity\User as User;
 
 /**
  * Class UserRepository
@@ -25,7 +25,7 @@ class UserRepository extends EntityRepository
         // Selecting user info
         $qb->select('DISTINCT b');
 
-        $qb->from('Application\Sonata\UserBundle\Entity\User', 'b');
+        $qb->from('Chamilo\UserBundle\Entity\User', 'b');
 
         // Selecting courses for users
         //$qb->innerJoin('u.courses', 'c');

src/Chamilo/UserBundle/Resources/config/serializer/Document.Group.xml

@@ -6,7 +6,7 @@
         @author <yourname> <youremail>
     -->
 
-    <class name="Application\Sonata\UserBundle\Document\Group" exclusion-policy="all" xml-root-name="_group">
+    <class name="Chamilo\UserBundle\Document\Group" exclusion-policy="all" xml-root-name="_group">
 
         <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
 

src/Chamilo/UserBundle/Resources/config/serializer/Document.User.xml

@@ -6,7 +6,7 @@
         @author <yourname> <youremail>
     -->
 
-    <class name="Application\Sonata\UserBundle\Document\User" exclusion-policy="all" xml-root-name="_user">
+    <class name="Chamilo\UserBundle\Document\User" exclusion-policy="all" xml-root-name="_user">
 
         <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
 

src/Chamilo/UserBundle/Resources/config/serializer/Entity.Group.xml

@@ -6,7 +6,7 @@
         @author <yourname> <youremail>
     -->
 
-    <class name="Application\Sonata\UserBundle\Entity\Group" exclusion-policy="all" xml-root-name="_group">
+    <class name="Chamilo\UserBundle\Entity\Group" exclusion-policy="all" xml-root-name="_group">
 
         <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
 

src/Chamilo/UserBundle/Resources/config/serializer/Entity.User.xml

@@ -6,7 +6,7 @@
         @author <yourname> <youremail>
     -->
 
-    <class name="Application\Sonata\UserBundle\Entity\User" exclusion-policy="all" xml-root-name="_user">
+    <class name="Chamilo\UserBundle\Entity\User" exclusion-policy="all" xml-root-name="_user">
         <property xml-attribute-map="true" name="id" type="integer" expose="true" since-version="1.0" groups="sonata_api_read,sonata_api_write,sonata_search" />
     </class>
 </serializer>

src/Chamilo/UserBundle/Resources/config/validation.xml

@@ -15,7 +15,7 @@
         </constraint>
     </class>
 
-    <class name="Application\Sonata\UserBundle\Entity\User">
+    <class name="Chamilo\UserBundle\Entity\User">
         <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
             <option name="fields">usernameCanonical</option>
             <option name="errorPath">username</option>

src/Chamilo/UserBundle/Resources/config/validation/orm.xml

@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
         http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
-    <class name="Application\Sonata\UserBundle\Entity\User">
+    <class name="Chamilo\UserBundle\Entity\User">
         <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
             <option name="fields">usernameCanonical</option>
             <option name="errorPath">username</option>

src/Chamilo/UserBundle/Security/Encoder.php

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace Application\Sonata\UserBundle\Security;
+namespace Chamilo\UserBundle\Security;
 
 use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
 
 /**
  * Class Encoder
- * @package Application\Sonata\UserBundle\Security
+ * @package Chamilo\UserBundle\Security
  */
 class Encoder implements PasswordEncoderInterface
 {