Fix a few bugs

diff --git a/Changelog b/Changelog
index ce557c27f23a1355643172ab27a553d9f92ea81e..d0a907f981391ecb5af386f6c0146a0748cf8c29 100644 (file)
--- 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 010317032cbd9116a4518af7bfc6d147bb2f21e5..23770f32ac0b3b3a17bf12e957c31abb9bd7e8e7 100644 (file)
--- 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 f6dee4b7814ca58a59f75ba05a1882a5ea12c544..b7cf84a66067bf62ad28687ce6c95aafde8b3d49 100644 (file)
--- 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 764161714801bed42607df7197c1782c114d47f4..9b9a47d130681bb9ba23aeeb1773ba49f4385e79 100644 (file)
--- 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] != '')