From 68df73e5638096881b4af36d959879babd60e651 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Tue, 27 Mar 2001 21:50:37 +0000
Subject: [PATCH] Make option dialog use ncat_id not cat_id

---
 addressbook/add.php               | 2 +-
 addressbook/edit.php              | 2 +-
 addressbook/inc/functions.inc.php | 6 +++---
 addressbook/index.php             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addressbook/add.php b/addressbook/add.php
index 00cf191529..79fb0ad370 100755
--- a/addressbook/add.php
+++ b/addressbook/add.php
@@ -151,7 +151,7 @@
 			$fields["access"]           = 'public';
 		}
 
-		$fields["cat_id"]               = $cat_id;
+		$fields["cat_id"]               = $ncat_id;
 
 		addressbook_add_entry($phpgw_info["user"]["account_id"],$fields,$fields["access"],$fields["cat_id"]);
 		$ab_id = addressbook_get_lastid();
diff --git a/addressbook/edit.php b/addressbook/edit.php
index 30dc435939..9c8d49cab9 100755
--- a/addressbook/edit.php
+++ b/addressbook/edit.php
@@ -158,7 +158,7 @@
 			$fields["access"]           = 'public';
 		}
 
-		$fields["cat_id"]               = $cat_id;
+		$fields["cat_id"]               = $ncat_id;
 
 		$userid = $phpgw_info["user"]["account_id"];
 
diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index ff73b34c2c..de5a57921d 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -34,10 +34,10 @@
 	}
 
 	// Return a select form element with the categories options in it
-	function cat_option($cat_id='',$notall=False) {
+	function cat_option($cat_id='',$name='cat_id',$notall=False) {
 		global $phpgw_info;
 		// Setup all and none first
-		$cats_link  = "<select name=\"cat_id\">";
+		$cats_link  = "<select name=\"".$name."\">";
 		if (!$notall) {
 			$cats_link .= "<option value =\"all\"";
 			if ($cat_id=="all") {
@@ -258,7 +258,7 @@
 			$cat_id   = $fields["cat_id"];
 		}
 
-		$cats_link    = cat_option($cat_id,True);
+		$cats_link    = cat_option($cat_id,'ncat_id',True);
 
 		if ($access == 'private') {
 			$access_check = ' checked';
diff --git a/addressbook/index.php b/addressbook/index.php
index c14415b17b..121e2e21cf 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -186,7 +186,7 @@
 	$t->set_var(cats,lang('Category'));
 	$t->set_var(cats_url,$phpgw->link("/addressbook/index.php",
 		"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
-	$t->set_var(cats_link,cat_option($cat_id));
+	$t->set_var(cats_link,cat_option($cat_id,'cat_id'));
 	$t->set_var(lang_cats,lang('Select'));
 	$t->set_var("lang_addressbook",lang("Address book"));
 	$t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);