Changing Chamilo Namespace from ChamiloLMS to Chamilo.

app/AppKernel.php

@@ -133,13 +133,13 @@ class AppKernel extends Kernel
             new FOS\MessageBundle\FOSMessageBundle(),
 
             // Chamilo
-            new ChamiloLMS\InstallerBundle\ChamiloLMSInstallerBundle(),
-            new ChamiloLMS\CoreBundle\ChamiloLMSCoreBundle(),
-            new ChamiloLMS\CourseBundle\ChamiloLMSCourseBundle(),
-            new ChamiloLMS\MessageBundle\ChamiloLMSMessageBundle(),
+            new Chamilo\InstallerBundle\ChamiloInstallerBundle(),
+            new Chamilo\CoreBundle\ChamiloCoreBundle(),
+            new Chamilo\CourseBundle\ChamiloCourseBundle(),
+            new Chamilo\MessageBundle\ChamiloMessageBundle(),
+            new Chamilo\NotebookBundle\ChamiloNotebookBundle(),
+            new Chamilo\SettingsBundle\ChamiloSettingsBundle(),
 
-
-            new ChamiloLMS\NotebookBundle\ChamiloLMSNotebookBundle(),
             new APY\DataGridBundle\APYDataGridBundle(),
             new JMS\TranslationBundle\JMSTranslationBundle(),
 
@@ -147,7 +147,7 @@ class AppKernel extends Kernel
             //new JMS\SerializerBundle\JMSSerializerBundle($this),
             new Sp\BowerBundle\SpBowerBundle(),
             new Oro\Bundle\MigrationBundle\OroMigrationBundle(),
-            new ChamiloLMS\SettingsBundle\ChamiloLMSSettingsBundle(),
+
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

app/ChamiloRequirements.php

@@ -5,7 +5,7 @@ require_once __DIR__ . '/SymfonyRequirements.php';
 use Symfony\Component\Process\ProcessBuilder;
 use Symfony\Component\Intl\Intl;
 
-use ChamiloLMS\InstallerBundle\Process\PhpExecutableFinder;
+use Chamilo\InstallerBundle\Process\PhpExecutableFinder;
 
 /**
  * This class specifies all requirements and optional recommendations

app/Resources/views/Common/topbar.html.twig

@@ -14,14 +14,14 @@
 
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse navbar-ex1-collapse">
-            {{ knp_menu_render('ChamiloLMSCoreBundle:Builder:leftMenu', { 'style': 'navbar' }) }}
+            {{ knp_menu_render('ChamiloCoreBundle:Builder:leftMenu', { 'style': 'navbar' }) }}
             <form class="navbar-form navbar-left" role="search">
                 <div class="form-group">
                     <input type="text" class="form-control" placeholder="Search">
                 </div>
                 <button type="submit" class="btn btn-default">Submit</button>
             </form>
-            {{ knp_menu_render('ChamiloLMSCoreBundle:Builder:rightMenu', { 'style': 'navbar-right' }) }}
+            {{ knp_menu_render('ChamiloCoreBundle:Builder:rightMenu', { 'style': 'navbar-right' }) }}
         </div><!-- /.navbar-collapse -->
     </nav>
 {% endblock %}

app/Resources/views/Layouts/3-9.html.twig

@@ -261,7 +261,7 @@
                 <aside class="left-side sidebar-offcanvas">
                     <section class="sidebar">
 
-                        {{ sonata_block_render({'type': 'chamilolms.corebundle.block.main_menu', 'settings': {
+                        {{ sonata_block_render({'type': 'chamilo.corebundle.block.main_menu', 'settings': {
                             'current_uri': app.request.requestUri,
                             'ttl': 60
                         }}) }}
@@ -337,7 +337,7 @@
                         {% block sidebar %}
 
                             {#{{ sonata_block_render({ 'type': 'sonata.block.service.menu' }, {#}
-                                {#'menu_name': 'ChamiloLMSCoreBundle:MainMenuBuilder:profileMenu',#}
+                                {#'menu_name': 'ChamiloCoreBundle:MainMenuBuilder:profileMenu',#}
                             {#}) }}#}
 
                             {% include "@template_style/layout/sidebar.tpl" %}

app/Resources/views/layout.html.twig

@@ -29,7 +29,7 @@
 {% block avanzu_sidebar %}
     {{- parent() -}}
     {% if is_granted('IS_AUTHENTICATED_FULLY') %}
-    {{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:mainMenu', {'automenu': 'pills', 'stacked':true}) }}
+    {{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:mainMenu', {'automenu': 'pills', 'stacked':true}) }}
     {% endif %}
     {% if is_granted('IS_AUTHENTICATED_FULLY') == false %}
 
@@ -48,10 +48,10 @@
             <button type="submit" class="btn btn-default">Submit</button>
         </form>
 
-        {{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:loginMenu', {'automenu': 'pills', 'stacked':true}) }}
+        {{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:loginMenu', {'automenu': 'pills', 'stacked':true}) }}
     {% endif %}
 
-    {#{{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:helpMenu', {'automenu': 'pills', 'stacked':true}) }}#}
+    {#{{ mopa_bootstrap_menu('ChamiloCoreBundle:SimpleMenuBuilder:helpMenu', {'automenu': 'pills', 'stacked':true}) }}#}
 
 {% endblock %}
 
@@ -62,7 +62,7 @@
 
     {{ parent() }}
 
-    {% javascripts 'bundles/chamilolmscore/js/app.js'%}
+    {% javascripts 'bundles/chamilocore/js/app.js'%}
     <script type="text/javascript" src="{{ asset_url }}"></script>
     {% endjavascripts %}
 {% endblock %}

app/config/assetic.yml

@@ -3,7 +3,7 @@ assetic:
     use_controller: false
     read_from:      %kernel.root_dir%/../web
     write_to:       %kernel.root_dir%/../web
-    bundles:        [ChamiloLMSCoreBundle, ChamiloLMSInstallerBundle] # disable bundles parsing
+    bundles:        [ChamiloCoreBundle, ChamiloInstallerBundle] # disable bundles parsing
 
     filters:
         cssrewrite: ~

app/config/config.yml

@@ -3,8 +3,8 @@ imports:
     - { resource: security.yml }
     - { resource: assetic.yml }
 
-    - { resource: @ChamiloLMSCoreBundle/Resources/config/admin.yml }
-    - { resource: @ChamiloLMSNotebookBundle/Resources/config/admin.yml }
+    - { resource: @ChamiloCoreBundle/Resources/config/admin.yml }
+    - { resource: @ChamiloNotebookBundle/Resources/config/admin.yml }
 
     # Mopa Bootstrap
     - { resource: mopa/mopa_bootstrap.yml }
@@ -51,7 +51,7 @@ framework:
         engines: ['twig']
         form:
             resources:
-                - 'ChamiloLMSCoreBundle:Form'
+                - 'ChamiloCoreBundle:Form'
         #assets_version: SomeVersionScheme
     default_locale:  "%locale%"
     trusted_hosts:   ~
@@ -77,12 +77,12 @@ twig:
             - 'SonataFormatterBundle:Form:formatter.html.twig'
             - 'SonataMediaBundle:Form:media_widgets.html.twig'
             - 'SonataCoreBundle:Form:datepicker.html.twig'
-            - 'ChamiloLMSCoreBundle:Form:fields.html.twig'
+            - 'ChamiloCoreBundle:Form:fields.html.twig'
 
     exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction'
 
     paths:
-      "%kernel.root_dir%/../src/ChamiloLMS/CoreBundle/Resources/views/default": template_style
+      "%kernel.root_dir%/../src/Chamilo/CoreBundle/Resources/views/default": template_style
 
     globals:
       show_toolbar: true
@@ -122,7 +122,7 @@ twig:
 #assetic:
 #    debug:          "%kernel.debug%"
 #    use_controller: false
-#    bundles:        [ ChamiloLMSCoreBundle, ChamiloLMSInstallerBundle ]
+#    bundles:        [ ChamiloCoreBundle, ChamiloInstallerBundle ]
 #    #java: /usr/bin/java
 #    filters:
 #        cssrewrite: ~
@@ -203,10 +203,10 @@ fos_advanced_encoder:
     encoders:
         FOS\UserBundle\Model\UserInterface: sha512
         legacy_encoder:
-            id: chamilolms.userbundle.encoder
+            id: chamilo.userbundle.encoder
 
 sonata_admin:
-    title:      ChamiloLMS
+    title:      Chamilo
     title_logo: apple-touch-icon.png
 
 nelmio_api_doc: ~
@@ -231,17 +231,17 @@ avanzu_admin_theme:
 
 sylius_resource:
     resources:
-        chamilolms.notebook:
+        chamilo.notebook:
             driver: doctrine/orm
-            templates: ChamiloLMSNotebookBundle:Notebook
+            templates: ChamiloNotebookBundle:Notebook
             classes:
-                model: ChamiloLMS\NotebookBundle\Entity\CNotebook
+                model: Chamilo\NotebookBundle\Entity\CNotebook
 
 sylius_settings:
     driver: doctrine/orm
     classes:
         parameter:
-            model: ChamiloLMS\CoreBundle\Entity\SettingsCurrent
+            model: Chamilo\CoreBundle\Entity\SettingsCurrent
 
 
 doctrine_cache:
@@ -253,4 +253,4 @@ sp_bower:
     assetic: true
     install_on_warmup: true
     bundles:
-        ChamiloLMSCoreBundle: ~
+        ChamiloCoreBundle: ~

app/config/fos/fos_message.yml

@@ -1,15 +1,15 @@
 fos_message:
     db_driver: orm
 
-    thread_class: ChamiloLMS\CoreBundle\Entity\Thread
-    message_class: ChamiloLMS\CoreBundle\Entity\Message
+    thread_class: Chamilo\CoreBundle\Entity\Thread
+    message_class: Chamilo\CoreBundle\Entity\Message
 
 fos_comment:
     db_driver: orm
     class:
         model:
-            comment: ChamiloLMS\CoreBundle\Entity\Comment
-            thread: ChamiloLMS\CoreBundle\Entity\Thread
+            comment: Chamilo\CoreBundle\Entity\Comment
+            thread: Chamilo\CoreBundle\Entity\Thread
 
 assetic:
     bundles: [ "FOSCommentBundle" ]

app/config/routing.yml

@@ -1,5 +1,5 @@
-chamilo_lms_course:
-    resource: "@ChamiloLMSCourseBundle/Resources/config/routing.yml"
+chamilo_course:
+    resource: "@ChamiloCourseBundle/Resources/config/routing.yml"
     prefix:   /
 
 _courses:
@@ -52,10 +52,10 @@ logout:
 login_check:
     path: /administration/login_check
 
-chamilolms_installer:
-    resource: "@ChamiloLMSInstallerBundle/Resources/config/routing.yml"
+chamilo_installer:
+    resource: "@ChamiloInstallerBundle/Resources/config/routing.yml"
 
 # Always at the end
 core_bundle:
-    resource: "@ChamiloLMSCoreBundle/Resources/config/routing.yml"
+    resource: "@ChamiloCoreBundle/Resources/config/routing.yml"
 

app/config/routing_courses.yml

@@ -1,2 +1,2 @@
 notebook:
-    resource: "@ChamiloLMSNotebookBundle/Resources/config/routing.yml"
+    resource: "@ChamiloNotebookBundle/Resources/config/routing.yml"

app/config/security.yml

@@ -1,7 +1,7 @@
 security:
     encoders:
        FOS\UserBundle\Model\UserInterface:
-           id: chamilolms.userbundle.encoder
+           id: chamilo.userbundle.encoder
 
     role_hierarchy:
         ROLE_SONATA_ADMIN: ROLE_USER

app/config/sonata/sonata_block.yml

@@ -5,7 +5,7 @@ sonata_block:
     http_cache:
             listener: true
     menus:
-        "ChamiloLMSCoreBundle:MainMenuBuilder:mainMenu": "Main Menu"
+        "ChamiloCoreBundle:MainMenuBuilder:mainMenu": "Main Menu"
         #"SonataDemoBundle:Builder:mainMenu": "Main Menu"
 
     blocks:
@@ -20,9 +20,9 @@ sonata_block:
         #    contexts:   [admin]
 
         # Chamilo blocks
-        chamilolms.corebundle.block.course:
-        chamilolms.corebundle.block.breadcrumb:
-        chamilolms.corebundle.block.main_menu:
+        chamilo.corebundle.block.course:
+        chamilo.corebundle.block.breadcrumb:
+        chamilo.corebundle.block.main_menu:
 
         # Builtin Block
         sonata.block.service.text:

app/config/sonata/sonata_page.yml

@@ -62,7 +62,7 @@ sonata_page:
     templates:
         default:
             #path: 'ApplicationSonataPageBundle::demo_layout.html.twig'
-            path: 'ChamiloLMSCoreBundle::main_layout.html.twig'
+            path: 'ChamiloCoreBundle::main_layout.html.twig'
             name: 'default'
             containers:
                  header:
@@ -92,7 +92,7 @@ sonata_page:
 
         2columns:
             #path: 'ApplicationSonataPageBundle::default_2columns_layout.html.twig'
-            path: 'ChamiloLMSCoreBundle::main_layout.html.twig'
+            path: 'ChamiloCoreBundle::main_layout.html.twig'
             name: '2 columns layout'
             containers:
                  header:

main/admin/archive_cleanup.php

@@ -36,7 +36,7 @@ if ($form->validate()) {
 	}
 	if ($result) {
         // Creating temp folders
-        /** @var ChamiloLMS\Component\DataFilesystem\DataFilesystem $filesystem */
+        /** @var Chamilo\Component\DataFilesystem\DataFilesystem $filesystem */
 /*        $filesystem = $app['chamilo.filesystem'];
         $filesystem->createFolders($app['temp.paths']->folders); */
 

main/admin/extra_field_workflow.php

@@ -122,7 +122,7 @@ $options[0] = get_lang('SelectAnOption');
 ksort($options);
 $form->addElement('select', 'status', get_lang('SelectRole'), $options, array('onclick' => 'changeStatus(this)'));
 
-$checks = Database::getManager()->getRepository('ChamiloLMSCoreBundle:ExtraFieldOptionRelFieldOption')->findBy(array('fieldId' => $field_id, 'roleId' => $roleId));
+$checks = Database::getManager()->getRepository('ChamiloCoreBundle:ExtraFieldOptionRelFieldOption')->findBy(array('fieldId' => $field_id, 'roleId' => $roleId));
 $includedFields = array();
 if (!empty($checks)) {
     foreach ($checks as $availableField) {
@@ -177,7 +177,7 @@ if ($form->validate()) {
     if (!empty($result)) {
         foreach ($result as $id => $items) {
             foreach ($items as $subItemId => $value) {
-                $extraFieldOptionRelFieldOption = $em->getRepository('ChamiloLMSCoreBundle:ExtraFieldOptionRelFieldOption')->findOneBy(
+                $extraFieldOptionRelFieldOption = $em->getRepository('ChamiloCoreBundle:ExtraFieldOptionRelFieldOption')->findOneBy(
                     array(
                     'fieldId' => $field_id,
                     'fieldOptionId' => $subItemId,
@@ -188,7 +188,7 @@ if ($form->validate()) {
 
                 if ($value == 1) {
                     if (empty($extraFieldOptionRelFieldOption)) {
-                        $extraFieldOptionRelFieldOption = new ChamiloLMS\ExtraFieldOptionRelFieldOption();
+                        $extraFieldOptionRelFieldOption = new Chamilo\ExtraFieldOptionRelFieldOption();
                         $extraFieldOptionRelFieldOption->setFieldId($field_id);
                         $extraFieldOptionRelFieldOption->setFieldOptionId($subItemId);
                         $extraFieldOptionRelFieldOption->setRelatedFieldOptionId($id);

main/admin/user_edit.php

@@ -316,7 +316,7 @@ if ($expiration_date == '0000-00-00 00:00:00') {
     $user_data['expiration_date']['i'] = substr($expiration_date, 14, 2);
 }
 
-$user = Database::getManager()->getRepository('ChamiloLMSCoreBundle:User')->find($user_data['user_id']);
+$user = Database::getManager()->getRepository('ChamiloCoreBundle:User')->find($user_data['user_id']);
 
 $roles = $user->getRoles();
 

main/auth/inscription.php

@@ -448,7 +448,7 @@ if ($form->validate()) {
     }
 
     // Symfony way to login as a user
-    $user = Database::getManager()->getRepository('ChamiloLMSCoreBundle:User')->find($user_id);
+    $user = Database::getManager()->getRepository('ChamiloCoreBundle:User')->find($user_id);
 
     // Here, "secured" is the name of the firewall in your security.yml
     $token = new UsernamePasswordToken(

main/calendar/agenda_js.php

@@ -215,5 +215,5 @@ if (!empty($userId)) {
 }
 $tpl->addGlobal('form_add', $form->return_form());
 
-echo $tpl->render('ChamiloLMSCoreBundle:Calendar:month.html.twig');
+echo $tpl->render('ChamiloCoreBundle:Calendar:month.html.twig');
 

main/course_progress/thematic_controller.php

@@ -15,7 +15,7 @@
 /**
  * Thematic Controller script. Prepares the common background variables to give to the scripts corresponding to
  * the requested action
- * @todo use a proper controller in src/ChamiloLMS
+ * @todo use a proper controller in src/Chamilo
  * @package chamilo.course_progress
  */
 class ThematicController
@@ -46,7 +46,7 @@ class ThematicController
         $check = Security::check_token('request');
         $thematic_id = isset($_REQUEST['thematic_id']) ? intval($_REQUEST['thematic_id']) : null;
         $displayHeader = (!empty($_REQUEST['display']) && $_REQUEST['display'] === 'no_header') ? false : true;
- 
+
         if ($check) {
             switch ($action) {
                 case 'thematic_add':
@@ -252,7 +252,7 @@ class ThematicController
 
         $data['action'] = $action;
         $layoutName = $displayHeader ? 'layout' : 'layout_no_header';
-       
+
         // render to the view
         $this->view->set_data($data);
         $this->view->set_layout($layoutName);
@@ -376,9 +376,9 @@ class ThematicController
         $thematic = new Thematic($courseInfo);
         $attendance = new Attendance();
         $data = array();
-        
+
         $displayHeader = (!empty($_REQUEST['display']) && $_REQUEST['display'] === 'no_header') ? false : true;
-  
+
         // get data for attendance input select
         $attendance_list = $attendance->get_attendances_list();
         $attendance_select = array();
@@ -386,7 +386,7 @@ class ThematicController
         foreach ($attendance_list as $attendance_id => $attendance_data) {
             $attendance_select[$attendance_id] = $attendance_data['name'];
         }
-       
+
         $thematic_id = intval($_REQUEST['thematic_id']);
         $thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
 
@@ -481,7 +481,7 @@ class ThematicController
         $data['thematic_advance_data'] = $thematic_advance_data;
         $data['calendar_select'] = $calendar_select;
         $layoutName = $displayHeader ? 'layout' : 'layout_no_header';
-        
+
         // render to the view
         $this->view->set_data($data);
         $this->view->set_layout($layoutName);

main/exercice/exercise.class.php

@@ -959,7 +959,7 @@ class Exercise
         if (!empty($questions_by_category)) {
 
             $em = Database::getManager();
-            $repo = $em->getRepository('ChamiloLMSCoreBundle:CQuizCategory');
+            $repo = $em->getRepository('ChamiloCoreBundle:CQuizCategory');
 
             $newCategoryList = array();
 
@@ -974,7 +974,7 @@ class Exercise
 
                 if (!empty($cat['parent_id'])) {
                     if (!isset($parentsLoaded[$cat['parent_id']])) {
-                        $categoryEntity = $em->find('ChamiloLMSCoreBundle:CQuizCategory', $cat['parent_id']);
+                        $categoryEntity = $em->find('ChamiloCoreBundle:CQuizCategory', $cat['parent_id']);
                         $parentsLoaded[$cat['parent_id']] = $categoryEntity;
                     } else {
                         $categoryEntity = $parentsLoaded[$cat['parent_id']];
@@ -984,7 +984,7 @@ class Exercise
                     if ($this->categoryMinusOne) {
                         //$index = 1;
                     }
-                    /** @var \ChamiloLMS\Entity\CQuizCategory $categoryParent*/
+                    /** @var \Chamilo\Entity\CQuizCategory $categoryParent*/
 
                     foreach ($path as $categoryParent) {
                         $visibility = $categoryParent->getVisibility();
@@ -1747,7 +1747,7 @@ class Exercise
         // QuestionScoreType
 
         $em = Database::getManager();
-        $types = $em->getRepository('ChamiloLMSCoreBundle:QuestionScore')->findAll();
+        $types = $em->getRepository('ChamiloCoreBundle:QuestionScore')->findAll();
         $options = array(
             '0' => get_lang('SelectAnOption')
         );

main/exercice/exercise_reminder.php

@@ -204,7 +204,7 @@ foreach ($question_list as $questionId) {
     }
 
     $rootCategories = null;
-    $repo = Database::getManager()->getRepository('ChamiloLMSCoreBundle:CQuizCategory');
+    $repo = Database::getManager()->getRepository('ChamiloCoreBundle:CQuizCategory');
     foreach ($objQuestionTmp->category_list as $categoryId) {
         $cat = $repo->find($categoryId);
         $parentCat = $repo->getPath($cat);

main/exercice/testcategory.class.php

@@ -3,7 +3,7 @@
 /**
  * @author hubert.borderiou & jmontoya
  */
-use ChamiloLMS\CoreBundle\CQuizCategory;
+use Chamilo\CoreBundle\CQuizCategory;
 
 class Testcategory
 {
@@ -206,7 +206,7 @@ class Testcategory
      */
     public function removeCategory()
     {
-        $category = Database::getManager()->find('ChamiloLMS\CoreBundle\CQuizCategory', $this->id);
+        $category = Database::getManager()->find('Chamilo\CoreBundle\CQuizCategory', $this->id);
         if (!$category) {
             return false;
         }
@@ -218,7 +218,7 @@ class Testcategory
             return false;
         }
 
-        $repo = Database::getManager()->getRepository('ChamiloLMSCoreBundle:CQuizCategory');
+        $repo = Database::getManager()->getRepository('ChamiloCoreBundle:CQuizCategory');
         $repo->removeFromTree($category);
         // clear cached nodes
         Database::getManager()->clear();
@@ -953,7 +953,7 @@ class Testcategory
             unset($category_list['total']);
         }
         $em = Database::getManager();
-        $repo = $em->getRepository('ChamiloLMSCoreBundle:CQuizCategory');
+        $repo = $em->getRepository('ChamiloCoreBundle:CQuizCategory');
 
         $redefineCategoryList = array();
 
@@ -961,7 +961,7 @@ class Testcategory
             $globalCategoryScore = array();
 
             foreach ($category_list as $category_id => $category_item) {
-                $cat = $em->find('ChamiloLMSCoreBundle:CQuizCategory', $category_id);
+                $cat = $em->find('ChamiloCoreBundle:CQuizCategory', $category_id);
                 $path = $repo->getPath($cat);
 
                 $categoryName = $category_name_list[$category_id];

main/exercice/tests_category.php

@@ -277,14 +277,14 @@ function display_categories($type = 'simple')
     );
 
     // @todo put this in a function
-    $repo = Database::getManager()->getRepository('ChamiloLMSCoreBundle:CQuizCategory');
+    $repo = Database::getManager()->getRepository('ChamiloCoreBundle:CQuizCategory');
 
     $query = null;
     if ($type == 'global') {
         $query = Database::getManager()
             ->createQueryBuilder()
             ->select('node')
-            ->from('ChamiloLMSCoreBundle:CQuizCategory', 'node')
+            ->from('ChamiloCoreBundle:CQuizCategory', 'node')
             ->where('node.cId = 0')
             ->orderBy('node.root, node.lft', 'ASC')
             ->getQuery();
@@ -292,7 +292,7 @@ function display_categories($type = 'simple')
         $query = Database::getManager()
             ->createQueryBuilder()
             ->select('node')
-            ->from('ChamiloLMSCoreBundle:CQuizCategory', 'node')
+            ->from('ChamiloCoreBundle:CQuizCategory', 'node')
             ->where('node.cId = :courseId')
             //->add('orderBy', 'node.title ASC')
             ->orderBy('node.root, node.lft', 'ASC')

main/group/group_edit.php

@@ -138,10 +138,10 @@ $form->add_textfield('name', get_lang('GroupName'));
 $form->addElement('textarea', 'description', get_lang('Description'), array('class' => 'span6', 'rows' => 6));
 
 // Getting course info
-$course = Database::getManager()->getRepository('ChamiloLMSCoreBundle:Course')->find(api_get_course_int_id());
+$course = Database::getManager()->getRepository('ChamiloCoreBundle:Course')->find(api_get_course_int_id());
 
 //Getting subscribed students
-$subscribedUsers = Database::getManager()->getRepository('ChamiloLMSCoreBundle:Course')->getSubscribedStudents($course);
+$subscribedUsers = Database::getManager()->getRepository('ChamiloCoreBundle:Course')->getSubscribedStudents($course);
 $subscribedUsers = $subscribedUsers->getQuery();
 $subscribedUsers = $subscribedUsers->execute();
 

main/inc/ajax/exercise.ajax.php

@@ -109,19 +109,19 @@ switch ($action) {
         $courseId = api_get_course_int_id();
 
         $em = Database::getManager();
-        $repo = $em->getRepository('ChamiloLMSCoreBundle:CQuizCategory');
+        $repo = $em->getRepository('ChamiloCoreBundle:CQuizCategory');
 
         $json_items = array();
         if (!empty($items)) {
             foreach ($items as $item) {
                 if ($item['c_id'] == 0) {
                     if ($filterByGlobal) {
-                        $cat = $em->find('ChamiloLMSCoreBundle:CQuizCategory', $item['iid']);
+                        $cat = $em->find('ChamiloCoreBundle:CQuizCategory', $item['iid']);
                         $idList = array();
                         if ($cat) {
                             $path = $repo->getPath($cat);
                             if (!empty($path)) {
-                                /** @var \ChamiloLMS\Entity\CQuizCategory $cat */
+                                /** @var \Chamilo\Entity\CQuizCategory $cat */
                                 foreach ($path as $cat) {
                                     $idList[] = $cat->getIid();
                                 }

main/inc/lib/api.lib.php

@@ -11,7 +11,7 @@
 use \ChamiloSession as Session;
 use Symfony\Component\Validator\Constraints as Assert;
 use Application\Sonata\UserBundle\Entity\User;
-use ChamiloLMS\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Course;
 
 /**
  * Constants declaration
@@ -527,7 +527,7 @@ define('TOOL_ADMIN_VISIBLE',             'tooladminvisible');
  * api_get_path(SYS_CSS_PATH)                   /var/www/chamilo/main/css
  * api_get_path(INCLUDE_PATH)                   /var/www/chamilo/main/inc/
  * api_get_path(LIBRARY_PATH)                   /var/www/chamilo/main/inc/lib/
- * api_get_path(SYS_LIBRARY_JS_PATH)            /var/www/chamilo/web/ChamiloLMS/js
+ * api_get_path(SYS_LIBRARY_JS_PATH)            /var/www/chamilo/web/Chamilo/js
  * api_get_path(CONFIGURATION_PATH)             /var/www/chamilo/main/inc/conf/
  * api_get_path(SYS_LANG_PATH)                  /var/www/chamilo/main/lang/
  * api_get_path(SYS_PLUGIN_PATH)                /var/www/chamilo/plugin/
@@ -542,12 +542,12 @@ define('TOOL_ADMIN_VISIBLE',             'tooladminvisible');
  * api_get_path(WEB_CODE_PATH)                  http://www.mychamilo.org/chamilo/main/
  * api_get_path(WEB_PLUGIN_PATH)                http://www.mychamilo.org/chamilo/plugin/
  * api_get_path(WEB_ARCHIVE_PATH)               http://www.mychamilo.org/chamilo/archive/
- * api_get_path(WEB_IMG_PATH)                   http://www.mychamilo.org/chamilo/web/chamiloLMS/img/
- * api_get_path(SYS_IMG_PATH)                   /var/www/chamilo/web/bundles/chamilolmscore/img/
+ * api_get_path(WEB_IMG_PATH)                   http://www.mychamilo.org/chamilo/web/chamilo/img/
+ * api_get_path(SYS_IMG_PATH)                   /var/www/chamilo/web/bundles/chamilocore/img/
  *
  * api_get_path(WEB_CSS_PATH)                   http://www.mychamilo.org/chamilo/main/css/
  * api_get_path(WEB_LIBRARY_PATH)               http://www.mychamilo.org/chamilo/main/inc/lib/
- * api_get_path(WEB_LIBRARY_JS_PATH)            http://www.mychamilo.org/chamilo/web/ChamiloLMS/javascript
+ * api_get_path(WEB_LIBRARY_JS_PATH)            http://www.mychamilo.org/chamilo/web/Chamilo/javascript
  * api_get_path(WEB_TEMPLATE_PATH)              http://www.mychamilo.org/chamilo/main/template/
  *
  *
@@ -576,20 +576,20 @@ function api_get_path($path_type, $path = null) {
         WEB_DATA_COURSE_PATH    => 'courses/',
         WEB_DATA_PATH           => '/',
         SYS_COURSE_PATH         => 'data/',
-        SYS_CSS_PATH            => 'bundles/chamilolmscore/css/',
+        SYS_CSS_PATH            => 'bundles/chamilocore/css/',
         SYS_LANG_PATH           => 'lang/',
-        WEB_IMG_PATH            => 'bundles/chamilolmscore/img/',
-        SYS_IMG_PATH            => 'web/bundles/chamilolmscore/img/',
-        WEB_CSS_PATH            => 'bundles/chamilolmscore/css/',
+        WEB_IMG_PATH            => 'bundles/chamilocore/img/',
+        SYS_IMG_PATH            => 'web/bundles/chamilocore/img/',
+        WEB_CSS_PATH            => 'bundles/chamilocore/css/',
         SYS_PLUGIN_PATH         => 'plugin/',
         WEB_PLUGIN_PATH         => 'plugin/',
         WEB_ARCHIVE_PATH        => 'temp/',
         INCLUDE_PATH            => 'inc/',
         LIBRARY_PATH            => 'inc/lib/',
-        SYS_LIBRARY_JS_PATH     => 'bundles/chamilolmscore//js/',
+        SYS_LIBRARY_JS_PATH     => 'bundles/chamilocore//js/',
         CONFIGURATION_PATH      => 'inc/conf/',
         WEB_LIBRARY_PATH        => 'inc/lib/',
-        WEB_LIBRARY_JS_PATH     => 'bundles/chamilolmscore//js/',
+        WEB_LIBRARY_JS_PATH     => 'bundles/chamilocore//js/',
         WEB_AJAX_PATH           => 'inc/ajax/',
         SYS_TEST_PATH           => 'tests/',
         WEB_TEMPLATE_PATH       => 'template/',
@@ -2117,6 +2117,7 @@ function api_get_session_condition($session_id, $and = true, $with_base_content
  * @author Bart Mollet
  */
 function api_get_setting($variable, $key = null) {
+
     $_setting = Session::read('_setting');
     if ($variable == 'header_extra_content') {
         $filename = api_get_path(SYS_PATH).api_get_home_path().'header_extra_content.txt';
@@ -6784,7 +6785,7 @@ function api_get_user_roles()
 {
     $em = Database::getManager();
     //var_dump(Session::getSecurity()->getToken()->getRoles());
-    $roles = $em->getRepository('ChamiloLMSCoreBundle:Role')->findBy(array(), array('name'=>'asc'));
+    $roles = $em->getRepository('ChamiloCoreBundle:Role')->findBy(array(), array('name'=>'asc'));
     $userRoles = array();
     foreach ($roles as $role) {
         $userRoles[$role->getId()] = $role->getName();

main/inc/lib/chamilo_session.class.php

@@ -78,7 +78,7 @@ class ChamiloSession
     }
 
     /**
-     * @return ChamiloLMS\CoreBundle\Component\Editor\Editor
+     * @return Chamilo\CoreBundle\Component\Editor\Editor
      */
     public static function getHtmlEditor()
     {

main/inc/lib/course_home.lib.php

@@ -681,7 +681,7 @@ class CourseHome
                             );
                             if (!empty($tool['id'])) {
                                 $link['cmd'] = $urlGenerator->generate(
-                                    'chamilolms_core_tool_coursehome_coursehome_hideicon',
+                                    'chamilo_core_tool_coursehome_coursehome_hideicon',
                                     array(
                                         'courseCode' => api_get_course_id(),
                                         'iconId' => $tool['id']
@@ -694,7 +694,7 @@ class CourseHome
                             $link['name'] = Display::return_icon('invisible.gif', get_lang('Activate'), array('id' => 'linktool_'.$tool['id']), ICON_SIZE_MEDIUM, false);
                             if (!empty($tool['id'])) {
                                 $link['cmd'] = $urlGenerator->generate(
-                                    'chamilolms_core_tool_coursehome_coursehome_showicon',
+                                    'chamilo_core_tool_coursehome_coursehome_showicon',
                                     array(
                                         'courseCode' => api_get_course_id(),
                                         'iconId' => $tool['id']

main/inc/lib/display.lib.php

@@ -213,7 +213,7 @@ class Display
                     $introduction_section .=  '<div id="introduction_block_action" class="col-md-2 col-md-offset-10">';
 
                     $url = $urlGenerator->generate(
-                        'chamilolms_course_introduction_introduction_edit',
+                        'chamilo_course_introduction_introduction_edit',
                         array('tool' => $tool, 'course' => api_get_course_id())
                     );
 
@@ -227,7 +227,7 @@ class Display
                     // Displays "edit intro && delete intro" commands
                     $introduction_section .=  '<div id="introduction_block_action" class="col-md-2 col-md-offset-10">';
                     $url = $urlGenerator->generate(
-                        'chamilolms_course_introduction_introduction_edit',
+                        'chamilo_course_introduction_introduction_edit',
                         array('tool' => $tool, 'course' => api_get_course_id())
                     );
 
@@ -236,7 +236,7 @@ class Display
                     $introduction_section .=  "</a>";
 
                     $url = $urlGenerator->generate(
-                        'chamilolms_course_introduction_introduction_delete',
+                        'chamilo_course_introduction_introduction_delete',
                         array('tool' => $tool, 'course' => api_get_course_id())
                     );
 
@@ -814,7 +814,7 @@ class Display
             $icon = $image;
         }
 
-        $icon = 'bundles/chamilolmscore/img/'.$icon;
+        $icon = 'bundles/chamilocore/img/'.$icon;
 
         $icon = Session::getAsset()->getUrl($icon);
         //$icon = api_get_cdn_path($icon);

main/inc/lib/document.lib.php

@@ -9,7 +9,7 @@
  *
  * 	@package chamilo.library
  */
-use ChamiloLMS\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Course;
 
 /**
  * Code

main/inc/lib/extra_field.lib.php

@@ -643,13 +643,13 @@ class ExtraField extends Model
 
                         $addOptions = array();
 
-                        $optionsExists = Database::getManager()->getRepository('ChamiloLMSCoreBundle:ExtraFieldOptionRelFieldOption')->
+                        $optionsExists = Database::getManager()->getRepository('ChamiloCoreBundle:ExtraFieldOptionRelFieldOption')->
                             findOneBy(array('fieldId' => $field_details['id']));
 
                         if ($optionsExists) {
                             if (isset($userInfo['status']) && !empty($userInfo['status'])) {
 
-                                $fieldWorkFlow = Database::getManager()->getRepository('ChamiloLMSCoreBundle:ExtraFieldOptionRelFieldOption')
+                                $fieldWorkFlow = Database::getManager()->getRepository('ChamiloCoreBundle:ExtraFieldOptionRelFieldOption')
                                     ->findBy(
                                         array(
                                             'fieldId' => $field_details['id'],

main/inc/lib/extra_field_value.lib.php

@@ -6,10 +6,10 @@
  * fields for any datatype
  * @package chamilo.library
  */
-use ChamiloLMS\CoreBundle\QuestionFieldValues;
-use ChamiloLMS\CoreBundle\CourseFieldValues;
-use ChamiloLMS\CoreBundle\UserFieldValues;
-use ChamiloLMS\CoreBundle\SessionFieldValues;
+use Chamilo\CoreBundle\QuestionFieldValues;
+use Chamilo\CoreBundle\CourseFieldValues;
+use Chamilo\CoreBundle\UserFieldValues;
+use Chamilo\CoreBundle\SessionFieldValues;
 
 /**
  * Class managing the values in extra fields for any datatype
@@ -40,31 +40,31 @@ class ExtraFieldValue extends Model
                 $this->table = Database::get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_COURSE_FIELD);
                 $this->author_id = 'user_id';
-                $this->entityName = 'ChamiloLMSCoreBundle:CourseFieldValues';
+                $this->entityName = 'ChamiloCoreBundle:CourseFieldValues';
                 break;
             case 'user':
                 $this->table = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_USER_FIELD);
                 $this->author_id = 'author_id';
-                $this->entityName = 'ChamiloLMSCoreBundle:UserFieldValues';
+                $this->entityName = 'ChamiloCoreBundle:UserFieldValues';
                 break;
             case 'session':
                 $this->table = Database::get_main_table(TABLE_MAIN_SESSION_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_SESSION_FIELD);
                 $this->author_id = 'user_id';
-                $this->entityName = 'ChamiloLMSCoreBundle:SessionFieldValues';
+                $this->entityName = 'ChamiloCoreBundle:SessionFieldValues';
                 break;
             case 'question':
                 $this->table = Database::get_main_table(TABLE_MAIN_QUESTION_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_QUESTION_FIELD);
                 $this->author_id = 'user_id';
-                $this->entityName = 'ChamiloLMSCoreBundle:QuestionFieldValues';
+                $this->entityName = 'ChamiloCoreBundle:QuestionFieldValues';
                 break;
             case 'lp':
                 $this->table = Database::get_main_table(TABLE_MAIN_LP_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_LP_FIELD);
                 $this->author_id = 'lp_id';
-                //$this->entityName = 'ChamiloLMSCoreBundle:QuestionFieldValues';
+                //$this->entityName = 'ChamiloCoreBundle:QuestionFieldValues';
                 break;
             default:
                 //unmanaged datatype, return false to let the caller know it
@@ -321,22 +321,22 @@ class ExtraFieldValue extends Model
                 if ($extra_field_info['field_loggeable'] == 1) {
                     switch($this->type) {
                         case 'question':
-                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:QuestionFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloCoreBundle:QuestionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setQuestionId($params[$this->handler_id]);
                             break;
                         case 'course':
-                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:CourseFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloCoreBundle:CourseFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setCourseCode($params[$this->handler_id]);
                             break;
                         case 'user':
-                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:UserFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloCoreBundle:UserFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setAuthorId(api_get_user_id());
                             break;
                         case 'session':
-                            $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:SessionFieldValues')->find($field_values['id']);
+                            $extraFieldValue = Database::getManager()->getRepository('ChamiloCoreBundle:SessionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setSessionId($params[$this->handler_id]);
                             break;

main/inc/lib/fileManager.lib.php

@@ -15,7 +15,7 @@
 
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Filesystem\Filesystem;
-use ChamiloLMS\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Course;
 
 class FileManager
 {

main/inc/lib/formvalidator/Element/html_editor.php

@@ -6,7 +6,7 @@
  */
 class HTML_QuickForm_html_editor extends HTML_QuickForm_textarea
 {
-    /** @var \ChamiloLMS\Component\Editor\Editor */
+    /** @var \Chamilo\Component\Editor\Editor */
     public $editor;
 
     /**

main/inc/lib/usermanager.lib.php

@@ -337,10 +337,10 @@ class UserManager
             }
 
             // Adding user
-            /** @var ChamiloLMS\UserBundle\Entity\User $user */
+            /** @var Chamilo\UserBundle\Entity\User $user */
             $em = Database::getManager();
 
-            $user = $em->getRepository('ChamiloLMSCoreBundle:User')->find($return);
+            $user = $em->getRepository('ChamiloCoreBundle:User')->find($return);
 
             $roleName = api_get_role_name_from_status($status);
             $user->addRole($roleName);
@@ -791,9 +791,9 @@ class UserManager
         }
 
         // Adding user
-        /** @var ChamiloLMS\UserBundle\Entity\User $user */
+        /** @var Chamilo\UserBundle\Entity\User $user */
         $em = Database::getManager();
-        $user = $em->getRepository('ChamiloLMSCoreBundle:User')->find($user_id);
+        $user = $em->getRepository('ChamiloCoreBundle:User')->find($user_id);
         $user->addRole(api_get_role_name_from_status($status));
         $em->persist($user);
         $em->flush();

main/install/index.php

@@ -20,8 +20,8 @@ set_time_limit(0);
 
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\HttpFoundation\Request;
-use ChamiloLMS\Component\Console\Output\BufferedOutput;
-use ChamiloLMS\Framework\Application;
+use Chamilo\Component\Console\Output\BufferedOutput;
+use Chamilo\Framework\Application;
 use Chash\Command\Installation\InstallCommand;
 use Chash\Command\Installation\UpgradeCommand;
 
@@ -29,7 +29,7 @@ $app = new Application();
 
 // Setting paths
 $app['path.base'] = dirname(dirname(__DIR__)).'/';
-$app['path.app'] = $app['path.base'].'src/ChamiloLMS/';
+$app['path.app'] = $app['path.base'].'src/Chamilo/';
 $app['path.config'] = $app['path.base'].'config/';
 
 $app->bindInstallPaths(require $app['path.app'].'paths.php');
@@ -173,7 +173,7 @@ $app->match('/', function () use ($app) {
         ))
         ->add('continue', 'submit', array('attr' => array('class' => 'btn')))
         ->getForm();
-    
+
     if ('POST' == $request->getMethod()) {
         $url = $app['url_generator']->generate('requirements');
 
@@ -189,7 +189,7 @@ $app->match('/', function () use ($app) {
 ->before($blockInstallation);
 
 $app->match('/requirements', function () use ($app) {
-    
+
     $allowedToContinue = checkRequiredSettings();
 
     $request = $app['request'];

main/install/templates/layout.tpl

@@ -3,9 +3,9 @@
     <title>Chamilo Installation</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
-    <link rel="stylesheet" href="{{ app.request.basepath }}/../../web/ChamiloLMS/js/bootstrap/css/bootstrap.css">
-    <script type="text/javascript" src="{{ app.request.basepath }}/../../web/ChamiloLMS/js/jquery.js"></script>
-    <script type="text/javascript" src="{{ app.request.basepath }}/../../web/ChamiloLMS/js/bootstrap/js/bootstrap.js"></script>
+    <link rel="stylesheet" href="{{ app.request.basepath }}/../../web/Chamilo/js/bootstrap/css/bootstrap.css">
+    <script type="text/javascript" src="{{ app.request.basepath }}/../../web/Chamilo/js/jquery.js"></script>
+    <script type="text/javascript" src="{{ app.request.basepath }}/../../web/Chamilo/js/bootstrap/js/bootstrap.js"></script>
 </head>
 
 <body>

main/link/link.class.php

@@ -21,11 +21,11 @@ class Link
 {
 
     /**
-     * @return \ChamiloLMS\Entity\Repository\LinkRepository
+     * @return \Chamilo\Entity\Repository\LinkRepository
      */
     public static function repository()
     {
-        return \ChamiloLMS\Entity\Repository\LinkRepository::instance();
+        return \Chamilo\Entity\Repository\LinkRepository::instance();
     }
 
     /**

main/newscorm/learnpath.class.php

@@ -14,7 +14,7 @@
  * @package chamilo.learnpath
  */
 
-use ChamiloLMS\CoreBundle\Entity\CLpCategory;
+use Chamilo\CoreBundle\Entity\CLpCategory;
 use \ChamiloSession as Session;
 
 class learnpath
@@ -10556,7 +10556,7 @@ EOD;
     static function update_category($params)
     {
         $em = Database::getManager();
-        $item = $em->find('ChamiloLMSCoreBundle:CLpCategory', $params['id']);
+        $item = $em->find('ChamiloCoreBundle:CLpCategory', $params['id']);
         if ($item) {
             $item->setName($params['name']);
             $item->setCId($params['c_id']);
@@ -10568,7 +10568,7 @@ EOD;
     static function move_up_category($id)
     {
         $em = Database::getManager();
-        $item = $em->find('ChamiloLMSCoreBundle:CLpCategory', $id);
+        $item = $em->find('ChamiloCoreBundle:CLpCategory', $id);
         if ($item) {
             $position = $item->getPosition() - 1;
             $item->setPosition($position);
@@ -10580,7 +10580,7 @@ EOD;
     static function move_down_category($id)
     {
         $em = Database::getManager();
-        $item = $em->find('ChamiloLMSCoreBundle:CLpCategory', $id);
+        $item = $em->find('ChamiloCoreBundle:CLpCategory', $id);
         if ($item) {
             $position = $item->getPosition() + 1;
             $item->setPosition($position);
@@ -10595,7 +10595,7 @@ EOD;
             return 0;
         }
         $em = Database::getManager();
-        $query = $em->createQuery('SELECT COUNT(u.id) FROM ChamiloLMSCoreBundle:CLpCategory u WHERE u.cId = :id');
+        $query = $em->createQuery('SELECT COUNT(u.id) FROM ChamiloCoreBundle:CLpCategory u WHERE u.cId = :id');
         $query->setParameter('id', $course_id);
         return $query->getSingleScalarResult();
     }
@@ -10605,13 +10605,13 @@ EOD;
     {
         $em = Database::getManager();
         //Default behaviour
-        /*$items = $em->getRepository('ChamiloLMSCoreBundle:CLpCategory')->findBy(
+        /*$items = $em->getRepository('ChamiloCoreBundle:CLpCategory')->findBy(
             array('cId' => $course_id),
             array('name' => 'ASC')
         );*/
 
         //Using doctrine extensions
-        $items = $em->getRepository('ChamiloLMSCoreBundle:CLpCategory')->getBySortableGroupsQuery(
+        $items = $em->getRepository('ChamiloCoreBundle:CLpCategory')->getBySortableGroupsQuery(
             array('cId' => $course_id)
         )->getResult();
 
@@ -10621,7 +10621,7 @@ EOD;
     static function get_category($id)
     {
         $em = Database::getManager();
-        $item = $em->find('ChamiloLMSCoreBundle:CLpCategory', $id);
+        $item = $em->find('ChamiloCoreBundle:CLpCategory', $id);
 
         return $item;
     }
@@ -10629,7 +10629,7 @@ EOD;
     static function get_category_by_course($course_id)
     {
         $em = Database::getManager();
-        $items = $em->getRepository('ChamiloLMSCoreBundle:CLpCategory')->findBy(array('cId' => $course_id));
+        $items = $em->getRepository('ChamiloCoreBundle:CLpCategory')->findBy(array('cId' => $course_id));
 
         return $items;
     }
@@ -10637,11 +10637,11 @@ EOD;
     static function delete_category($id)
     {
         $em = Database::getManager();
-        $item = $em->find('ChamiloLMSCoreBundle:CLpCategory', $id);
+        $item = $em->find('ChamiloCoreBundle:CLpCategory', $id);
         if ($item) {
 
             $courseId = $item->getCId();
-            $query = $em->createQuery('SELECT u FROM ChamiloLMSCoreBundle:CLp u WHERE u.cId = :id AND u.categoryId = :catId');
+            $query = $em->createQuery('SELECT u FROM ChamiloCoreBundle:CLp u WHERE u.cId = :id AND u.categoryId = :catId');
             $query->setParameter('id', $courseId);
             $query->setParameter('catId', $item->getId());
             $lps = $query->getResult();

main/newscorm/lp_list.php

@@ -106,7 +106,7 @@ $token = Security::get_token();
 /* DISPLAY SCORM LIST */
 
 $categories_temp = learnpath::get_categories(api_get_course_int_id());
-$category_test = new ChamiloLMS\Entity\CLpCategory();
+$category_test = new Chamilo\Entity\CLpCategory();
 $category_test->setId(0);
 $category_test->setName(get_lang('WithOutCategory'));
 $category_test->setPosition(0);

plugin/follow_buttons/index.php

@@ -9,11 +9,11 @@ $_template = null;
 
 //$_template['message']       = 'Follow us';
 
-$_template['facebook']      = 'chamilolms'; //http://www.facebook.com/your-profile
-$_template['twitter']       = 'chamilo_news'; //http://twitter.com/your-profile 
+$_template['facebook']      = 'chamilo'; //http://www.facebook.com/your-profile
+$_template['twitter']       = 'chamilo_news'; //http://twitter.com/your-profile
 $_template['linkedin']      = 'chamilo_news'; //http://www.linkedin.com/in/your-profile
 $_template['googleplus']    = ''; //https://plus.google.com/your-profile
-$_template['youtube']       = ''; //http://www.youtube.com/user/your-profile 
-$_template['flickr']        = ''; //http://www.flickr.com/photos/your-profile 
-$_template['vimeo']         = ''; //http://www.vimeo.com/your-profile 
-$_template['rss']           = 'http://www.chamilo.org/';
+$_template['youtube']       = ''; //http://www.youtube.com/user/your-profile
+$_template['flickr']        = ''; //http://www.flickr.com/photos/your-profile
+$_template['vimeo']         = ''; //http://www.vimeo.com/your-profile
+$_template['rss']           = 'http://www.chamilo.org/';

src/Application/Sonata/UserBundle/Entity/User.php

@@ -14,7 +14,7 @@ use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Validator\Constraints\DateTime;
-use ChamiloLMS\CoreBundle\Component\Auth;
+use Chamilo\CoreBundle\Component\Auth;
 use FOS\AdvancedEncoderBundle\Security\Encoder\EncoderAwareInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use FOS\MessageBundle\Model\ParticipantInterface;
@@ -238,32 +238,32 @@ class User extends BaseUser implements ParticipantInterface, ThemeUser
     private $hrDeptId;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CoreBundle\Entity\CourseRelUser", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\CourseRelUser", mappedBy="user")
      **/
     protected $courses;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CourseBundle\Entity\CItemProperty", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="Chamilo\CourseBundle\Entity\CItemProperty", mappedBy="user")
      **/
     protected $items;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CoreBundle\Entity\UsergroupRelUser", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\UsergroupRelUser", mappedBy="user")
      **/
     protected $classes;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CourseBundle\Entity\CDropboxPost", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="Chamilo\CourseBundle\Entity\CDropboxPost", mappedBy="user")
      **/
     protected $dropBoxReceivedFiles;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CourseBundle\Entity\CDropboxFile", mappedBy="userSent")
+     * @ORM\OneToMany(targetEntity="Chamilo\CourseBundle\Entity\CDropboxFile", mappedBy="userSent")
      **/
     protected $dropBoxSentFiles;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CoreBundle\Entity\JuryMembers", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\JuryMembers", mappedBy="user")
      **/
     //protected $jurySubscriptions;
 
@@ -284,12 +284,12 @@ class User extends BaseUser implements ParticipantInterface, ThemeUser
     private $isActive;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CoreBundle\Entity\CurriculumItemRelUser", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\CurriculumItemRelUser", mappedBy="user")
      **/
     protected $curriculumItems;
 
     /**
-     * @ORM\ManyToMany(targetEntity="ChamiloLMS\CoreBundle\Entity\AccessUrl")
+     * @ORM\ManyToMany(targetEntity="Chamilo\CoreBundle\Entity\AccessUrl")
      * @ORM\JoinTable(
      *      joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="access_url_id", referencedColumnName="id")}
@@ -298,7 +298,7 @@ class User extends BaseUser implements ParticipantInterface, ThemeUser
     protected $portals;
 
     /**
-     * @ORM\OneToMany(targetEntity="ChamiloLMS\CoreBundle\Entity\Session", mappedBy="generalCoach")
+     * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\Session", mappedBy="generalCoach")
      **/
     protected $sessionAsGeneralCoach;
 

src/Application/Sonata/UserBundle/Repository/UserRepository.php

@@ -88,10 +88,10 @@ class UserRepository extends EntityRepository
         $queryBuilder->select('c');
 
         // Loading User.
-        //$qb->from('ChamiloLMS\UserBundle\Entity\User', 'u');
+        //$qb->from('Chamilo\UserBundle\Entity\User', 'u');
 
         // Selecting course
-        $queryBuilder->innerJoin('ChamiloLMS\CoreBundle\Entity\Course', 'c');
+        $queryBuilder->innerJoin('Chamilo\CoreBundle\Entity\Course', 'c');
 
         //@todo check app settings
         //$qb->add('orderBy', 'u.lastname ASC');

src/Chamilo/CoreBundle/Admin/AccessUrlAdmin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Admin;
+namespace Chamilo\CoreBundle\Admin;
 
 use Sonata\AdminBundle\Admin\Admin;
 use Sonata\AdminBundle\Form\FormMapper;
@@ -12,7 +12,7 @@ use Knp\Menu\ItemInterface as MenuItemInterface;
 
 /**
  * Class AccessUrlAdmin
- * @package ChamiloLMS\CoreBundle\Admin
+ * @package Chamilo\CoreBundle\Admin
  */
 class AccessUrlAdmin extends Admin
 {

src/Chamilo/CoreBundle/Admin/AccessUrlRelCourseAdmin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Admin;
+namespace Chamilo\CoreBundle\Admin;
 
 use Sonata\AdminBundle\Admin\Admin;
 use Sonata\AdminBundle\Form\FormMapper;
@@ -8,13 +8,13 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-use ChamiloLMS\CoreBundle\Entity\CourseRelUser;
+use Chamilo\CoreBundle\Entity\CourseRelUser;
 
 use Knp\Menu\ItemInterface as MenuItemInterface;
 
 /**
  * Class CourseAdmin
- * @package ChamiloLMS\CoreBundle\Admin
+ * @package Chamilo\CoreBundle\Admin
  */
 class AccessUrlRelCourseAdmin extends Admin
 {

src/Chamilo/CoreBundle/Admin/BranchAdmin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Admin;
+namespace Chamilo\CoreBundle\Admin;
 
 use Sonata\AdminBundle\Admin\Admin;
 use Sonata\AdminBundle\Form\FormMapper;

src/Chamilo/CoreBundle/Admin/CourseAdmin.php

@@ -1,21 +1,21 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Admin;
+namespace Chamilo\CoreBundle\Admin;
 
-use ChamiloLMS\CoreBundle\Entity\Listener\CourseListener;
-use ChamiloLMS\CourseBundle\Entity\CTool;
+use Chamilo\CoreBundle\Entity\Listener\CourseListener;
+use Chamilo\CourseBundle\Entity\CTool;
 use Sonata\AdminBundle\Admin\Admin;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
-use ChamiloLMS\CourseBundle\ToolChain;
+use Chamilo\CourseBundle\ToolChain;
 
 use Knp\Menu\ItemInterface as MenuItemInterface;
 
 /**
  * Class CourseAdmin
- * @package ChamiloLMS\CoreBundle\Admin
+ * @package Chamilo\CoreBundle\Admin
  */
 class CourseAdmin extends Admin
 {
@@ -90,7 +90,7 @@ class CourseAdmin extends Admin
 
     /**
      * Very important in order to save the related entities!
-     * @param \ChamiloLMS\CoreBundle\Entity\Course $course
+     * @param \Chamilo\CoreBundle\Entity\Course $course
      * @return mixed|void
      */
     public function preUpdate($course)

src/Chamilo/CoreBundle/Admin/CourseRelUserAdmin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Admin;
+namespace Chamilo\CoreBundle\Admin;
 
 use Sonata\AdminBundle\Admin\Admin;
 use Sonata\AdminBundle\Form\FormMapper;
@@ -8,13 +8,13 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-use ChamiloLMS\CoreBundle\Entity\CourseRelUser;
+use Chamilo\CoreBundle\Entity\CourseRelUser;
 
 use Knp\Menu\ItemInterface as MenuItemInterface;
 
 /**
  * Class CourseAdmin
- * @package ChamiloLMS\CoreBundle\Admin
+ * @package Chamilo\CoreBundle\Admin
  */
 class CourseRelUserAdmin extends Admin
 {

src/Chamilo/CoreBundle/Admin/SessionAdmin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Admin;
+namespace Chamilo\CoreBundle\Admin;
 
 use Sonata\AdminBundle\Admin\Admin;
 use Sonata\AdminBundle\Form\FormMapper;
@@ -12,7 +12,7 @@ use Knp\Menu\ItemInterface as MenuItemInterface;
 
 /**
  * Class SessionAdmin
- * @package ChamiloLMS\CoreBundle\Admin
+ * @package Chamilo\CoreBundle\Admin
  */
 class SessionAdmin extends Admin
 {
@@ -84,7 +84,7 @@ class SessionAdmin extends Admin
 
     /**
      * Very important in order to save the related entities!
-     * @param \ChamiloLMS\CoreBundle\Entity\Session $session
+     * @param \Chamilo\CoreBundle\Entity\Session $session
      * @return mixed|void
      */
     public function preUpdate($session)

src/Chamilo/CoreBundle/Admin/SessionRelCourseAdmin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Admin;
+namespace Chamilo\CoreBundle\Admin;
 
 use Sonata\AdminBundle\Admin\Admin;
 use Sonata\AdminBundle\Form\FormMapper;
@@ -8,13 +8,13 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-use ChamiloLMS\CoreBundle\Entity\CourseRelUser;
+use Chamilo\CoreBundle\Entity\CourseRelUser;
 
 use Knp\Menu\ItemInterface as MenuItemInterface;
 
 /**
  * Class SessionRelCourseAdmin
- * @package ChamiloLMS\CoreBundle\Admin
+ * @package Chamilo\CoreBundle\Admin
  */
 class SessionRelCourseAdmin extends Admin
 {

src/Chamilo/CoreBundle/Block/CourseBlockService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Block;
+namespace Chamilo\CoreBundle\Block;
 
 use Symfony\Component\HttpFoundation\Response;
 
@@ -23,7 +23,7 @@ class CourseBlockService extends BaseBlockService
     public function setDefaultSettings(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
-            'template' => 'ChamiloLMSCoreBundle:Block:course.html.twig',
+            'template' => 'ChamiloCoreBundle:Block:course.html.twig',
             'ttl' => 0
         ));
     }

src/Chamilo/CoreBundle/Block/CourseMenuBlockService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Block;
+namespace Chamilo\CoreBundle\Block;
 
 use Knp\Menu\Provider\MenuProviderInterface;
 use Sonata\BlockBundle\Block\BlockContextInterface;
@@ -8,7 +8,7 @@ use Sonata\BlockBundle\Block\Service\MenuBlockService;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Templating\EngineInterface;
 
-use ChamiloLMS\CoreBundle\Menu\CourseMenuBuilder;
+use Chamilo\CoreBundle\Menu\CourseMenuBuilder;
 
 /**
  * Class CategoriesMenuBlockService

src/Chamilo/CoreBundle/Block/DefaultBreadcrumbBlockService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Block;
+namespace Chamilo\CoreBundle\Block;
 
 use Sonata\BlockBundle\Block\BlockContextInterface;
 use Sonata\SeoBundle\Block\Breadcrumb\BaseBreadcrumbMenuBlockService;
@@ -16,7 +16,7 @@ class DefaultBreadcrumbBlockService extends BaseBreadcrumbMenuBlockService
      */
     public function getName()
     {
-        return 'chamilolms.corebundle.block.breadcrumb';
+        return 'chamilo.corebundle.block.breadcrumb';
     }
 
     /**

src/Chamilo/CoreBundle/Block/MainMenuBlockService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Block;
+namespace Chamilo\CoreBundle\Block;
 
 use Knp\Menu\Provider\MenuProviderInterface;
 use Sonata\BlockBundle\Block\BlockContextInterface;
@@ -9,7 +9,7 @@ use Sonata\ProductBundle\Menu\ProductMenuBuilder;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Templating\EngineInterface;
 
-use ChamiloLMS\CoreBundle\Menu\MainMenuBuilder;
+use Chamilo\CoreBundle\Menu\MainMenuBuilder;
 
 /**
  * Class CategoriesMenuBlockService

src/Chamilo/CoreBundle/ChamiloCoreBundle.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle;
+namespace Chamilo\CoreBundle;
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\EntityListenerPass;
-use ChamiloLMS\CoreBundle\DependencyInjection\Compiler\DoctrineEntityListenerPass;
+use Chamilo\CoreBundle\DependencyInjection\Compiler\DoctrineEntityListenerPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class ChamiloLMSCoreBundle extends Bundle
+class ChamiloCoreBundle extends Bundle
 {
     public function boot()
     {

src/Chamilo/CoreBundle/Command/Translation/ExportLanguagesCommand.php

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Command\Translation;
+namespace Chamilo\CoreBundle\Command\Translation;
 
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
@@ -14,7 +14,7 @@ use Symfony\Component\Console\Input\InputInterface;
 
 /**
  * Class ExportLanguagesCommand
- * @package ChamiloLMS\CoreBundle\Command\Translation
+ * @package Chamilo\CoreBundle\Command\Translation
  */
 class ExportLanguagesCommand extends Command
 {

src/Chamilo/CoreBundle/Component/Auth/Role.php

@@ -1,16 +1,16 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Auth;
+namespace Chamilo\CoreBundle\Component\Auth;
 
 use Symfony\Component\Security\Core\Role\RoleInterface;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Doctrine\Common\Collections\ArrayCollection;
-use ChamiloLMS\CoreBundle\Entity\CourseRelUser;
+use Chamilo\CoreBundle\Entity\CourseRelUser;
 
 /**
  * Class Role
- * @package ChamiloLMS\CoreBundle\Component\Auth
+ * @package Chamilo\CoreBundle\Component\Auth
  */
 class Role implements RoleInterface
 {

src/Chamilo/CoreBundle/Component/Composer/Tasks.php

@@ -1,12 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Composer;
+namespace Chamilo\CoreBundle\Composer;
 
 /**
  * Class Tasks
  * Executes tasks when executing composer update/install methods
- * @package ChamiloLMS\CoreBundle\Composer
+ * @package Chamilo\CoreBundle\Composer
  */
 class Tasks
 {

src/Chamilo/CoreBundle/Component/Console/Output/BufferedOutput.php

@@ -1,14 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Console\Output;
+namespace Chamilo\CoreBundle\Component\Console\Output;
 
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Class BufferedOutput
- * @package ChamiloLMS\CoreBundle\Component\Console\Output
+ * @package Chamilo\CoreBundle\Component\Console\Output
  */
 class BufferedOutput extends Output
 {

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

@@ -1,15 +1,15 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\DataFilesystem;
+namespace Chamilo\CoreBundle\Component\DataFilesystem;
 
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Console;
 use Sunra\PhpSimple\HtmlDomParser;
-use ChamiloLMS\CoreBundle\Component\Editor\Connector;
-use ChamiloLMS\CoreBundle\Component\Editor\Driver\CourseDriver;
+use Chamilo\CoreBundle\Component\Editor\Connector;
+use Chamilo\CoreBundle\Component\Editor\Driver\CourseDriver;
 use Application\Sonata\UserBundle\Entity\User;
 use MediaAlchemyst\Alchemyst;
 use Unoconv\Unoconv;
@@ -19,7 +19,7 @@ use Symfony\Component\Console\Output\OutputInterface;
  * @todo use Gaufrette to manage course files (some day)
  * @todo add security restrictions.
  * Class DataFilesystem
- * @package ChamiloLMS\CoreBundle\Component\DataFilesystem
+ * @package Chamilo\CoreBundle\Component\DataFilesystem
  */
 class DataFilesystem
 {

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

@@ -1,15 +1,15 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor;
 
-use ChamiloLMS\CoreBundle\Component\Editor\Editor;
-use ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+use Chamilo\CoreBundle\Component\Editor\Editor;
+use Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 
 /**
  * Class CkEditor
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor
  */
 class CkEditor extends Editor
 {
@@ -73,7 +73,7 @@ class CkEditor extends Editor
         if (empty($templates)) {
             return null;
         }
-        /** @var \ChamiloLMS\CoreBundle\Entity\SystemTemplate $template */
+        /** @var \Chamilo\CoreBundle\Entity\SystemTemplate $template */
         $templateList = array();
 
         $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
-use ChamiloLMS\CoreBundle\Component\Editor\Toolbar;
+use Chamilo\CoreBundle\Component\Editor\Toolbar;
 
 /**
  * Class Basic
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class Basic extends Toolbar
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Documents.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class Documents
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class Documents extends Basic
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/IntroductionTool.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class IntroductionTool
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class IntroductionTool extends Basic
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/LearningPathDocuments.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class LearningPathDocuments
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class LearningPathDocuments extends Basic
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Message.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class Message
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class Message extends Basic
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswer.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class TestFreeAnswer
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class TestFreeAnswer extends Basic
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestFreeAnswerStrict.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class TestFreeAnswerStrict
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class TestFreeAnswerStrict extends Basic
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestProposedAnswer.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class TestProposedAnswer
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class TestProposedAnswer
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class TestQuestionDescription
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class TestQuestionDescription
 {

src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/UniqueAnswerImage.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * Class UniqueAnswerImage
- * @package ChamiloLMS\CoreBundle\Component\Editor\CkEditor\Toolbar
+ * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class UniqueAnswerImage extends Basic
 {

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

@@ -1,20 +1,20 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor;
+namespace Chamilo\CoreBundle\Component\Editor;
 
 use Doctrine\ORM\EntityManager;
 use Application\Sonata\UserBundle\Entity\User;
-use ChamiloLMS\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Course;
 
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Routing\Router;
-use ChamiloLMS\CoreBundle\Component\Editor\Driver\Driver;
+use Chamilo\CoreBundle\Component\Editor\Driver\Driver;
 use Symfony\Component\Security\Core\SecurityContext;
 
 /**
  * Class elFinder Connector - editor + Chamilo repository
- * @package ChamiloLMS\CoreBundle\Component\Editor
+ * @package Chamilo\CoreBundle\Component\Editor
  */
 class Connector
 {
@@ -168,7 +168,7 @@ class Connector
 
         $driverUpdated = array_merge($defaultDriver, $driver);
 
-        $driverUpdated['driver'] = 'ChamiloLMS\CoreBundle\Component\Editor\Driver\\'.$driver['driver'];
+        $driverUpdated['driver'] = 'Chamilo\CoreBundle\Component\Editor\Driver\\'.$driver['driver'];
         $driverUpdated['attributes'] = $attributes;
         return $driverUpdated;
     }
@@ -380,6 +380,6 @@ class Connector
      */
     private function getDriverClass($driver)
     {
-        return 'ChamiloLMS\CoreBundle\Component\Editor\Driver\\'.$driver;
+        return 'Chamilo\CoreBundle\Component\Editor\Driver\\'.$driver;
     }
 }

src/Chamilo/CoreBundle/Component/Editor/Driver/CourseDriver.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\Driver;
+namespace Chamilo\CoreBundle\Component\Editor\Driver;
 
 /**
  * Class CourseDriver
- * @package ChamiloLMS\CoreBundle\Component\Editor\Driver
+ * @package Chamilo\CoreBundle\Component\Editor\Driver
  */
 class CourseDriver extends Driver
 {

src/Chamilo/CoreBundle/Component/Editor/Driver/CourseUserDriver.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\Driver;
+namespace Chamilo\CoreBundle\Component\Editor\Driver;
 
 /**
  * Class CourseUserDriver
- * @package ChamiloLMS\CoreBundle\Component\Editor\Driver
+ * @package Chamilo\CoreBundle\Component\Editor\Driver
  */
 class CourseUserDriver extends CourseDriver
 {

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

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\Driver;
+namespace Chamilo\CoreBundle\Component\Editor\Driver;
 
-use ChamiloLMS\CoreBundle\Component\Editor\Connector;
+use Chamilo\CoreBundle\Component\Editor\Connector;
 
 /**
  * Class Driver
- * @package ChamiloLMS\CoreBundle\Component\Editor\Driver
+ * @package Chamilo\CoreBundle\Component\Editor\Driver
  */
 class Driver extends \elFinderVolumeLocalFileSystem implements InterfaceDriver
 {

src/Chamilo/CoreBundle/Component/Editor/Driver/DropBoxDriver.php

@@ -1,14 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\Driver;
+namespace Chamilo\CoreBundle\Component\Editor\Driver;
 
-use ChamiloLMS\CoreBundle\Entity\CDropboxFile;
-use ChamiloLMS\CoreBundle\Component\Editor\Connector;
+use Chamilo\CoreBundle\Entity\CDropboxFile;
+use Chamilo\CoreBundle\Component\Editor\Connector;
 
 /**
  * Class DropBoxDriver
- * @package ChamiloLMS\CoreBundle\Component\Editor\Driver
+ * @package Chamilo\CoreBundle\Component\Editor\Driver
  */
 class DropBoxDriver extends \elFinderVolumeMySQL implements InterfaceDriver
 {
@@ -69,8 +69,8 @@ class DropBoxDriver extends \elFinderVolumeMySQL implements InterfaceDriver
     {
         if ($this->connector->security->isGranted('IS_AUTHENTICATED_FULLY')) {
 
-            /** @var \ChamiloLMS\CoreBundle\Entity\Repository\UserRepository $repository */
-            /*$repository = $this->connector->entityManager->getRepository('ChamiloLMS\UserBundle\Entity\User');
+            /** @var \Chamilo\CoreBundle\Entity\Repository\UserRepository $repository */
+            /*$repository = $this->connector->entityManager->getRepository('Chamilo\UserBundle\Entity\User');
             $courses = $repository->getCourses($this->connector->user);*/
 
             //if (!empty($courses)) {
@@ -206,7 +206,7 @@ class DropBoxDriver extends \elFinderVolumeMySQL implements InterfaceDriver
             return $this->returnDirectory();
         }
 
-        $file = $this->connector->entityManager->getRepository('ChamiloLMS\CoreBundle\Entity\CDropboxFile')->findOneBy($criteria);
+        $file = $this->connector->entityManager->getRepository('Chamilo\CoreBundle\Entity\CDropboxFile')->findOneBy($criteria);
 
         if ($file) {
             $stat = $this->transformFileInStat($file);

src/Chamilo/CoreBundle/Component/Editor/Driver/HomeDriver.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\Driver;
+namespace Chamilo\CoreBundle\Component\Editor\Driver;
 
 /**
  * Class HomeDriver
- * @package ChamiloLMS\CoreBundle\Component\Editor\Driver
+ * @package Chamilo\CoreBundle\Component\Editor\Driver
  */
 class HomeDriver extends Driver
 {

src/Chamilo/CoreBundle/Component/Editor/Driver/InterfaceDriver.php

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\Driver;
+namespace Chamilo\CoreBundle\Component\Editor\Driver;
 
-use ChamiloLMS\CoreBundle\Component\Editor\Connector;
+use Chamilo\CoreBundle\Component\Editor\Connector;
 
 /**
  * Class Driver
- * @package ChamiloLMS\CoreBundle\Component\Editor\Driver
+ * @package Chamilo\CoreBundle\Component\Editor\Driver
  */
 interface interfaceDriver
 {

src/Chamilo/CoreBundle/Component/Editor/Driver/PersonalDriver.php

@@ -1,12 +1,12 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\Driver;
+namespace Chamilo\CoreBundle\Component\Editor\Driver;
 
 /**
  * Class PersonalDriver
  * @todo add more checks in upload/rm
- * @package ChamiloLMS\CoreBundle\Component\Editor\Driver
+ * @package Chamilo\CoreBundle\Component\Editor\Driver
  */
 class PersonalDriver extends Driver
 {

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

@@ -1,16 +1,16 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor;
+namespace Chamilo\CoreBundle\Component\Editor;
 
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Routing\RouterInterface;
-use ChamiloLMS\CoreBundle\Entity\Course;
-use ChamiloLMS\CoreBundle\Framework\Template;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Framework\Template;
 
 /**
  * Class Editor
- * @package ChamiloLMS\CoreBundle\Component\Editor
+ * @package Chamilo\CoreBundle\Component\Editor
  */
 class Editor
 {

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

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor;
+namespace Chamilo\CoreBundle\Component\Editor;
 
 /**
  * elFinder - file manager for web.

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

@@ -1,14 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\TinyMce;
+namespace Chamilo\CoreBundle\Component\Editor\TinyMce;
 
-use ChamiloLMS\CoreBundle\Component\Editor\Editor;
-use ChamiloLMS\CoreBundle\Component\Editor\TinyMce\Toolbar;
+use Chamilo\CoreBundle\Component\Editor\Editor;
+use Chamilo\CoreBundle\Component\Editor\TinyMce\Toolbar;
 
 /**
  * Class TinyMce
- * @package ChamiloLMS\CoreBundle\Component\Editor\TinyMce
+ * @package Chamilo\CoreBundle\Component\Editor\TinyMce
  */
 class TinyMce extends Editor
 {

src/Chamilo/CoreBundle/Component/Editor/TinyMce/Toolbar/Basic.php

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor\TinyMce\Toolbar;
+namespace Chamilo\CoreBundle\Component\Editor\TinyMce\Toolbar;
 
-use ChamiloLMS\CoreBundle\Component\Editor\Toolbar;
+use Chamilo\CoreBundle\Component\Editor\Toolbar;
 
 /**
  * Class Basic
- * @package ChamiloLMS\CoreBundle\Component\Editor\TinyMce\Toolbar\Basic
+ * @package Chamilo\CoreBundle\Component\Editor\TinyMce\Toolbar\Basic
  */
 class Basic extends Toolbar
 {

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

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Editor;
+namespace Chamilo\CoreBundle\Component\Editor;
 
 use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Class Toolbar
- * @package ChamiloLMS\CoreBundle\Component\Editor
+ * @package Chamilo\CoreBundle\Component\Editor
  */
 class Toolbar
 {

src/Chamilo/CoreBundle/Component/Mail/MailGenerator.php

@@ -1,11 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Mail;
+namespace Chamilo\CoreBundle\Component\Mail;
 
 /**
  * Class MailGenerator
- * @package ChamiloLMS\CoreBundle\Component\Mail
+ * @package Chamilo\CoreBundle\Component\Mail
  */
 class MailGenerator
 {

src/Chamilo/CoreBundle/Component/Validator/ConstraintValidatorFactory.php

@@ -1,7 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Component\Validator;
+namespace Chamilo\CoreBundle\Component\Validator;
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;

src/Chamilo/CoreBundle/Controller/AccessUrlAdminController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ChamiloLMS\CoreBundle\Controller;
+namespace Chamilo\CoreBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;

src/Chamilo/CoreBundle/Controller/Admin/AdminController.php

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin;
+namespace Chamilo\CoreBundle\Controller\Admin;
 
-use ChamiloLMS\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Controller\BaseController;
 use Symfony\Component\HttpFoundation\Response;
 use Entity;
 use Symfony\Component\Routing\Annotation\Route;
@@ -11,7 +11,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 /**
  * Class Administrator
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class AdminController extends BaseController
@@ -261,7 +261,7 @@ class AdminController extends BaseController
         $admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
 
         return $this->render(
-            'ChamiloLMSCoreBundle:Admin:index.html.twig',
+            'ChamiloCoreBundle:Admin:index.html.twig',
             array(
                 'blocks' => $blocks,
                 'web_admin_ajax_url' => $admin_ajax_url

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

@@ -1,32 +1,32 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\Administrator;
+namespace Chamilo\CoreBundle\Controller\Admin\Administrator;
 
-use ChamiloLMS\CoreBundle\Controller\CrudController;
+use Chamilo\CoreBundle\Controller\CrudController;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
 use Entity;
-use ChamiloLMS\CoreBundle\Form\JuryType;
-use ChamiloLMS\CoreBundle\Form\JuryUserType;
-use ChamiloLMS\CoreBundle\Form\JuryMembersType;
+use Chamilo\CoreBundle\Form\JuryType;
+use Chamilo\CoreBundle\Form\JuryUserType;
+use Chamilo\CoreBundle\Form\JuryMembersType;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use ChamiloLMS\CoreBundle\Entity\JuryMembers;
-use ChamiloLMS\CoreBundle\Entity\Jury;
+use Chamilo\CoreBundle\Entity\JuryMembers;
+use Chamilo\CoreBundle\Entity\Jury;
 
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 /**
  * Class JuryController
- * @package ChamiloLMS\CoreBundle\Controller\Admin\Administrator
+ * @package Chamilo\CoreBundle\Controller\Admin\Administrator
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class JuryController
 {
     public function getClass()
     {
-        return 'ChamiloLMS\CoreBundle\Entity\Jury';
+        return 'Chamilo\CoreBundle\Entity\Jury';
     }
 
     public function getControllerAlias()
@@ -39,7 +39,7 @@ class JuryController
      */
     public function getType()
     {
-        return 'ChamiloLMS\CoreBundle\Form\JuryType';
+        return 'Chamilo\CoreBundle\Form\JuryType';
     }
 
     /**
@@ -73,7 +73,7 @@ class JuryController
     */
     public function removeMemberAction($id)
     {
-        $juryMembers = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\JuryMembers')->find($id);
+        $juryMembers = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\JuryMembers')->find($id);
         if ($juryMembers) {
             $em = $this->getManager();
             $em->remove($juryMembers);
@@ -95,7 +95,7 @@ class JuryController
         $keyword = $request->get('tag');
 
         $role = $request->get('role');
-        /** @var \ChamiloLMS\CoreBundle\Entity\Repository\UserRepository $repo */
+        /** @var \Chamilo\CoreBundle\Entity\Repository\UserRepository $repo */
         $repo = $this->getManager()->getRepository('Application\Sonata\UserBundle\Entity\User');
 
         if (empty($role)) {
@@ -106,7 +106,7 @@ class JuryController
 
         $data = array();
         if ($entities) {
-            /** @var \ChamiloLMS\UserBundle\Entity\User $entity */
+            /** @var \Chamilo\UserBundle\Entity\User $entity */
             foreach ($entities as $entity) {
                 $data[] = array(
                     'key' => (string) $entity->getUserId(),
@@ -136,7 +136,7 @@ class JuryController
 
                 $userIdList = $item->getUserId();
                 $userId = ($userIdList[0]);
-                $user = $this->getManager()->getRepository('ChamiloLMS\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/Admin/Administrator/QuestionScoreController.php

@@ -1,17 +1,17 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\Administrator;
+namespace Chamilo\CoreBundle\Controller\Admin\Administrator;
 
-use ChamiloLMS\CoreBundle\Controller\CrudController;
+use Chamilo\CoreBundle\Controller\CrudController;
 use Symfony\Component\HttpFoundation\Response;
-use ChamiloLMS\CoreBundle\Entity;
+use Chamilo\CoreBundle\Entity;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 /**
  * Class QuestionScoreController
- * @package ChamiloLMS\CoreBundle\Controller\Admin\Administrator
+ * @package Chamilo\CoreBundle\Controller\Admin\Administrator
  * @author Julio Montoya <gugli100@gmail.com>
  * @Route("/question_score")
  */
@@ -28,12 +28,12 @@ class QuestionScoreController
     }
     public function getClass()
     {
-        return 'ChamiloLMS\CoreBundle\Entity\BranchSync';
+        return 'Chamilo\CoreBundle\Entity\BranchSync';
     }
 
     public function getType()
     {
-        return 'ChamiloLMS\CoreBundle\Form\QuestionScoreType';
+        return 'Chamilo\CoreBundle\Form\QuestionScoreType';
     }
 
     /**

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

@@ -1,16 +1,16 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\Administrator;
+namespace Chamilo\CoreBundle\Controller\Admin\Administrator;
 
-use ChamiloLMS\CoreBundle\Controller\CrudController;
-use ChamiloLMS\CoreBundle\Entity;
+use Chamilo\CoreBundle\Controller\CrudController;
+use Chamilo\CoreBundle\Entity;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 /**
  * Class QuestionScoreController
- * @package ChamiloLMS\CoreBundle\Controller\Admin\Administrator
+ * @package Chamilo\CoreBundle\Controller\Admin\Administrator
  * @author Julio Montoya <gugli100@gmail.com>
  */
 
@@ -18,12 +18,12 @@ class QuestionScoreNameController
 {
     public function getClass()
     {
-        return 'ChamiloLMS\CoreBundle\Entity\QuestionScoreName';
+        return 'Chamilo\CoreBundle\Entity\QuestionScoreName';
     }
 
     public function getType()
     {
-        return 'ChamiloLMS\CoreBundle\Form\QuestionScoreNameType';
+        return 'Chamilo\CoreBundle\Form\QuestionScoreNameType';
     }
 
     public function getControllerAlias()

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

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\Administrator;
+namespace Chamilo\CoreBundle\Controller\Admin\Administrator;
 
-use ChamiloLMS\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Controller\BaseController;
 use Silex\Application;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
-use ChamiloLMS\CoreBundle\Component\Console\Output\BufferedOutput;
+use Chamilo\CoreBundle\Component\Console\Output\BufferedOutput;
 use Symfony\Component\HttpFoundation\Response;
 use Entity;
 use Symfony\Component\Routing\Annotation\Route;
@@ -17,7 +17,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 /**
  * Class RoleController
  * @todo @route and @method function don't work yet
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class UpgradeController extends BaseController

src/Chamilo/CoreBundle/Controller/Admin/Director/BranchDirectorController.php

@@ -1,16 +1,16 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\Director;
-
-use ChamiloLMS\CoreBundle\Controller\CrudController;
-use ChamiloLMS\CoreBundle\Form\DirectorJuryUserType;
-use ChamiloLMS\CoreBundle\Form\JuryType;
-use ChamiloLMS\CoreBundle\Entity;
-use ChamiloLMS\CoreBundle\Entity\BranchSync;
-use ChamiloLMS\CoreBundle\Entity\Jury;
-use ChamiloLMS\CoreBundle\Entity\JuryMembers;
-use ChamiloLMS\UserBundle\Entity\User;
+namespace Chamilo\CoreBundle\Controller\Admin\Director;
+
+use Chamilo\CoreBundle\Controller\CrudController;
+use Chamilo\CoreBundle\Form\DirectorJuryUserType;
+use Chamilo\CoreBundle\Form\JuryType;
+use Chamilo\CoreBundle\Entity;
+use Chamilo\CoreBundle\Entity\BranchSync;
+use Chamilo\CoreBundle\Entity\Jury;
+use Chamilo\CoreBundle\Entity\JuryMembers;
+use Chamilo\UserBundle\Entity\User;
 use Symfony\Component\HttpFoundation\Response;
 
 use Symfony\Component\Routing\Annotation\Route;
@@ -18,19 +18,19 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 /**
  * Class RoleController
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class BranchDirectorController
 {
     public function getClass()
     {
-        return 'ChamiloLMS\CoreBundle\Entity\BranchSync';
+        return 'Chamilo\CoreBundle\Entity\BranchSync';
     }
 
     public function getType()
     {
-        return 'ChamiloLMS\CoreBundle\Form\DirectorJuryUserType';
+        return 'Chamilo\CoreBundle\Form\DirectorJuryUserType';
     }
 
     public function getControllerAlias()
@@ -62,7 +62,7 @@ class BranchDirectorController
             'childClose' => '</li>',
             'nodeDecorator' => function ($row) {
                 /**  @var BranchSync $branch */
-                $branch = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\BranchSync')->find($row['id']);
+                $branch = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\BranchSync')->find($row['id']);
                 $juries = $branch->getJuries();
                 /** @var Jury $jury */
                 $juryList = null;
@@ -92,7 +92,7 @@ class BranchDirectorController
         $query = $this->getManager()
             ->createQueryBuilder()
             ->select('node')
-            ->from('ChamiloLMS\CoreBundle\Entity\BranchSync', 'node')
+            ->from('Chamilo\CoreBundle\Entity\BranchSync', 'node')
             ->innerJoin('node.users', 'u')
             ->where('u.userId = :userId')
             ->setParameter('userId', $userId)
@@ -162,7 +162,7 @@ class BranchDirectorController
         $form->handleRequest($request);
         if ($form->isValid()) {
 
-            $jury = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\Jury')->find($juryId);
+            $jury = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\Jury')->find($juryId);
 
             $factory = $this->get('security.encoder_factory');
             $encoder = $factory->getEncoder($user);

src/Chamilo/CoreBundle/Controller/Admin/JuryMember/JuryMemberController.php

@@ -1,14 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\JuryMember;
-
-use ChamiloLMS\CoreBundle\Controller\CrudController;
-use ChamiloLMS\CoreBundle\Entity\TrackExercise;
-use ChamiloLMS\CoreBundle\Entity\Jury;
-use ChamiloLMS\CoreBundle\Entity\TrackAttemptJury;
-use ChamiloLMS\CoreBundle\Entity\JuryMembers;
-use ChamiloLMS\CoreBundle\Entity;
+namespace Chamilo\CoreBundle\Controller\Admin\JuryMember;
+
+use Chamilo\CoreBundle\Controller\CrudController;
+use Chamilo\CoreBundle\Entity\TrackExercise;
+use Chamilo\CoreBundle\Entity\Jury;
+use Chamilo\CoreBundle\Entity\TrackAttemptJury;
+use Chamilo\CoreBundle\Entity\JuryMembers;
+use Chamilo\CoreBundle\Entity;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
 use Doctrine\Common\Collections\Criteria;
@@ -17,7 +17,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 /**
  * Class JuryMemberController
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class JuryMemberController
@@ -26,7 +26,7 @@ class JuryMemberController
 
     public function getClass()
     {
-        return 'ChamiloLMS\CoreBundle\Entity\Jury';
+        return 'Chamilo\CoreBundle\Entity\Jury';
     }
 
     public function getControllerAlias()
@@ -48,7 +48,7 @@ class JuryMemberController
      */
     public function getType()
     {
-        return 'ChamiloLMS\CoreBundle\Form\JuryType';
+        return 'Chamilo\CoreBundle\Form\JuryType';
     }
 
     /**
@@ -147,7 +147,7 @@ class JuryMemberController
             $this->createNotFoundException();
         }
 
-        /** @var \ChamiloLMS\CoreBundle\Entity\Jury $jury */
+        /** @var \Chamilo\CoreBundle\Entity\Jury $jury */
         $jury = $this->getRepository()->find($juryId);
 
         if (empty($jury)) {
@@ -190,7 +190,7 @@ class JuryMemberController
         if ($security->isGranted('ROLE_JURY_PRESIDENT')) {
             // Relating user with president
             if ($member) {
-                $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\JuryMembers')->assignUserToJuryMember(
+                $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\JuryMembers')->assignUserToJuryMember(
                     $trackExercise['exe_user_id'],
                     $member->getId()
                 );
@@ -204,7 +204,7 @@ class JuryMemberController
             'juryUserId' => $userId
         );
 
-        $trackJury = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\TrackAttemptJury')->findBy($criteria);
+        $trackJury = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\TrackAttemptJury')->findBy($criteria);
 
         if ($trackJury) {
             $this->get('session')->getFlashBag()->add('info', "You already review this exercise attempt.");
@@ -232,11 +232,11 @@ class JuryMemberController
         $options = array();
 
         if ($modelType) {
-            /** @var \ChamiloLMS\CoreBundle\Entity\QuestionScore $questionScoreName */
-            $questionScore = $this->get('orm.em')->getRepository('ChamiloLMS\CoreBundle\Entity\QuestionScore')->find($modelType);
+            /** @var \Chamilo\CoreBundle\Entity\QuestionScore $questionScoreName */
+            $questionScore = $this->get('orm.em')->getRepository('Chamilo\CoreBundle\Entity\QuestionScore')->find($modelType);
             if ($questionScore) {
                 $items = $questionScore->getItems();
-                /** @var \ChamiloLMS\CoreBundle\Entity\QuestionScoreName  $score */
+                /** @var \Chamilo\CoreBundle\Entity\QuestionScoreName  $score */
                 foreach ($items as $score) {
                     $options[$score->getId().':'.$score->getScore()] = $score;
                 }
@@ -349,8 +349,8 @@ class JuryMemberController
     public function saveScoreAction($exeId, $juryId)
     {
         $questionsAndScore = $this->getRequest()->get('options');
-        /** @var \ChamiloLMS\CoreBundle\Entity\TrackExercise $attempt */
-        $attempt = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\TrackExercise')->find($exeId);
+        /** @var \Chamilo\CoreBundle\Entity\TrackExercise $attempt */
+        $attempt = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\TrackExercise')->find($exeId);
 
         $totalScore = 0;
 
@@ -372,7 +372,7 @@ class JuryMemberController
 
                     $totalScore += $score;
 
-                    $obj = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\TrackAttemptJury')->findOneBy($criteria);
+                    $obj = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\TrackAttemptJury')->findOneBy($criteria);
                     if ($obj) {
                         $obj->setQuestionScoreNameId($questionScoreNameId);
                         $obj->setScore($score);

src/Chamilo/CoreBundle/Controller/Admin/JuryPresident/JuryPresidentController.php

@@ -1,15 +1,15 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\JuryPresident;
+namespace Chamilo\CoreBundle\Controller\Admin\JuryPresident;
 
-use ChamiloLMS\CoreBundle\Controller\CrudController;
-use ChamiloLMS\CoreBundle\Form\JuryType;
-use ChamiloLMS\CoreBundle\Form\JuryUserType;
-use ChamiloLMS\CoreBundle\Entity\Jury;
-use ChamiloLMS\CoreBundle\Entity\JuryMembers;
-use ChamiloLMS\CoreBundle\Entity\TrackAttemptJury;
-use ChamiloLMS\CoreBundle\Entity\TrackExercise;
+use Chamilo\CoreBundle\Controller\CrudController;
+use Chamilo\CoreBundle\Form\JuryType;
+use Chamilo\CoreBundle\Form\JuryUserType;
+use Chamilo\CoreBundle\Entity\Jury;
+use Chamilo\CoreBundle\Entity\JuryMembers;
+use Chamilo\CoreBundle\Entity\TrackAttemptJury;
+use Chamilo\CoreBundle\Entity\TrackExercise;
 
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
@@ -23,7 +23,7 @@ use Whoops\Example\Exception;
 /**
  * Class RoleController
  * @todo @route and @method function don't work yet
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class JuryPresidentController
@@ -32,12 +32,12 @@ class JuryPresidentController
 
     public function getClass()
     {
-        return 'ChamiloLMS\CoreBundle\Entity\BranchSync';
+        return 'Chamilo\CoreBundle\Entity\BranchSync';
     }
 
     public function getType()
     {
-        return 'ChamiloLMS\CoreBundle\Form\JuryType';
+        return 'Chamilo\CoreBundle\Form\JuryType';
     }
 
     public function getControllerAlias()
@@ -138,7 +138,7 @@ class JuryPresidentController
     */
     public function assignUserToJuryMemberAction($userId, $juryMemberId)
     {
-        return $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\JuryMembers')->assignUserToJuryMember($userId, $juryMemberId);
+        return $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\JuryMembers')->assignUserToJuryMember($userId, $juryMemberId);
     }
 
     /**
@@ -147,7 +147,7 @@ class JuryPresidentController
     */
     public function removeUserToJuryMemberAction($userId, $juryMemberId)
     {
-        return $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\JuryMembers')->removeUserToJuryMember($userId, $juryMemberId);
+        return $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\JuryMembers')->removeUserToJuryMember($userId, $juryMemberId);
     }
 
     /**
@@ -205,7 +205,7 @@ class JuryPresidentController
                 $randomMembers = array_rand($members, $maxCount);
                 foreach ($randomMembers as $randomMember) {
                     $member = $members[$randomMember];
-                    $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\JuryMembers')->assignUserToJuryMember($userId, $member->getId());
+                    $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\JuryMembers')->assignUserToJuryMember($userId, $member->getId());
                 }
             }
             $this->get('session')->getFlashBag()->add('success', "Los usuarios fueron asignados al azar");

src/Chamilo/CoreBundle/Controller/Admin/QuestionManager/QuestionManagerController.php

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\Admin\QuestionManager;
+namespace Chamilo\CoreBundle\Controller\Admin\QuestionManager;
 
-use ChamiloLMS\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Controller\BaseController;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -12,7 +12,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 /**
  * Class QuestionManagerController
  * @todo reduce controller size
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class QuestionManagerController extends BaseController
@@ -98,7 +98,7 @@ class QuestionManagerController extends BaseController
     public function getCategoriesAction($id)
     {
         // Getting CQuizCategory repo.
-        $repo = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\CQuizCategory');
+        $repo = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\CQuizCategory');
 
         $options  = array(
             'decorate'      => true,
@@ -143,9 +143,9 @@ class QuestionManagerController extends BaseController
         // Getting CQuizCategory repo.
         /** @var \Doctrine\ORM\EntityManager $em */
         $em   = $this->getManager();
-        $repo = $em->getRepository('ChamiloLMS\CoreBundle\Entity\CQuizCategory');
+        $repo = $em->getRepository('Chamilo\CoreBundle\Entity\CQuizCategory');
 
-        /** @var \ChamiloLMS\CoreBundle\Entity\CQuizCategory $category */
+        /** @var \Chamilo\CoreBundle\Entity\CQuizCategory $category */
         $category = $repo->find($categoryId);
 
         $questionColumns = \Question::getQuestionColumns();
@@ -219,7 +219,7 @@ class QuestionManagerController extends BaseController
         // Getting CQuizCategory repo.
         /** @var \Gedmo\Tree\Entity\Repository\NestedTreeRepository $repo */
 
-        $repo = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\CQuizCategory');
+        $repo = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\CQuizCategory');
         $categoryId = $this->getRequest()->get('categoryId');
         $subtree = null;
 
@@ -271,7 +271,7 @@ class QuestionManagerController extends BaseController
 
         $qb = $this->getManager()->createQueryBuilder()
             ->select('node')
-            ->from('ChamiloLMS\CoreBundle\Entity\CQuizCategory', 'node')
+            ->from('Chamilo\CoreBundle\Entity\CQuizCategory', 'node')
             ->where('node.cId <> 0 AND node.lvl = 0')
             ->orderBy('node.root, node.lft', 'ASC');
 
@@ -286,7 +286,7 @@ class QuestionManagerController extends BaseController
         $query = $this->getManager()
             ->createQueryBuilder()
             ->select('node')
-            ->from('ChamiloLMS\CoreBundle\Entity\CQuizCategory', 'node')
+            ->from('Chamilo\CoreBundle\Entity\CQuizCategory', 'node')
             ->where('node.cId = 0 AND node.lvl = 0')
             ->orderBy('node.root, node.lft', 'ASC')
             ->getQuery();
@@ -395,7 +395,7 @@ class QuestionManagerController extends BaseController
      */
     public function deleteCategoryAction($id)
     {
-        $repo = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\CQuizCategory');
+        $repo = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\CQuizCategory');
         $category = $repo->find($id);
         if (empty($category)) {
             $this->abort(404);

src/Chamilo/CoreBundle/Controller/App/Certificate/CertificateController.php

@@ -1,15 +1,15 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\App\Certificate;
+namespace Chamilo\CoreBundle\Controller\App\Certificate;
 
-use ChamiloLMS\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Controller\BaseController;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Class CertificateController
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class CertificateController extends BaseController

src/Chamilo/CoreBundle/Controller/App/Editor/EditorController.php

@@ -1,20 +1,20 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\App\Editor;
+namespace Chamilo\CoreBundle\Controller\App\Editor;
 
-use ChamiloLMS\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Controller\BaseController;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
-use ChamiloLMS\CoreBundle\Component\Editor\Connector;
-use ChamiloLMS\CoreBundle\Component\Editor\Finder;
+use Chamilo\CoreBundle\Component\Editor\Connector;
+use Chamilo\CoreBundle\Component\Editor\Finder;
 
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use ChamiloLMS\CoreBundle\Component\Editor\Driver\elFinderVolumePersonalDriver;
+use Chamilo\CoreBundle\Component\Editor\Driver\elFinderVolumePersonalDriver;
 
 /**
- * @package ChamiloLMS.Controller
+ * @package Chamilo.Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class EditorController extends BaseController
@@ -48,7 +48,7 @@ class EditorController extends BaseController
      */
     public function getTemplatesAction()
     {
-        $templates = $this->getManager()->getRepository('ChamiloLMS\CoreBundle\Entity\SystemTemplate')->findAll();
+        $templates = $this->getManager()->getRepository('Chamilo\CoreBundle\Entity\SystemTemplate')->findAll();
         $templates = $this->getHtmlEditor()->formatTemplates($templates);
         $this->getTemplate()->assign('templates', $templates);
         $response = $this->getTemplate()->renderTemplate('javascript/editor/ckeditor/templates.tpl');

src/Chamilo/CoreBundle/Controller/App/ModelAjax/ModelAjaxController.php

@@ -1,14 +1,14 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\App\ModelAjax;
+namespace Chamilo\CoreBundle\Controller\App\ModelAjax;
 
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Class ModelAjaxController should replace the model.ajax.php file
- * @package ChamiloLMS\CoreBundle\Controller
+ * @package Chamilo\CoreBundle\Controller
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class ModelAjaxController

src/Chamilo/CoreBundle/Controller/App/News/NewsController.php

@@ -1,9 +1,9 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-namespace ChamiloLMS\CoreBundle\Controller\App\News;
+namespace Chamilo\CoreBundle\Controller\App\News;
 
-use ChamiloLMS\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Controller\BaseController;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -12,7 +12,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 /**
  * Class NewsController
- * @package ChamiloLMS\CoreBundle\Controller\App\News
+ * @package Chamilo\CoreBundle\Controller\App\News
  * @author Julio Montoya <gugli100@gmail.com>
  */
 class NewsController extends BaseController