From 73d6c7cfd6342d3d3e97738ce6cc666f90d05883 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Tue, 13 Mar 2001 17:18:22 +0000
Subject: [PATCH] Remove access related info, since we are using acl now

---
 addressbook/templates/default/vcardin.tpl | 19 -------------------
 addressbook/vcardin.php                   | 17 +++++++++--------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/addressbook/templates/default/vcardin.tpl b/addressbook/templates/default/vcardin.tpl
index 65a9485b84..434d9ce485 100644
--- a/addressbook/templates/default/vcardin.tpl
+++ b/addressbook/templates/default/vcardin.tpl
@@ -7,24 +7,5 @@
        <td>Vcard: <input type="file" name="uploadedfile"></td>
        <td><input type="submit" name="action" value="Load Vcard"></td>
       </tr>
-      <tr></tr>
-      <tr></tr>
-      <tr></tr>
-      <tr>
-        <td>{lang_access}:</td>
-        <td>{lang_groups}:</td>
-      </tr>
-      <tr>
-        <td>
-          <select name="access">
-		    {access_option}
-          </select>
-        </td>
-        <td colspan="3">
-          <select name=n_groups[] multiple size="5">
-		    {groups_option}
-          </select>
-        </td>
-      </tr>
       </table>
      </form>
diff --git a/addressbook/vcardin.php b/addressbook/vcardin.php
index 03dde58622..14baad837a 100644
--- a/addressbook/vcardin.php
+++ b/addressbook/vcardin.php
@@ -31,7 +31,8 @@
 	// Some of the methods where borrowed from
 	// Squirrelmail <Luke Ehresman> http://www.squirrelmail.org
 
-	$sep = $phpgw->common->filesystem_separator();
+	//$sep = $phpgw->common->filesystem_separator();
+	$sep = SEP;
 
 	$uploaddir = $phpgw_info["server"]["temp_dir"] . $sep . $phpgw_info["user"]["sessionid"] . $sep;
 
@@ -51,10 +52,10 @@
 
 			// This has to be non-interactive in case of a multi-entry vcard.
 			$filename = $uploaddir . $newfilename;
-			$n_groups = $phpgw->accounts->array_to_string($access,$n_groups);
+			//$n_groups = $phpgw->accounts->array_to_string($access,$n_groups);
       
-			if($access == "group")
-				$access = $n_groups;
+			//if($access == "group")
+			//	$access = $n_groups;
 			//echo $access . "<BR>";
 
 			parsevcard($filename,$access);
@@ -82,7 +83,7 @@
 	$t->set_var(action_url,$phpgw->link("/addressbook/vcardin.php"));
 	$t->set_var(lang_access,lang("Access"));
 	$t->set_var(lang_groups,lang("Which groups"));
-
+/*
 	$access_option = "<option value=\"private\"";
 	if($access == "private")
 		$access_option .= "selected";
@@ -98,9 +99,9 @@
 		$access_option .= "selected";
     $access_option .= ">" . lang("Group Public"); 
     $access_option .= "</option>\n";
-	
+*/	
 	$t->set_var(access_option,$access_option);
-	
+/*	
     //$user_groups = $phpgw->accounts->read_group_names($fields["ab_owner"]);
     for ($i=0;$i<count($user_groups);$i++) {
     	$group_option = "<option value=\"" . $user_groups[$i][0] . "\"";
@@ -110,7 +111,7 @@
 			$group_option .= "</option>\n";
 		}
 	}
-
+*/
 	$t->set_var(group_option,$group_option);
 	
 	$t->pparse("out","vcardin");