Fixing welcome to course

main/inc/global.inc.php

@@ -188,7 +188,7 @@ $app->register(new DoctrineOrmServiceProvider, array(
             array(
                 "type" => "annotation",
                 "namespace" => "Entity",
-                "path" => api_get_path(INCLUDE_PATH).'',
+                "path" => api_get_path(INCLUDE_PATH).'Entity',
             )
             // Using PSR-0 namespaceish embedded resources
             // (requires registering a PSR-0 Resource Locator
@@ -259,6 +259,7 @@ $app->error(function (\Exception $e, $code) use ($app) {
     if ($app['debug']) {
         //return;
     }
+    if (isset($code)) {
         switch ($code) {
              case 404:
                 $message = 'The requested page could not be found.';
@@ -267,8 +268,12 @@ $app->error(function (\Exception $e, $code) use ($app) {
                 //$message = 'We are sorry, but something went terribly wrong.';
                 $message = $e->getMessage();
         }
+    } else {
+        $code = null;
+        $message = null;
+    }
     //$code = ($e instanceof HttpException) ? $e->getStatusCode() : 500;
-    $app['template']->assign('code', $code);
+    $app['template']->assign('error_code', $code);
     $app['template']->assign('error_message', $message);
     $response = $app['template']->render_layout('error.tpl');
     return new Response($response);

main/inc/lib/page.lib.php

@@ -885,7 +885,6 @@ class PageController {
      */
     static function return_welcome_to_course_block($tpl) {
         $count_courses = CourseManager::count_courses();
-        $tpl = $tpl->get_template('layout/welcome_to_course.tpl');
 
         $course_catalog_url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
         $course_list_url = api_get_path(WEB_PATH).'user_portal.php';
@@ -895,8 +894,7 @@ class PageController {
         $tpl->assign('course_catalog_link', Display::url(get_lang('here'), $course_catalog_url));
         $tpl->assign('course_list_link', Display::url(get_lang('here'), $course_list_url));
         $tpl->assign('count_courses', $count_courses);
-
+        $tpl->assign('welcome_to_course_block', 1);
-        return $tpl->fetch($tpl);
     }
 
     /*function run() {

main/template/default/layout/error.tpl

@@ -1,7 +1,7 @@
 {% extends 'default/layout/layout_1_col.tpl' %}
 
 {% block content %}
-    {{ code }}
+    {{ error_code }}
     {{ error_message }}
 
 {% endblock %}

main/template/default/layout/layout_2_col.tpl

@@ -86,7 +86,7 @@
         {#  Welcome to course block  #}
         {% if welcome_to_course_block %}      
             <section id="welcome_to_course">
-            {{ welcome_to_course_block }}
+            {% include "default/layout/welcome_to_course.tpl" %}
             </section>
         {% endif %}
 

user_portal.php

@@ -153,7 +153,7 @@ class UserPortalController
 
         //Show the chamilo mascot
         if (empty($courses_and_sessions) && !isset($_GET['history'])) {
-            $app['template']->assign('welcome_to_course_block', self::return_welcome_to_course_block($app));
+            PageController::return_welcome_to_course_block($app['template']);
         }
 
         $app['template']->assign('content', $courses_and_sessions);
@@ -199,22 +199,6 @@ class UserPortalController
         return new Response($response, 200, array());
     }
 
-    function return_welcome_to_course_block(Application $app) {
-        $count_courses = CourseManager::count_courses();
-        $tpl = $app['template']->get_template('layout/welcome_to_course.tpl');
-
-        $course_catalog_url = api_get_path(WEB_CODE_PATH).'auth/courses.php';
-        $course_list_url = api_get_path(WEB_PATH).'user_portal.php';
-
-        $app['template']->assign('course_catalog_url', $course_catalog_url);
-        $app['template']->assign('course_list_url', $course_list_url);
-        $app['template']->assign('course_catalog_link', Display::url(get_lang('here'), $course_catalog_url));
-        $app['template']->assign('course_list_link', Display::url(get_lang('here'), $course_list_url));
-        $app['template']->assign('count_courses', $count_courses);
-
-        return $app['template']->fetch($tpl);
-    }
-
 
     function check_last_login() {
         /**