* 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

diff --git a/Changelog b/Changelog
index f8756b591fd1e1f09a70c57f007026b81f9064d5..a442b85b343e263a2f5b4ab10e276a3cb978e0da 100644 (file)
--- 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 871de484569c466e5bd56c84228d00f2fd28c785..b610de823475f155fe4b7e412834cbc28161616c 100644 (file)
--- 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 39f133efef557dbcb3f07ba0e0a1a4d91b436a58..363cd8158d4ba357f47d85482ab600b1b4b5942f 100644 (file)
--- 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 61043f46f83d27e4630bf379b94b822a070863b8..9f352a7c3ccdc13e90aedf827f3cb616e34098cd 100644 (file)
--- 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 9d631dcfd50b0199dc6102368414ff963dc1f28d..c4afb71c7ae2d9a53ded2de5670b35f865f7fda7 100644 (file)
--- 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('"','"',$val);
                        $oper_name = $name1 . '_op';
                        $oper = $ops[$i];
                        $selected[$oper] = 'selected';