Avoiding warning messages, fixing minor PHP errors, commenting todo code

skala
Julio Montoya 14 years ago
parent e622a61871
commit ed4db6cd58
  1. 6
      main/admin/add_many_session_to_category.php
  2. 4
      main/admin/resume_session.php
  3. 8
      main/admin/session_list.php
  4. 59
      main/admin/user_list.php
  5. 1
      main/inc/lib/display.lib.php
  6. 1
      main/inc/lib/sessionmanager.lib.php
  7. 4
      main/messages/send_message_to_userfriend.inc.php
  8. 4
      user_portal.php

@ -125,7 +125,6 @@ if(isset($_GET['msg']) && $_GET['msg']=='ok'){
// display the dokeos header
Display::display_header($tool_name);
echo '<div class="row"><div class="form_header">'.$tool_name.' </div></div><br />';
$where ='';
@ -139,6 +138,11 @@ if((isset($_POST['CategorySessionId']) && $_POST['formSent'] == 0) || isset($_GE
}
$rows_session_category = SessionManager::get_all_session_category();
if (empty($rows_session_category)) {
Display::display_warning_message(get_lang('YouNeedToAddASessionCategoryFirst'));
Display::display_footer();
exit;
}
$sql = "SELECT id, name FROM $tbl_session $where ORDER BY name";
$result=Database::query($sql);

@ -170,8 +170,8 @@ echo Display::tag('h3', $tool_name);
<?php
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
global $_configuration;
if ($_configuration['multiple_access_urls']) {
if (api_get_multiple_access_url()) {
echo '<tr><td>';
echo get_lang('URL');
echo '</td>';

@ -52,6 +52,8 @@ if ($action == 'delete') {
$interbreadcrumb[]=array("url" => "index.php","name" => get_lang('PlatformAdmin'));
$keyword_name = isset($_GET['keyword_name']) ? Security::remove_XSS($_GET['keyword_name']) : null;
//table for the search
if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
@ -208,12 +210,14 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
if (!isset($_GET['id_category'])) {
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'','32').'</a>';
}
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/add_many_session_to_category.php?id_category='.intval($_GET['id_category']).'">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'','32').'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'','32').'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'','32').'</a>';
echo '</div>';
?>
<form method="POST" action="session_list.php">
<input type="text" name="keyword_name" value="<?php echo Security::remove_XSS($_GET['keyword_name']); ?>"/>
<input type="text" name="keyword_name" value="<?php echo $keyword_name; ?>"/>
<button class="search" type="submit" name="name" value="<?php echo get_lang('Search') ?>"><?php echo get_lang('Search') ?></button>
<a href="session_list.php?search=advanced"><?php echo get_lang('AdvancedSearch'); ?></a>
</form>

@ -119,14 +119,14 @@ $htmlHeadXtra[] = '<style type="text/css" media="screen, projection">
.blackboard_hide {
display: none;
}
';
</style>';
// xajax
$xajax = new xajax();
$xajax->registerFunction('courses_of_user');
//$xajax->registerFunction('empty_courses_of_user');
$xajax->processRequests();
/**
* Get a formatted list of courses for given user
* @param int User ID
@ -317,14 +317,12 @@ function login_user($user_id) {
* Get the total number of users on the platform
* @see SortableTable#get_total_number_of_items()
*/
function get_number_of_users()
{
function get_number_of_users() {
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$sql = "SELECT COUNT(u.user_id) AS total_number_of_items FROM $user_table u";
// adding the filter to see the user's only of the current access_url
global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}
@ -384,7 +382,7 @@ function get_number_of_users()
}
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}
@ -402,7 +400,7 @@ function get_number_of_users()
*/
function get_user_data($from, $number_of_items, $column, $direction)
{
global $_configuration,$origin;
global $origin;
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$admin_table = Database :: get_main_table(TABLE_MAIN_ADMIN);
@ -423,7 +421,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
" FROM $user_table u ";
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}
@ -484,7 +482,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
}
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}
@ -560,6 +558,7 @@ function modify_filter($user_id,$url_params,$row) {
if ($row['7'] == $statusname[ANONYMOUS]) {
$user_is_anonymous =true;
}
$result = '';
if (!$user_is_anonymous) {
$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')">
<img onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" onmouseout="clear_course_list (\'div_'.$user_id.'\')" src="../img/course.gif" title="'.get_lang('Courses').'" alt="'.get_lang('Courses').'"/>
@ -662,14 +661,14 @@ function active_filter($active, $url_params, $row) {
$image='wrong';
}
$result = '';
if ($action=='edit') {
$result = Display::return_icon($image.'.gif', get_lang('AccountExpired'));
} elseif ($row['0']<>$_user['user_id']) {
// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
//$result = '<a href="user_list.php?action='.$action.'&amp;user_id='.$row['0'].'&amp;'.$url_params.'&amp;sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon($image.'.gif', get_lang(ucfirst($action))).'</a>';
//$result = '<a href="'.api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?action=active_user&amp;user_id='.$row['0'].'&amp;'.$url_params.'&amp;sec_token='.$_SESSION['sec_token'].'">';
$result .=Display::return_icon($image.'.gif', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0'])).'</a>';
$result = Display::return_icon($image.'.gif', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0'])).'</a>';
//$result .= '<div>';
}
return $result;
@ -734,10 +733,6 @@ if ($_GET['action'] == "login_as" && isset ($login_as_user_id)) {
login_user($login_as_user_id);
}
//if (isset ($_GET['search']) && $_GET['search'] == 'advanced')
//{}
//else
//{
if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array ("url" => 'user_list.php', "name" => get_lang('UserList'));
@ -793,13 +788,11 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
Security::clear_token();
}
}
if (isset ($_POST['action']))
{
if (isset ($_POST['action'])) {
$check = Security::check_token('get');
if($check)
{
switch ($_POST['action'])
{
if ($check) {
switch ($_POST['action']) {
case 'delete' :
if (api_is_platform_admin()) {
$number_of_selected_users = count($_POST['id']);
@ -830,6 +823,7 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
Security::clear_token();
}
}
// Create a search-box
$form = new FormValidator('search_simple','get','','',null,false);
$renderer =& $form->defaultRenderer();
@ -871,15 +865,6 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
$_admins_list[] = $row_admin[0];
}
$image_path = UserManager::get_user_picture_path_by_id($user_id, 'web', false, true);
$user_profile = UserManager::get_picture_user($user_id, $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
if (!api_is_anonymous()) {
$photo = '<center><a href="userInfo.php?'.api_get_cidreq().'&origin='.$origin.'&amp;uInfo='.$user_id.'" title="'.get_lang('Info').'" ><img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'" title="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'" /></a></center>';
} else {
$photo = '<center><img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'" title="'.api_get_person_name($o_course_user['firstname'], $o_course_user['lastname']).'" /></center>';
}
// display advaced search form
$form = new FormValidator('advanced_search','get');
@ -926,7 +911,11 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
$form->addGroup($active_group,'',get_lang('ActiveAccount'),'<br/>',false);
$form->addElement('html', '</td><td>');
$extra_data = UserManager::get_extra_user_data($user_id, false, true, false, 1);
/*
* @todo fix this code
$extra_data = UserManager::get_extra_fields( 0,10,5, 'ASC', true, 1);
var_dump($extra_data);
$extra_options = array();
if (!empty($extra_data)) {
$extra_options[0] = get_lang('All');
@ -942,7 +931,7 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
$form->addElement('html', '</div>');
} else {
$form->addElement('html', '<div id="extra_data_text" style="display:none;">');
}
}*/
$form->addElement('html', '</td></tr>');
@ -957,7 +946,6 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
$form->setDefaults($defaults);
$form->addElement('html','</div>');
$form->display();
$table = new SortableTable('users', 'get_number_of_users', 'get_user_data', (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2);
@ -985,8 +973,9 @@ if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
$table->set_column_filter(7, 'status_filter');
$table->set_column_filter(8, 'active_filter');
$table->set_column_filter(9, 'modify_filter');
if (api_is_platform_admin())
$table->set_form_actions(array ('delete' => get_lang('DeleteFromPlatform')));
$table->display();
//}
Display :: display_footer();

@ -464,6 +464,7 @@ class Display {
$hmail .= '&#'.ord($email {
$i }).';';
}
$hclickable_text = null;
// Encrypt clickable text if @ is present
if (strpos($clickable_text, '@')) {
for ($i = 0; $i < strlen($clickable_text); $i ++) {

@ -1101,7 +1101,6 @@ class SessionManager {
* @return mixed false if the session category does not exist, array if the session category exists
*/
public static function get_all_session_category() {
$id = intval($id);
$tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY);
$id = api_get_current_access_url_id();
$sql = 'SELECT * FROM '.$tbl_session_category.' WHERE access_url_id ="'.$id.'" ORDER BY name ASC';

@ -33,8 +33,8 @@ if (api_get_setting('allow_message_tool')=='true') {
if ($panel == 1) {
//normal message
$user_info=api_get_user_info($userfriend_id); ?>
<div id="display_response_id" style="height:200px;width=400px">
<?php echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;&nbsp;&nbsp;<?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>
<div id="display_response_id" style="height:200px;width:400px">
<?php echo api_xml_http_response_encode(get_lang('To')); ?> :&nbsp;&nbsp;<?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>
<br />
<br /><span style="color:red"> * </span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :<br />
<input id="txt_subject_id" type="text" style="width:400px;"><br/>

@ -376,16 +376,20 @@ if (is_array($courses_tree)) {
// Courses inside the current session.
$date_session_start = $session['details']['date_start'];
$days_access_before_beginning = $session['details']['nb_days_access_before_beginning'] * 24 * 3600;
$session_now = time();
$html_courses_session = '';
$count_courses_session = 0;
foreach ($session['courses'] as $course) {
$is_coach_course = api_is_coach($session['details']['id'], $course['code']);
$allowed_time = 0;
if ($date_session_start != '0000-00-00') {
if ($is_coach_course) {
$allowed_time = api_strtotime($date_session_start) - $days_access_before_beginning;
} else {
$allowed_time = api_strtotime($date_session_start);
}
}
if ($session_now > $allowed_time) { //read only and accesible
if (api_get_setting('hide_courses_in_sessions') == 'false') {
$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',true);

Loading…
Cancel
Save