show search archive and burn media CGI interface

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

index e683fdf..a1d06aa 100644 (file)
--- a/lib/BackupPC/CGI/Lib.pm
+++ b/lib/BackupPC/CGI/Lib.pm
@@ -29,7 +29,7 @@
  #
  #========================================================================
  #
-# Version 3.2.0beta0, released 5 April 2009.
+# Version 3.2.0, released 31 Jul 2010.
  #
  # See http://backuppc.sourceforge.net.
  #
@@ -294,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}}"));
          }
      }
  }
@@ -353,6 +354,10 @@ sub CheckPermission
  
      $Privileged ||= $User eq $Hosts->{$host}{user};
      $Privileged ||= defined($Hosts->{$host}{moreUsers}{$User});
+
+    # XXX check against REMOTE_NTGROUP from mod_ntlm
+    $Privileged ||= $Conf{CgiAdminUserGroup} eq $ENV{REMOTE_NTGROUP};
+
      return $Privileged;
  }
  
@@ -436,6 +441,11 @@ sub Header
                                             priv => 1},
          { link => "?action=queue",         name => $Lang->{Current_queues},
                                             priv => 1},
+       # XXX additional search extensions
+        { link => "?action=search",        name => $Lang->{Search_archive},
+                                           priv => 0},
+        { link => "?action=burn",          name => $Lang->{Burn_media},
+                                           priv => 1},
          @{$Conf{CgiNavBarLinks} || []},
      );
      my $host = $In{host};
@@ -447,6 +457,7 @@ 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">