[svn r18199] Adding the UI to add/edit session and access_url table FS#3462

main/admin/access_url_add_sessions_to_url.php

@@ -0,0 +1,203 @@
+<?php
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+	
+	Copyright (c) 2009 Dokeos SPRL
+	Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
+
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+	
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+	
+	See the GNU General Public License for more details.
+	
+	Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
+	Mail: info@dokeos.com
+==============================================================================
+*/
+/**
+============================================================================== 
+*	This script allows platform admins to add users to urls.
+*	It displays a list of users and a list of courses;
+*	you can select multiple users and courses and then click on
+*	@package dokeos.admin
+============================================================================== 
+*/
+
+// name of the language file that needs to be included
+$language_file = 'admin';
+$cidReset = true;
+require ('../inc/global.inc.php');
+$this_section=SECTION_PLATFORM_ADMIN;
+
+require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
+api_protect_admin_script();
+if (!$_configuration['multiple_access_urls'])
+	header('Location: index.php');
+	
+/*
+-----------------------------------------------------------
+	Global constants and variables
+-----------------------------------------------------------
+*/
+
+$users = $_GET['users'];
+$form_sent = 0;
+$first_letter_session = '';
+$sessions = array ();
+$url_list = array();
+$users = array();
+
+$tbl_access_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+$tbl_access_url 			= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+$tbl_user 					= Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_session				= Database :: get_main_table(TABLE_MAIN_SESSION);
+
+/*
+-----------------------------------------------------------
+	Header
+-----------------------------------------------------------
+*/
+$tool_name = get_lang('AddSessionToURL');
+$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+
+/*
+==============================================================================
+		MAIN CODE
+==============================================================================
+*/
+
+Display :: display_header($tool_name);
+echo '<div class="actions" style="height:22px;">';
+echo '<div style="float:right;">		
+		<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit_sessions_to_url.php">'.Display::return_icon('course_del.gif',get_lang('EditSessionToURL'),'').get_lang('EditSessionToURL').'</a>												
+	  </div><br />';		  
+echo '</div>';
+
+api_display_tool_title($tool_name);
+
+if ($_POST['form_sent']) {
+	$form_sent = $_POST['form_sent'];
+	$sessions = is_array($_POST['session_list']) ? $_POST['session_list'] : array() ;	
+	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+	$first_letter_session = $_POST['first_letter_session'];
+
+	foreach($users as $key => $value) {
+		$users[$key] = intval($value);	
+	}
+
+	if ($form_sent == 1) {
+		if ( count($sessions) == 0 || count($url_list) == 0) {
+			Display :: display_error_message(get_lang('AtLeastOneSessionAndOneURL'));
+			//header('Location: access_urls.php?action=show_message&message='.get_lang('AtLeastOneUserAndOneURL'));
+		} else {
+			UrlManager::add_sessions_to_urls($sessions,$url_list);
+			Display :: display_confirmation_message(get_lang('SessionBelongURL'));
+			//header('Location: access_urls.php?action=show_message&message='.get_lang('UsersBelongURL'));				
+		}
+	}
+}
+
+
+
+/*
+-----------------------------------------------------------
+	Display GUI
+-----------------------------------------------------------
+*/
+/*
+if(empty($first_letter_user)) {
+	$sql = "SELECT count(*) as num_courses FROM $tbl_course";
+	$result = api_sql_query($sql, __FILE__, __LINE__);
+	$num_row = Database::fetch_array($result);	
+	if($num_row['num_courses']>1000) 
+	{//if there are too much num_courses to gracefully handle with the HTML select list,
+	 // assign a default filter on users names
+		$first_letter_user = 'A';
+	}
+	unset($result);
+}
+*/
+
+$sql = "SELECT id, name FROM $tbl_session
+		WHERE name LIKE '".$first_letter_session."%' OR name LIKE '".strtolower($first_letter_session)."%'
+		ORDER BY name DESC ";
+		
+$result = api_sql_query($sql, __FILE__, __LINE__);
+$db_sessions = api_store_result($result);
+unset($result);
+
+$sql = "SELECT id, url FROM $tbl_access_url  WHERE active=1 ORDER BY url";
+$result = api_sql_query($sql, __FILE__, __LINE__);
+$db_urls = api_store_result($result);
+unset($result);
+?>
+
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
+ <input type="hidden" name="form_sent" value="1"/>
+  <table border="0" cellpadding="5" cellspacing="0" width="100%">
+   <tr>
+    <td width="40%" align="center">
+     <b><?php echo get_lang('SessionList'); ?></b>
+     <br/><br/>
+     <?php echo get_lang('FirstLetterSession'); ?> : 
+     <select name="first_letter_session" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
+      <option value="">--</option>
+      <?php
+        echo Display :: get_alphabet_options($first_letter_session);
+        echo Display :: get_numeric_options(0,9,$first_letter_session);
+      ?>
+     </select>
+    </td>    
+        <td width="20%">&nbsp;</td>
+    <td width="40%" align="center">
+     <b><?php echo get_lang('URLList'); ?> :</b>     
+    </td>       
+   </tr>
+   <tr>
+    <td width="40%" align="center">
+     <select name="session_list[]" multiple="multiple" size="20" style="width:230px;">
+		<?php
+		
+		foreach ($db_sessions as $session) {
+			?>
+			<option value="<?php echo $session['id']; ?>" 
+			<?php if(in_array($session['id'],$sessions)) 
+			echo 'selected="selected"'; ?>>
+			<?php echo $session['name']; ?></option>
+			<?php
+		}
+		?>
+    </select>
+   </td>
+   <td width="20%" valign="middle" align="center">
+    <input type="submit" value="<?php echo get_lang('AddSessionsToThatURL'); ?> &gt;&gt;"/>
+   </td>
+   <td width="40%" align="center">
+    <select name="url_list[]" multiple="multiple" size="20" style="width:230px;">
+		<?php
+		foreach ($db_urls as $url_obj) {
+			?>
+			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?></option>
+			<?php
+		}
+		?>
+    </select>
+   </td>
+  </tr>
+ </table>
+</form>
+<?php
+/*
+==============================================================================
+		FOOTER 
+==============================================================================
+*/
+Display :: display_footer();
+?>

main/admin/access_url_edit_sessions_to_url.php

@@ -0,0 +1,468 @@
+<?php
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+
+	Copyright (c) 2009 Dokeos SPRL
+	Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
+
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	See the GNU General Public License for more details.
+
+	Contact: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
+==============================================================================
+*/
+/**
+==============================================================================
+*	@package dokeos.admin
+==============================================================================
+*/
+
+// name of the language file that needs to be included
+$language_file='admin';
+
+// resetting the course id
+$cidReset=true;
+
+// including some necessary dokeos files
+require('../inc/global.inc.php');
+
+require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
+require_once ('../inc/lib/xajax/xajax.inc.php');
+$xajax = new xajax();
+//$xajax->debugOn();
+$xajax -> registerFunction ('search_sessions');
+
+// setting the section (for the tabs)
+$this_section = SECTION_PLATFORM_ADMIN;
+
+// Access restrictions
+api_protect_admin_script();
+if (!$_configuration['multiple_access_urls'])
+	header('Location: index.php');
+
+
+// Database Table Definitions
+$tbl_access_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+$tbl_session 			 	= Database :: get_main_table(TABLE_MAIN_SESSION);
+$tbl_access_url 		 	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+
+// setting breadcrumbs
+$tool_name = get_lang('EditSessionsToURL');
+$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+
+$add_type = 'unique';
+if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
+	$add_type = $_REQUEST['add_type'];
+}
+
+$access_url_id=1;
+if(isset($_REQUEST['access_url_id']) && $_REQUEST['access_url_id']!=''){
+	$access_url_id = $_REQUEST['access_url_id']; 
+}
+
+function search_sessions($needle, $id)
+{
+	global $tbl_session;	
+	$xajax_response = new XajaxResponse();
+	$return = '';
+				
+	if(!empty($needle)) {		
+		// xajax send utf8 datas... datas in db can be non-utf8 datas
+		$charset = api_get_setting('platform_charset');
+		$needle = mb_convert_encoding($needle, $charset, 'utf-8');
+		// search sessiones where username or firstname or lastname begins likes $needle
+		$sql = 'SELECT id, name FROM '.$tbl_session.' u 
+				WHERE (name LIKE "'.$needle.'%") 
+				ORDER BY name, id
+				LIMIT 11';				
+		$rs = api_sql_query($sql, __FILE__, __LINE__);		
+        $i=0;        
+		while ($session = Database :: fetch_array($rs)) {
+			$i++;
+            if ($i<=10) {
+			     $return .= '<a href="#" onclick="add_user_to_url(\''.addslashes($session['id']).'\',\''.addslashes($session['name']).' ('.addslashes($session['id']).')'.'\')">'.$session['name'].' </a><br />';
+            } else {
+            	$return .= '...<br />';
+            }
+		}
+	}
+	$xajax_response -> addAssign('ajax_list_courses','innerHTML',utf8_encode($return));
+	return $xajax_response;
+}
+
+$xajax -> processRequests();
+$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
+$htmlHeadXtra[] = '
+<script type="text/javascript">
+function add_user_to_url(code, content) {
+
+	document.getElementById("course_to_add").value = "";
+	document.getElementById("ajax_list_courses").innerHTML = "";
+	
+	destination = document.getElementById("destination_users");
+	destination.options[destination.length] = new Option(content,code);
+	
+	destination.selectedIndex = -1;
+	sortOptions(destination.options);	
+}
+	
+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.submit();
+	}	
+}
+	
+function remove_item(origin)
+{
+	for(var i = 0 ; i<origin.options.length ; i++) {
+		if(origin.options[i].selected) {
+			origin.options[i]=null;
+			i = i-1;
+		}
+	}
+}
+</script>';
+
+$form_sent=0;
+$errorMsg='';
+$UserList=$SessionList=array();
+$users=$sessions=array();
+
+if($_POST['form_sent']) {	
+	$form_sent=$_POST['form_sent'];
+	$session_list=$_POST['session_list'];	
+		
+	if(!is_array($session_list)) {
+		$session_list=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'));
+		}
+		elseif(is_array($session_list) ) {									
+			UrlManager::update_urls_rel_session($session_list,$access_url_id);
+			header('Location: access_urls.php?action=show_message&message='.get_lang('SessionsWereEdited'));
+		}		
+	}
+}
+
+Display::display_header($tool_name);
+
+echo '<div class="actions" style="height:22px;">';
+echo '<div style="float:right;">		
+		<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_add_sessions_to_url.php">'.Display::return_icon('course_add.gif',get_lang('AddSessionsToURL'),'').get_lang('AddSessionsToURL').'</a>												
+	  </div><br />';		  
+echo '</div>';	
+
+api_display_tool_title($tool_name);
+
+if ($_GET['action'] == 'show_message')
+	Display :: display_normal_message(Security::remove_XSS(stripslashes($_GET['message'])));
+
+$no_session_list = $session_list = array();
+$ajax_search = $add_type == 'unique' ? true : false;
+
+if($ajax_search) {		
+	$sessions=UrlManager::get_url_rel_session_data($access_url_id);
+	foreach($sessions as $session) {
+		$session_list[$session['id']] = $session ;
+	}	
+} else {	
+	$sessions=UrlManager::get_url_rel_session_data();		
+	foreach($sessions as $session) {
+		if($session['access_url_id'] == $access_url_id) {
+			$session_list[$session['id']] = $session ;
+		}
+	}
+		
+	$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
+	$sql="SELECT id, name
+	  	  	FROM $tbl_session u	
+			ORDER BY name, id";	
+	$result=api_sql_query($sql,__FILE__,__LINE__);	
+	$sessions=api_store_result($result);
+	$session_list_leys = array_keys($session_list);
+	foreach($sessions as $session) {	
+		if (!in_array($session['id'],$session_list_leys))
+			$no_session_list[$session['id']] = $session ;
+	}	
+}
+
+
+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>';
+}
+
+$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 ?>
+</div>
+<br /><br />
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
+<?php echo get_lang('SelectUrl').' : '; ?>
+<select name="access_url_id" onchange="javascript:send();">
+<option value="0"> <?php echo get_lang('SelectUrl')?></option>
+	<?php	
+	$url_selected='';
+	foreach ($url_list as $url_obj) {
+		$checked = '';
+		if (!empty($access_url_id)) {
+			if ($url_obj[0]==$access_url_id) {
+			$checked = 'selected=true';
+			$url_selected=$url_obj[1];
+			}
+		}
+		if ($url_obj['active']==1) {						
+			?>
+				<option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
+			<?php
+		}
+	}
+	?>		
+</select>
+<br /><br />
+<input type="hidden" name="form_sent" value="1" />
+<input type="hidden" name="add_type" value = "<?php echo $add_type ?>" /> 
+
+<?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('SessionListInPlatform') ?> :</b>
+  </td>
+  <td></td>  
+  <td align="center"><b><?php echo get_lang('SessionListIn').' '.$url_selected; ?></b></td>
+</tr>
+
+<tr>
+  <td align="center">
+  <div id="content_source">
+  	  <?php
+  	  if($ajax_search) {
+  	  	?>
+		<input type="text" id="course_to_add" onkeyup="xajax_search_sessions(this.value,document.formulaire.access_url_id.options[document.formulaire.access_url_id.selectedIndex].value)" />
+		<div id="ajax_list_courses"></div>
+		<?php
+  	  } else {
+  	  ?>  	  
+	  <select id="origin_users" name="no_session_list[]" multiple="multiple" size="15" style="width:300px;">
+		<?php
+		foreach($no_session_list as $no_session) {
+		?>
+			<option value="<?php echo $no_session['id']; ?>"><?php echo $no_session['name'].''; ?></option>
+
+$xajax -> processRequests();
+
+$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
+$htmlHeadXtra[] = '
+<script type="text/javascript">
+function add_user_to_url (code, content) {
+
+	document.getElementById("course_to_add").value = "";
+	document.getElementById("ajax_list_courses").innerHTML = "";
+	
+	destination = document.getElementById("destination_users");
+	destination.options[destination.length] = new Option(content,code);
+	
+	destination.selectedIndex = -1;
+	sortOptions(destination.options);
+	
+}
+function remove_item(origin)
+{
+	for(var i = 0 ; i<origin.options.length ; i++) {
+		if(origin.options[i].selected) {
+			origin.options[i]=null;
+			i = i-1;
+		}
+	}
+}
+</script>';
+		<?php
+		}
+		unset($no_session_list);
+		?>
+
+	  </select>
+	<?php
+  	  }
+  	 ?>
+  </div>
+  </td>
+  <td width="10%" valign="middle" align="center">
+  <?php
+  if($ajax_search) {
+	?>
+	<input type="button" onclick="remove_item(document.getElementById('destination_users'))" value="<<" />
+  	<?php
+  } else {
+  	?>
+	<input type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" value=">>" />
+	<br /><br />
+	<input type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" value="<<" />
+	<?php 
+  } 
+  ?>
+	<br /><br /><br /><br /><br /><br />
+  </td>
+  <td align="center">
+  <select id="destination_users" name="session_list[]" multiple="multiple" size="15" style="width:300px;">
+
+<?php
+
+foreach($session_list as $session) {
+?>
+	<option value="<?php echo $session['id']; ?>"><?php echo $session['name']; ?></option>
+
+<?php
+}
+unset($session_list);
+?>
+
+  </select></td>
+</tr>
+
+<tr>
+	<td colspan="3" align="center">
+		<br />
+		<?php
+		if(isset($_GET['add']))
+			echo '<input type="button" value="'.get_lang('EditSessions').'" onclick="valide()" />';
+		else
+			echo '<input type="button" value="'.get_lang('EditSessions').'" onclick="valide()" />';
+		?>
+	</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_users').options;
+	for (i = 0 ; i<options.length ; i++)
+		options[i].selected = true;
+	/*
+	var options = document.getElementById('destination_classes').options;
+	for (i = 0 ; i<options.length ; i++)
+		options[i].selected = true;
+		*/
+	document.forms.formulaire.submit();
+}
+
+
+function loadUsersInSelect(select){
+
+	var xhr_object = null;
+
+	if(window.XMLHttpRequest) // Firefox
+		xhr_object = new XMLHttpRequest();
+	else if(window.ActiveXObject) // Internet Explorer
+		xhr_object = new ActiveXObject("Microsoft.XMLHTTP");
+	else  // XMLHttpRequest non supporté par le navigateur
+	alert("Votre navigateur ne supporte pas les objets XMLHTTPRequest...");
+
+	//xhr_object.open("GET", "loadUsersInSelect.ajax.php?id_session=<?php echo $id_session ?>&letter="+select.options[select.selectedIndex].text, false);
+	xhr_object.open("POST", "loadUsersInSelect.ajax.php");
+
+	xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+
+
+	nosessionUsers = makepost(document.getElementById('origin_users'));
+	sessionUsers = makepost(document.getElementById('destination_users'));
+	nosessionClasses = makepost(document.getElementById('origin_classes'));
+	sessionClasses = makepost(document.getElementById('destination_classes'));
+	xhr_object.send("nosessionusers="+nosessionUsers+"&sessionusers="+sessionUsers+"&nosessionclasses="+nosessionClasses+"&sessionclasses="+sessionClasses);
+
+	xhr_object.onreadystatechange = function() {
+		if(xhr_object.readyState == 4) {
+			document.getElementById('content_source').innerHTML = result = xhr_object.responseText;
+			//alert(xhr_object.responseText);
+		}
+	}
+}
+
+function makepost(select){
+	var options = select.options;
+	var ret = "";
+	for (i = 0 ; i<options.length ; i++)
+		ret = ret + options[i].value +'::'+options[i].text+";;";
+
+	return ret;
+
+}
+-->
+
+</script>
+<?php
+/*
+==============================================================================
+		FOOTER
+==============================================================================
+*/
+Display::display_footer();
+?>

main/admin/access_urls.php

@@ -127,6 +127,7 @@ echo '<div style="float:right;">
 		<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit.php">'.Display::return_icon('view_more_stats.gif',get_lang('AddUrl'),'').get_lang('AddUrl').'</a>&nbsp;&nbsp;
 		<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php">'.Display::return_icon('members.gif',get_lang('AddUserToURL'),'').get_lang('ManageUsers').'</a>															
 	    <a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php">'.Display::return_icon('courses.gif',get_lang('AddUsersToCourse'),'').get_lang('ManageCourses').'</a>
+	    <a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit_sessions_to_url.php">'.Display::return_icon('courses.gif',get_lang('AddUsersToCourse'),'').get_lang('ManageSessions').'</a>
 	  </div><br />';		  
 echo '</div>';		  
 

main/admin/user_list.php

@@ -1,4 +1,4 @@
-<?php // $Id: user_list.php 17831 2009-01-19 17:54:00Z juliomontoya $
+<?php // $Id: user_list.php 18199 2009-02-03 17:21:58Z juliomontoya $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -310,23 +310,19 @@ function get_user_data($from, $number_of_items, $column, $direction)
                  u.status				AS col6,
                  u.active				AS col7,
                  u.user_id				AS col8
-             FROM
-                 $user_table u ";
+             FROM $user_table u ";
                  
-    // adding the filter to see  
+    // adding the filter to see the user's only of the current access_url 
     global $_configuration;
-    if (api_is_session_admin() && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
+    if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
     	$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     	$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";    		
     }
                  
-	if (isset ($_GET['keyword']))
-	{
+	if (isset ($_GET['keyword'])) {
 		$keyword = Database::escape_string($_GET['keyword']);
 		$sql .= " WHERE u.firstname LIKE '%".$keyword."%' OR u.lastname LIKE '%".$keyword."%'  OR u.username LIKE '%".$keyword."%'  OR u.official_code LIKE '%".$keyword."%' OR u.email LIKE '%".$keyword."%'";
-	}
-	elseif (isset ($_GET['keyword_firstname']))
-	{
+	} elseif (isset ($_GET['keyword_firstname'])) {
 		$admin_table = Database :: get_main_table(TABLE_MAIN_ADMIN);
 		$keyword_firstname = Database::escape_string($_GET['keyword_firstname']);
 		$keyword_lastname = Database::escape_string($_GET['keyword_lastname']);
@@ -336,8 +332,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
 		$query_admin_table = '';
 		$keyword_admin = '';
 		
-		if($keyword_status == SESSIONADMIN)
-		{
+		if ($keyword_status == SESSIONADMIN) {
 			$keyword_status = '%';
 			$query_admin_table = " , $admin_table a ";
 			$keyword_admin = ' AND a.user_id = u.user_id ';
@@ -352,26 +347,24 @@ function get_user_data($from, $number_of_items, $column, $direction)
 				"AND u.status LIKE '".$keyword_status."'" .
 				$keyword_admin;
 
-		if($keyword_active && !$keyword_inactive)
-		{
+		if ($keyword_active && !$keyword_inactive) {
 			$sql .= " AND u.active='1'";
-		}
-		elseif($keyword_inactive && !$keyword_active)
-		{
+		} elseif($keyword_inactive && !$keyword_active) {
 			$sql .= " AND u.active='0'";
 		}
 	}
 	
-	if (api_is_session_admin() && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {		
+    // adding the filter to see the user's only of the current access_url
+	if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {		
     		$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();   	  
     }
+    
 	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
+	$sql .= " LIMIT $from,$number_of_items";	
 	$res = api_sql_query($sql, __FILE__, __LINE__);
 		
 	$users = array ();
-	while ($user = Database::fetch_row($res))
-	{
+	while ($user = Database::fetch_row($res)) {
 		$users[] = $user;
 	}
 	return $users;