From ac227c8de2567bb7e23cfb7c93cfd2de0a069f57 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 28 Sep 2016 15:22:53 -0500
Subject: [PATCH] Fix usergroups for multi-URL - refs BT#11614

Minor - Format code - refs BT#11614

Add bootstrap style for EditGroupsToUrl form - refs BT#11614
---
 .../access_url_edit_usergroup_to_url.php      | 422 +++++++++---------
 main/inc/lib/urlmanager.lib.php               |   2 +-
 main/inc/lib/usergroup.lib.php                |   2 +-
 3 files changed, 213 insertions(+), 213 deletions(-)

diff --git a/main/admin/access_url_edit_usergroup_to_url.php b/main/admin/access_url_edit_usergroup_to_url.php
index 17f25c0ed8..a90fe8ac2a 100755
--- a/main/admin/access_url_edit_usergroup_to_url.php
+++ b/main/admin/access_url_edit_usergroup_to_url.php
@@ -1,9 +1,9 @@
 <?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>
+ */
 // resetting the course id
 $cidReset = true;
 
@@ -25,8 +25,8 @@ if (!api_get_multiple_access_url()) {
 
 // setting breadcrumbs
 $tool_name = get_lang('EditUserGroupToURL');
-$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'] != '') {
@@ -43,7 +43,6 @@ $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
 $htmlHeadXtra[] = '
 <script>
 function add_user_to_url(code, content) {
-
 	document.getElementById("course_to_add").value = "";
 	document.getElementById("ajax_list_courses").innerHTML = "";
 
@@ -55,10 +54,9 @@ function add_user_to_url(code, content) {
 }
 
 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();
 	}
 }
@@ -73,10 +71,10 @@ function remove_item(origin) {
 }
 </script>';
 
-$form_sent=0;
-$errorMsg='';
-$UserList=$SessionList=array();
-$users=$sessions=array();
+$form_sent = 0;
+$errorMsg = '';
+$UserList = $SessionList = array();
+$users = $sessions = array();
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
@@ -102,7 +100,7 @@ Display::display_header($tool_name);
 echo '<div class="actions">';
 echo Display::url(
     Display::return_icon('view_more_stats.gif', get_lang('AddUserGroupToURL'), ''),
-    api_get_path(WEB_CODE_PATH).'admin/access_url_add_usergroup_to_url.php'
+    api_get_path(WEB_CODE_PATH) . 'admin/access_url_add_usergroup_to_url.php'
 );
 echo '</div>';
 
@@ -121,224 +119,226 @@ if ($ajax_search) {
         $userGroupList[$item['id']] = $item;
     }
 } else {
-	$userGroups = UrlManager::get_url_rel_usergroup_data();
+    $userGroups = UrlManager::get_url_rel_usergroup_data();
 
     foreach ($userGroups as $item) {
         if ($item['access_url_id'] == $access_url_id) {
-            $userGroupList[$item['id']] = $item ;
+            $userGroupList[$item['id']] = $item;
         }
     }
     $noUserGroupList = $userGroup->getUserGroupNotInList(array_keys($userGroupList));
 }
 
+$link_add_type_unique = ['class' => 'disabled'];
+$link_add_type_multiple = [];
+
 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_unique = [];
+    $link_add_type_multiple = ['class' => 'disabled'];
 }
-
+?>
+    <div class="btn-toolbar">
+        <div class="btn-group">
+            <?php
+            echo Display::toolbarButton(
+                get_lang('SessionAddTypeUnique'),
+                api_get_self() . '?' . http_build_query([
+                    'add_type' => 'unique',
+                    'access_url_id' => $access_url_id
+                ]),
+                'file-o',
+                'default',
+                $link_add_type_unique
+            );
+            echo Display::toolbarButton(
+                get_lang('SessionAddTypeMultiple'),
+                api_get_self() . '?' . http_build_query([
+                    'add_type' => 'multiple',
+                    'access_url_id' => $access_url_id
+                ]),
+                'files-o',
+                'default',
+                $link_add_type_multiple
+            );
+            ?>
+        </div>
+    </div>
+<?php
 $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 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>
-	<?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>
+    <form
+        name="formulaire"
+        method="post"
+        action="<?php echo api_get_self(); ?>"
+        style="margin:0px;" <?php if ($ajax_search) {
+        echo ' onsubmit="valide();"';
+    } ?>
+    >
+        <div class="row">
+            <div class="col-xs-2">
+                <label for="access_url_id"><?php echo get_lang('SelectUrl') ?></label>
+            </div>
+            <div class="col-xs-5">
+                <select name="access_url_id" id="access_url_id" onchange="javascript:send();" class="form-control">
+                    <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>
+            </div>
+        </div>
+        <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
+        }
+        ?>
+        <div class="row">
+            <div class="col-sm-5">
+                <label for="<?php echo $ajax_search ? 'course_to_add' : 'origin_users' ?>"><?php echo get_lang('UserGroupListInPlatform') ?></label>
+                <div id="content_source">
+                    <?php if ($ajax_search) { ?>
+                        <input type="text" id="course_to_add" class="form-control"
+                               onkeyup="xajax_searchUserGroupAjax(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_course_list[]" multiple="multiple" size="15" class="form-control">
+                            <?php foreach ($noUserGroupList as $noItem) { ?>
+                                <option value="<?php echo $noItem['id']; ?>"><?php echo $noItem['name']; ?></option>
+                            <?php } ?>
+                        </select>
+                    <?php } ?>
+                </div>
+            </div>
+            <div class="col-sm-2 text-center">
+                <br><br><br><br>
+                <?php if ($ajax_search) { ?>
+                    <button class="btn btn-default" type="button"
+                            onclick="remove_item(document.getElementById('destination_users'))">
+                        <em class="fa fa-arrow-left"></em>
+                    </button>
+                <?php } else { ?>
+                    <button class="btn btn-default" type="button"
+                            onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))">
+                        <em class="fa fa-arrow-right"></em>
+                    </button>
+                    <br/><br/>
+                    <button class="btn btn-default" type="button"
+                            onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
+                        <em class="fa fa-arrow-left"></em>
+                    </button>
+                <?php } ?>
+            </div>
+            <div class="col-sm-5">
+                <label for="destination_users"><?php printf(get_lang('UserGroupListInX'), $url_selected); ?></label>
+                <select id="destination_users" name="course_list[]" multiple="multiple" size="15" class="form-control">
+                    <?php foreach ($userGroupList as $item) { ?>
+                        <option value="<?php echo $item['id']; ?>">
+                            <?php echo $item['name']; ?>
+                        </option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xs-12 text-center">
+                <button class="save btn btn-primary" onclick="valide()">
+                    <span class="fa fa-save fa-fw" aria-hidden="true"></span>
+                    <?php echo isset($_GET['add']) ? get_lang('AddUserGroupToURL') : get_lang('EditUserGroupToURL') ?>
+                </button>
+            </div>
+        </div>
+    </form>
+    <script>
+        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);
         }
-    }
-?>
-</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('UserGroupListInPlatform') ?> :</b>
-  </td>
-  <td></td>
-  <td align="center"><b><?php printf(get_lang('UserGroupListInX'),$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_searchUserGroupAjax(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_course_list[]" multiple="multiple" size="15" style="width:380px;">
-		<?php
-		foreach ($noUserGroupList as $noItem) {
-		?>
-			<option value="<?php echo $noItem['id']; ?>">
-                <?php echo $noItem['name']; ?>
-            </option>
-		<?php
-		}
-		?>
-	  </select>
-	<?php
-  	  }
-  	 ?>
-  </div>
-  </td>
-  <td width="10%" valign="middle" align="center">
-  <?php
-  if ($ajax_search) {
-	?>
-	<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
-        <em class="fa fa-arrow-left"></em>
-	</button>
-  	<?php
-  } else {
-  	?>
-	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
-        <em class="fa fa-arrow-right"></em>
-	</button>
-	<br /><br />
-	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" >
-        <em class="fa fa-arrow-left"></em>
-	</button>
-	<?php
-  }
-  ?>
-	<br /><br /><br /><br /><br /><br />
-  </td>
-  <td align="center">
-  <select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;">
-<?php
-foreach($userGroupList as $item) {
-?>
-	<option value="<?php echo $item['id']; ?>">
-        <?php echo $item['name']; ?>
-    </option>
-<?php
-}
-?>
-  </select>
-  </td>
-</tr>
-<tr>
-	<td colspan="3" align="center">
-		<br />
-		<?php
-		if(isset($_GET['add']))
-			echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
-		else
-			echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
-		?>
-	</td>
-</tr>
-</table>
-</form>
-<script>
-
-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;
-	document.forms.formulaire.submit();
-}
+        function sortOptions(options) {
+            newOptions = new Array();
+            for (i = 0; i < options.length; i++)
+                newOptions[i] = options[i];
 
-function loadUsersInSelect(select){
+            newOptions = newOptions.sort(mysort);
+            options.length = 0;
+            for (i = 0; i < newOptions.length; i++)
+                options[i] = newOptions[i];
 
-	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...");
+        function mysort(a, b) {
+            if (a.text.toLowerCase() > b.text.toLowerCase()) {
+                return 1;
+            }
+            if (a.text.toLowerCase() < b.text.toLowerCase()) {
+                return -1;
+            }
+            return 0;
+        }
 
-	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);
+        function valide() {
+            var options = document.getElementById('destination_users').options;
+            for (i = 0; i < options.length; i++)
+                options[i].selected = true;
+            document.forms.formulaire.submit();
+        }
 
-	xhr_object.onreadystatechange = function() {
-		if(xhr_object.readyState == 4) {
-			document.getElementById('content_source').innerHTML = result = xhr_object.responseText;
-		}
-	}
-}
+        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("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;
+                }
+            }
+        }
 
-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>
+        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
 Display::display_footer();
diff --git a/main/inc/lib/urlmanager.lib.php b/main/inc/lib/urlmanager.lib.php
index dc026b3b99..51080fbbc9 100755
--- a/main/inc/lib/urlmanager.lib.php
+++ b/main/inc/lib/urlmanager.lib.php
@@ -315,7 +315,7 @@ class UrlManager
             $where ="WHERE $table_url_rel_usergroup.access_url_id = ".intval($access_url_id);
         }
 
-        $sql = "SELECT id, name, access_url_id
+        $sql = "SELECT u.id, u.name, access_url_id
 				FROM $table_user_group u
 				INNER JOIN $table_url_rel_usergroup
 				ON $table_url_rel_usergroup.usergroup_id = u.id
diff --git a/main/inc/lib/usergroup.lib.php b/main/inc/lib/usergroup.lib.php
index 413393264b..0a4e86bebd 100755
--- a/main/inc/lib/usergroup.lib.php
+++ b/main/inc/lib/usergroup.lib.php
@@ -44,7 +44,7 @@ class UserGroup extends Model
         $this->table_course = Database::get_main_table(TABLE_MAIN_COURSE);
         $this->table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-        $this->useMultipleUrl = api_get_configuration_value('enable_multiple_url_support_for_classes');
+        $this->useMultipleUrl = api_get_configuration_value('multiple_access_urls');
     }
 
     /**