From be4ef15bef8163ce0b57b8955f7ce428538c5e10 Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Sun, 8 Sep 2002 12:10:35 +0000
Subject: [PATCH] Fix a few bugs

---
 Changelog                 | 1 +
 htdocs/user_edit.php3     | 6 +++---
 lib/sql/create_group.php3 | 5 +++--
 lib/sql/defaults.php3     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index ce557c2..d0a907f 100644
--- a/Changelog
+++ b/Changelog
@@ -37,6 +37,7 @@ Ver 1.60:
 * Add sessions in order to cache the various mappings. Add a corresponding configuration directive
   general_use_session. Also add a session cache destroy page.
 * Also cache the admin.conf if use_session is set to 1 in config.php3
+* Fix a few bugs
 Ver 1.55:
 * Update the FAQ about missing attributes from the user/group edit pages and add a few comments
   in the configuration files
diff --git a/htdocs/user_edit.php3 b/htdocs/user_edit.php3
index 0103170..23770f3 100644
--- a/htdocs/user_edit.php3
+++ b/htdocs/user_edit.php3
@@ -119,13 +119,13 @@ if ($user_type != 'group'){
 	echo <<<EOM
 <tr>
 <td align=right colspan=$colspan bgcolor="#d0ddb0">
-User Password (changes only)
-<?php
+User Password (changes only)<br>
+EOM;
 if ($user_password_exists == 'yes')
 	echo "<font size=-2>User password <font color=\"green\"><b>exists</b></font></font>\n";
 else
 	echo "<font size=-2>User password <font color=\"red\"><b>does not exist</b></font></font>\n";
-?>
+	echo <<<EOM
 </td>
 <td>
 <input type=password name=passwd value="" size=40>
diff --git a/lib/sql/create_group.php3 b/lib/sql/create_group.php3
index f6dee4b..b7cf84a 100644
--- a/lib/sql/create_group.php3
+++ b/lib/sql/create_group.php3
@@ -1,4 +1,5 @@
 <?php
+require('../lib/functions.php3');
 if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3"))
 	include_once("../lib/sql/drivers/$config[sql_type]/functions.php3");
 else{
@@ -33,7 +34,7 @@ if ($link){
 				$attrmap["$key"] = $key;
 				$attr_type["$key"] = 'replyItem';
 				$rev_attrmap["$key"] = $key;
-			}	
+			}
 			if ($attr_type["$key"] == 'checkItem'){
 				$table = "$config[sql_groupcheck_table]";
 				$type = 1;
@@ -56,7 +57,7 @@ if ($link){
 				continue;
 			$res = @da_sql_query($link,$config,
 			"INSERT INTO $table (Attribute,Value,GroupName $text)
-			VALUES ('$attrmap[$key]','$val','$login' $op_val2;");
+			VALUES ('$attrmap[$key]','$val','$login' $op_val2);");
 			if (!$res || !@da_sql_affected_rows($link,$res,$config))
 				echo "<b>Query failed for attribute $key: " . da_sql_error($link,$config) . "</b><br>\n";
 		}
diff --git a/lib/sql/defaults.php3 b/lib/sql/defaults.php3
index 7641617..9b9a47d 100644
--- a/lib/sql/defaults.php3
+++ b/lib/sql/defaults.php3
@@ -77,7 +77,7 @@ if ($login != ''){
 								$attr_type["$key"] = 'replyItem';
 								$rev_attrmap["$val"] = $key;
 							}
-							if (isset($default_vals["$key"]) && $overwrite_defaults){
+							if (!isset($default_vals["$key"]) || $overwrite_defaults){
 								if ($use_op)
 									$default_vals["$key"][operator] = $tmp["$val"][operator];
 								if ($tmp[$val][0] != '')
-- 
2.39.5