From b6de07bbd106049cd71fb7a24502c8267b059a61 Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Tue, 3 Sep 2002 20:51:30 +0000
Subject: [PATCH] * In config.php3 include a relative admin.conf file not an
 absolute * Add an entry in the FAQ about php magic quotes * Escape double
 quotes in attribute values in the user edit page

---
 Changelog             | 3 +++
 FAQ                   | 5 +++++
 conf/admin.conf       | 3 ---
 conf/config.php3      | 8 +-------
 htdocs/user_edit.php3 | 1 +
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Changelog b/Changelog
index f8756b5..a442b85 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,9 @@ Ver 1.56:
 * Small html fixes in user_edit.php3 and password.php3
 * Show number of failed logins in the last 7 days in the user admin page
 * Show date in the user/server test page
+* In config.php3 include a relative admin.conf file not an absolute
+* Add an entry in the FAQ about php magic quotes
+* Escape double quotes in attribute values in the user edit page
 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/FAQ b/FAQ
index 871de48..b610de8 100644
--- a/FAQ
+++ b/FAQ
@@ -35,6 +35,11 @@ ${freeradius_install_dir}/etc/raddb/ldap.attrmap and check if the attribute is i
 the attribute mapping. If it is not then add it there also.
 Everything should work ok after that.
 
+>
+> When an attribute contains double (") or single (') quotes something goes wrong.
+>
+
+Make sure that magic quotes in PHP are turned off
 
 --
 kkalev
diff --git a/conf/admin.conf b/conf/admin.conf
index 39f133e..363cd81 100644
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -1,9 +1,6 @@
 #
 # Main Configuration File
 #
-# *** Make sure that conf/config.php3 opens the correct admin.conf file ***
-#
-#
 # it can be default or whatever language. Only greek are supported
 # from non latin alphabet languages
 # These attribute only apply for ldap not for sql
diff --git a/conf/config.php3 b/conf/config.php3
index 61043f4..9f352a7 100644
--- a/conf/config.php3
+++ b/conf/config.php3
@@ -1,11 +1,5 @@
 <?php
-#
-# IMPORTANT IMPORTANT IMPORTANT
-#
-# Remember to change the included file to the location of your admin.conf
-#
-#
-$ARR=file("/usr/local/dialup_admin/conf/admin.conf");
+$ARR=file("../conf/admin.conf");
 foreach($ARR as $val) {
 	$val=chop($val);
 	if (ereg('^[[:space:]]*#',$val) || ereg('^[[:space:]]*$',$val))
diff --git a/htdocs/user_edit.php3 b/htdocs/user_edit.php3
index 9d631dc..c4afb71 100644
--- a/htdocs/user_edit.php3
+++ b/htdocs/user_edit.php3
@@ -144,6 +144,7 @@ EOM;
 		$i = 0;
 		foreach($vals as $val){
 			$name1 = $name . $i;
+			$val = ereg_replace('"','&quot;',$val);
 			$oper_name = $name1 . '_op';
 			$oper = $ops[$i];
 			$selected[$oper] = 'selected';
-- 
2.39.5