X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FLib.pm;h=b67be9178d8866cb1252ba328f381490e5f8c034;hp=baa168f7431a1ba476a53efd1894f84087e285a9;hb=79e0593c501fd58046feeca20c315cc4ac283435;hpb=329e870f56fb6572fa697998d33676588034c149

diff --git a/lib/BackupPC/CGI/Lib.pm b/lib/BackupPC/CGI/Lib.pm
index baa168f..b67be91 100644
--- a/lib/BackupPC/CGI/Lib.pm
+++ b/lib/BackupPC/CGI/Lib.pm
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 2.1.0beta2, released 23 May 2004.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -48,7 +48,7 @@ use vars qw($Cgi %In $MyURL $User %Conf $TopDir $BinDir $bpc);
 use vars qw(%Status %Info %Jobs @BgQueue @UserQueue @CmdQueue
             %QueueLen %StatusHost);
 use vars qw($Hosts $HostsMTime $ConfigMTime $PrivAdmin);
-use vars qw(%UserEmailInfo $UserEmailInfoMTime %RestoreReq);
+use vars qw(%UserEmailInfo $UserEmailInfoMTime %RestoreReq %ArchiveReq);
 use vars qw($Lang);
 
 @ISA = qw(Exporter);
@@ -80,7 +80,7 @@ use vars qw($Lang);
 		    %Status %Info %Jobs @BgQueue @UserQueue @CmdQueue
 		    %QueueLen %StatusHost
 		    $Hosts $HostsMTime $ConfigMTime $PrivAdmin
-		    %UserEmailInfo $UserEmailInfoMTime %RestoreReq
+		    %UserEmailInfo $UserEmailInfoMTime %RestoreReq %ArchiveReq
 		    $Lang
              );
 
@@ -93,15 +93,6 @@ sub NewRequest
     $Cgi = new CGI;
     %In = $Cgi->Vars;
 
-    #
-    # We require that Apache pass in $ENV{SCRIPT_NAME} and $ENV{REMOTE_USER}.
-    # The latter requires .ht_access style authentication.  Replace this
-    # code if you are using some other type of authentication, and have
-    # a different way of getting the user name.
-    #
-    $MyURL  = $ENV{SCRIPT_NAME};
-    $User   = $ENV{REMOTE_USER};
-
     if ( !defined($bpc) ) {
 	ErrorExit($Lang->{BackupPC__Lib__new_failed__check_apache_error_log})
 	    if ( !($bpc = BackupPC::Lib->new(undef, undef, 1)) );
@@ -111,12 +102,25 @@ sub NewRequest
 	$Lang   = $bpc->Lang();
 	$ConfigMTime = $bpc->ConfigMTime();
     } elsif ( $bpc->ConfigMTime() != $ConfigMTime ) {
-	$bpc->ConfigRead();
-	%Conf   = $bpc->Conf();
-	$ConfigMTime = $bpc->ConfigMTime();
-	$Lang   = $bpc->Lang();
+        $bpc->ServerMesg("log Re-read config file because mtime changed");
+        $bpc->ServerMesg("server reload");
     }
 
+    #
+    # Default REMOTE_USER so in a miminal installation the user
+    # has a sensible default.
+    #
+    $ENV{REMOTE_USER} = $Conf{BackupPCUser} if ( $ENV{REMOTE_USER} eq "" );
+
+    #
+    # We require that Apache pass in $ENV{SCRIPT_NAME} and $ENV{REMOTE_USER}.
+    # The latter requires .ht_access style authentication.  Replace this
+    # code if you are using some other type of authentication, and have
+    # a different way of getting the user name.
+    #
+    $MyURL  = $ENV{SCRIPT_NAME};
+    $User   = $ENV{REMOTE_USER};
+
     #
     # Clean up %ENV for taint checking
     #
@@ -156,7 +160,6 @@ sub timeStamp2
 {
     my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)
               = localtime($_[0] == 0 ? time : $_[0] );
-    $year += 1900;
     $mon++;
     if ( $Conf{CgiDateFormatMMDD} ) {
         return sprintf("$mon/$mday %02d:%02d", $hour, $min);
@@ -218,10 +221,6 @@ sub ErrorExit
     my(@mesg) = @_;
     my($head) = shift(@mesg);
     my($mesg) = join("</p>\n<p>", @mesg);
-    $Conf{CgiHeaderFontType} ||= "arial"; 
-    $Conf{CgiHeaderFontSize} ||= "3";  
-    $Conf{CgiNavBarBgColor}  ||= "#ddeeee";
-    $Conf{CgiHeaderBgColor}  ||= "#99cc33";
 
     if ( !defined($ENV{REMOTE_USER}) ) {
 	$mesg .= <<EOF;
@@ -236,19 +235,19 @@ EOF
     $bpc->ServerMesg("log User $User (host=$In{host}) got CGI error: $head")
                             if ( defined($bpc) );
     if ( !defined($Lang->{Error}) ) {
-	Header("BackupPC: Error");
         $mesg = <<EOF if ( !defined($mesg) );
 There is some problem with the BackupPC installation.
 Please check the permissions on BackupPC_Admin.
 EOF
-	print <<EOF;
+        my $content = <<EOF;
 ${h1("Error: Unable to read config.pl or language strings!!")}
 <p>$mesg</p>
 EOF
+        Header("BackupPC: Error", $content);
 	Trailer();
     } else {
-	Header(eval("qq{$Lang->{Error}}"));
-	print (eval("qq{$Lang->{Error____head}}"));
+        my $content = eval("qq{$Lang->{Error____head}}");
+        Header(eval("qq{$Lang->{Error}}"), $content);
 	Trailer();
     }
     exit(1);
@@ -262,7 +261,16 @@ sub ServerConnect
     return if ( $bpc->ServerOK() );
     $bpc->ServerDisconnect();
     if ( my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}) ) {
-        ErrorExit(eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server}}"));
+        if ( CheckPermission() 
+          && -f $Conf{ServerInitdPath}
+          && $Conf{ServerInitdStartCmd} ne "" ) {
+            my $content = eval("qq{$Lang->{Admin_Start_Server}}");
+            Header(eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server}}"), $content);
+            Trailer();
+            exit(1);
+        } else {
+            ErrorExit(eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server}}"));
+        }
     }
 }
 
@@ -275,7 +283,9 @@ sub GetStatusInfo
     eval($reply);
     # ignore status related to admin and trashClean jobs
     if ( $status =~ /\bhosts\b/ ) {
-        delete($Status{$bpc->adminJob});
+	foreach my $host ( grep(/admin/, keys(%Status)) ) {
+	    delete($Status{$host}) if ( $bpc->isAdminJob($host) );
+	}
         delete($Status{$bpc->trashJob});
     }
 }
@@ -312,27 +322,31 @@ sub CheckPermission
         $Privileged ||= $Conf{CgiAdminUsers} eq "*";
     }
     $PrivAdmin = $Privileged;
+    return $Privileged if ( !defined($host) );
+
     $Privileged ||= $User eq $Hosts->{$host}{user};
     $Privileged ||= defined($Hosts->{$host}{moreUsers}{$User});
-
     return $Privileged;
 }
 
 #
 # Returns the list of hosts that should appear in the navigation bar
-# for this user.  If $Conf{CgiNavBarAdminAllHosts} is set, the admin
-# gets all the hosts.  Otherwise, regular users get hosts for which
-# they are the user or are listed in the moreUsers column in the
-# hosts file.
+# for this user.  If $getAll is set, the admin gets all the hosts.
+# Otherwise, regular users get hosts for which they are the user or
+# are listed in the moreUsers column in the hosts file.
 #
 sub GetUserHosts
 {
-    if ( $Conf{CgiNavBarAdminAllHosts} && CheckPermission() ) {
-       return sort keys %$Hosts;
-    }
+    my($getAll) = @_;
+    my @hosts;
 
-    return sort grep { $Hosts->{$_}{user} eq $User ||
+    if ( $getAll && CheckPermission() ) {
+        @hosts = sort keys %$Hosts;
+    } else {
+        @hosts = sort grep { $Hosts->{$_}{user} eq $User ||
                        defined($Hosts->{$_}{moreUsers}{$User}) } keys(%$Hosts);
+    }
+    return @hosts;
 }
 
 #
@@ -376,94 +390,128 @@ sub ConfirmIPAddress
 
 sub Header
 {
-    my($title) = @_;
+    my($title, $content, $noBrowse, $contentSub, $contentPost) = @_;
     my @adminLinks = (
-        { link => "",                          name => $Lang->{Status},
-                                               priv => 1},
-        { link => "?action=summary",           name => $Lang->{PC_Summary} },
-        { link => "?action=view&type=LOG",     name => $Lang->{LOG_file} },
-        { link => "?action=LOGlist",           name => $Lang->{Old_LOGs} },
-        { link => "?action=emailSummary",      name => $Lang->{Email_summary} },
-        { link => "?action=view&type=config",  name => $Lang->{Config_file} },
-        { link => "?action=view&type=hosts",   name => $Lang->{Hosts_file} },
-        { link => "?action=queue",             name => $Lang->{Current_queues} },
-        { link => "?action=view&type=docs",    name => $Lang->{Documentation},
-                                               priv => 1},
-        { link => "http://backuppc.sourceforge.net/faq", name => "FAQ",
-                                               priv => 1},
-        { link => "http://backuppc.sourceforge.net", name => "SourceForge",
-                                               priv => 1},
+        { link => "",                         name => $Lang->{Status}},
+        { link => "?action=adminOpts",        name => $Lang->{Admin_Options},
+                                              priv => 1},
+        { link => "?action=summary",          name => $Lang->{PC_Summary}},
+        { link => "?action=view&type=LOG",    name => $Lang->{LOG_file},
+                                              priv => 1},
+        { link => "?action=LOGlist",          name => $Lang->{Old_LOGs},
+                                              priv => 1},
+        { link => "?action=emailSummary",     name => $Lang->{Email_summary},
+                                              priv => 1},
+        { link => "?action=view&type=config", name => $Lang->{Config_file},
+                                              priv => 1},
+        { link => "?action=view&type=hosts",  name => $Lang->{Hosts_file},
+                                              priv => 1},
+        { link => "?action=queue",            name => $Lang->{Current_queues},
+                                              priv => 1},
+        @{$Conf{CgiNavBarLinks} || []},
     );
+    my $host = $In{host};
+
     print $Cgi->header();
     print <<EOF;
 <!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
 <title>$title</title>
+<link rel=stylesheet type="text/css" href="$Conf{CgiImageDirURL}/$Conf{CgiCSSFile}" title="CSSFile">
 $Conf{CgiHeaders}
-</head><body bgcolor="$Conf{CgiBodyBgColor}">
-<table cellpadding="0" cellspacing="0" border="0">
-<tr valign="top"><td valign="top" bgcolor="$Conf{CgiNavBarBgColor}" width="10%">
+</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
-    NavSectionTitle("BackupPC");
-    print "&nbsp;\n";
-    if ( defined($In{host}) && defined($Hosts->{$In{host}}) ) {
-        my $host = $In{host};
-        NavSectionTitle( eval("qq{$Lang->{Host_Inhost}}") );
-        NavSectionStart();
-        NavLink("?host=${EscURI($host)}", $Lang->{Home});
-        NavLink("?action=view&type=LOG&host=${EscURI($host)}", $Lang->{LOG_file});
-        NavLink("?action=LOGlist&host=${EscURI($host)}", $Lang->{Old_LOGs});
-        if ( -f "$TopDir/pc/$host/SmbLOG.bad"
-                    || -f "$TopDir/pc/$host/SmbLOG.bad.z"
-                    || -f "$TopDir/pc/$host/XferLOG.bad"
-                    || -f "$TopDir/pc/$host/XferLOG.bad.z" ) {
-            NavLink("?action=view&type=XferLOGbad&host=${EscURI($host)}",
-                                $Lang->{Last_bad_XferLOG});
-            NavLink("?action=view&type=XferErrbad&host=${EscURI($host)}",
-                                $Lang->{Last_bad_XferLOG_errors_only});
-        }
-        if ( -f "$TopDir/pc/$host/config.pl" ) {
-            NavLink("?action=view&type=config&host=${EscURI($host)}", $Lang->{Config_file});
-        }
-        NavSectionEnd();
+
+    if ( defined($Hosts) && defined($host) && defined($Hosts->{$host}) ) {
+	print "<div class=\"NavMenu\">";
+	NavSectionTitle("${EscHTML($host)}");
+	print <<EOF;
+</div>
+<div class="NavMenu">
+EOF
+	NavLink("?host=${EscURI($host)}",
+		"$host $Lang->{Home}", " class=\"navbar\"");
+	NavLink("?action=browse&host=${EscURI($host)}",
+		$Lang->{Browse}, " class=\"navbar\"") if ( !$noBrowse );
+	NavLink("?action=view&type=LOG&host=${EscURI($host)}",
+		$Lang->{LOG_file}, " class=\"navbar\"");
+	NavLink("?action=LOGlist&host=${EscURI($host)}",
+		$Lang->{LOG_files}, " class=\"navbar\"");
+	if ( -f "$TopDir/pc/$host/SmbLOG.bad"
+		    || -f "$TopDir/pc/$host/SmbLOG.bad.z"
+		    || -f "$TopDir/pc/$host/XferLOG.bad"
+		    || -f "$TopDir/pc/$host/XferLOG.bad.z" ) {
+	   NavLink("?action=view&type=XferLOGbad&host=${EscURI($host)}",
+		    $Lang->{Last_bad_XferLOG}, " class=\"navbar\"");
+	   NavLink("?action=view&type=XferErrbad&host=${EscURI($host)}",
+		    $Lang->{Last_bad_XferLOG_errors_only},
+		    " class=\"navbar\"");
+	}
+	if ( -f "$TopDir/pc/$host/config.pl" ) {
+	    NavLink("?action=view&type=config&host=${EscURI($host)}",
+		    $Lang->{Config_file}, " class=\"navbar\"");
+	}
+	print "</div>\n";
     }
-    NavSectionTitle($Lang->{NavSectionTitle_});
-    NavSectionStart();
-    foreach my $l ( @adminLinks ) {
-        if ( $PrivAdmin || $l->{priv} ) {
-            NavLink($l->{link}, $l->{name});
-        } else {
-            NavLink(undef, $l->{name});
-        }
+    print("<div id=\"Content\">\n$content\n");
+    if ( defined($contentSub) && ref($contentSub) eq "CODE" ) {
+	while ( (my $s = &$contentSub()) ne "" ) {
+	    print($s);
+	}
     }
-    NavSectionEnd();
-    NavSectionTitle($Lang->{Hosts});
+    print($contentPost) if ( defined($contentPost) );
     print <<EOF;
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-    <tr><td>$Lang->{Host_or_User_name}</td>
-    <tr><td><form action="$MyURL" method="get"><small>
-    <input type="text" name="host" size="10" maxlength="64">
+<br><br><br>
+</div>
+<div class="NavMenu" id="NavMenu" style="height:100%">
+EOF
+    my $hostSelectbox = "<option value=\"#\">$Lang->{Select_a_host}</option>";
+    my @hosts = GetUserHosts($Conf{CgiNavBarAdminAllHosts});
+    if ( defined($Hosts) && %$Hosts > 0 && @hosts ) {
+	NavSectionTitle($Lang->{Hosts});
+        foreach my $host ( @hosts ) {
+	    NavLink("?host=${EscURI($host)}", $host)
+		    if ( @hosts < $Conf{CgiNavBarAdminAllHosts} );
+	    my $sel = " selected" if ( $host eq $In{host} );
+	    $hostSelectbox .= "<option value=\"?host=${EscURI($host)}\"$sel>"
+			    . "$host</option>";
+        }
+    }
+    if ( @hosts >= $Conf{CgiNavBarAdminAllHosts} ) {
+        print <<EOF;
+<br>
+<select onChange="document.location=this.value">
+$hostSelectbox
+</select>
+<br><br>
+EOF
+    }
+    if ( $Conf{CgiSearchBoxEnable} ) {
+        print <<EOF;
+<form action="$MyURL" method="get">
+    <input type="text" name="host" size="14" maxlength="64">
     <input type="hidden" name="action" value="hostInfo"><input type="submit" value="$Lang->{Go}" name="ignore">
-    </small></form></td></tr>
-</table>
+    </form>
 EOF
-    if ( defined($Hosts) && %$Hosts > 0 ) {
-        NavSectionStart(1);
-        foreach my $host ( GetUserHosts() ) {
-            NavLink("?host=${EscURI($host)}", $host);
+    }
+    NavSectionTitle($Lang->{NavSectionTitle_});
+    foreach my $l ( @adminLinks ) {
+        if ( $PrivAdmin || !$l->{priv} ) {
+            my $txt = defined($l->{lname}) ? $Lang->{$l->{lname}} : $l->{name};
+            NavLink($l->{link}, $txt);
         }
-        NavSectionEnd();
     }
+
     print <<EOF;
-</td><td valign="top" width="5">&nbsp;&nbsp;</td>
-<td valign="top" width="90%">
+<br><br><br>
+</div>
 EOF
 }
 
 sub Trailer
 {
     print <<EOF;
-</td></table>
 </body></html>
 EOF
 }
@@ -473,41 +521,33 @@ sub NavSectionTitle
 {
     my($head) = @_;
     print <<EOF;
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr><td bgcolor="$Conf{CgiHeaderBgColor}"><font face="$Conf{CgiHeaderFontType}"
-size="$Conf{CgiHeaderFontSize}"><b>$head</b>
-</font></td></tr>
-</table>
+<div class="NavTitle">$head</div>
 EOF
 }
 
 sub NavSectionStart
 {
-    my($padding) = @_;
-
-    $padding = 1 if ( !defined($padding) );
-    print <<EOF;
-<table cellpadding="$padding" cellspacing="0" border="0" width="100%">
-EOF
 }
 
 sub NavSectionEnd
 {
-    print "</table>\n";
 }
 
 sub NavLink
 {
     my($link, $text) = @_;
-    print "<tr><td width=\"2%\" valign=\"top\"><b>&middot;</b></td>";
     if ( defined($link) ) {
+        my($class);
+        $class = " class=\"NavCurrent\""
+                if ( length($link) && $ENV{REQUEST_URI} =~ /\Q$link\E$/
+                    || $link eq "" && $ENV{REQUEST_URI} !~ /\?/ );
         $link = "$MyURL$link" if ( $link eq "" || $link =~ /^\?/ );
         print <<EOF;
-<td width="98%"><a href="$link"><small>$text</small></a></td></tr>
+<a href="$link"$class>$text</a>
 EOF
     } else {
         print <<EOF;
-<td width="98%"><small>$text</small></td></tr>
+$text<br>
 EOF
     }
 }
@@ -516,12 +556,7 @@ sub h1
 {
     my($str) = @_;
     return \<<EOF;
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-<td bgcolor="$Conf{CgiHeaderBgColor}">&nbsp;<font face="$Conf{CgiHeaderFontType}"
-    size="$Conf{CgiHeaderFontSize}"><b>$str</b></font>
-</td></tr>
-</table>
+<div class="h1">$str</div>
 EOF
 }
 
@@ -529,11 +564,6 @@ sub h2
 {
     my($str) = @_;
     return \<<EOF;
-<table cellpadding="2" cellspacing="0" border="0" width="100%">
-<tr>
-<td bgcolor="$Conf{CgiHeaderBgColor}">&nbsp;<font face="$Conf{CgiHeaderFontType}"
-    size="$Conf{CgiHeaderFontSize}"><b>$str</b></font>
-</td></tr>
-</table>
+<div class="h2">$str</div>
 EOF
 }