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

Format code

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent 3d793f4fa3
commit 28316e11f2
6 changed files with 89 additions and 88 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. 38
      index.php
  2. 9
      main/inc/lib/api.lib.php
  3. 26
      main/inc/lib/userportal.lib.php
  4. 90
      main/user/add_users_to_session.php
  5. 2
      main/user/resume_session.php
  6. 12
      user_portal.php

38
index.php
Unescape View File

@ -1,11 +1,12 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* @package chamilo.main
*/
use \ChamiloSession as Session;
define('CHAMILO_HOMEPAGE', true);
define('CHAMILO_LOAD_WYSIWYG', false);
@ -21,7 +22,7 @@ $this_section = SECTION_CAMPUS;
$header_title = null;
if (!api_is_anonymous()) {
$header_title = " ";
$header_title = ' ';
}
$controller = new IndexManager($header_title);
@ -34,17 +35,6 @@ if (!empty($_GET['logout'])) {
$controller->logout($redirect);
}
/* Table definitions */
/* Constants and CONFIGURATION parameters */
/** @todo these configuration settings should move to the Chamilo config settings. */
/** Defines wether or not anonymous visitors can see a list of the courses on the Chamilo homepage that are open to the world. */
$_setting['display_courses_to_anonymous_users'] = 'true';
/* LOGIN */
/**
* Registers in the track_e_default table (view in important activities in admin
* interface) a possible attempted break in, sending auth data through get.
@ -65,7 +55,7 @@ if (isset($_GET['submitAuth']) && $_GET['submitAuth'] == 1) {
}
// Delete session item necessary to check for legal terms
if (api_get_setting('allow_terms_conditions') == 'true') {
if (api_get_setting('allow_terms_conditions') === 'true') {
Session::erase('term_and_condition');
}
//If we are not logged in and customapages activated
@ -87,28 +77,26 @@ if (!api_get_user_id() && CustomPages::enabled()) {
if (!empty($_POST['submitAuth'])) {
// The user has been already authenticated, we are now to find the last login of the user.
if (isset ($_user['user_id'])) {
$track_login_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$sql_last_login = "SELECT UNIX_TIMESTAMP(login_date)
FROM $track_login_table
WHERE login_user_id = '".$_user['user_id']."'
ORDER BY login_date DESC LIMIT 1";
$result_last_login = Database::query($sql_last_login);
$track_login_table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$sql = "SELECT UNIX_TIMESTAMP(login_date)
FROM $track_login_table
WHERE login_user_id = '".$_user['user_id']."'
ORDER BY login_date DESC LIMIT 1";
$result_last_login = Database::query($sql);
if (!$result_last_login) {
if (Database::num_rows($result_last_login) > 0) {
$user_last_login_datetime = Database::fetch_array($result_last_login);
$user_last_login_datetime = $user_last_login_datetime[0];
Session::write('user_last_login_datetime',$user_last_login_datetime);
Session::write('user_last_login_datetime', $user_last_login_datetime);
}
}
//Event::event_login();
}
// End login -- if ($_POST['submitAuth'])
} else {
// Only if login form was not sent because if the form is sent the user was already on the page.
Event::event_open();
}
if (api_get_setting('display_categories_on_homepage') == 'true') {
if (api_get_setting('display_categories_on_homepage') === 'true') {
$controller->tpl->assign('course_category_block', $controller->return_courses_in_categories());
}
@ -175,7 +163,7 @@ if (isset($_GET['firstpage'])) {
api_set_firstpage_parameter($_GET['firstpage']);
// if we are already logged, go directly to course
if (api_user_is_login()) {
echo "<script type='text/javascript'>self.location.href='index.php?firstpage=".Security::remove_XSS($_GET['firstpage'])."'</script>";
echo "<script>self.location.href='index.php?firstpage=".Security::remove_XSS($_GET['firstpage'])."'</script>";
}
} else {
api_delete_firstpage_parameter();

9
main/inc/lib/api.lib.php
Unescape View File

@ -1655,16 +1655,25 @@ function api_get_cidreq($addSessionId = true, $addGroupId = true)
return $url;
}
/**
* get gradebook in session
*/
function api_is_in_gradebook()
{
return Session::read('in_gradebook', false);
}
/**
* set gradebook session
*/
function api_set_in_gradebook()
{
Session::write('in_gradebook', true);
}
/**
* remove gradebook session
*/
function api_remove_in_gradebook()
{
Session::erase('in_gradebook');

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

@ -41,7 +41,7 @@ class IndexManager
}
}*/
if (api_get_setting('show_documents_preview') == 'true') {
if (api_get_setting('show_documents_preview') === 'true') {
$this->load_directories_preview = true;
}
}
@ -55,11 +55,14 @@ class IndexManager
$this->tpl->setLoginForm($setLoginForm);
}
/**
* @param array $personal_course_list
*/
function return_exercise_block($personal_course_list)
{
$exercise_list = array();
if (!empty($personal_course_list)) {
foreach($personal_course_list as $course_item) {
foreach ($personal_course_list as $course_item) {
$course_code = $course_item['c'];
$session_id = $course_item['id_session'];
@ -68,7 +71,7 @@ class IndexManager
$session_id
);
foreach($exercises as $exercise_item) {
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');
@ -79,14 +82,21 @@ class IndexManager
if (!empty($exercise_list)) {
$exercise_list = msort($exercise_list, 'tms');
$my_exercise = $exercise_list[0];
$url = Display::url($my_exercise['title'], api_get_path(WEB_CODE_PATH).'exercise/overview.php?exerciseId='.$my_exercise['id'].'&cidReq='.$my_exercise['course_code'].'&id_session='.$my_exercise['session_id']);
$url = Display::url(
$my_exercise['title'],
api_get_path(WEB_CODE_PATH).'exercise/overview.php?exerciseId='.$my_exercise['id'].'&cidReq='.$my_exercise['course_code'].'&id_session='.$my_exercise['session_id']
);
$this->tpl->assign('exercise_url', $url);
$this->tpl->assign('exercise_end_date', api_convert_and_format_date($my_exercise['end_time'], DATE_FORMAT_SHORT));
}
}
}
function return_announcements($show_slide = true)
/**
* @param bool $show_slide
* @return null|string
*/
public function return_announcements($show_slide = true)
{
//// Display System announcements
$hideAnnouncements = api_get_setting('hide_global_announcements_when_not_connected');
@ -131,7 +141,7 @@ class IndexManager
* Alias for the online_logout() function
* @param bool $redirect Whether to ask online_logout to redirect to index.php or not
*/
function logout($redirect = true)
public function logout($redirect = true)
{
online_logout($this->user_id, true);
}
@ -142,7 +152,7 @@ class IndexManager
* @param string $category
* @return boolean
*/
function category_has_open_courses($category)
public function category_has_open_courses($category)
{
$setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 'true';
$main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
@ -164,7 +174,7 @@ class IndexManager
return false;
}
function return_teacher_link()
public function return_teacher_link()
{
$html = '';
$show_menu = false;

90
main/user/add_users_to_session.php
Unescape View File

@ -197,7 +197,6 @@ if ($allowTutors == 'true') {
$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
} else {
global $nosessionUsersList;
$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
while ($user = Database :: fetch_array($rs)) {
$person_name = api_get_person_name($user['firstname'], $user['lastname']);
@ -207,14 +206,14 @@ if ($allowTutors == 'true') {
$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
}
}
return $xajax_response;
}
$xajax -> processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = '
<script type="text/javascript">
$htmlHeadXtra[] = '<script>
function add_user_to_session (code, content) {
document.getElementById("user_to_add").value = "";
document.getElementById("ajax_list_users_single").innerHTML = "";
@ -241,9 +240,9 @@ if ($allowTutors == 'true') {
}
function validate_filter() {
document.formulaire.add_type.value = \''.$add_type.'\';
document.formulaire.form_sent.value=0;
document.formulaire.submit();
document.formulaire.add_type.value = \''.$add_type.'\';
document.formulaire.form_sent.value=0;
document.formulaire.submit();
}
function checked_in_no_session(checked) {
@ -261,7 +260,7 @@ if ($allowTutors == 'true') {
</script>';
$form_sent = 0;
$errorMsg = $firstLetterUser = $firstLetterSession='';
$firstLetterUser = $firstLetterSession='';
$UserList = $SessionList = array();
$sessions = array();
$noPHP_SELF = true;
@ -289,16 +288,18 @@ if ($allowTutors == 'true') {
$nosessionUsersList = $sessionUsersList = array();
$ajax_search = $add_type == 'unique' ? true : false;
$ajax_search = $add_type === 'unique' ? true : false;
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
if ($ajax_search) {
$sql = "SELECT u.user_id, lastname, firstname, username, session_id
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.session_id = ".intval($id_session)."
WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
ON
$tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
$tbl_session_rel_user.session_id = ".intval($id_session)."
WHERE u.status <> ".DRH." AND u.status<>6 $order_clause";
if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -307,9 +308,12 @@ if ($allowTutors == 'true') {
$sql = "SELECT u.user_id, lastname, firstname, username, session_id
FROM $tbl_user u
INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.user_id = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.session_id = ".intval($id_session)."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
ON
$tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
$tbl_session_rel_user.session_id = ".intval($id_session)."
INNER JOIN $tbl_user_rel_access_url url_user
ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6
$order_clause";
}
@ -324,8 +328,8 @@ if ($allowTutors == 'true') {
//Filter by Extra Fields
$use_extra_fields = false;
if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) {
$result_list=array();
if (is_array($new_field_list) && count($new_field_list) > 0) {
$result_list = array();
foreach ($new_field_list as $new_field) {
$varname = 'field_'.$new_field['variable'];
if (UserManager::is_extra_field_available($new_field['variable'])) {
@ -391,7 +395,7 @@ if ($allowTutors == 'true') {
ON $tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH." AND u.status<>6
WHERE u.status <> ".DRH." AND u.status<>6
$order_clause";
}
if (api_is_multiple_url_enabled()) {
@ -427,28 +431,28 @@ if ($allowTutors == 'true') {
unset($users); //clean to free memory
//filling the correct users in list
$sql="SELECT user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON
$tbl_session_rel_user.user_id = u.id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
$sql = "SELECT user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON
$tbl_session_rel_user.user_id = u.id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status <> ".DRH." AND u.status<>6 $order_clause";
if (api_is_multiple_url_enabled()) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql="SELECT u.user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON
$tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6
$sql = "SELECT u.user_id, lastname, firstname, username, session_id
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON
$tbl_session_rel_user.user_id = u.user_id AND
$tbl_session_rel_user.session_id = '$id_session' AND
$tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id AND u.status<>".DRH." AND u.status<>6
$order_clause";
}
}
@ -466,14 +470,15 @@ if ($allowTutors == 'true') {
unset($users); //clean to free memory
}
if ($add_type == 'multiple') {
if ($add_type === 'multiple') {
$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
} else {
$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.Security::remove_XSS($_GET['add']).'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
}
$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
$link_add_group = '<a href="usergroups.php">'.
Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
?>
<div class="actions">
<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
@ -481,7 +486,7 @@ if ($allowTutors == 'true') {
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
<?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
<?php
if ($add_type == 'multiple') {
if ($add_type === 'multiple') {
if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) {
echo '<h3>'.get_lang('FilterUsers').'</h3>';
@ -508,15 +513,8 @@ if ($allowTutors == 'true') {
}
}
?>
<input type="hidden" name="form_sent" value="1" />
<input type="hidden" name="add_type" />
<?php
if (!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API
}
?>
<div class="row">
<div class="span5">
<div class="multiple_select_header">
@ -610,7 +608,6 @@ if ($allowTutors == 'true') {
</div>
</form>
<script>
<!--
function moveItem(origin , destination) {
for (var i = 0 ; i<origin.options.length ; i++) {
if (origin.options[i].selected) {
@ -689,7 +686,6 @@ if ($allowTutors == 'true') {
ret = ret + options[i].value +'::'+options[i].text+";;";
return ret;
}
-->
</script>
<?php
} else {

2
main/user/resume_session.php
Unescape View File

@ -17,7 +17,7 @@ SessionManager::protect_teacher_session_edit($id_session);
$tool_name = get_lang('SessionOverview');
$allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
if ($allowTutors == 'true') {
if ($allowTutors === 'true') {
// Database Table Definitions
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);

12
user_portal.php
Unescape View File

@ -1,6 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* This is the index file displayed when a user is logged in on Chamilo.
*
@ -15,8 +17,6 @@
* @todo display_digest, shouldn't this be removed and be made into an extension?
*/
use ChamiloSession as Session;
/* Flag forcing the 'current course' reset, as we're not inside a course anymore */
$cidReset = true;
@ -47,8 +47,7 @@ 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 type="text/javascript">
$htmlHeadXtra[] = '<script>
$(document).ready(function() {
$(".document_preview_container").hide();
$(".document_preview").click(function() {
@ -58,10 +57,9 @@ if ($load_dirs) {
//showing div
$(".document_preview_container").hide();
$("#document_result_" +course_id+"_" + session_id).show();
//Loading
// Loading
var image = $("img", this);
image.attr("src", "'.$close_icon.'");
@ -85,7 +83,7 @@ if ($displayMyCourseViewBySessionLink) {
$(document).ready(function() {
changeMyCoursesView($.cookie("defaultMyCourseView"+userId));
});
/**
* Keep in cookie the last teacher view for the My Courses Tab. default view, or view by session
* @param inView

Write Preview
Loading…
Cancel
Save