3.1.0 changes:

[BackupPC.git] / lib / BackupPC / CGI / StartStopBackup.pm

diff --git a/lib/BackupPC/CGI/StartStopBackup.pm b/lib/BackupPC/CGI/StartStopBackup.pm
index e62ced2..3ab2bfe 100644 (file)
--- a/lib/BackupPC/CGI/StartStopBackup.pm
+++ b/lib/BackupPC/CGI/StartStopBackup.pm
@@ -10,7 +10,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2003  Craig Barratt
+#   Copyright (C) 2003-2007  Craig Barratt
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 3.1.0, released 25 Nov 2007.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -43,10 +43,10 @@ sub action
 {
     my($str, $reply);
 
-    my $start = 1 if ( $In{action} eq $Lang->{Start_Incr_Backup}
-                       || $In{action} eq $Lang->{Start_Full_Backup} );
-    my $doFull = $In{action} eq $Lang->{Start_Full_Backup} ? 1 : 0;
-    my $type = $doFull ? "full" : "incremental";
+    my $start = 1 if ( $In{action} eq "Start_Incr_Backup"
+                       || $In{action} eq "Start_Full_Backup" );
+    my $doFull = $In{action} eq "Start_Full_Backup" ? 1 : 0;
+    my $type = $doFull ? $Lang->{Type_full} : $Lang->{Type_incr};
     my $host = $In{host};
     my $Privileged = CheckPermission($host);
 
@@ -76,7 +76,14 @@ sub action
         Trailer();
     } else {
         if ( $start ) {
-           my $ipAddr = ConfirmIPAddress($host);
+            $bpc->ConfigRead($host);
+            %Conf = $bpc->Conf();
+
+            my $checkHost = $host;
+            $checkHost = $Conf{ClientNameAlias}
+                                if ( $Conf{ClientNameAlias} ne "" );
+           my $ipAddr     = ConfirmIPAddress($checkHost);
+            my $buttonText = $Lang->{$In{action}};
            my $content = eval("qq{$Lang->{Are_you_sure_start}}");
             Header(eval("qq{$Lang->{BackupPC__Start_Backup_Confirm_on__host}}"),$content);
         } else {
@@ -86,8 +93,10 @@ sub action
                 $backoff = sprintf("%.1f",
                                   ($StatusHost{backoffTime} - time) / 3600);
             }
+            my $buttonText = $Lang->{$In{action}};
             my $content = eval ("qq{$Lang->{Are_you_sure_stop}}");
-            Header($Lang->{BackupPC__Stop_Backup_Confirm_on__host},$content);
+            Header(eval("qq{$Lang->{BackupPC__Stop_Backup_Confirm_on__host}}"),
+                        $content);
         }
         Trailer();
     }