Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x
Alex Aragon
8 years ago
commit
d3e1ca5559
@ -1,3 +1,6 @@ |
||||
<FilesMatch "(?i)\.(php5|php4|php|php3|php2|phtml|pl|py|jsp|asp|sh|cgi)$"> |
||||
deny from all |
||||
# Apache 2.2 |
||||
#deny from all |
||||
# Apache 2.4 |
||||
Require all denied |
||||
</FilesMatch> |
||||
@ -0,0 +1,97 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
use Chamilo\UserBundle\Entity\User, |
||||
Chamilo\CoreBundle\Entity\UserRelUser; |
||||
|
||||
$cidReset = true; |
||||
|
||||
require_once __DIR__.'/../inc/global.inc.php'; |
||||
|
||||
api_protect_admin_script(); |
||||
|
||||
if (!isset($_REQUEST['u'])) { |
||||
api_not_allowed(true); |
||||
} |
||||
|
||||
$em = Database::getManager(); |
||||
$relationsRepo = $em->getRepository('ChamiloCoreBundle:UserRelUser'); |
||||
/** @var User $user */ |
||||
$user = UserManager::getManager()->find($_REQUEST['u']); |
||||
|
||||
if (!$user) { |
||||
api_not_allowed(true); |
||||
} |
||||
|
||||
$subscribedUsers = $user->getHrm(); |
||||
|
||||
$hrmOptions = []; |
||||
|
||||
/** @var UserRelUser $subscribedUser */ |
||||
foreach ($subscribedUsers as $subscribedUser) { |
||||
/** @var User $hrm */ |
||||
$hrm = UserManager::getManager()->find($subscribedUser->getFriendUserId()); |
||||
|
||||
if (!$hrm) { |
||||
continue; |
||||
} |
||||
|
||||
$hrmOptions[$hrm->getId()] = $hrm->getCompleteNameWithUsername(); |
||||
} |
||||
|
||||
$form = new FormValidator('assign_hrm'); |
||||
$form->addUserAvatar('u', get_lang('User'), 'medium'); |
||||
$form->addSelectAjax( |
||||
'hrm', |
||||
get_lang('HrmList'), |
||||
$hrmOptions, |
||||
['multiple' => 'multiple', 'url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=user_by_role'] |
||||
); |
||||
$form->addButtonSave(get_lang('Send')); |
||||
$form->setDefaults([ |
||||
'u' => $user, |
||||
'hrm' => array_keys($hrmOptions) |
||||
]); |
||||
|
||||
if ($form->validate()) { |
||||
/** @var UserRelUser $subscribedUser */ |
||||
foreach ($subscribedUsers as $subscribedUser) { |
||||
$em->remove($subscribedUser); |
||||
}; |
||||
|
||||
$em->flush(); |
||||
|
||||
$values = $form->exportValues(); |
||||
|
||||
foreach ($values['hrm'] as $hrmId) { |
||||
/** @var User $hrm */ |
||||
$hrm = UserManager::getManager()->find($hrmId); |
||||
|
||||
if (!$hrm) { |
||||
continue; |
||||
} |
||||
|
||||
if ($hrm->getStatus() !== DRH) { |
||||
continue; |
||||
} |
||||
|
||||
UserManager::subscribeUsersToHRManager($hrm->getId(), [$user->getId()], false); |
||||
} |
||||
|
||||
Display::addFlash( |
||||
Display::return_message(get_lang('AssignedUsersHaveBeenUpdatedSuccessfully'), 'success') |
||||
); |
||||
|
||||
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.$user->getId()); |
||||
exit; |
||||
} |
||||
|
||||
$interbreadcrumb[] = ['name' => get_lang('PlatformAdmin'), 'url' => 'index.php']; |
||||
$interbreadcrumb[] = ['name' => get_lang('UserList'), 'url' => 'user_list.php']; |
||||
$interbreadcrumb[] = ['name' => $user->getCompleteName(), 'url' => 'user_information.php?user_id='.$user->getId()]; |
||||
|
||||
$toolName = get_lang('AssignHrmToUser'); |
||||
|
||||
$view = new Template($toolName); |
||||
$view->assign('header', $toolName); |
||||
$view->assign('content', $form->returnForm()); |
||||
$view->display_one_col_template(); |
||||
|
After Width: | Height: | Size: 1.6 KiB |
File diff suppressed because it is too large
Load Diff
@ -1,338 +0,0 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
|
||||
// TODO: Is this file deprecated? |
||||
|
||||
/** |
||||
* @package chamilo.tracking |
||||
* @todo clean code - structure is unclear and difficult to modify |
||||
*/ |
||||
|
||||
$uInfo = $_REQUEST['uInfo']; |
||||
$view = $_REQUEST['view']; |
||||
require_once __DIR__.'/../inc/global.inc.php'; |
||||
|
||||
// Roles and rights system |
||||
$user_id = api_get_user_id(); |
||||
$course_id = api_get_course_id(); |
||||
$courseId = api_get_course_int_id(); |
||||
|
||||
//YW Hack security to quick fix RolesRights bug |
||||
$is_allowed = true; |
||||
|
||||
require_once api_get_path(SYS_CODE_PATH).'exercise/hotpotatoes.lib.php'; |
||||
|
||||
/* Header */ |
||||
|
||||
/* |
||||
$interbreadcrumb[]= array ("url"=>"../group/group.php", "name"=> get_lang('BredCrumpGroups')); |
||||
$interbreadcrumb[]= array ("url"=>"../group/group_space.php?gidReq=$_gid", "name"=> get_lang('BredCrumpGroupSpace')); |
||||
*/ |
||||
|
||||
if ($uInfo) { |
||||
$interbreadcrumb[] = array( |
||||
"url" => "../user/userInfo.php?uInfo=$uInfo", |
||||
"name" => get_lang('BredCrumpUsers') |
||||
); |
||||
} |
||||
|
||||
$nameTools = get_lang('ToolName'); |
||||
|
||||
/* Constants and variables */ |
||||
|
||||
$is_allowedToTrack = $is_courseAdmin; |
||||
$is_course_member = CourseManager::is_user_subscribed_in_real_or_linked_course( |
||||
$user_id, |
||||
$courseId |
||||
); |
||||
|
||||
// Database Table Definitions |
||||
$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER); |
||||
$TABLEUSER = Database::get_main_table(TABLE_MAIN_USER); |
||||
$tbl_session_course_user = Database::get_main_table( |
||||
TABLE_MAIN_SESSION_COURSE_USER |
||||
); |
||||
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); |
||||
|
||||
$TABLECOURSE_GROUPSUSER = Database::get_course_table(TABLE_GROUP_USER); |
||||
$now = api_get_utc_datetime(); |
||||
|
||||
$sql = "SELECT 1 |
||||
FROM $tbl_session_course_user AS session_course_user |
||||
INNER JOIN $tbl_session AS session |
||||
ON session_course_user.session_id = session.id |
||||
AND ((access_start_date <= '$now' |
||||
AND access_end_date >= '$now') |
||||
OR (access_start_date IS NULL AND access_end_date IS NULL)) |
||||
WHERE session_id='".api_get_session_id()."' AND c_id = $courseId"; |
||||
//echo $sql; |
||||
$result = Database::query($sql); |
||||
if (!Database::num_rows($result)) { |
||||
$disabled = true; |
||||
} |
||||
|
||||
|
||||
$tbl_learnpath_main = Database::get_course_table(TABLE_LP_MAIN); |
||||
$tbl_learnpath_item = Database::get_course_table(TABLE_LP_ITEM); |
||||
$tbl_learnpath_view = Database::get_course_table(TABLE_LP_VIEW); |
||||
$tbl_learnpath_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW); |
||||
|
||||
$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; |
||||
|
||||
// The variables for the days and the months |
||||
$DaysShort = api_get_week_days_short(); |
||||
$DaysLong = api_get_week_days_long(); |
||||
$MonthsLong = api_get_months_long(); |
||||
$MonthsShort = api_get_months_short(); |
||||
|
||||
//$is_allowedToTrack = $is_groupTutor; // allowed to track only user of one group |
||||
//$is_allowedToTrackEverybodyInCourse = $is_allowed[EDIT_RIGHT]; // allowed to track all students in course |
||||
//YW hack security to fix RolesRights bug |
||||
$is_allowedToTrack = true; // allowed to track only user of one group |
||||
$is_allowedToTrackEverybodyInCourse = $is_allowedToTrack; // allowed to track all students in course |
||||
|
||||
/* MAIN SECTION */ |
||||
|
||||
$title[0] = ''; |
||||
$title[1] = ''; |
||||
$line = ''; |
||||
$title_line = ''; |
||||
|
||||
// check if uid is tutor of this group |
||||
if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) { |
||||
if (!$uInfo && !isset($uInfo)) { |
||||
/* |
||||
* Display list of user of this group |
||||
*/ |
||||
|
||||
if ($is_allowedToTrackEverybodyInCourse) { |
||||
// if user can track everybody : list user of course |
||||
$sql = "SELECT count(user_id) |
||||
FROM $TABLECOURSUSER |
||||
WHERE c_id = '$courseId' AND relation_type<>".COURSE_RELATION_TYPE_RRHH.""; |
||||
|
||||
} else { |
||||
// if user can only track one group : list users of this group |
||||
$sql = "SELECT count(user) |
||||
FROM $TABLECOURSE_GROUPSUSER |
||||
WHERE group_id = '$_gid'"; |
||||
} |
||||
$userGroupNb = StatsUtils::getOneResult($sql); |
||||
$step = 25; // number of student per page |
||||
if ($userGroupNb > $step) { |
||||
if (!isset($offset)) { |
||||
$offset = 0; |
||||
} |
||||
|
||||
$next = $offset + $step; |
||||
$previous = $offset - $step; |
||||
|
||||
$navLink = ""; |
||||
|
||||
if ($previous >= 0) { |
||||
} |
||||
if ($next < $userGroupNb) { |
||||
} |
||||
|
||||
} else { |
||||
$offset = 0; |
||||
} |
||||
|
||||
echo $navLink; |
||||
|
||||
if (!settype($offset, 'integer') || !settype($step, 'integer')) { |
||||
die('Offset or step variables are not integers.'); |
||||
} //sanity check of integer vars |
||||
if ($is_allowedToTrackEverybodyInCourse) { |
||||
// list of users in this course |
||||
$sql = "SELECT u.user_id, u.firstname,u.lastname |
||||
FROM $TABLECOURSUSER cu , $TABLEUSER u |
||||
WHERE cu.user_id = u.user_id AND cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." |
||||
AND cu.c_id = '$courseId' |
||||
LIMIT $offset,$step"; |
||||
} else { |
||||
// list of users of this group |
||||
$sql = "SELECT u.user_id, u.firstname,u.lastname |
||||
FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u |
||||
WHERE gu.user_id = u.user_id |
||||
AND gu.group_id = '$_gid' |
||||
LIMIT $offset,$step"; |
||||
} |
||||
$list_users = getManyResults3Col($sql); |
||||
for ($i = 0; $i < sizeof($list_users); $i++) { |
||||
// just sum $i up |
||||
} |
||||
|
||||
} else { // if uInfo is set |
||||
/* |
||||
* Informations about student uInfo |
||||
*/ |
||||
// these checks exists for security reasons, neither a prof nor a tutor can see statistics of a user from |
||||
// another course, or group |
||||
if ($is_allowedToTrackEverybodyInCourse) { |
||||
// check if user is in this course |
||||
$tracking_is_accepted = $is_course_member; |
||||
$tracked_user_info = api_get_user_info($uInfo); |
||||
$title[0] = $tracked_user_info[1].'_'.$tracked_user_info[2]; |
||||
} else { |
||||
// check if user is in the group of this tutor |
||||
$sql = "SELECT u.firstname,u.lastname, u.email |
||||
FROM $TABLECOURSE_GROUPSUSER gu , $TABLEUSER u |
||||
WHERE gu.user_id = u.user_id |
||||
AND gu.group_id = '$_gid' |
||||
AND u.user_id = '$uInfo'"; |
||||
$query = Database::query($sql); |
||||
$tracked_user_info = @Database::fetch_assoc($query); |
||||
if (is_array($tracked_user_info)) { |
||||
$tracking_is_accepted = true; |
||||
} |
||||
|
||||
$title[0] = $tracked_user_info['firstname'].'_'.$tracked_user_info['lastname']; |
||||
} |
||||
|
||||
if ($tracking_is_accepted) { |
||||
$tracked_user_info['email'] == '' ? $mail_link = get_lang( |
||||
'NoEmail' |
||||
) : $mail_link = Display::encrypted_mailto_link( |
||||
$tracked_user_info['email'] |
||||
); |
||||
|
||||
if (!isset($view)) { |
||||
$view = '0000000'; |
||||
} |
||||
//Logins |
||||
list($title_line1, $line1) = TrackingUserLogCSV::display_login_tracking_info( |
||||
$view, |
||||
$uInfo, |
||||
$courseId |
||||
); |
||||
|
||||
//Exercise results |
||||
list($title_line2, $line2) = TrackingUserLogCSV::display_exercise_tracking_info( |
||||
$view, |
||||
$uInfo, |
||||
$_cid |
||||
); |
||||
|
||||
//Student publications uploaded |
||||
list($title_line3, $line3) = TrackingUserLogCSV::display_student_publications_tracking_info( |
||||
$view, |
||||
$uInfo, |
||||
$courseId |
||||
); |
||||
|
||||
//Links usage |
||||
list($title_line4, $line4) = TrackingUserLogCSV::display_links_tracking_info( |
||||
$view, |
||||
$uInfo, |
||||
$_cid |
||||
); |
||||
|
||||
//Documents downloaded |
||||
list($title_line5, $line5) = TrackingUserLogCSV::display_document_tracking_info( |
||||
$view, |
||||
$uInfo, |
||||
$_cid |
||||
); |
||||
|
||||
$title_line = $title_line1.$title_line2.$title_line3.$title_line4.$title_line5; |
||||
$line = $line1.$line2.$line3.$line4.$line5; |
||||
} else { |
||||
echo get_lang('ErrorUserNotInGroup'); |
||||
} |
||||
|
||||
|
||||
/* |
||||
* Scorm contents and Learning Path |
||||
*/ |
||||
//TODO: scorm tools is in work and the logs will change in few days... |
||||
/*if(substr($view,5,1) == '1') |
||||
{ |
||||
$new_view = substr_replace($view,'0',5,1); |
||||
$title[1]=get_lang('ScormContentColumn'); |
||||
$line =''; |
||||
$sql = "SELECT id, name FROM $tbl_learnpath_main"; |
||||
$result=Database::query($sql); |
||||
$ar=Database::fetch_array($result); |
||||
|
||||
if (is_array($ar)) |
||||
{ |
||||
while ($ar['id'] != '') { |
||||
$lp_title = stripslashes($ar['name']); |
||||
echo "<tr><td>"; |
||||
echo "<a href='".api_get_self()."?view=".$view."&scormcontopen=".$ar['id']."&uInfo=$uInfo' class='specialLink'>$lp_title</a>"; |
||||
echo "</td></tr>"; |
||||
if ($ar['id']==$scormcontopen) { //have to list the students here |
||||
$contentId=$ar['id']; |
||||
$sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " . |
||||
"FROM $tbl_learnpath_item i " . |
||||
"INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " . |
||||
"INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " . |
||||
"WHERE (v.user_id=$uInfo and v.lp_id=$contentId) ORDER BY v.id, i.id"; |
||||
$result3=Database::query($sql3); |
||||
$ar3=Database::fetch_array($result3); |
||||
if (is_array($ar3)) { |
||||
$title_line=get_lang('ScormTitleColumn').";".get_lang('ScormStatusColumn').";".get_lang('ScormScoreColumn').";".get_lang('ScormTimeColumn')."\n"; |
||||
|
||||
while ($ar3['status'] != '') { |
||||
require_once('../lp/learnpathItem.class.php'); |
||||
$time = learnpathItem::get_scorm_time('php',$ar3['total_time']); |
||||
$line .= $title.';'.$ar3['status'].';'.$ar3['score'].';'.$time."\n"; |
||||
$ar3=Database::fetch_array($result3); |
||||
} |
||||
} else { |
||||
$line .= get_lang('ScormNeverOpened'); |
||||
} |
||||
} |
||||
$ar=Database::fetch_array($result); |
||||
} |
||||
} else { |
||||
$noscorm=true; |
||||
} |
||||
|
||||
if ($noscorm) { |
||||
$line=get_lang('NoResult'); |
||||
} |
||||
} else { |
||||
$new_view = substr_replace($view,'1',5,1); |
||||
}*/ |
||||
|
||||
} |
||||
/* |
||||
* Export to a CSV file |
||||
* force the browser to save the file instead of opening it |
||||
*/ |
||||
|
||||
$len = strlen($title_line.$line); |
||||
header('Content-type: application/octet-stream'); |
||||
//header('Content-Type: application/force-download'); |
||||
header('Content-length: '.$len); |
||||
$filename = html_entity_decode( |
||||
str_replace( |
||||
":", |
||||
"", |
||||
str_replace(" ", "_", $title[0].'_'.$title[1].'.csv') |
||||
) |
||||
); |
||||
$filename = api_replace_dangerous_char($filename); |
||||
if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) { |
||||
header('Content-Disposition: filename= '.$filename); |
||||
} else { |
||||
header('Content-Disposition: attachment; filename= '.$filename); |
||||
} |
||||
if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) { |
||||
header('Pragma: '); |
||||
header('Cache-Control: '); |
||||
header( |
||||
'Cache-Control: public' |
||||
); // IE cannot download from sessions without a cache |
||||
} |
||||
header('Content-Description: '.$filename); |
||||
header('Content-transfer-encoding: binary'); |
||||
|
||||
echo api_html_entity_decode($title_line, ENT_QUOTES, $charset); |
||||
echo api_html_entity_decode($line, ENT_QUOTES, $charset); |
||||
exit; |
||||
} else { // not allowed |
||||
api_not_allowed(); |
||||
} |
||||
@ -0,0 +1,14 @@ |
||||
<?php |
||||
|
||||
exit; |
||||
/* For license terms, see /license.txt */ |
||||
if (PHP_SAPI != 'cli') { |
||||
die('This script can only be launched from the command line'); |
||||
} |
||||
|
||||
require_once __DIR__.'/../../main/inc/global.inc.php'; |
||||
|
||||
require_once api_get_path(SYS_CODE_PATH).'install/install.lib.php'; |
||||
|
||||
$connection = Database::getManager()->getConnection(); |
||||
fixPostGroupIds($connection); |
||||
@ -0,0 +1,18 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
|
||||
exit; |
||||
|
||||
if (PHP_SAPI != 'cli') { |
||||
die('This script can only be executed from the command line'); |
||||
} |
||||
|
||||
require_once __DIR__.'/../../main/inc/global.inc.php'; |
||||
|
||||
$userInfo = UserManager::logInAsFirstAdmin(); |
||||
|
||||
if (api_is_platform_admin()) { |
||||
echo 'Logged as admin user: '.$userInfo['complete_name']; |
||||
} else { |
||||
echo 'NOT logged as admin '; |
||||
} |
||||
Loading…
Reference in new issue