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

Adding user number in list see BT#4927

Browse Source
skala
Julio Montoya 12 years ago
parent ffd8c0c567
commit 30956491cb
2 changed files with 163 additions and 159 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. 158
      main/admin/access_url_edit_users_to_url.php
  2. 8
      main/inc/lib/urlmanager.lib.php

158
main/admin/access_url_edit_users_to_url.php
Unescape View File

@ -1,24 +1,22 @@
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.admin
* @author Julio Montoya <gugli100@gmail.com>
*/
* @package chamilo.admin
* @author Julio Montoya <gugli100@gmail.com>
*/
// name of the language file that needs to be included
$language_file='admin';
$language_file = 'admin';
// resetting the course id
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'access_url_edit_users_to_url_functions.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'urlmanager.lib.php';
require_once api_get_path(LIBRARY_PATH) . 'access_url_edit_users_to_url_functions.lib.php';
require_once '../inc/lib/xajax/xajax.inc.php';
$xajax = new xajax();
//$xajax->debugOn();
$xajax -> registerFunction (array('search_users', 'Accessurledituserstourl', 'search_users'));
$xajax->registerFunction(array('search_users', 'Accessurledituserstourl', 'search_users'));
// setting the section (for the tabs)
@ -39,20 +37,20 @@ $tbl_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
// setting breadcrumbs
$tool_name = get_lang('EditUsersToURL');
$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
$add_type = 'multiple';
if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
$add_type = Security::remove_XSS($_REQUEST['add_type']);
}
$access_url_id=1;
if(isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!=''){
$access_url_id = 1;
if (isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id'] != '') {
$access_url_id = Security::remove_XSS($_REQUEST['access_url_id']);
}
$xajax -> processRequests();
$xajax->processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = '
<script type="text/javascript">
@ -72,7 +70,7 @@ function send() {
if (document.formulaire.access_url_id.value!=0) {
document.formulaire.form_sent.value=0;
document.formulaire.add_type.value=\''.$add_type.'\';
document.formulaire.add_type.value=\'' . $add_type . '\';
document.formulaire.submit();
}
}
@ -88,9 +86,9 @@ function remove_item(origin)
}
</script>';
$form_sent=0;
$errorMsg='';
$UserList=array();
$form_sent = 0;
$errorMsg = '';
$UserList = array();
$message = '';
@ -99,26 +97,26 @@ if ($_POST['form_sent']) {
$UserList = $_POST['sessionUsersList'];
if (!is_array($UserList)) {
$UserList=array();
$UserList = array();
}
if ($form_sent == 1) {
if ($access_url_id==0) {
header('Location: access_url_edit_users_to_url.php?action=show_message&message='.get_lang('SelectURL'));
if ($access_url_id == 0) {
header('Location: access_url_edit_users_to_url.php?action=show_message&message=' . get_lang('SelectURL'));
} elseif (is_array($UserList)) {
$result = UrlManager::update_urls_rel_user($UserList, $access_url_id);
$url_info = UrlManager::get_url_data_from_id($access_url_id);
if (!empty($result)) {
$message .= 'URL: '.$url_info['url'].'<br />';
$message .= 'URL: ' . $url_info['url'] . '<br />';
}
if (!empty($result['users_added'])) {
$message .= '<h4>'.get_lang('UsersAdded').':</h4>';
$message .= '<h4>' . get_lang('UsersAdded') . ':</h4>';
$i = 1;
$user_added_list = array();
foreach($result['users_added'] as $user) {
foreach ($result['users_added'] as $user) {
$user_info = api_get_user_info($user);
if (!empty($user_info)) {
$user_added_list[] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
$user_added_list[] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname']);
$i++;
}
}
@ -128,13 +126,13 @@ if ($_POST['form_sent']) {
}
if (!empty($result['users_deleted'])) {
$message .= '<br /><h4>'.get_lang('UsersDeleted').': </h4>';
$message .= '<br /><h4>' . get_lang('UsersDeleted') . ': </h4>';
$user_deleted_list = array();
$i = 1;
foreach($result['users_deleted'] as $user) {
foreach ($result['users_deleted'] as $user) {
$user_info = api_get_user_info($user);
if (!empty($user_info)) {
$user_deleted_list [] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
$user_deleted_list [] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname']);
$i++;
}
}
@ -153,7 +151,7 @@ if (!empty($message)) {
}
echo '<div class="actions">';
echo Display::url(Display::return_icon('view_more_stats.gif',get_lang('AddUserToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php');
echo Display::url(Display::return_icon('view_more_stats.gif', get_lang('AddUserToURL'), ''), api_get_path(WEB_CODE_PATH) . 'admin/access_url_add_users_to_url.php');
echo '</div>';
api_display_tool_title($tool_name);
@ -164,65 +162,67 @@ if ($_GET['action'] == 'show_message')
$nosessionUsersList = $sessionUsersList = array();
$ajax_search = $add_type == 'unique' ? true : false;
if($ajax_search) {
$Users=UrlManager::get_url_rel_user_data($access_url_id);
foreach($Users as $user) {
$sessionUsersList[$user['user_id']] = $user ;
if ($ajax_search) {
$Users = UrlManager::get_url_rel_user_data($access_url_id);
foreach ($Users as $user) {
$sessionUsersList[$user['user_id']] = $user;
}
} else {
$Users=UrlManager::get_url_rel_user_data();
foreach($Users as $user) {
if($user['access_url_id'] == $access_url_id) {
$sessionUsersList[$user['user_id']] = $user ;
$Users = UrlManager::get_url_rel_user_data();
foreach ($Users as $user) {
if ($user['access_url_id'] == $access_url_id) {
$sessionUsersList[$user['user_id']] = $user;
}
}
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
$sql="SELECT u.user_id, lastname, firstname, username
FROM $tbl_user u WHERE status <> ".ANONYMOUS." ".
$sql = "SELECT u.user_id, lastname, firstname, username
FROM $tbl_user u WHERE status <> " . ANONYMOUS . " " .
$order_clause;
$result=Database::query($sql);
$Users=Database::store_result($result);
$result = Database::query($sql);
$Users = Database::store_result($result);
$user_list_leys = array_keys($sessionUsersList);
foreach($Users as $user) {
if (!in_array($user['user_id'],$user_list_leys))
$nosessionUsersList[$user['user_id']] = $user ;
foreach ($Users as $user) {
if (!in_array($user['user_id'], $user_list_leys)) {
$nosessionUsersList[$user['user_id']] = $user;
}
}
}
if($add_type == 'multiple') {
$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
if ($add_type == 'multiple') {
$link_add_type_unique = '<a href="' . api_get_self() . '?add_type=unique&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeUnique') . '</a>';
$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
} else {
$link_add_type_unique = get_lang('SessionAddTypeUnique');
$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
$link_add_type_multiple = '<a href="' . api_get_self() . '?add_type=multiple&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeMultiple') . '</a>';
}
$url_list = UrlManager::get_url_data();
?>
<div style="text-align: left;">
<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>
<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>
</div>
<br /><br />
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?> >
<?php echo get_lang('SelectUrl').' : '; ?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {
echo ' onsubmit="valide();"';
} ?> >
<?php echo get_lang('SelectUrl') . ' : '; ?>
<select name="access_url_id" onchange="javascript:send();">
<option value="0"> <?php echo get_lang('SelectUrl')?></option>
<option value="0"> <?php echo get_lang('SelectUrl') ?></option>
<?php
$url_selected='';
$url_selected = '';
foreach ($url_list as $url_obj) {
$checked = '';
if (!empty($access_url_id)) {
if ($url_obj['id']==$access_url_id) {
if ($url_obj['id'] == $access_url_id) {
$checked = 'selected=true';
$url_selected= $url_obj[1];
$url_selected = $url_obj[1];
}
}
if ($url_obj['active']==1) {
if ($url_obj['active'] == 1) {
?>
<option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
<option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
<?php
}
}
@ -232,27 +232,27 @@ $url_list = UrlManager::get_url_data();
<input type="hidden" name="form_sent" value="1" />
<input type="hidden" name="add_type" value = "<?php echo $add_type ?>" />
<?php
if(!empty($errorMsg)) {
<?php
if (!empty($errorMsg)) {
Display::display_normal_message($errorMsg); //main API
}
?>
}
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%">
<!-- Users -->
<tr>
<td align="center"><b><?php echo get_lang('UserListInPlatform') ?> :</b>
<td align="center"><b><?php echo get_lang('UserListInPlatform') ?> : <?php echo count($nosessionUsersList); ?></b>
</td>
<td></td>
<td align="center"><b><?php echo get_lang('UserListIn').' '.$url_selected; ?> :</b></td>
<td align="center"><b><?php echo get_lang('UserListIn') . ' ' . $url_selected; ?> : <?php echo count($sessionUsersList); ?></b></td>
</tr>
<tr>
<td align="center">
<div id="content_source">
<?php
if($ajax_search) {
if ($ajax_search) {
?>
<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,document.formulaire.access_url_id.options[document.formulaire.access_url_id.selectedIndex].value)" />
<div id="ajax_list_users"></div>
@ -261,9 +261,9 @@ if(!empty($errorMsg)) {
?>
<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:380px;">
<?php
foreach($nosessionUsersList as $enreg) {
foreach ($nosessionUsersList as $enreg) {
?>
<option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
<option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']) . ' (' . $enreg['username'] . ')'; ?></option>
<?php
}
unset($nosessionUsersList);
@ -277,7 +277,7 @@ if(!empty($errorMsg)) {
</td>
<td width="10%" valign="middle" align="center">
<?php
if($ajax_search) {
if ($ajax_search) {
?>
<button class="arrowl" type="button" onclick="remove_item(document.getElementById('destination_users'))"> </button>
<?php
@ -294,15 +294,15 @@ if(!empty($errorMsg)) {
<td align="center">
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:380px;">
<?php
foreach($sessionUsersList as $enreg) {
?>
<option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
<?php
foreach ($sessionUsersList as $enreg) {
?>
<option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']) . ' (' . $enreg['username'] . ')'; ?></option>
<?php
}
unset($sessionUsersList);
?>
<?php
}
unset($sessionUsersList);
?>
</select></td>
</tr>
@ -311,10 +311,10 @@ unset($sessionUsersList);
<td colspan="3" align="center">
<br />
<?php
if(isset($_GET['add']))
echo '<button class="save" type="button" onclick="valide()" >'.get_lang('AddUsersToURL').'</button>';
if (isset($_GET['add']))
echo '<button class="save" type="button" onclick="valide()" >' . get_lang('AddUsersToURL') . '</button>';
else
echo '<button class="save" type="button" onclick="valide()" >'.get_lang('EditUsersToURL').'</button>';
echo '<button class="save" type="button" onclick="valide()" >' . get_lang('EditUsersToURL') . '</button>';
?>
</td>
</tr>

8
main/inc/lib/urlmanager.lib.php
Unescape View File

@ -153,7 +153,7 @@ class UrlManager
* @param int access url id
* @return array Database::store_result of the result
* */
public static function get_url_rel_user_data($access_url_id='')
public static function get_url_rel_user_data($access_url_id = null, $order_by = null)
{
$where = '';
$table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -161,12 +161,16 @@ class UrlManager
if (!empty($access_url_id)) {
$where ="WHERE $table_url_rel_user.access_url_id = ".Database::escape_string($access_url_id);
}
if (empty($order_by)) {
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
} else {
$order_clause = $order_by;
}
$sql="SELECT u.user_id, lastname, firstname, username, access_url_id
FROM $tbl_user u
INNER JOIN $table_url_rel_user
ON $table_url_rel_user.user_id = u.user_id
$where".$order_clause;
$where $order_clause";
$result=Database::query($sql);
$users=Database::store_result($result);
return $users;

Write Preview
Loading…
Cancel
Save