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

Removing PHP notices/warnings

Browse Source
skala
Julio Montoya 12 years ago
parent e125039337
commit 184fc64e4d
4 changed files with 250 additions and 249 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. 6
      main/inc/lib/course.lib.php
  2. 6
      main/inc/lib/fckeditor/fckeditor.php
  3. 428
      main/inc/lib/userportal.lib.php
  4. 59
      user_portal.php

6
main/inc/lib/course.lib.php
Unescape View File

@ -2804,9 +2804,10 @@ class CourseManager {
}
$html .= '</div>';
$notifications = isset($params['notifications']) ? $params['notifications'] : null;
$html .= '<div class="span6">';
$html .='<h3>'.$params['title'].$params['notifications'].'</h3> ';
$html .='<h3>'.$params['title'].$notifications.'</h3> ';
if (!empty($params['subtitle'])) {
$html .= '<small>'.$params['subtitle'].'</small>';
@ -2818,12 +2819,11 @@ class CourseManager {
$html .= '<h5>'.Display::return_icon('teacher.png', get_lang('Coach'), array(), ICON_SIZE_TINY).$params['coaches'].'</h5>';
}
$html .= '</div>';
$html .= '</div>';
$html .= '</div>';
$params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
$html .= '<div class="span1 pull-right course-box-actions">'.$params['right_actions'].'</div>';
$html .= '</div>';
$html .= '</div>';

6
main/inc/lib/fckeditor/fckeditor.php
Unescape View File

@ -164,7 +164,7 @@ class FCKeditor
*/
public function CreateHtml() {
// Adaptation for the Chamilo LMS
//@todo why the BasePath is relative ? we should use this constant WEB_PATH
$this->BasePath = api_get_path(REL_PATH).'main/inc/lib/fckeditor/';
//$this->BasePath = api_get_path(WEB_PATH).'main/inc/lib/fckeditor/';
@ -367,7 +367,7 @@ class FCKeditor
}
$toolbar_dir = isset($config['ToolbarSets']['Directory']) ? $config['ToolbarSets']['Directory'] : 'default';
$return = array_merge($config, $this->get_custom_toolbar_configuration($toolbar_dir));
return $return;
return $return;
}
/**
@ -515,7 +515,7 @@ class FCKeditor
$config['BaseHref'] = $script_path;
}
} else {
if (api_is_platform_admin() && $_SESSION['this_section'] == 'platform_admin') {
if (api_is_platform_admin() && isset($_SESSION['this_section']) && $_SESSION['this_section'] == 'platform_admin') {
// 3. Platform administration activities.
$config['CreateDocumentWebDir'] = api_get_path(WEB_PATH).'home/default_platform_document/';
$config['CreateDocumentDir'] = api_get_path(WEB_PATH).'home/default_platform_document/'; // A side-effect is in use here.

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

@ -1,4 +1,4 @@
<?php
<?php
/* For licensing terms, see /license.txt */
use \ChamiloSession as Session;
@ -6,40 +6,40 @@ use \ChamiloSession as Session;
class IndexManager {
var $tpl = false; //An instance of the template engine
var $name = '';
var $home = '';
var $default_home = 'home/';
function __construct($title) {
$this->tpl = new Template($title);
var $default_home = 'home/';
function __construct($title) {
$this->tpl = new Template($title);
$this->home = api_get_home_path();
$this->user_id = api_get_user_id();
$this->load_directories_preview = false;
if (api_get_setting('show_documents_preview') == 'true') {
$this->load_directories_preview = true;
}
}
}
}
function set_login_form() {
global $loginFailed;
$login_form = '';
if (!($this->user_id) || api_is_anonymous($this->user_id)) {
// Only display if the user isn't logged in.
$this->tpl->assign('login_language_form', api_display_language_form(true));
$this->tpl->assign('login_form', self::display_login_form());
if ($loginFailed) {
if ($loginFailed) {
$this->tpl->assign('login_failed', self::handle_login_failed());
}
if (api_get_setting('allow_lostpassword') == 'true' || api_get_setting('allow_registration') == 'true') {
$login_form .= '<ul class="nav nav-list">';
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') {
$login_form .= '<li><a href="main/auth/lostPassword.php">'.get_lang('LostPassword').'</a></li>';
@ -49,8 +49,8 @@ class IndexManager {
$this->tpl->assign('login_options', $login_form);
}
}
function return_exercise_block($personal_course_list) {
require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php';
$exercise_list = array();
@ -58,14 +58,14 @@ class IndexManager {
foreach($personal_course_list as $course_item) {
$course_code = $course_item['c'];
$session_id = $course_item['id_session'];
$exercises = get_exercises_to_be_taken($course_code, $session_id);
foreach($exercises as $exercise_item) {
$exercise_item['course_code'] = $course_code;
$exercise_item['session_id'] = $session_id;
$exercise_item['tms'] = api_strtotime($exercise_item['end_time'], 'UTC');
$exercise_list[] = $exercise_item;
}
}
@ -78,16 +78,16 @@ class IndexManager {
}
}
}
function return_announcements($show_slide = true) {
function return_announcements($show_slide = true) {
// Display System announcements
$announcement = isset($_GET['announcement']) ? $_GET['announcement'] : null;
$announcement = intval($announcement);
$announcement = intval($announcement);
if (!api_is_anonymous() && $this->user_id) {
$visibility = api_is_allowed_to_create_course() ? SystemAnnouncementManager::VISIBLE_TEACHER : SystemAnnouncementManager::VISIBLE_STUDENT;
if ($show_slide) {
$announcements = SystemAnnouncementManager :: display_announcements_slider($visibility, $announcement);
$announcements = SystemAnnouncementManager :: display_announcements_slider($visibility, $announcement);
} else {
$announcements = SystemAnnouncementManager :: display_all_announcements($visibility, $announcement);
}
@ -99,15 +99,15 @@ class IndexManager {
}
}
return $announcements;
}
}
/**
* Alias for the online_logout() function
* Alias for the online_logout() function
*/
function logout() {
function logout() {
online_logout($this->user_id, true);
}
/**
* This function checks if there are courses that are open to the world in the platform course categories (=faculties)
*
@ -133,8 +133,8 @@ class IndexManager {
}
return false;
}
/**
* Displays the right-hand menu for anonymous users:
* login form, useful links, help section
@ -143,24 +143,24 @@ class IndexManager {
* @todo does $_plugins need to be global?
*/
function display_anonymous_right_menu() {
global $loginFailed, $_user;
$display_add_course_link = api_is_allowed_to_create_course() && ($_SESSION['studentview'] != 'studentenview');
global $loginFailed, $_user;
$display_add_course_link = api_is_allowed_to_create_course() && ($_SESSION['studentview'] != 'studentenview');
$current_user_id = api_get_user_id();
echo self::set_login_form(false);
echo self::return_teacher_link();
echo self::return_notice();
}
echo self::set_login_form(false);
echo self::return_teacher_link();
echo self::return_notice();
}
function return_teacher_link() {
$html = '';
if (!empty($this->user_id)) {
// tabs that are deactivated are added here
$show_menu = false;
$show_create_link = false;
$show_course_link = false;
if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
$show_menu = true;
$show_course_link = true;
@ -170,55 +170,55 @@ class IndexManager {
$show_course_link = true;
}
}
if ($show_menu && ($show_create_link || $show_course_link )) {
$show_menu = true;
} else {
$show_menu = false;
}
}
}
// My Account section
if ($show_menu) {
$html .= '<ul class="nav nav-list">';
if ($show_create_link) {
if ($show_create_link) {
$html .= '<li><a href="main/create_course/add_course.php" class="add course">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
}
if ($show_course_link) {
if (!api_is_drh() && !api_is_session_admin()) {
$html .= '<li><a href="main/auth/courses.php" class="list course">'.get_lang('CourseCatalog').'</a></li>';
$html .= '<li><a href="main/auth/courses.php" class="list course">'.get_lang('CourseCatalog').'</a></li>';
} else {
$html .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
}
}
}
$html .= '</ul>';
}
}
if (!empty($html)) {
$html = self::show_right_block(get_lang('Courses'), $html, 'teacher_block');
}
return $html;
}
/* Includes a created page */
function return_home_page() {
function return_home_page() {
// Including the page for the news
$html = '';
if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['include'])) {
$open = @(string)file_get_contents(api_get_path(SYS_PATH).$this->home.$_GET['include']);
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
} else {
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
} else {
if (!empty($_SESSION['user_language_choice'])) {
$user_selected_language = $_SESSION['user_language_choice'];
} elseif (!empty($_SESSION['_user']['language'])) {
$user_selected_language = $_SESSION['_user']['language'];
} else {
$user_selected_language = api_get_setting('platformLanguage');
}
}
if (!file_exists($this->home.'home_news_'.$user_selected_language.'.html')) {
if (file_exists($this->home.'home_top.html')) {
$home_top_temp = file($this->home.'home_top.html');
@ -237,22 +237,22 @@ class IndexManager {
$home_top_temp = get_lang('PortalHomepageDefaultIntroduction');
}
$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
}
return $html;
return $html;
}
function return_notice() {
function return_notice() {
$sys_path = api_get_path(SYS_PATH);
$user_selected_language = api_get_interface_language();
$html = '';
// Notice
$home_notice = @(string)file_get_contents($sys_path.$this->home.'home_notice_'.$user_selected_language.'.html');
if (empty($home_notice)) {
$home_notice = @(string)file_get_contents($sys_path.$this->home.'home_notice.html');
}
if (!empty($home_notice)) {
$home_notice = api_to_system_encoding($home_notice, api_detect_encoding(strip_tags($home_notice)));
$home_notice = Display::div($home_notice, array('class' => 'homepage_notice'));
@ -260,46 +260,46 @@ class IndexManager {
}
return $html;
}
function return_help() {
function return_help() {
$user_selected_language = api_get_interface_language();
$sys_path = api_get_path(SYS_PATH);
$platformLanguage = api_get_setting('platformLanguage');
// Help section.
/* Hide right menu "general" and other parts on anonymous right menu. */
if (!isset($user_selected_language)) {
$user_selected_language = $platformLanguage;
}
$html = null;
$html = null;
$home_menu = @(string)file_get_contents($sys_path.$this->home.'home_menu_'.$user_selected_language.'.html');
if (!empty($home_menu)) {
$home_menu_content .= '<ul class="nav nav-list">';
$home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu_content .= '</ul>';
$html .= self::show_right_block(get_lang('MenuGeneral'), $home_menu_content, 'help_block');
}
}
return $html;
}
function return_skills_links() {
$html = '';
if (api_get_setting('allow_skills_tool') == 'true') {
$content = '<ul class="nav nav-list">';
$content = '<ul class="nav nav-list">';
$content .= Display::tag('li', Display::url(get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/skills_wheel.php'));
if (api_get_setting('allow_hr_skills_management') == 'true' || api_is_platform_admin()) {
$content .= Display::tag('li', Display::url(get_lang('ManageSkills'), api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php'));
}
$content .= '</ul>';
$content .= '</ul>';
$html = self::show_right_block(get_lang("Skills"), $content, 'skill_block');
}
return $html;
}
/**
* Reacts on a failed login:
* Displays an explanation with a link to the registration form.
@ -308,14 +308,14 @@ class IndexManager {
*/
function handle_login_failed() {
$message = get_lang('InvalidId');
if (!isset($_GET['error'])) {
if (!isset($_GET['error'])) {
if (api_is_self_registration_allowed()) {
$message = get_lang('InvalidForSelfRegistration');
}
} else {
switch ($_GET['error']) {
case '':
case '':
if (api_is_self_registration_allowed()) {
$message = get_lang('InvalidForSelfRegistration');
}
@ -338,8 +338,8 @@ class IndexManager {
}
}
return Display::return_message($message, 'error');
}
}
/**
* Display list of courses in a category.
* (for anonymous users)
@ -352,22 +352,22 @@ class IndexManager {
$result = '';
$ctok = $_SESSION['sec_token'];
$stok = Security::get_token();
// Initialization.
$user_identified = (api_get_user_id() > 0 && !api_is_anonymous());
$web_course_path = api_get_path(WEB_COURSE_PATH);
$category = Database::escape_string($_GET['category']);
$setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 'true';
// Database table definitions.
$main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
$main_category_table = Database :: get_main_table(TABLE_MAIN_CATEGORY);
$main_category_table = Database :: get_main_table(TABLE_MAIN_CATEGORY);
// Get list of courses in category $category.
$sql_get_course_list = "SELECT * FROM $main_course_table cours
WHERE category_code = '".Database::escape_string($_GET['category'])."'
ORDER BY title, UPPER(visual_code)";
// Showing only the courses of the current access_url_id.
global $_configuration;
if ($_configuration['multiple_access_urls']) {
@ -379,14 +379,14 @@ class IndexManager {
WHERE access_url_id = $url_access_id AND category_code = '".Database::escape_string($_GET['category'])."' ORDER BY title, UPPER(visual_code)";
}
}
// Removed: AND cours.visibility='".COURSE_VISIBILITY_OPEN_WORLD."'
$sql_result_courses = Database::query($sql_get_course_list);
while ($course_result = Database::fetch_array($sql_result_courses)) {
$course_list[] = $course_result;
}
$platform_visible_courses = '';
// $setting_show_also_closed_courses
if ($user_identified) {
@ -409,9 +409,9 @@ class IndexManager {
LEFT JOIN $main_course_table t3 ON (t3.category_code=t1.code $platform_visible_courses)
WHERE t1.parent_id ". (empty ($category) ? "IS NULL" : "='$category'")."
GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
// Showing only the category of courses of the current access_url_id
// Showing only the category of courses of the current access_url_id
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id != -1) {
@ -427,14 +427,14 @@ class IndexManager {
GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count ORDER BY t1.tree_pos, t1.name";
}
}
$resCats = Database::query($sqlGetSubCatList);
$thereIsSubCat = false;
if (Database::num_rows($resCats) > 0) {
$htmlListCat = Display::page_header(get_lang('CatList'));
$htmlListCat .= '<ul>';
while ($catLine = Database::fetch_array($resCats)) {
if ($catLine['code'] != $category) {
if ($catLine['code'] != $category) {
$category_has_open_courses = self::category_has_open_courses($catLine['code']);
if ($category_has_open_courses) {
// The category contains courses accessible to anonymous visitors.
@ -488,14 +488,14 @@ class IndexManager {
$courses_list_string = '';
$courses_shown = 0;
if ($numrows > 0) {
$courses_list_string .= Display::page_header(get_lang('CourseList'));
$courses_list_string .= "<ul>";
if (api_get_user_id()) {
$courses_of_user = self::get_courses_of_user(api_get_user_id());
}
foreach ($course_list as $course) {
// $setting_show_also_closed_courses
if (!$setting_show_also_closed_courses) {
@ -561,7 +561,7 @@ class IndexManager {
if (api_get_setting('show_different_course_language') == 'true' && $course['course_language'] != api_get_setting('platformLanguage')) {
$course_details[] = $course['course_language'];
}
$courses_list_string .= implode(' - ', $course_details);
// We display a subscription link if:
// 1. it is allowed to register for the course and if the course is not already in the courselist of the user and if the user is identiefied
@ -589,9 +589,9 @@ class IndexManager {
if ($category != '') {
$result .= '<p><a href="'.api_get_self().'"> ' . Display :: return_icon('back.png', get_lang('BackToHomePage')) . get_lang('BackToHomePage') . '</a></p>';
}
return $result;
return $result;
}
/**
* retrieves all the courses that the user has already subscribed to
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
@ -619,25 +619,25 @@ class IndexManager {
$courses[$row['k']] = array('db' => $row['db'], 'code' => $row['k'], 'visual_code' => $row['vc'], 'title' => $row['i'], 'directory' => $row['dir'], 'status' => $row['status'], 'tutor' => $row['t'], 'subscribe' => $row['subscr'], 'unsubscribe' => $row['unsubscr'], 'sort' => $row['sort'], 'user_course_category' => $row['user_course_cat']);
}
return $courses;
}
}
/**
* @todo use the template system
*/
function show_right_block($title, $content, $id = null, $params = null) {
if (!empty($id)) {
function show_right_block($title, $content, $id = null, $params = null) {
if (!empty($id)) {
$params['id'] = $id;
}
}
$params['class'] = 'well sidebar-nav';
$html = null;
$html = null;
if (!empty($title)) {
$html.= '<h4>'.$title.'</h4>';
}
}
$html.= $content;
$html = Display::div($html, $params);
return $html;
}
/**
* Adds a form to let users login
* @version 1.1
@ -645,11 +645,11 @@ class IndexManager {
function display_login_form() {
$form = new FormValidator('formLogin', 'POST', null, null, array('class'=>'form-vertical'));
// 'placeholder'=>get_lang('UserName')
//'autocomplete'=>"off",
//'autocomplete'=>"off",
$form->addElement('text', 'login', get_lang('UserName'), array('class' => 'span2 autocapitalize_off', 'autofocus' => 'autofocus'));
$form->addElement('password', 'password', get_lang('Pass'), array('class' => 'span2'));
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn'));
$form->addElement('style_submit_button','submitAuth', get_lang('LoginEnter'), array('class' => 'btn'));
$html = $form->return_form();
if (api_get_setting('openid_authentication') == 'true') {
include_once 'main/auth/openid/login.php';
@ -657,22 +657,22 @@ class IndexManager {
}
return $html;
}
function return_search_block() {
$html = '';
$html = '';
if (api_get_setting('search_enabled') == 'true') {
$html .= '<div class="searchbox">';
$search_btn = get_lang('Search');
$search_btn = get_lang('Search');
$search_content = '<br />
<form action="main/search/" method="post">
<input type="text" id="query" class="span2" name="query" value="" />
<button class="save" type="submit" name="submit" value="'.$search_btn.'" />'.$search_btn.' </button>
</form></div>';
</form></div>';
$html .= self::show_right_block(get_lang('Search'), $search_content, 'search_block');
}
return $html;
return $html;
}
function return_classes_block() {
$html = '';
if (api_get_setting('show_groups_to_users') == 'true') {
@ -693,11 +693,11 @@ class IndexManager {
if (!empty($classes)) {
$classes = Display::tag('ul', $classes, array('class'=>'nav nav-list'));
$html .= self::show_right_block(get_lang('Classes'), $classes, 'classes_block');
}
}
}
return $html;
}
function return_reservation_block() {
$html = '';
if (api_get_setting('allow_reservation') == 'true' && api_is_allowed_to_create_course()) {
@ -708,196 +708,196 @@ class IndexManager {
}
return $html;
}
function return_user_image_block() {
$img_array = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'web', true, true);
$img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 50, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" ');
function return_user_image_block() {
$img_array = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'web', true, true);
$img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 50, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" ');
$profile_content = null;
if (api_get_setting('allow_social_tool') == 'true') {
$profile_content .='<a style="text-align:center" href="'.api_get_path(WEB_PATH).'main/social/home.php"><img src="'.$img_array['file'].'" '.$img_array['style'].' ></a>';
} else {
$profile_content .='<a style="text-align:center" href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].'></a>';
}
}
$html = self::show_right_block(null, $profile_content, 'user_image_block', array('style' => 'text-align:center;'));
return $html;
}
function return_profile_block() {
$html = '';
$user_id = api_get_user_id();
if (empty($user_id)) {
return;
return;
}
$profile_content .= '<ul class="nav nav-list">';
$profile_content = '<ul class="nav nav-list">';
// @todo Add a platform setting to add the user image.
if (api_get_setting('allow_message_tool') == 'true') {
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
// New messages.
$number_of_new_messages = MessageManager::get_new_messages();
// New contact invitations.
$number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id(api_get_user_id());
// New group invitations sent by a moderator.
$group_pending_invitations = GroupPortalManager::get_groups_by_user(api_get_user_id(), GROUP_USER_PERMISSION_PENDING_INVITATION, false);
$group_pending_invitations = count($group_pending_invitations);
$total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations;
$cant_msg = Display::badge($number_of_new_messages);
$cant_msg = Display::badge($number_of_new_messages);
$link = '';
if (api_get_setting('allow_social_tool') == 'true') {
$link = '?f=social';
}
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.get_lang('Inbox').$cant_msg.' </a></li>';
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.get_lang('Compose').' </a></li>';
if (api_get_setting('allow_social_tool') == 'true') {
$total_invitations = Display::badge($total_invitations);
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.get_lang('Compose').' </a></li>';
if (api_get_setting('allow_social_tool') == 'true') {
$total_invitations = Display::badge($total_invitations);
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('PendingInvitations').$total_invitations.'</a></li>';
}
}
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.get_lang('EditProfile').'</a></li>';
$profile_content .= '<li><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.get_lang('EditProfile').'</a></li>';
$profile_content .= '</ul>';
$html = self::show_right_block(get_lang('Profile'), $profile_content, 'profile_block');
return $html;
}
function return_navigation_links() {
$html = '';
// Deleting the myprofile link.
if (api_get_setting('allow_social_tool') == 'true') {
unset($this->tpl->menu_navigation['myprofile']);
}
// Main navigation section.
// Tabs that are deactivated are added here.
if (!empty($this->tpl->menu_navigation)) {
if (!empty($this->tpl->menu_navigation)) {
$content = '<ul class="nav nav-list">';
foreach ($this->tpl->menu_navigation as $section => $navigation_info) {
foreach ($this->tpl->menu_navigation as $section => $navigation_info) {
$current = $section == $GLOBALS['this_section'] ? ' id="current"' : '';
$content .= '<li'.$current.'>';
$content .= '<a href="'.$navigation_info['url'].'" target="_self">'.$navigation_info['title'].'</a>';
$content .= '</li>';
}
$content .= '</ul>';
$content .= '</ul>';
$html = self::show_right_block(get_lang('MainNavigation'), $content, 'navigation_link_block');
}
}
return $html;
}
function return_course_block() {
$html = '';
$show_create_link = false;
$show_course_link = false;
if ((api_get_setting('allow_users_to_create_courses') == 'false' && !api_is_platform_admin()) || api_is_student()) {
$display_add_course_link = false;
} else {
$display_add_course_link = true;
}
//$display_add_course_link = api_is_allowed_to_create_course() && ($_SESSION['studentview'] != 'studentenview');
if ($display_add_course_link) {
$show_create_link = true;
}
if (api_is_platform_admin() || api_is_course_admin() || api_is_allowed_to_create_course()) {
$show_course_link = true;
} else {
if (api_get_setting('allow_students_to_browse_courses') == 'true') {
if (api_get_setting('allow_students_to_browse_courses') == 'true') {
$show_course_link = true;
}
}
// My account section
// My account section
$my_account_content = '<ul class="nav nav-list">';
if ($show_create_link) {
$my_account_content .= '<li><a href="main/create_course/add_course.php" class="add course">'.(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
}
//Sort courses
$url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
$my_account_content .= '<li>'.Display::url(get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
//Course management
//Course management
if ($show_course_link) {
if (!api_is_drh()) {
$my_account_content .= '<li><a href="main/auth/courses.php" class="list course">'.get_lang('CourseCatalog').'</a></li>';
$my_account_content .= '<li><a href="main/auth/courses.php" class="list course">'.get_lang('CourseCatalog').'</a></li>';
if (isset($_GET['history']) && intval($_GET['history']) == 1) {
$my_account_content .= '<li><a href="user_portal.php">'.get_lang('DisplayTrainingList').'</a></li>';
} else {
$my_account_content .= '<li><a href="user_portal.php?history=1" class="history course">'.get_lang('HistoryTrainingSessions').'</a></li>';
}
} else {
$my_account_content .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
}
}
$my_account_content .= '</ul>';
if (!empty($my_account_content)) {
$html = self::show_right_block(get_lang('Courses'), $my_account_content, 'course_block');
}
return $html;
}
/**
* The most important function here, prints the session and course list (user_portal.php)
*
*
* */
function return_courses_and_sessions($user_id) {
$session_categories = array();
$session_categories = array();
$load_history = (isset($_GET['history']) && intval($_GET['history']) == 1) ? true : false;
if ($load_history) {
//Load sessions in category in *history*
$session_categories = UserManager::get_sessions_by_category($user_id, true);
$session_categories = UserManager::get_sessions_by_category($user_id, true);
} else {
//Load sessions in category
$session_categories = UserManager::get_sessions_by_category($user_id, false);
}
}
$html = '';
//Showing history title
if ($load_history) {
$html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
$html .= Display::page_subheader(get_lang('HistoryTrainingSession'));
if (empty($session_categories)) {
$html .= get_lang('YouDoNotHaveAnySessionInItsHistory');
}
}
$courses_html = '';
$special_courses = '';
// If we're not in the history view...
if (!isset($_GET['history'])) {
//Display special courses
$special_courses = CourseManager::display_special_courses($user_id, $this->load_directories_preview);
$special_courses = CourseManager::display_special_courses($user_id, $this->load_directories_preview);
//Display courses
$courses_html .= CourseManager::display_courses($user_id, $this->load_directories_preview);
}
$sessions_with_category = '';
$sessions_with_no_category = '';
$sessions_with_no_category = '';
if (is_array($session_categories)) {
foreach ($session_categories as $session_category) {
$session_category_id = $session_category['session_category']['id'];
// Sessions and courses that are not in a session category
if ($session_category_id == 0) {
// Independent sessions
foreach ($session_category['sessions'] as $session) {
foreach ($session_category['sessions'] as $session) {
$session_id = $session['session_id'];
// Don't show empty sessions.
@ -913,7 +913,7 @@ class IndexManager {
$session_now = time();
$html_courses_session = '';
$count_courses_session = 0;
foreach ($session['courses'] as $course) {
$is_coach_course = api_is_coach($session_id, $course['code']);
$allowed_time = 0;
@ -932,7 +932,7 @@ class IndexManager {
if ($session_now > $allowed_time && $days_access_after_end >= $dif_time_after-1) {
//read only and accesible
if (api_get_setting('hide_courses_in_sessions') == 'false') {
$c = CourseManager :: get_logged_user_course_html($course, $session_id, 'session_course_item', true, $this->load_directories_preview);
$c = CourseManager :: get_logged_user_course_html($course, $session_id, 'session_course_item', true, $this->load_directories_preview);
$html_courses_session .= $c[1];
}
$count_courses_session++;
@ -940,7 +940,7 @@ class IndexManager {
}
if ($count_courses_session > 0) {
$params = array();
$params = array();
$session_box = Display :: get_session_title_box($session_id);
@ -957,7 +957,7 @@ class IndexManager {
}
$params['title'] = $session_link;
$params['subtitle'] = $extra_info;
$params['subtitle'] = $extra_info;
$params['right_actions'] = '';
if (api_is_platform_admin()) {
@ -970,11 +970,11 @@ class IndexManager {
}
$sessions_with_no_category .= CourseManager::course_item_parent(CourseManager::course_item_html($params, true), $html_courses_session);
}
}
} else {
// All sessions included in
}
} else {
// All sessions included in
$count_courses_session = 0;
$html_sessions = '';
$html_sessions = '';
foreach ($session_category['sessions'] as $session) {
$session_id = $session['session_id'];
//var_dump($session);var_dump($session_category);
@ -1012,11 +1012,11 @@ class IndexManager {
$count++;
}
}
$params = array();
if ($count > 0) {
$session_box = Display :: get_session_title_box($session_id);
$session_box = Display :: get_session_title_box($session_id);
$params['icon'] = Display::return_icon('window_list.png', $session_box['title'], array('width' => '48px', 'align' => 'absmiddle', 'id' => 'session_img_'.$session_id)) . ' ';
if (api_is_drh()) {
@ -1029,17 +1029,17 @@ class IndexManager {
$params['title'] .= $session_link;
$params['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'].' | ' : '').$session_box['dates'];
$params['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'].' | ' : '').$session_box['dates'];
if (api_is_platform_admin()) {
$params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session='.$session_id.'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
}
$html_sessions .= CourseManager::course_item_html($params, true).$html_courses_session;
}
$html_sessions .= CourseManager::course_item_html($params, true).$html_courses_session;
}
}
}
if ($count_courses_session > 0) {
$params = array();
$params = array();
$params['icon'] = Display::return_icon('folder_blue.png', $session_category['session_category']['name'], array(), ICON_SIZE_LARGE);
if (api_is_platform_admin()) {
@ -1051,49 +1051,49 @@ class IndexManager {
if (api_is_platform_admin()) {
$params['link'] = api_get_path(WEB_CODE_PATH).'admin/session_category_edit.php?&id='.$session_category['session_category']['id'];
}
$session_category_start_date = $session_category['session_category']['date_start'];
$session_category_end_date = $session_category['session_category']['date_end'];
if (!empty($session_category_start_date) && $session_category_start_date != '0000-00-00' && !empty($session_category_end_date) && $session_category_end_date != '0000-00-00' ) {
$params['subtitle'] = sprintf(get_lang('FromDateXToDateY'), $session_category['session_category']['date_start'], $session_category['session_category']['date_end']);
} else {
} else {
if (!empty($session_category_start_date) && $session_category_start_date != '0000-00-00') {
$params['subtitle'] = get_lang('From').' '.$session_category_start_date;
}
if (!empty($session_category_end_date) && $session_category_end_date != '0000-00-00') {
$params['subtitle'] = get_lang('Until').' '.$session_category_end_date;
}
}
}
$sessions_with_category .= CourseManager::course_item_parent(CourseManager::course_item_html($params, true), $html_sessions);
}
}
}
}
}
return $sessions_with_category.$sessions_with_no_category.$courses_html.$special_courses;
}
/**
* Shows a welcome message when the user doesn't have any content in the course list
/**
* Shows a welcome message when the user doesn't have any content in the course list
*/
function return_welcome_to_course_block() {
$count_courses = CourseManager::count_courses();
function return_welcome_to_course_block() {
$count_courses = CourseManager::count_courses();
$tpl = $this->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';
$this->tpl->assign('course_catalog_url', $course_catalog_url);
$this->tpl->assign('course_list_url', $course_list_url);
$this->tpl->assign('course_catalog_link', Display::url(get_lang('here'), $course_catalog_url));
$this->tpl->assign('course_list_link', Display::url(get_lang('here'), $course_list_url));
$this->tpl->assign('count_courses', $count_courses);
return $this->tpl->fetch($tpl);
}
function return_hot_courses() {
return CourseManager::return_hot_courses();
return CourseManager::return_hot_courses();
}
}

59
user_portal.php
Unescape View File

@ -43,15 +43,15 @@ $load_dirs = api_get_setting('show_documents_preview');
// Check if a user is enrolled only in one course for going directly to the course after the login.
if (api_get_setting('go_to_course_after_login') == 'true') {
// Get the courses list
$personal_course_list = UserManager::get_personal_session_course_list(api_get_user_id());
$my_session_list = array();
$count_of_courses_no_sessions = 0;
$count_of_courses_with_sessions = 0;
foreach ($personal_course_list as $course) {
foreach ($personal_course_list as $course) {
if (!empty($course['id_session'])) {
$my_session_list[$course['id_session']] = true;
$count_of_courses_with_sessions++;
@ -59,31 +59,31 @@ if (api_get_setting('go_to_course_after_login') == 'true') {
$count_of_courses_no_sessions++;
}
}
$count_of_sessions = count($my_session_list);
$count_of_sessions = count($my_session_list);
if ($count_of_sessions == 1 && $count_of_courses_no_sessions == 0) {
$key = array_keys($personal_course_list);
$course_info = $personal_course_list[$key[0]];
$course_directory = $course_info['course_info']['path'];
$id_session = isset($course_info['id_session']) ? $course_info['id_session'] : 0;
$url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$id_session;
$url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$id_session;
header('location:'.$url);
header('location:'.$url);
exit;
}
if (!isset($_SESSION['coursesAlreadyVisited']) && $count_of_sessions == 0 && $count_of_courses_no_sessions == 1) {
$key = array_keys($personal_course_list);
$course_info = $personal_course_list[$key[0]];
$course_directory = $course_info['course_info']['path'];
$id_session = isset($course_info['id_session']) ? $course_info['id_session'] : 0;
$url = api_get_path(WEB_COURSE_PATH).$course_directory.'/?id_session='.$id_session;
header('location:'.$url);
header('location:'.$url);
exit;
}
}
}
$nameTools = get_lang('MyCourses');
$this_section = SECTION_COURSES;
@ -96,35 +96,35 @@ if ($load_dirs) {
$url = api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_preview';
$folder_icon = api_get_path(WEB_IMG_PATH).'icons/22/folder.png';
$close_icon = api_get_path(WEB_IMG_PATH).'loading1.gif';
$htmlHeadXtra[] = '<script>
$(document).ready(function() {
$(".document_preview_container").hide();
$(document).ready(function() {
$(".document_preview_container").hide();
$(".document_preview").click(function() {
var my_id = this.id;
var course_id = my_id.split("_")[2];
var session_id = my_id.split("_")[3];
//showing div
$(".document_preview_container").hide();
$("#document_result_" +course_id+"_" + session_id).show();
//Loading
$("#document_result_" +course_id+"_" + session_id).show();
//Loading
var image = $("img", this);
image.attr("src", "'.$close_icon.'");
image.attr("src", "'.$close_icon.'");
$.ajax({
url: "'.$url.'",
data: "course_id="+course_id+"&session_id="+session_id,
success: function(return_value) {
image.attr("src", "'.$folder_icon.'");
$("#document_result_" +course_id+"_" + session_id).html(return_value);
}
});
});
});
</script>';
@ -133,7 +133,8 @@ if ($load_dirs) {
/* Sniffing system */
//store posts to sessions
if ($_SESSION['sniff_navigator']!="checked") {
/*
if (isset($_SESSION['sniff_navigator']) && $_SESSION['sniff_navigator']!="checked") {
$_SESSION['sniff_navigator']=Security::remove_XSS($_POST['sniff_navigator']);
$_SESSION['sniff_screen_size_w']=Security::remove_XSS($_POST['sniff_navigator_screen_size_w']);
$_SESSION['sniff__screen_size_h']=Security::remove_XSS($_POST['sniff_navigator_screen_size_h']);
@ -145,7 +146,7 @@ if ($_SESSION['sniff_navigator']!="checked") {
$_SESSION['sniff_java']=Security::remove_XSS($_POST['sniff_navigator_java']);
$_SESSION['sniff_java_sun_ver']=Security::remove_XSS($_POST['sniff_navigator_java_sun_ver']);
}
*/
/* MAIN CODE */
$controller = new IndexManager(get_lang('MyCourses'));
@ -161,7 +162,7 @@ if (empty($courses_and_sessions) && !isset($_GET['history'])) {
}
$controller->tpl->assign('content', $courses_and_sessions);
if (api_get_setting('allow_browser_sniffer') == 'true') {
if ($_SESSION['sniff_navigator']!="checked") {
$controller->tpl->assign('show_sniff', 1);
@ -180,7 +181,7 @@ if(!empty($some_activex) || !empty($some_plugins)){
$sniff_notification = Display::return_message(get_lang('NoFlash'), 'warning', true);
//js verification - To annoying of redirecting every time the page
$controller->tpl->assign('sniff_notification', $sniff_notification);
}
}
}
$controller->tpl->assign('profile_block', $controller->return_profile_block());

Write Preview
Loading…
Cancel
Save