chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Now, index.php and userportal.php are using the smarty template

Browse Source
skala
Julio Montoya 14 years ago
parent 13317a6d98
commit c4944b6ccb
8 changed files with 154 additions and 287 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 57
      index-smarty.php
  2. 121
      index.php
  3. 10
      main/inc/lib/template.lib.php
  4. 41
      main/inc/lib/userportal.lib.php
  5. 4
      main/template/default/layout/layout_2_col.tpl
  6. 12
      main/template/default/layout/login_form.tpl
  7. 61
      user_portal.php
  8. 53
      userportal-smarty.php

57
index-smarty.php
Unescape View File

@ -1,57 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.main
*/
define('CHAMILO_HOMEPAGE', true);
$language_file = array('courses', 'index');
/* Flag forcing the 'current course' reset, as we're not inside a course anymore. */
// Maybe we should change this into an api function? an example: Coursemanager::unset();
$cidReset = true;
require_once 'main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'userportal.lib.php';
// The section (for the tabs).
$this_section = SECTION_CAMPUS;
$header_title = null;
if (!api_is_anonymous()) {
$header_title = " ";
}
$htmlHeadXtra[] = api_get_jquery_libraries_js(array('bxslider'));
$htmlHeadXtra[] ='
<script type="text/javascript">
$(document).ready(function(){
$("#slider").bxSlider({
infiniteLoop : true,
auto : true,
pager : true,
autoHover : true,
pause : 10000
});
});
</script>';
$index = new IndexManager($header_title);
$tpl = $index->tpl->get_template('layout/layout_2_col.tpl');
//@todo move this inside the IndexManager
$index->tpl->assign('login_block', $index->set_login_form());
$index->tpl->assign('announcements_block', $index->return_announcements());
$index->tpl->assign('teacher_block', $index->return_teacher_link());
$index->tpl->assign('home_page_block', $index->return_home_page());
$index->tpl->assign('profile_block', $index->return_profile_block());
$index->tpl->assign('notice_block', $index->return_notice());
$index->tpl->assign('plugin_campushomepage', $index->return_plugin_campushomepage());
$index->tpl->display($tpl);

121
index.php
Unescape View File

@ -3,14 +3,8 @@
/** /**
* @package chamilo.main * @package chamilo.main
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Refactoring
* @todo check the different @todos in this page and really do them
* @todo check if the news management works as expected
*/ */
// Only this script should have this constant defined. This is used to activate the javascript that
// gives the login name automatic focus in header.inc.html.
/** @todo Couldn't this be done using the $HtmlHeadXtra array? */
define('CHAMILO_HOMEPAGE', true); define('CHAMILO_HOMEPAGE', true);
$language_file = array('courses', 'index'); $language_file = array('courses', 'index');
@ -19,38 +13,54 @@ $language_file = array('courses', 'index');
// Maybe we should change this into an api function? an example: Coursemanager::unset(); // Maybe we should change this into an api function? an example: Coursemanager::unset();
$cidReset = true; $cidReset = true;
/* Included libraries */
/** @todo Make all the library files consistent, use filename.lib.php and not filename.lib.inc.php. */
require_once 'main/inc/global.inc.php'; require_once 'main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'userportal.lib.php'; require_once api_get_path(LIBRARY_PATH).'userportal.lib.php';
require_once 'main/chat/chat_functions.lib.php'; require_once 'main/chat/chat_functions.lib.php';
$loginFailed = isset($_GET['loginFailed']) ? true : isset($loginFailed);
$setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 'true';
// The section (for the tabs). // The section (for the tabs).
$this_section = SECTION_CAMPUS; $this_section = SECTION_CAMPUS;
unset($_SESSION['this_section']);//for hmtl editor repository
$header_title = null; $header_title = null;
if (!api_is_anonymous()) { if (!api_is_anonymous()) {
$header_title = " "; $header_title = " ";
} }
$index = new IndexManager($header_title, false); $htmlHeadXtra[] = api_get_jquery_libraries_js(array('bxslider'));
$htmlHeadXtra[] ='
<script type="text/javascript">
$(document).ready(function(){
$("#slider").bxSlider({
infiniteLoop : true,
auto : true,
pager : true,
autoHover : true,
pause : 10000
});
});
</script>';
//@todo add this in the template
/* Action Handling */ //check if javascript is enabled
echo '<noscript>';
echo Display::display_error_message(get_lang("NoJavascript"));
echo '</noscript>';
/** @todo Wouldn't it make more sense if this would be done in local.inc.php so that local.inc.php become the only place where authentication is done? //check if cookies are enabled
* by doing this you could logout from any page instead of only from index.php. From the moment there is a logout=true in the url you will be logged out ?>
* this can be usefull when you are on an open course and you need to log in to edit something and you immediately want to check how anonymous users <script language="JavaScript">
* will see it. if(navigator.cookieEnabled==false){
*/ document.writeln('<?php Display::display_error_message(get_lang("NoCookies")); ?>');
$my_user_id = api_get_user_id(); }
</script>
<?php
$index = new IndexManager($header_title);
//Actions
$loginFailed = isset($_GET['loginFailed']) ? true : isset($loginFailed);
$setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 'true';
if (!empty($_GET['logout'])) { if (!empty($_GET['logout'])) {
$index->logout(); $index->logout();
@ -58,7 +68,6 @@ if (!empty($_GET['logout'])) {
/* Table definitions */ /* Table definitions */
/* Constants and CONFIGURATION parameters */ /* Constants and CONFIGURATION parameters */
/** @todo these configuration settings should move to the Chamilo config settings. */ /** @todo these configuration settings should move to the Chamilo config settings. */
@ -122,41 +131,9 @@ if (!empty($_POST['submitAuth'])) {
event_open(); event_open();
} }
$htmlHeadXtra[] = api_get_jquery_libraries_js(array('bxslider'));
$htmlHeadXtra[] ='
<script type="text/javascript">
$(document).ready(function(){
$("#slider").bxSlider({
infiniteLoop : true,
auto : true,
pager : true,
autoHover : true,
pause : 10000
});
});
</script>';
Display::display_header($header_title);
/* MAIN CODE */
echo '<div id="content" class="maincontent">';
//check if javascript is enabled
echo '<noscript>';
echo Display::display_error_message(get_lang("NoJavascript"));
echo '</noscript>';
//check if cookies are enabled
?>
<script language="JavaScript">
if(navigator.cookieEnabled==false){
document.writeln('<?php Display::display_error_message(get_lang("NoCookies")); ?>');
}
</script>
<?php
//@todo add this in the template
// Plugins for loginpage_main AND campushomepage_main. // Plugins for loginpage_main AND campushomepage_main.
if (!api_get_user_id()) { if (!api_get_user_id()) {
api_plugin('loginpage_main'); api_plugin('loginpage_main');
@ -164,29 +141,25 @@ if (!api_get_user_id()) {
api_plugin('campushomepage_main'); api_plugin('campushomepage_main');
} }
echo $index->return_home_page();
//@todo add this in the template
// Display courses and category list. if (api_get_setting('display_categories_on_homepage') == 'true') {
//if (!$page_included) {
echo $index->return_announcements();
if (api_get_setting('display_categories_on_homepage') == 'true') {
echo '<div class="home_cats">'; echo '<div class="home_cats">';
$index->display_anonymous_course_list(); $index->display_anonymous_course_list();
echo '</div>'; echo '</div>';
} }
//}
echo '</div>';
echo '<div id="menu-wrapper">'; $tpl = $index->tpl->get_template('layout/layout_2_col.tpl');
echo $index->return_profile_block(); $index->set_login_form();
// Display right menu: language form, login section + useful weblinks. //@todo move this inside the IndexManager
$index->display_anonymous_right_menu(); $index->tpl->assign('announcements_block', $index->return_announcements());
$index->tpl->assign('teacher_block', $index->return_teacher_link());
$index->tpl->assign('home_page_block', $index->return_home_page());
echo '</div>'; $index->tpl->assign('profile_block', $index->return_profile_block());
$index->tpl->assign('notice_block', $index->return_notice());
$index->tpl->assign('plugin_campushomepage', $index->return_plugin_campushomepage());
/* Footer */ $index->tpl->display($tpl);
Display :: display_footer();

10
main/inc/lib/template.lib.php
Unescape View File

@ -6,7 +6,7 @@ require_once api_get_path(LIBRARY_PATH).'smarty/Smarty.class.php';
class Template extends Smarty { class Template extends Smarty {
var $style = 'experimental'; //see the template folder var $style = 'default'; //see the template folder
function __construct($title = '') { function __construct($title = '') {
$this->title = $title; $this->title = $title;
@ -45,11 +45,13 @@ class Template extends Smarty {
} }
private function set_user_parameters() { private function set_user_parameters() {
if (api_get_user_id()) { $user_info = array();
$user_info['logged'] = 0;
if (api_get_user_id() && !api_is_anonymous()) {
$user_info = api_get_user_info(); $user_info = api_get_user_info();
//$this->assign('user_info', $user_info); $user_info['logged'] = 1;
$this->assign('_u', $user_info);
} }
$this->assign('_u', $user_info);
} }
private function set_system_parameters() { private function set_system_parameters() {

41
main/inc/lib/userportal.lib.php
Unescape View File

@ -33,10 +33,11 @@ class IndexManager {
} }
$this->home = $home; $this->home = $home;
$this->user_id = api_get_user_id(); $this->user_id = api_get_user_id();
$this->load_directories_preview = true;
} }
function set_login_form($use_template = true) { function set_login_form() {
global $loginFailed; global $loginFailed;
$login_form = ''; $login_form = '';
@ -44,41 +45,35 @@ class IndexManager {
if (!($this->user_id) || api_is_anonymous($this->user_id)) { if (!($this->user_id) || api_is_anonymous($this->user_id)) {
// Only display if the user isn't logged in. // Only display if the user isn't logged in.
$login_form = api_display_language_form(true); $this->tpl->assign('login_language_form', api_display_language_form(true));
$login_form .= self::display_login_form(); $this->tpl->assign('login_form', self::display_login_form());
if ($loginFailed) { if ($loginFailed) {
$login_form .= self::handle_login_failed(); $this->tpl->assign('login_failed', self::handle_login_failed());
} }
if (api_get_setting('allow_lostpassword') == 'true' || api_get_setting('allow_registration') == 'true') { if (api_get_setting('allow_lostpassword') == 'true' || api_get_setting('allow_registration') == 'true') {
$login_form .= '<div class="menusection"><span class="menusectioncaption">'.get_lang('MenuUser').'</span><ul class="menulist">'; $login_form .= '<ul class="menulist">';
if (api_get_setting('allow_registration') != 'false') { if (api_get_setting('allow_registration') != 'false') {
$login_form .= '<li><a href="main/auth/inscription.php">'.get_lang('Reg').'</a></li>'; $login_form .= '<li><a href="main/auth/inscription.php">'.get_lang('Reg').'</a></li>';
} }
if (api_get_setting('allow_lostpassword') == 'true') { if (api_get_setting('allow_lostpassword') == 'true') {
$login_form .= '<li><a href="main/auth/lostPassword.php">'.get_lang('LostPassword').'</a></li>'; $login_form .= '<li><a href="main/auth/lostPassword.php">'.get_lang('LostPassword').'</a></li>';
} }
$login_form .= '</ul></div>'; $login_form .= '</ul>';
} }
$this->tpl->assign('login_options', $login_form);
if (api_number_of_plugins('loginpage_menu') > 0) { if (api_number_of_plugins('loginpage_menu') > 0) {
$login_form .= '<div class="note" style="background: none">'; $login_form = '<div class="note" style="background: none">';
ob_start(); ob_start();
api_plugin('loginpage_menu'); api_plugin('loginpage_menu');
$plugin_login = ob_get_contents(); $plugin_login = ob_get_contents();
$login_form .= $plugin_login; $login_form .= $plugin_login;
$login_form .= '</div>'; $login_form .= '</div>';
} $this->tpl->assign('login_plugin_menu', $login_form);
if (!empty($login_form)) {
$login_form = '<div class="menu" id="menu">'.$login_form.'</div>';
} }
} }
$login_form_tmp = $login_form;
if ($use_template)
$this->tpl->assign('login_block', $login_form);
//@todo remove this return
return $login_form;
} }
@ -775,7 +770,7 @@ class IndexManager {
<input type="text" id="query" size="15" name="query" value="" /> <input type="text" id="query" size="15" name="query" value="" />
<button class="save" type="submit" name="submit" value="'.$search_btn.'" />'.$search_btn.' </button> <button class="save" type="submit" name="submit" value="'.$search_btn.'" />'.$search_btn.' </button>
</form></div>'; </form></div>';
$html .= show_right_block(get_lang('Search'), $search_content); $html .= self::show_right_block(get_lang('Search'), $search_content);
} }
return $html; return $html;
} }
@ -799,7 +794,7 @@ class IndexManager {
} }
if (!empty($classes)) { if (!empty($classes)) {
$classes = Display::tag('ul', $classes, array('class'=>'menulist')); $classes = Display::tag('ul', $classes, array('class'=>'menulist'));
$html .= show_right_block(get_lang('Classes'), $classes); $html .= self::show_right_block(get_lang('Classes'), $classes);
} }
} }
return $html; return $html;
@ -811,7 +806,7 @@ class IndexManager {
$booking_content .='<ul class="menulist">'; $booking_content .='<ul class="menulist">';
$booking_content .='<a href="main/reservation/reservation.php">'.get_lang('ManageReservations').'</a><br />'; $booking_content .='<a href="main/reservation/reservation.php">'.get_lang('ManageReservations').'</a><br />';
$booking_content .='</ul>'; $booking_content .='</ul>';
$html .= show_right_block(get_lang('Booking'), $booking_content); $html .= self::show_right_block(get_lang('Booking'), $booking_content);
} }
return $html; return $html;
} }
@ -824,7 +819,7 @@ class IndexManager {
api_plugin('mycourses_menu'); api_plugin('mycourses_menu');
$plugin_content = ob_get_contents(); $plugin_content = ob_get_contents();
ob_end_clean(); ob_end_clean();
echo show_right_block('', $plugin_content); echo self::show_right_block('', $plugin_content);
} }
} }
@ -1192,8 +1187,8 @@ class IndexManager {
// Sessions and courses that are not in a session category. // Sessions and courses that are not in a session category.
if (!isset($_GET['history'])) { if (!isset($_GET['history'])) {
// If we're not in the history view... // If we're not in the history view...
CourseManager :: display_special_courses(api_get_user_id(), $load_dirs); CourseManager :: display_special_courses(api_get_user_id(), $this->load_directories_preview);
CourseManager :: display_courses(api_get_user_id(), $load_dirs); CourseManager :: display_courses(api_get_user_id(), $this->load_directories_preview);
} }
// Independent sessions. // Independent sessions.
foreach ($category['sessions'] as $session) { foreach ($category['sessions'] as $session) {
@ -1223,7 +1218,7 @@ class IndexManager {
if ($session_now > $allowed_time) { if ($session_now > $allowed_time) {
//read only and accesible //read only and accesible
if (api_get_setting('hide_courses_in_sessions') == 'false') { if (api_get_setting('hide_courses_in_sessions') == 'false') {
$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item', true, $load_dirs); $c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item', true, $this->load_directories_preview);
//$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',($session['details']['visibility']==3?false:true)); //$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',($session['details']['visibility']==3?false:true));
$html_courses_session .= $c[1]; $html_courses_session .= $c[1];
} }

4
main/template/default/layout/layout_2_col.tpl
Unescape View File

@ -13,7 +13,9 @@
</div> </div>
<div id="menu-wrapper"> <div id="menu-wrapper">
{$login_block} {if $_u.logged == 0}
{include file="default/layout/login_form.tpl"}
{/if}
{$profile_block} {$profile_block}
{$account_block} {$account_block}
{$teacher_block} {$teacher_block}

12
main/template/default/layout/login_form.tpl
Unescape View File

@ -0,0 +1,12 @@
<div id="menu" class="menu">
<div class="menusection">
<span class="menusectioncaption">
{"Login"|get_lang}
</span>
</div>
{$login_language_form}
{$login_form}
{$login_failed}
{$login_options}
{$login_plugin_menu}
</div>

61
user_portal.php
Unescape View File

@ -21,6 +21,7 @@
/** /**
* INIT SECTION * INIT SECTION
*/ */
// Language files that should be included. // Language files that should be included.
$language_file = array('courses', 'index','admin'); $language_file = array('courses', 'index','admin');
@ -35,7 +36,6 @@ if (isset($_SESSION['this_section']))
require_once './main/inc/global.inc.php'; require_once './main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'userportal.lib.php'; require_once api_get_path(LIBRARY_PATH).'userportal.lib.php';
api_block_anonymous_users(); // Only users who are logged in can proceed. api_block_anonymous_users(); // Only users who are logged in can proceed.
/* Constants and CONFIGURATION parameters */ /* Constants and CONFIGURATION parameters */
@ -183,8 +183,6 @@ if ($load_dirs) {
</script>'; </script>';
} }
Display :: display_header($nameTools);
/* Sniffing system */ /* Sniffing system */
//by Juan Carlos Raña Trabado //by Juan Carlos Raña Trabado
?> ?>
@ -348,45 +346,40 @@ if (stripos("flash_yes", $_SESSION['sniff_check_some_activex'])===0 || stripos("
/* MAIN CODE */ /* MAIN CODE */
$index = new IndexManager($nameTools, false); $userportal = new IndexManager(get_lang('MyCourses'));
echo '<div class="maincontent" id="maincontent">'; // Start of content for logged in users.
// Plugins for the my courses main area.
echo $index->return_courses_main_plugin();
// Main courses and session list
echo $index->return_courses_and_sessions($personal_course_list);
echo '</div>'; // End of content main-section
$tpl = $userportal->tpl->get_template('layout/layout_2_col.tpl');
// Register whether full admin or null admin course by course through an array dbname x user status.
api_session_register('status');
/* RIGHT MENU */ //if (!$userportal->tpl->isCached($tpl, api_get_user_id())) {
echo '<div id="menu-wrapper">'; //@todo all this could be moved in the IndexManager
//Profile content $courses_list = $userportal->return_courses_main_plugin();
echo $index->return_profile_block(); $personal_course_list = UserManager::get_personal_session_course_list(api_get_user_id());
echo $index->return_account_block();
echo $index->return_navigation_course_links($menu_navigation);
echo $index->return_plugin_courses_block();
echo $index->return_reservation_block();
echo $index->return_search_block();
echo $index->return_classes_block();
echo '</div>'; // End of menu wrapper // Main courses and session list
ob_start();
$userportal->return_courses_and_sessions($personal_course_list);
$courses_and_sessions = ob_get_contents();
ob_get_clean();
//
$userportal->tpl->assign('content', $courses_and_sessions);
$userportal->tpl->assign('plugin_courses_block', $userportal->return_courses_main_plugin());
$userportal->tpl->assign('profile_block', $userportal->return_profile_block());
$userportal->tpl->assign('account_block', $userportal->return_account_block());
$userportal->tpl->assign('navigation_course_links', $userportal->return_navigation_course_links($menu_navigation));
$userportal->tpl->assign('plugin_courses_right_block', $userportal->return_plugin_courses_block());
$userportal->tpl->assign('reservation_block', $userportal->return_reservation_block());
$userportal->tpl->assign('search_block', $userportal->return_search_block());
$userportal->tpl->assign('classes_block', $userportal->return_classes_block());
/*} else {
}*/
$userportal->tpl->display($tpl);
// Deleting the session_id. // Deleting the session_id.
api_session_unregister('session_id'); api_session_unregister('session_id');
// Footer
Display :: display_footer();

53
userportal-smarty.php
Unescape View File

@ -1,53 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.main
*/
define('CHAMILO_HOMEPAGE', true);
$language_file = array('courses', 'index');
/* Flag forcing the 'current course' reset, as we're not inside a course anymore. */
// Maybe we should change this into an api function? an example: Coursemanager::unset();
$cidReset = true;
/* Included libraries */
require_once 'main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'userportal.lib.php';
$this_section = SECTION_COURSES;
api_block_anonymous_users(); // Only users who are logged in can proceed.
$userportal = new IndexManager(get_lang('MyCourses'));
$tpl = $userportal->tpl->get_template('layout/layout_2_col.tpl');
//if (!$userportal->tpl->isCached($tpl, api_get_user_id())) {
//@todo all this could be moved in the IndexManager
$courses_list = $userportal->return_courses_main_plugin();
$personal_course_list = UserManager::get_personal_session_course_list(api_get_user_id());
// Main courses and session list
ob_start();
$userportal->return_courses_and_sessions($personal_course_list);
$courses_and_sessions = ob_get_contents();
ob_get_clean();
//
$userportal->tpl->assign('content', $courses_and_sessions);
$userportal->tpl->assign('plugin_courses_block', $userportal->return_courses_main_plugin());
$userportal->tpl->assign('profile_block', $userportal->return_profile_block());
$userportal->tpl->assign('account_block', $userportal->return_account_block());
$userportal->tpl->assign('navigation_course_links', $userportal->return_navigation_course_links($menu_navigation));
$userportal->tpl->assign('plugin_courses_right_block', $userportal->return_plugin_courses_block());
$userportal->tpl->assign('reservation_block', $userportal->return_reservation_block());
$userportal->tpl->assign('search_block', $userportal->return_search_block());
$userportal->tpl->assign('classes_block', $userportal->return_classes_block());
/*} else {
}*/
$userportal->tpl->display($tpl);
Write Preview
Loading…
Cancel
Save