Fixing PHP warnings.

app/.htaccess

@@ -0,0 +1 @@
+deny from all

composer.json

@@ -62,7 +62,8 @@
         "jbroadway/urlify": "1.0.0-stable",
         "chamilo/chash": "dev-master",
         "doctrine/migrations": "dev-master",
-        "composer/composer": "1.0.*@dev"
+        "composer/composer": "1.0.*@dev",
+        "sonata-project/media-bundle": "~2.2"
     },
     "scripts": {
         "post-install-cmd": [
@@ -87,7 +88,7 @@
         "symfony-app-dir": "app",
         "symfony-web-dir": "web",
         "incenteev-parameters": {
-            "file": "app/config/parameters.yml"
+            "file": "config/configuration.php"
         },
         "branch-alias": {
             "dev-master": "2.4-dev"

main/admin/change_user_session.php

@@ -77,7 +77,5 @@ $(document).ready(function() {
 
 </script>';
 
-$tpl = $app['template'];
-$tpl->assign('message', $message);
-$tpl->assign('content', $content);
-$tpl->display_one_col_template();
+echo $message;
+echo $content;

main/admin/class_list.php

@@ -123,9 +123,8 @@ $actions .= Display::url(Display::return_icon('add.png', get_lang('Add'), array(
 $actions .= Display::url(Display::return_icon('import_csv.png', get_lang('AddUsersToAClass'), array(), ICON_SIZE_MEDIUM), 'class_user_import.php');
 $actions .= Display::url(Display::return_icon('import_csv.png', get_lang('ImportClassListCSV'), array(), ICON_SIZE_MEDIUM), 'class_import.php');
 
-$app['title'] = $tool_name;
-$tpl = $app['template'];
-$tpl->assign('content', $content);
-$tpl->assign('actions', $actions);
-$tpl->assign('message', $message);
-$tpl->display_one_col_template();
+//$app['title'] = $tool_name;
+
+echo $message;
+echo $actions;
+echo $content;

main/admin/event_controller.php

@@ -94,9 +94,7 @@ $(function() {
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Events'));
 
-$app['title'] = $tool_name;
-$tpl = $app['template'];
-$tpl->assign('actions', $actions);
-$tpl->assign('message', $message);
-$tpl->assign('content', $content);
-$tpl->display_one_col_template();
+//$app['title'] = $tool_name;
+echo $message;
+echo $actions;
+echo $content;

main/admin/user_list.php

@@ -350,7 +350,7 @@ function email_filter($email) {
  * @return string Some HTML-code with modify-buttons
  */
 function modify_filter($user_id, $url_params, $row) {
-	global $_admins_list, $delete_user_available, $app;
+	global $_admins_list, $delete_user_available;
     $is_admin = false;
 
     $userId = api_get_user_id();

main/auth/inscription.php

@@ -451,8 +451,14 @@ if ($form->validate()) {
     $user = Database::getManager()->getRepository('ChamiloLMSCoreBundle:User')->find($user_id);
 
     // Here, "secured" is the name of the firewall in your security.yml
-    $token = new UsernamePasswordToken($user, $user->getPassword(), 'secured', $user->getRoles());
-    $app['security']->setToken($token);
+    $token = new UsernamePasswordToken(
+        $user,
+        $user->getPassword(),
+        'secured',
+        $user->getRoles()
+    );
+
+    Security::getSecurity()->setToken($token);
     $request = $app['request'];
 
     // Fire the login event

main/inc/lib/extra_field_value.lib.php

@@ -261,7 +261,6 @@ class ExtraFieldValue extends Model
             // Insert
             if (empty($field_values)) {
                 if ($extra_field_info['field_loggeable'] == 1) {
-                    global $app;
                     switch($this->type) {
                         case 'question':
                             $extraFieldValue = new QuestionFieldValues();
@@ -320,7 +319,6 @@ class ExtraFieldValue extends Model
             } else {
                 // Update
                 if ($extra_field_info['field_loggeable'] == 1) {
-                    global $app;
                     switch($this->type) {
                         case 'question':
                             $extraFieldValue = Database::getManager()->getRepository('ChamiloLMSCoreBundle:QuestionFieldValues')->find($field_values['id']);

src/ChamiloLMS/CoreBundle/Block/CourseBlockService.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace ChamiloLMS\CoreBundle\Block;
 
 use Symfony\Component\HttpFoundation\Response;

src/ChamiloLMS/CoreBundle/Controller/LegacyController.php

@@ -75,7 +75,6 @@ class LegacyController extends BaseController
             require_once $fileToLoad;
             $out = ob_get_contents();
             ob_end_clean();
-
             // No browser cache when executing an exercise.
             if ($name == 'exercice/exercise_submit.php') {
                 $responseHeaders = array(

web/ChamiloLMS/css/themes/chamilo/default.css

@@ -152,7 +152,7 @@ footer {
 .portal {
     background-image:url(images/portal.png);
 }
-
+/*
 .sidebar {
     background-color: #F5F5F5;
     border-right: 1px solid #EEEEEE;
@@ -166,3 +166,4 @@ footer {
     top: 51px;
     z-index: 1000;
 }
+*/

web/app.php

@@ -17,6 +17,7 @@ $apcLoader->register(true);
 require_once __DIR__.'/../app/AppKernel.php';
 //require_once __DIR__.'/../app/AppCache.php';
 
+// Chamilo legacy code.
 require_once __DIR__.'/legacy.php';
 
 $kernel = new AppKernel('prod', true);