From f3372be5ea03eb1ad4e1d19a4fb73b574a27554b Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Thu, 28 Oct 2004 11:12:10 +0000
Subject: [PATCH] In lib/sql/group_info.php3 only unset variables if we need
 to. In lib/sql/defaults.php3 don't run for groups only for users

---
 Changelog               |  2 ++
 lib/sql/defaults.php3   |  2 +-
 lib/sql/group_info.php3 | 11 +++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 6b8e2c0..9945682 100644
--- a/Changelog
+++ b/Changelog
@@ -34,6 +34,8 @@ Ver 1.75:
   change user group membership by changing membership in this group list.
 * On group creation, if member list is empty report that, not that the group was created.
 * In the show groups page, note that we only show groups with members
+* In lib/sql/group_info.php3 only unset variables if we need to. In lib/sql/defaults.php3 don't run for groups
+  only for users
 Ver 1.72:
 * Move the xlat function to a separate file in lib/xlat.php3
 * Add a lib/sql/nas_list.php3 to also get the nas list from sql (naslist.conf still works)
diff --git a/lib/sql/defaults.php3 b/lib/sql/defaults.php3
index 5aa331b..8ade8a1 100644
--- a/lib/sql/defaults.php3
+++ b/lib/sql/defaults.php3
@@ -1,6 +1,6 @@
 <?php
 require('../lib/sql/attrmap.php3');
-if ($login != ''){
+if ($login != '' && $user_type != 'group'){
 	if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3"))
 		include_once("../lib/sql/drivers/$config[sql_type]/functions.php3");
 	else{
diff --git a/lib/sql/group_info.php3 b/lib/sql/group_info.php3
index 5791b07..58d2261 100644
--- a/lib/sql/group_info.php3
+++ b/lib/sql/group_info.php3
@@ -14,13 +14,11 @@ if ($config[sql_use_operators] == 'true'){
 	$use_op = 0;
 }
 $group_exists = 'no';
-unset($item_vals);
-unset($tmp);
-unset($group_members);
-unset($existing_groups);
 $link = @da_sql_pconnect($config);
 if ($link){
 	if ($login == ''){
+		unset($existing_groups);
+
 		$res = @da_sql_query($link,$config,
 		"SELECT COUNT(*) as counter,groupname FROM $config[sql_usergroup_table]
 		GROUP BY groupname;");
@@ -36,6 +34,11 @@ if ($link){
 			echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
 	}
 	else{
+		unset($item_vals);
+		unset($tmp);
+		unset($group_members);
+		unset($existing_groups);
+
 		$res = @da_sql_query($link,$config,
 		"SELECT attribute,value $op FROM $config[sql_groupcheck_table] WHERE groupname = '$login';");
 		if ($res){
-- 
2.39.5