Added bin/BackupPC_sendEmail to Lang variable check in makeDist

diff --git a/ChangeLog b/ChangeLog
index 49f9915..1407309 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,10 @@
   setting $Conf{CgiNavBarAdminAllHosts} that allows all hosts to
   be listed in the left nav bar for admins.
 
+* Fixed new 2.0.0 CGI navigation bug that causes the top-level directory
+  to have a URL "&share=//boot&dir=" instead of "&share=/boot&dir=/".
+  Reported by Pascal Schelcher.
+
 * Added "PerlTaintCheck On" to the mod_perl section in the docs,
   suggested by Tim Demarest.
 

diff --git a/configure.pl b/configure.pl
index b66231e..2761b34 100755 (executable)
--- a/configure.pl
+++ b/configure.pl
@@ -461,6 +461,17 @@ $Conf{EMailAdminUserName} ||= $Conf{BackupPCUser};
 # Update various config parameters
 #
 
+#
+# Guess $Conf{CgiURL}
+#
+if ( !defined($Conf{CgiURL}) ) {
+    if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) {
+       $Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'";
+    } else {
+       $Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'";
+    }
+}
+
 #
 # IncrFill should now be off
 #

diff --git a/makeDist b/makeDist
index c6ebf3d..0821a7e 100755 (executable)
--- a/makeDist
+++ b/makeDist
@@ -297,12 +297,13 @@ sub CheckLangUsage
     my $errors;
     my $vars = {};
 
-    open(F, "cgi-bin/BackupPC_Admin")
-                || die("can't open cgi-bin/BackupPC_Admin\n");
-    while ( <F> ) {
-        s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg;
+    foreach my $file ( qw(cgi-bin/BackupPC_Admin bin/BackupPC_sendEmail) ) {
+       open(F, $file) || die("can't open $file");
+       while ( <F> ) {
+           s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg;
+       }
+       close(F);
     }
-    close(F);
     foreach my $f ( <lib/BackupPC/Lang/*.pm> ) {
         my $done = {};
         open(F, $f) || die("can't open $f\n");