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

Fixing PHP warnings.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent d34f481ce5
commit c888454a10
3 changed files with 186 additions and 195 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. 336
      main/admin/session_course_user.php
  2. 31
      main/inc/lib/usermanager.lib.php
  3. 14
      main/inc/lib/userportal.lib.php

336
main/admin/session_course_user.php
Unescape View File

@ -1,16 +1,15 @@
<?php //$id: $
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.admin
*/
* @package chamilo.admin
*/
// name of the language file that needs to be included
$language_file='admin';
// resetting the course id
$cidReset=true;
$cidReset = true;
// including some necessary dokeos files
require_once '../inc/global.inc.php';
// setting the section (for the tabs)
@ -37,15 +36,15 @@ $tool_name = get_lang('EditSessionCoursesByUser');
$id_user = intval($_GET['id_user']);
if (empty($id_user) || empty($id_session)) {
header('Location: resume_session.php?id_session='.$id_session);
header('Location: resume_session.php?id_session='.$id_session);
}
if (!api_is_platform_admin()) {
$sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session;
$rs = Database::query($sql);
if (Database::result($rs,0,0)!=$_user['user_id']) {
api_not_allowed(true);
}
$sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session;
$rs = Database::query($sql);
if (Database::result($rs,0,0)!=$_user['user_id']) {
api_not_allowed(true);
}
}
$formSent=0;
@ -54,61 +53,61 @@ $CourseList=$SessionList=array();
$courses=$sessions=array();
$noPHP_SELF=true;
if ($_POST['formSent']) {
$formSent = $_POST['formSent'];
$CourseList = $_POST['SessionCoursesList'];
if (isset($_POST['formSent']) && $_POST['formSent']) {
$formSent = $_POST['formSent'];
$CourseList = $_POST['SessionCoursesList'];
if (!is_array($CourseList)) {
$CourseList=array();
}
if (!is_array($CourseList)) {
$CourseList=array();
}
$sql="SELECT distinct code
$sql="SELECT distinct code
FROM $tbl_course course LEFT JOIN $tbl_session_rel_course session_rel_course
ON course.code = session_rel_course.course_code inner join $tbl_session_rel_course_rel_user as srcru
ON (srcru.id_session = session_rel_course.id_session)
WHERE id_user = $id_user and session_rel_course.id_session = $id_session";
$rs = Database::query($sql);
$existingCourses = Database::store_result($rs);
if (count($CourseList) == count($existingCourses)) {
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user.'&msg='.get_lang('MaybeYouWantToDeleteThisUserFromSession'));
exit;
}
foreach($CourseList as $enreg_course) {
$exists = false;
foreach($existingCourses as $existingCourse) {
if($enreg_course == $existingCourse['course_code']) {
$exists=true;
}
}
if(!$exists) {
$enreg_course = Database::escape_string($enreg_course);
$sql_delete = "DELETE FROM $tbl_session_rel_course_rel_user
$rs = Database::query($sql);
$existingCourses = Database::store_result($rs);
if (count($CourseList) == count($existingCourses)) {
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user.'&msg='.get_lang('MaybeYouWantToDeleteThisUserFromSession'));
exit;
}
foreach($CourseList as $enreg_course) {
$exists = false;
foreach($existingCourses as $existingCourse) {
if($enreg_course == $existingCourse['course_code']) {
$exists=true;
}
}
if(!$exists) {
$enreg_course = Database::escape_string($enreg_course);
$sql_delete = "DELETE FROM $tbl_session_rel_course_rel_user
WHERE id_user='".$id_user."' AND course_code='".$enreg_course."' AND id_session=$id_session";
Database::query($sql_delete);
if (Database::affected_rows()) {
//update session rel course table
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users - 1 WHERE id_session='$id_session' AND course_code='$enreg_course'";
Database::query($sql_update);
}
}
}
foreach($existingCourses as $existingCourse) {
//$sql_insert_rel_course= "INSERT INTO $tbl_session_rel_course(id_session,course_code, id_coach) VALUES('$id_session','$enreg_course','$id_coach')";
if(!in_array($existingCourse['code'], $CourseList)){
$existingCourse = Database::escape_string($existingCourse['code']);
$sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$existingCourse','$id_user')";
Database::query($sql_insert);
if(Database::affected_rows()) {
//update session rel course table
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users + 1 WHERE id_session='$id_session' AND course_code='$existingCourse'";
Database::query($sql_update);
}
}
}
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user.'&msg='.get_lang('CoursesUpdated'));
exit;
Database::query($sql_delete);
if (Database::affected_rows()) {
//update session rel course table
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users - 1 WHERE id_session='$id_session' AND course_code='$enreg_course'";
Database::query($sql_update);
}
}
}
foreach($existingCourses as $existingCourse) {
//$sql_insert_rel_course= "INSERT INTO $tbl_session_rel_course(id_session,course_code, id_coach) VALUES('$id_session','$enreg_course','$id_coach')";
if(!in_array($existingCourse['code'], $CourseList)){
$existingCourse = Database::escape_string($existingCourse['code']);
$sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$existingCourse','$id_user')";
Database::query($sql_insert);
if(Database::affected_rows()) {
//update session rel course table
$sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users + 1 WHERE id_session='$id_session' AND course_code='$existingCourse'";
Database::query($sql_update);
}
}
}
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user.'&msg='.get_lang('CoursesUpdated'));
exit;
}
// display the dokeos header
@ -131,8 +130,8 @@ $sql = "SELECT code, title, visual_code, srcru.id_session
//all
$sql_all="SELECT code, title, visual_code, src.id_session " .
"FROM $tbl_course course inner JOIN $tbl_session_rel_course as src " .
"ON course.code = src.course_code AND id_session = $id_session";
"FROM $tbl_course course inner JOIN $tbl_session_rel_course as src " .
"ON course.code = src.course_code AND id_session = $id_session";
$result=Database::query($sql);
$Courses=Database::store_result($result);
@ -141,125 +140,118 @@ $CoursesAll=Database::store_result($result);
$course_temp = array();
foreach($Courses as $course) {
$course_temp[] = $course['code'];
$course_temp[] = $course['code'];
}
foreach($CoursesAll as $course) {
if (in_array($course['code'], $course_temp)) {
$nosessionCourses[$course['code']] = $course ;
} else {
$sessionCourses[$course['code']] = $course ;
}
if (in_array($course['code'], $course_temp)) {
$nosessionCourses[$course['code']] = $course ;
} else {
$sessionCourses[$course['code']] = $course ;
}
}
unset($Courses);
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo Security::remove_XSS($_GET['page']) ?>&id_user=<?php echo $id_user; ?>&id_session=<?php echo $id_session; ?>" style="margin:0px;">
<input type="hidden" name="formSent" value="1" />
<?php
if(!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API
}
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
<tr>
<td width="45%" align="center"><b><?php echo get_lang('CurrentCourses') ?> :</b></td>
<td width="10%">&nbsp;</td>
<td align="center" width="45%"><b><?php echo get_lang('CoursesToAvoid') ?> :</b></td>
</tr>
</td>
<tr>
<td width="45%" align="center">
<div id="ajax_list_courses_multiple">
<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
foreach($nosessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
<?php
}
?> </select></div> <?php
unset($nosessionCourses);
?>
</select></td>
<td width="10%" valign="middle" align="center">
<button class="arrowr" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))"></button>
<br /><br />
<button class="arrowl" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))"></button>
<br /><br /><br /><br /><br /><br />
<?php
echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('EditSessionCourses').'</button>';
?>
</td>
<td width="45%" align="center"><select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:320px;">
<?php
foreach($sessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>"><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
<?php
}
unset($sessionCourses);
?>
</select></td>
</tr>
</table>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id_user=<?php echo $id_user; ?>&id_session=<?php echo $id_session; ?>" style="margin:0px;">
<input type="hidden" name="formSent" value="1" />
<?php
if(!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API
}
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
<tr>
<td width="45%" align="center"><b><?php echo get_lang('CurrentCourses') ?> :</b></td>
<td width="10%">&nbsp;</td>
<td align="center" width="45%"><b><?php echo get_lang('CoursesToAvoid') ?> :</b></td>
</tr>
</td>
<tr>
<td width="45%" align="center">
<div id="ajax_list_courses_multiple">
<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
foreach($nosessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
<?php
}
?> </select></div> <?php
unset($nosessionCourses);
?>
</select></td>
<td width="10%" valign="middle" align="center">
<button class="arrowr" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))"></button>
<br /><br />
<button class="arrowl" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))"></button>
<br /><br /><br /><br /><br /><br />
<?php
echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('EditSessionCourses').'</button>';
?>
</td>
<td width="45%" align="center"><select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:320px;">
<?php
foreach($sessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['code']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>"><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
<?php
}
unset($sessionCourses);
?>
</select></td>
</tr>
</table>
</form>
<script type="text/javascript">
<!--
function moveItem(origin , destination){
for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) {
destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
origin.options[i]=null;
i = i-1;
}
}
destination.selectedIndex = -1;
sortOptions(destination.options);
}
function sortOptions(options) {
newOptions = new Array();
for (i = 0 ; i<options.length ; i++) {
newOptions[i] = options[i];
}
newOptions = newOptions.sort(mysort);
options.length = 0;
for(i = 0 ; i < newOptions.length ; i++){
options[i] = newOptions[i];
}
}
function mysort(a, b){
if(a.text.toLowerCase() > b.text.toLowerCase()){
return 1;
}
if(a.text.toLowerCase() < b.text.toLowerCase()){
return -1;
}
return 0;
}
function valide(){
var options = document.getElementById('destination').options;
for (i = 0 ; i<options.length ; i++)
options[i].selected = true;
document.forms.formulaire.submit();
}
-->
<script>
function moveItem(origin , destination) {
for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) {
destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
origin.options[i]=null;
i = i-1;
}
}
destination.selectedIndex = -1;
sortOptions(destination.options);
}
function sortOptions(options) {
newOptions = new Array();
for (i = 0 ; i<options.length ; i++) {
newOptions[i] = options[i];
}
newOptions = newOptions.sort(mysort);
options.length = 0;
for(i = 0 ; i < newOptions.length ; i++){
options[i] = newOptions[i];
}
}
function mysort(a, b){
if(a.text.toLowerCase() > b.text.toLowerCase()){
return 1;
}
if(a.text.toLowerCase() < b.text.toLowerCase()){
return -1;
}
return 0;
}
function valide(){
var options = document.getElementById('destination').options;
for (i = 0 ; i<options.length ; i++)
options[i].selected = true;
document.forms.formulaire.submit();
}
</script>
<?php
Display::display_footer();
Display::display_footer();

31
main/inc/lib/usermanager.lib.php
Unescape View File

@ -3656,7 +3656,7 @@ class UserManager
$extraFiltrableFields[] = array('name'=> $extraField[3], 'variable'=>$extraField[1], 'data'=> $extraField[9]);
}
}
}
}
if (is_array($extraFiltrableFields) && count($extraFiltrableFields) > 0 ) {
return $extraFiltrableFields;
}
@ -3668,13 +3668,10 @@ class UserManager
*/
public static function get_search_form_where_extra_fields()
{
$useExtraFields = false;
$extraFields = UserManager::get_extra_filtrable_fields();
$extraFieldResult = array();
if (is_array($extraFields) && count($extraFields)>0 ) {
$resultList=array();
foreach ($extraFields as $extraField) {
$varName = 'field_'.$extraField['variable'];
if (UserManager::is_extra_field_available($extraField['variable'])) {
@ -3698,29 +3695,27 @@ class UserManager
$finalResult = $extraFieldResult[0];
}
$whereFilter ='';
if (is_array($finalResult) && count($finalResult)>0) {
$whereFilter = " AND u.user_id IN ('".implode("','", $finalResult)."') ";
} else {
//no results
$whereFilter = " AND u.user_id = -1 ";
}
return $whereFilter;
}
}
/**
* Show the search form
* @param string the value of the search box
* @param string $query the value of the search box
* @return string HTML form
*/
public static function get_search_form($query)
{
$extraFiltrableFields = UserManager::get_extra_filtrable_fields();
$extraFields = null;
if (is_array($extraFiltrableFields) && count($extraFiltrableFields)>0 ) {
$extraFields = '';
foreach ($extraFiltrableFields as $extraField) {
$extraFields .= '<label class="extra_field">'.$extraField['name'].'</label>';
$varName = 'field_'.$extraField['variable'];
@ -3739,13 +3734,13 @@ class UserManager
$extraFields .= '&nbsp;&nbsp;';
}
}
$searchType = isset($_GET['search_type']) ? $_GET['search_type'] : null;
return '
<form method="GET" class="well form-search" action="'.api_get_path(WEB_PATH).'main/social/search.php">
<input placeholder="'.get_lang('UsersGroups').'" type="text" class="input-small" value="'.api_htmlentities(Security::remove_XSS($query)).'" name="q"/> &nbsp;
' . get_lang('Type') .'
' . get_lang('Type') .'
<select name="search_type" onchange="javascript: extra_field_toogle();">
<option value="0">--'.get_lang('Select').'--</option>
<option value="1"' . (($searchType=='1')?'selected="selected"':"") . '>--' . get_lang('User') .'--</option>
@ -3763,7 +3758,7 @@ class UserManager
</script>
';
}
/**
* Shows the user menu
*/
@ -3819,8 +3814,6 @@ class UserManager
$code_special_courses = ' course.code IN ('.join($special_course_list, ',').') ';
}
// variable initialisation
$course_list_sql = '';
$course_list = array();
if (!empty($code_special_courses)) {
$course_list_sql = "SELECT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, course.tutor_name t, course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
@ -3843,9 +3836,9 @@ class UserManager
/**
* Allow to register contact to social network
* @param int user friend id
* @param int user id
* @param int relation between users see constants definition
* @param int $friend_id user friend id
* @param int $my_user_id user id
* @param int $relation_type relation between users see constants definition
*/
public static function relate_users($friend_id, $my_user_id, $relation_type)
{

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

@ -975,11 +975,17 @@ class IndexManager
$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);
// Load sessions in category in *history*
$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);
// Load sessions in category
$session_categories = UserManager::get_sessions_by_category(
$user_id,
false
);
}
$html = '';

Write Preview
Loading…
Cancel
Save