|
@@ -39,8 +39,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
|
|
}
|
|
}
|
|
|
|
|
|
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
|
|
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
|
|
-$htmlHeadXtra[] = '
|
|
|
|
-<script type="text/javascript">
|
|
|
|
|
|
+$htmlHeadXtra[] = '<script>
|
|
function add_user_to_session (code, content) {
|
|
function add_user_to_session (code, content) {
|
|
|
|
|
|
document.getElementById("user_to_add").value = "";
|
|
document.getElementById("user_to_add").value = "";
|
|
@@ -68,9 +67,9 @@ function remove_item(origin) {
|
|
}
|
|
}
|
|
|
|
|
|
function validate_filter() {
|
|
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();
|
|
}
|
|
}
|
|
</script>';
|
|
</script>';
|
|
|
|
|
|
@@ -80,17 +79,17 @@ $errorMsg = '';
|
|
$sessions=array();
|
|
$sessions=array();
|
|
$usergroup = new UserGroup();
|
|
$usergroup = new UserGroup();
|
|
$id = intval($_GET['id']);
|
|
$id = intval($_GET['id']);
|
|
-if($_POST['form_sent']) {
|
|
|
|
- $form_sent = $_POST['form_sent'];
|
|
|
|
- $elements_posted = $_POST['elements_in_name'];
|
|
|
|
|
|
+if (isset($_POST['form_sent']) && $_POST['form_sent']) {
|
|
|
|
+ $form_sent = $_POST['form_sent'];
|
|
|
|
+ $elements_posted = $_POST['elements_in_name'];
|
|
if (!is_array($elements_posted)) {
|
|
if (!is_array($elements_posted)) {
|
|
$elements_posted = array();
|
|
$elements_posted = array();
|
|
}
|
|
}
|
|
if ($form_sent == 1) {
|
|
if ($form_sent == 1) {
|
|
- //added a parameter to send emails when registering a user
|
|
|
|
|
|
+ //added a parameter to send emails when registering a user
|
|
$usergroup->subscribe_sessions_to_usergroup($id, $elements_posted);
|
|
$usergroup->subscribe_sessions_to_usergroup($id, $elements_posted);
|
|
header('Location: usergroups.php');
|
|
header('Location: usergroups.php');
|
|
- exit;
|
|
|
|
|
|
+ exit;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$data = $usergroup->get($id);
|
|
$data = $usergroup->get($id);
|
|
@@ -101,9 +100,9 @@ $session_list = SessionManager::get_sessions_list(array(), array('name'));
|
|
$elements_not_in = $elements_in= array();
|
|
$elements_not_in = $elements_in= array();
|
|
|
|
|
|
if (!empty($session_list)) {
|
|
if (!empty($session_list)) {
|
|
- foreach($session_list as $session) {
|
|
|
|
- if (in_array($session['id'], $session_list_in)) {
|
|
|
|
- $elements_in[$session['id']] = $session['name'];
|
|
|
|
|
|
+ foreach($session_list as $session) {
|
|
|
|
+ if (in_array($session['id'], $session_list_in)) {
|
|
|
|
+ $elements_in[$session['id']] = $session['name'];
|
|
} else {
|
|
} else {
|
|
$elements_not_in[$session['id']] = $session['name'];
|
|
$elements_not_in[$session['id']] = $session['name'];
|
|
}
|
|
}
|
|
@@ -135,8 +134,8 @@ function search_sessions($needle,$type) {
|
|
' LIMIT 11';*/
|
|
' LIMIT 11';*/
|
|
} else {
|
|
} else {
|
|
$session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "$needle%"));
|
|
$session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "$needle%"));
|
|
- }
|
|
|
|
- $i=0;
|
|
|
|
|
|
+ }
|
|
|
|
+ $i=0;
|
|
if ($type=='single') {
|
|
if ($type=='single') {
|
|
/*
|
|
/*
|
|
while ($user = Database :: fetch_array($rs)) {
|
|
while ($user = Database :: fetch_array($rs)) {
|
|
@@ -151,9 +150,9 @@ function search_sessions($needle,$type) {
|
|
$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));*/
|
|
$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));*/
|
|
} else {
|
|
} else {
|
|
$return .= '<select id="elements_not_in" name="elements_not_in_name[]" multiple="multiple" size="15" style="width:360px;">';
|
|
$return .= '<select id="elements_not_in" name="elements_not_in_name[]" multiple="multiple" size="15" style="width:360px;">';
|
|
-
|
|
|
|
- foreach ($session_list as $row ) {
|
|
|
|
- if (!in_array($row['id'], array_keys($elements_in))) {
|
|
|
|
|
|
+
|
|
|
|
+ foreach ($session_list as $row ) {
|
|
|
|
+ if (!in_array($row['id'], array_keys($elements_in))) {
|
|
$return .= '<option value="'.$row['id'].'">'.$row['name'].'</option>';
|
|
$return .= '<option value="'.$row['id'].'">'.$row['name'].'</option>';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -168,15 +167,15 @@ $xajax -> processRequests();
|
|
Display::display_header($tool_name);
|
|
Display::display_header($tool_name);
|
|
|
|
|
|
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_unique = '<a href="'.api_get_self().'?add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
|
|
$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
|
|
$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
|
|
} else {
|
|
} else {
|
|
$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
|
|
$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.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
|
|
|
|
|
|
+ $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
|
|
}
|
|
}
|
|
|
|
|
|
echo '<div class="actions">';
|
|
echo '<div class="actions">';
|
|
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
|
|
|
|
|
|
+echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
|
|
echo '</div>';
|
|
echo '</div>';
|
|
|
|
|
|
?>
|
|
?>
|
|
@@ -185,6 +184,7 @@ echo '</div>';
|
|
echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
|
|
echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
|
|
|
|
|
|
if ($add_type=='multiple') {
|
|
if ($add_type=='multiple') {
|
|
|
|
+ /*
|
|
if (is_array($extra_field_list)) {
|
|
if (is_array($extra_field_list)) {
|
|
if (is_array($new_field_list) && count($new_field_list)>0 ) {
|
|
if (is_array($new_field_list) && count($new_field_list)>0 ) {
|
|
echo '<h3>'.get_lang('FilterUsers').'</h3>';
|
|
echo '<h3>'.get_lang('FilterUsers').'</h3>';
|
|
@@ -208,7 +208,7 @@ if ($add_type=='multiple') {
|
|
echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
|
|
echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
|
|
echo '<br /><br />';
|
|
echo '<br /><br />';
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
}
|
|
}
|
|
echo Display::input('hidden','id',$id);
|
|
echo Display::input('hidden','id',$id);
|
|
echo Display::input('hidden','form_sent','1');
|
|
echo Display::input('hidden','form_sent','1');
|
|
@@ -243,16 +243,16 @@ if(!empty($errorMsg)) {
|
|
<tr>
|
|
<tr>
|
|
<td align="center">
|
|
<td align="center">
|
|
<div id="content_source">
|
|
<div id="content_source">
|
|
- <?php
|
|
|
|
- if (!($add_type=='multiple')) {
|
|
|
|
|
|
+ <?php
|
|
|
|
+ if (!($add_type=='multiple')) {
|
|
?>
|
|
?>
|
|
<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
|
|
<input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
|
|
<div id="ajax_list_users_single"></div>
|
|
<div id="ajax_list_users_single"></div>
|
|
<?php
|
|
<?php
|
|
- } else {
|
|
|
|
|
|
+ } else {
|
|
?>
|
|
?>
|
|
<div id="ajax_list_multiple">
|
|
<div id="ajax_list_multiple">
|
|
- <?php echo Display::select('elements_not_in_name',$elements_not_in, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
|
|
|
|
|
|
+ <?php echo Display::select('elements_not_in_name',$elements_not_in, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
|
|
</div>
|
|
</div>
|
|
<?php
|
|
<?php
|
|
}
|
|
}
|
|
@@ -293,45 +293,7 @@ if(!empty($errorMsg)) {
|
|
</table>
|
|
</table>
|
|
</form>
|
|
</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;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
|
|
+<script>
|
|
function valide(){
|
|
function valide(){
|
|
var options = document.getElementById('elements_in').options;
|
|
var options = document.getElementById('elements_in').options;
|
|
for (i = 0 ; i<options.length ; i++)
|
|
for (i = 0 ; i<options.length ; i++)
|
|
@@ -339,7 +301,6 @@ function valide(){
|
|
document.forms.formulaire.submit();
|
|
document.forms.formulaire.submit();
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
function loadUsersInSelect(select){
|
|
function loadUsersInSelect(select){
|
|
|
|
|
|
var xhr_object = null;
|
|
var xhr_object = null;
|
|
@@ -349,9 +310,8 @@ function loadUsersInSelect(select){
|
|
else if(window.ActiveXObject) // Internet Explorer
|
|
else if(window.ActiveXObject) // Internet Explorer
|
|
xhr_object = new ActiveXObject("Microsoft.XMLHTTP");
|
|
xhr_object = new ActiveXObject("Microsoft.XMLHTTP");
|
|
else // XMLHttpRequest non supporté par le navigateur
|
|
else // XMLHttpRequest non supporté par le navigateur
|
|
- alert("Votre navigateur ne supporte pas les objets XMLHTTPRequest...");
|
|
|
|
|
|
+ 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.open("POST", "loadUsersInSelect.ajax.php");
|
|
|
|
|
|
xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
|
|
xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
|
|
@@ -379,7 +339,6 @@ function makepost(select){
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
--->
|
|
|
|
</script>
|
|
</script>
|
|
<?php
|
|
<?php
|
|
Display::display_footer();
|
|
Display::display_footer();
|