* Changes in preparation for 3.2.0beta1...

[BackupPC.git] / lib / BackupPC / CGI / Lib.pm
diff --git a/lib/BackupPC/CGI/Lib.pm b/lib/BackupPC/CGI/Lib.pm

index c776d3f..44afe9d 100644 (file)
--- a/lib/BackupPC/CGI/Lib.pm
+++ b/lib/BackupPC/CGI/Lib.pm
@@ -11,7 +11,7 @@
  #   Craig Barratt  <cbarratt@users.sourceforge.net>
  #
  # COPYRIGHT
-#   Copyright (C) 2003  Craig Barratt
+#   Copyright (C) 2003-2009  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
@@ -29,7 +29,7 @@
  #
  #========================================================================
  #
-# Version 3.0.0beta1, released 30 Jul 2006.
+# Version 3.2.0beta0, released 5 April 2009.
  #
  # See http://backuppc.sourceforge.net.
  #
@@ -102,11 +102,16 @@ sub NewRequest
         %Conf   = $bpc->Conf();
         $Lang   = $bpc->Lang();
         $ConfigMTime = $bpc->ConfigMTime();
+        umask($Conf{UmaskMode});
      } elsif ( $bpc->ConfigMTime() != $ConfigMTime ) {
          $bpc->ConfigRead();
+       $TopDir = $bpc->TopDir();
+       $LogDir = $bpc->LogDir();
+       $BinDir = $bpc->BinDir();
          %Conf   = $bpc->Conf();
          $Lang   = $bpc->Lang();
          $ConfigMTime = $bpc->ConfigMTime();
+        umask($Conf{UmaskMode});
      }
  
      #
@@ -178,7 +183,10 @@ sub timeStamp2
      my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)
                = localtime($_[0] == 0 ? time : $_[0] );
      $mon++;
-    if ( $Conf{CgiDateFormatMMDD} ) {
+    if ( $Conf{CgiDateFormatMMDD} == 2 ) {
+        $year += 1900;
+        return sprintf("%04d-%02d-%02d %02d:%02d", $year, $mon, $mday, $hour, $min);
+    } elsif ( $Conf{CgiDateFormatMMDD} ) {
          return sprintf("$mon/$mday %02d:%02d", $hour, $min);
      } else {
          return sprintf("$mday/$mon %02d:%02d", $hour, $min);
@@ -286,7 +294,8 @@ sub ServerConnect
              Trailer();
              exit(1);
          } else {
-            ErrorExit(eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server}}"));
+            ErrorExit(eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server}}"),
+                      eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server_error_message}}"));
          }
      }
  }
@@ -412,14 +421,14 @@ sub Header
      my($title, $content, $noBrowse, $contentSub, $contentPost) = @_;
      my @adminLinks = (
          { link => "",                      name => $Lang->{Status}},
-        { link => "?action=adminOpts",     name => $Lang->{Admin_Options},
-                                           priv => 1},
+        { link => "?action=summary",       name => $Lang->{PC_Summary}},
          { link => "?action=editConfig",    name => $Lang->{CfgEdit_Edit_Config},
                                             priv => 1},
          { link => "?action=editConfig&newMenu=hosts",
                                             name => $Lang->{CfgEdit_Edit_Hosts},
                                             priv => 1},
-        { link => "?action=summary",       name => $Lang->{PC_Summary}},
+        { link => "?action=adminOpts",     name => $Lang->{Admin_Options},
+                                           priv => 1},
          { link => "?action=view&type=LOG", name => $Lang->{LOG_file},
                                             priv => 1},
          { link => "?action=LOGlist",       name => $Lang->{Old_LOGs},
@@ -439,7 +448,9 @@ sub Header
  <html><head>
  <title>$title</title>
  <link rel=stylesheet type="text/css" href="$Conf{CgiImageDirURL}/$Conf{CgiCSSFile}" title="CSSFile">
+<link rel=icon href="$Conf{CgiImageDirURL}/favicon.ico" type="image/x-icon">
  $Conf{CgiHeaders}
+<script src="$Conf{CgiImageDirURL}/sorttable.js"></script>
  </head><body onLoad="document.getElementById('NavMenu').style.height=document.body.scrollHeight">
  <a href="http://backuppc.sourceforge.net"><img src="$Conf{CgiImageDirURL}/logo.gif" hspace="5" vspace="7" border="0"></a><br>
  EOF