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

Minor - fixing PHP warnings.

Browse Source
1.9.x
Julio Montoya 12 years ago
parent a2b919a091
commit a722bf7bab
3 changed files with 163 additions and 164 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. 20
      main/admin/dashboard_add_courses_to_user.php
  2. 29
      main/admin/dashboard_add_sessions_to_user.php
  3. 34
      main/admin/dashboard_add_users_to_user.php

20
main/admin/dashboard_add_courses_to_user.php
Unescape View File

@ -17,7 +17,6 @@ require_once '../inc/lib/xajax/xajax.inc.php';
global $_configuration; global $_configuration;
// create an ajax object // create an ajax object
$xajax = new xajax(); $xajax = new xajax();
$xajax->registerFunction('search_courses'); $xajax->registerFunction('search_courses');
@ -38,7 +37,6 @@ $tbl_course_rel_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
// initializing variables // initializing variables
$id_session=intval($_GET['id_session']);
$user_id = intval($_GET['user']); $user_id = intval($_GET['user']);
$user_info = api_get_user_info($user_id); $user_info = api_get_user_info($user_id);
$user_anonymous = api_get_anonymous_id(); $user_anonymous = api_get_anonymous_id();
@ -62,7 +60,8 @@ if (!api_is_platform_admin()) {
api_not_allowed(true); api_not_allowed(true);
} }
function search_courses($needle,$type) { function search_courses($needle,$type)
{
global $_configuration, $tbl_course, $tbl_course_rel_user, $tbl_course_rel_access_url,$user_id; global $_configuration, $tbl_course, $tbl_course_rel_user, $tbl_course_rel_access_url,$user_id;
$xajax_response = new XajaxResponse(); $xajax_response = new XajaxResponse();
@ -90,7 +89,6 @@ function search_courses($needle,$type) {
WHERE c.code LIKE '$needle%' $without_assigned_courses "; WHERE c.code LIKE '$needle%' $without_assigned_courses ";
} }
$rs = Database::query($sql); $rs = Database::query($sql);
$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" style="width:340px;">'; $return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
@ -107,7 +105,6 @@ $xajax -> processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = ' $htmlHeadXtra[] = '
<script type="text/javascript"> <script type="text/javascript">
<!--
function moveItem(origin , destination) { function moveItem(origin , destination) {
for(var i = 0 ; i<origin.options.length ; i++) { for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) { if(origin.options[i].selected) {
@ -155,7 +152,6 @@ function remove_item(origin) {
} }
} }
} }
-->
</script>'; </script>';
$formSent=0; $formSent=0;
@ -163,7 +159,7 @@ $errorMsg = $firstLetterCourse = '';
$UserList = array(); $UserList = array();
$msg = ''; $msg = '';
if (intval($_POST['formSent']) == 1) { if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
$courses_list = $_POST['CoursesList']; $courses_list = $_POST['CoursesList'];
$affected_rows = CourseManager::suscribe_courses_to_hr_manager($user_id,$courses_list); $affected_rows = CourseManager::suscribe_courses_to_hr_manager($user_id,$courses_list);
if ($affected_rows) { if ($affected_rows) {
@ -200,9 +196,13 @@ if (isset($_POST['firstLetterCourse'])) {
$needle = "$needle%"; $needle = "$needle%";
} }
if ($_configuration['multiple_access_urls']) { if (api_is_multiple_url_enabled()) {
$sql = " SELECT c.code, c.title FROM $tbl_course c LEFT JOIN $tbl_course_rel_access_url a ON (a.course_code = c.code) $sql = " SELECT c.code, c.title
WHERE c.code LIKE '$needle' $without_assigned_courses AND access_url_id = ".api_get_current_access_url_id()." FROM $tbl_course c
LEFT JOIN $tbl_course_rel_access_url a ON (a.course_code = c.code)
WHERE
c.code LIKE '$needle' $without_assigned_courses AND
access_url_id = ".api_get_current_access_url_id()."
ORDER BY c.title"; ORDER BY c.title";
} else { } else {

29
main/admin/dashboard_add_sessions_to_user.php
Unescape View File

@ -34,14 +34,13 @@ $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
// initializing variables // Initializing variables
$id_session = intval($_GET['id_session']); $user_id = isset($_GET['user']) ? intval($_GET['user']) : null;
$user_id = intval($_GET['user']);
$user_info = api_get_user_info($user_id); $user_info = api_get_user_info($user_id);
$user_anonymous = api_get_anonymous_id(); $user_anonymous = api_get_anonymous_id();
$current_user_id = api_get_user_id(); $current_user_id = api_get_user_id();
// setting the name of the tool // Setting the name of the tool
if (UserManager::is_admin($user_id)) { if (UserManager::is_admin($user_id)) {
$tool_name = get_lang('AssignSessionsToPlatformAdministrator'); $tool_name = get_lang('AssignSessionsToPlatformAdministrator');
} else if ($user_info['status'] == SESSIONADMIN) { } else if ($user_info['status'] == SESSIONADMIN) {
@ -59,7 +58,8 @@ if (!api_is_platform_admin() && !api_is_session_admin()) {
api_not_allowed(true); api_not_allowed(true);
} }
function search_sessions($needle,$type) { function search_sessions($needle,$type)
{
global $_configuration, $tbl_session_rel_access_url, $tbl_session, $user_id; global $_configuration, $tbl_session_rel_access_url, $tbl_session, $user_id;
$xajax_response = new XajaxResponse(); $xajax_response = new XajaxResponse();
@ -77,15 +77,14 @@ function search_sessions($needle,$type) {
} }
if ($_configuration['multiple_access_urls']) { if ($_configuration['multiple_access_urls']) {
$sql = " SELECT s.id, s.name FROM $tbl_session s LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id) $sql = " SELECT s.id, s.name FROM $tbl_session s
LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
WHERE s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id().""; WHERE s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id()."";
} else { } else {
$sql = "SELECT s.id, s.name FROM $tbl_session s $sql = "SELECT s.id, s.name FROM $tbl_session s
WHERE s.name LIKE '$needle%' $without_assigned_sessions "; WHERE s.name LIKE '$needle%' $without_assigned_sessions ";
} }
$rs = Database::query($sql); $rs = Database::query($sql);
$return .= '<select id="origin" name="NoAssignedSessionsList[]" multiple="multiple" size="20" style="width:340px;">'; $return .= '<select id="origin" name="NoAssignedSessionsList[]" multiple="multiple" size="20" style="width:340px;">';
while($session = Database :: fetch_array($rs)) { while($session = Database :: fetch_array($rs)) {
$return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'],ENT_QUOTES).'">'.$session['name'].'</option>'; $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'],ENT_QUOTES).'">'.$session['name'].'</option>';
@ -154,7 +153,7 @@ $errorMsg = $firstLetterSession = '';
$UserList = array(); $UserList = array();
$msg = ''; $msg = '';
if (intval($_POST['formSent']) == 1) { if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
$sessions_list = $_POST['SessionsList']; $sessions_list = $_POST['SessionsList'];
$userInfo = api_get_user_info($user_id); $userInfo = api_get_user_info($user_id);
$affected_rows = SessionManager::suscribe_sessions_to_hr_manager($userInfo, $sessions_list); $affected_rows = SessionManager::suscribe_sessions_to_hr_manager($userInfo, $sessions_list);
@ -193,16 +192,18 @@ if (isset($_POST['firstLetterSession'])) {
} }
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$sql = " SELECT s.id, s.name FROM $tbl_session s LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id) $sql = "SELECT s.id, s.name
WHERE s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id()." FROM $tbl_session s
LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
WHERE
s.name LIKE '$needle%' $without_assigned_sessions AND
access_url_id = ".api_get_current_access_url_id()."
ORDER BY s.name"; ORDER BY s.name";
} else { } else {
$sql = "SELECT s.id, s.name FROM $tbl_session s $sql = "SELECT s.id, s.name FROM $tbl_session s
WHERE s.name LIKE '$needle%' $without_assigned_sessions WHERE s.name LIKE '$needle%' $without_assigned_sessions
ORDER BY s.name ORDER BY s.name";
";
} }
$result = Database::query($sql); $result = Database::query($sql);
?> ?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){ echo ' onsubmit="valide();"';}?>> <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){ echo ' onsubmit="valide();"';}?>>

34
main/admin/dashboard_add_users_to_user.php
Unescape View File

@ -36,7 +36,6 @@ $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
$tbl_access_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_access_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
// initializing variables // initializing variables
$id_session=intval($_GET['id_session']);
$user_id = intval($_GET['user']); $user_id = intval($_GET['user']);
$user_info = api_get_user_info($user_id); $user_info = api_get_user_info($user_id);
$user_anonymous = api_get_anonymous_id(); $user_anonymous = api_get_anonymous_id();
@ -60,7 +59,8 @@ if (!api_is_platform_admin()) {
api_not_allowed(true); api_not_allowed(true);
} }
function search_users($needle,$type) { function search_users($needle,$type)
{
global $_configuration,$tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id; global $_configuration,$tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id;
$xajax_response = new XajaxResponse(); $xajax_response = new XajaxResponse();
@ -78,24 +78,26 @@ function search_users($needle,$type) {
$without_assigned_users = " AND user.user_id NOT IN(".implode(',',$assigned_users_id).")"; $without_assigned_users = " AND user.user_id NOT IN(".implode(',',$assigned_users_id).")";
} }
if ($_configuration['multiple_access_urls']) { if (api_is_multiple_url_enabled()) {
$sql = "SELECT user.user_id, username, lastname, firstname FROM $tbl_user user LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id) $sql = "SELECT user.user_id, username, lastname, firstname
FROM $tbl_user user LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND status NOT IN(".DRH.", ".SESSIONADMIN.") AND user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id) $without_assigned_users AND access_url_id = ".api_get_current_access_url_id().""; WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND status NOT IN(".DRH.", ".SESSIONADMIN.") AND user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id) $without_assigned_users AND access_url_id = ".api_get_current_access_url_id()."";
} else { } else {
$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user $sql = "SELECT user_id, username, lastname, firstname
FROM $tbl_user user
WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND status NOT IN(".DRH.", ".SESSIONADMIN.") AND user_id NOT IN ($user_anonymous, $current_user_id, $user_id) $without_assigned_users"; WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND status NOT IN(".DRH.", ".SESSIONADMIN.") AND user_id NOT IN ($user_anonymous, $current_user_id, $user_id) $without_assigned_users";
} }
$rs = Database::query($sql); $rs = Database::query($sql);
$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return)); $xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
if ($type == 'single') { if ($type == 'single') {
$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id(); $access_url_id = api_get_current_access_url_id();
$sql = 'SELECT user.user_id, username, lastname, firstname FROM '.$tbl_user.' user $sql = 'SELECT user.user_id, username, lastname, firstname
FROM '.$tbl_user.' user
INNER JOIN '.$tbl_user_rel_access_url.' url_user ON (url_user.user_id=user.user_id) INNER JOIN '.$tbl_user_rel_access_url.' url_user ON (url_user.user_id=user.user_id)
WHERE access_url_id = '.$access_url_id.' AND (username LIKE "'.$needle.'%" WHERE access_url_id = '.$access_url_id.' AND (username LIKE "'.$needle.'%"
OR firstname LIKE "'.$needle.'%" OR firstname LIKE "'.$needle.'%"
@ -113,7 +115,6 @@ function search_users($needle,$type) {
$return .= '...<br />'; $return .= '...<br />';
} }
} }
$xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
} else { } else {
$return .= '<select id="origin" name="NoAssignedUsersList[]" multiple="multiple" size="20" style="width:340px;">'; $return .= '<select id="origin" name="NoAssignedUsersList[]" multiple="multiple" size="20" style="width:340px;">';
@ -132,7 +133,6 @@ $xajax -> processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = ' $htmlHeadXtra[] = '
<script type="text/javascript"> <script type="text/javascript">
<!--
function add_user_to_user (code, content) { function add_user_to_user (code, content) {
document.getElementById("user_to_add").value = ""; document.getElementById("user_to_add").value = "";
document.getElementById("ajax_list_users_single").innerHTML = ""; document.getElementById("ajax_list_users_single").innerHTML = "";
@ -195,7 +195,6 @@ function remove_item(origin) {
} }
} }
} }
-->
</script>'; </script>';
$formSent=0; $formSent=0;
@ -203,7 +202,7 @@ $errorMsg = $firstLetterUser = '';
$UserList = array(); $UserList = array();
$msg = ''; $msg = '';
if (intval($_POST['formSent']) == 1) { if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
$user_list = $_POST['UsersList']; $user_list = $_POST['UsersList'];
$affected_rows = UserManager::suscribe_users_to_hr_manager($user_id,$user_list); $affected_rows = UserManager::suscribe_users_to_hr_manager($user_id,$user_list);
if ($affected_rows) { if ($affected_rows) {
@ -211,7 +210,7 @@ if (intval($_POST['formSent']) == 1) {
} }
} }
// display header // Display header
Display::display_header($tool_name); Display::display_header($tool_name);
// actions // actions
@ -236,19 +235,18 @@ if (isset($_POST['firstLetterUser'])) {
$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'"; $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
} }
if (api_is_multiple_url_enabled()) {
if ($_configuration['multiple_access_urls']) { $sql = "SELECT user.user_id, username, lastname, firstname
$sql = "SELECT user.user_id, username, lastname, firstname FROM $tbl_user user LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id) FROM $tbl_user user LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
WHERE $without_assigned_users user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user AND access_url_id = ".api_get_current_access_url_id()." WHERE $without_assigned_users user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user AND access_url_id = ".api_get_current_access_url_id()."
ORDER BY firstname"; ORDER BY firstname";
} else { } else {
$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user $sql = "SELECT user_id, username, lastname, firstname
FROM $tbl_user user
WHERE $without_assigned_users user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user WHERE $without_assigned_users user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user
ORDER BY firstname "; ORDER BY firstname ";
} }
$result = Database::query($sql); $result = Database::query($sql);
?> ?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
<input type="hidden" name="formSent" value="1" /> <input type="hidden" name="formSent" value="1" />

Write Preview
Loading…
Cancel
Save