* Add a patch from Neil McCalden to not put spaces in the -p argument to the mysql...

* Fix a bug in conf/config.php3. Patch from Neil McCalden

diff --git a/Changelog b/Changelog
index 6e6bfc37c543cca13bbf23016456e17c03245f9f..073b87ecdbaa29c7182593c5a93dde5d5409556b 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,8 @@ Ver 1.68:
 * In log_badlogins for multiple logins if it is a mppp attempt, log it
 * Add a message when adding a user in the badusers table
 * Close sql connections in add_badusers.php3
+* Add a patch from Neil McCalden to not put spaces in the -p argument to the mysql binary.
+* Fix a bug in conf/config.php3. Patch from Neil McCalden
 Ver 1.65:
 * Add a captions.conf file with a few configurable captions for now
 * Move the nas list to a separate file called naslist.conf

diff --git a/bin/monthly_tot_stats b/bin/monthly_tot_stats
index 53857201669aae46ad6e639cf42a9bad6a2e3089..79a976eaee7021ae4e5fa2e2dd1e03befc332ad4 100755 (executable)
--- a/bin/monthly_tot_stats
+++ b/bin/monthly_tot_stats
@@ -26,7 +26,7 @@ close CONF;
 die "sql_command directive is not set in admin.conf\n" if ($mysql eq '');
 die "Could not find mysql binary. Please make sure that the \$mysql variable points to the right location\n" if (! -x $mysql);
 
-$sql_password = ($sql_password == '') ? '' : "-p $sql_password";
+$sql_password = ($sql_password == '') ? '' : "-p$sql_password";
 
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
 if ($mday == 1){

diff --git a/bin/tot_stats b/bin/tot_stats
index 2b38881416e740742404df64f8cf528858329314..ca4149bb6428278672fc268102e4f8e00ad71d1e 100755 (executable)
--- a/bin/tot_stats
+++ b/bin/tot_stats
@@ -26,7 +26,7 @@ close CONF;
 die "sql_command directive is not set in admin.conf\n" if ($mysql eq '');
 die "Could not find mysql binary. Please make sure that the \$mysql variable points to the right location\n" if (! -x $mysql);
 
-$sql_password = ($sql_password == '') ? '' : "-p $sql_password";
+$sql_password = ($sql_password == '') ? '' : "-p$sql_password";
 
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
 $date_start = POSIX::strftime("%Y-%m-%d %T",0,0,0,($mday - 1),$mon,$year,$wday,$yday,$isdst);

diff --git a/conf/config.php3 b/conf/config.php3
index eb8cccef4e8c8ab4b455e68928a530f0a7e76e57..42fc00599a21935ed3fe318125664409cbe21762 100644 (file)
--- a/conf/config.php3
+++ b/conf/config.php3
@@ -44,8 +44,7 @@ if (!isset($config)){
                                $val=$config[$matches[1]];
                                $v=preg_replace("/%\{$matches[1]\}/",$val,$v);
                        }
-                       else
-                               $config["$key"]="$v";
+                       $config["$key"]="$v";
                }
        }
        if ($use_session)