From 1bdb8ded81b242e42a7f36910fdb323610ccd175 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 2 Feb 2009 21:12:21 +0100
Subject: [PATCH] [svn r18166] UI improvements see FS#3462

---
 main/admin/access_url_add_users_to_url.php    |  2 +-
 main/admin/access_url_edit.php                |  1 -
 main/admin/access_url_edit_courses_to_url.php | 10 ++++++----
 main/admin/access_url_edit_users_to_url.php   |  4 +++-
 main/admin/access_urls.php                    |  4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php
index adaef0552d..ab4bb15f87 100755
--- a/main/admin/access_url_add_users_to_url.php
+++ b/main/admin/access_url_add_users_to_url.php
@@ -135,7 +135,7 @@ $result = api_sql_query($sql, __FILE__, __LINE__);
 $db_users = api_store_result($result);
 unset($result);
 
-$sql = "SELECT id, url FROM $tbl_access_url  WHERE active=1 ORDER BY url";
+$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);
diff --git a/main/admin/access_url_edit.php b/main/admin/access_url_edit.php
index 01e288567d..b89890a608 100644
--- a/main/admin/access_url_edit.php
+++ b/main/admin/access_url_edit.php
@@ -97,7 +97,6 @@ else
 }
 
 $form->addElement('text','url',get_lang('URL'),array('size'=>'30'));
-$form->addElement('static', null, null, get_lang('MustHaveSlash'));
 $form->addRule('url', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('url', '', 'maxlength',254);
 $form->addElement('textarea','description',get_lang('Description'));
diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php
index d26fe87a20..aef8c47627 100755
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
@@ -234,10 +234,12 @@ $url_list = UrlManager::get_url_data();
 			$checked = 'selected=true';
 			$url_selected=$url_obj[1];
 			}
-		}				
-	?>
-		<option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
-	<?php
+		}
+		if ($url_obj['active']==1) {						
+			?>
+				<option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?></option>
+			<?php
+		}
 	}
 	?>		
 </select>
diff --git a/main/admin/access_url_edit_users_to_url.php b/main/admin/access_url_edit_users_to_url.php
index a5cdc349c4..f71f9ad75e 100755
--- a/main/admin/access_url_edit_users_to_url.php
+++ b/main/admin/access_url_edit_users_to_url.php
@@ -231,10 +231,12 @@ $url_list = UrlManager::get_url_data();
 			$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>
diff --git a/main/admin/access_urls.php b/main/admin/access_urls.php
index aa0a2612fb..fb2ee600c2 100644
--- a/main/admin/access_urls.php
+++ b/main/admin/access_urls.php
@@ -45,8 +45,8 @@ require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'
 require_once (api_get_path(LIBRARY_PATH).'security.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
 
-$current_access_url_id = api_get_current_access_url_id();
 $my_user_url_list = api_get_access_url_from_user(api_get_user_id());
+$current_access_url_id = api_get_current_access_url_id();
 $url_list = UrlManager::get_url_data();
 
 // Actions
@@ -98,10 +98,10 @@ if (isset ($_GET['action'])) {
 
 $parameters['sec_token'] = Security::get_token();
 
-
 // checking if the admin is registered in all sites
 
 $url_string='';
+$my_user_url_list = api_get_access_url_from_user(api_get_user_id());
 foreach($url_list as $my_url) {	
 	if (!in_array($my_url['id'],$my_user_url_list)){
 		$url_string.=$my_url['url'].' ';