]> git.ipfire.org Git - thirdparty/AWStats.git/commitdiff
User info file is not loaded if chart is empty in userinfo plugin..
authoreldy <>
Sun, 22 Jun 2003 21:26:23 +0000 (21:26 +0000)
committereldy <>
Sun, 22 Jun 2003 21:26:23 +0000 (21:26 +0000)
wwwroot/cgi-bin/plugins/urlalias.pm
wwwroot/cgi-bin/plugins/userinfo.pm

index bf3aa1660c781dc338063dc0d3b657b8edf11ba9..026005769d90a799fe3c4f1ca4e027371e029451 100644 (file)
@@ -66,7 +66,8 @@ sub Init_urlalias {
 #-----------------------------------------------------------------------------
 sub ShowInfoURL_urlalias {
        # <-----
-       if (! $urlinfoloaded) {
+       my $urltoshow="$_[0]";
+       if ($urltoshow && ! $urlinfoloaded) {
                # Load urlalias file
                my $filetoload='';
                if ($SiteConfig && open(URLINFOFILE,"$PluginDir/urlalias.$SiteConfig.txt"))     { $filetoload="$PluginDir/urlalias.$SiteConfig.txt"; }
@@ -78,9 +79,11 @@ sub ShowInfoURL_urlalias {
                debug("UrlAlias file loaded: ".(scalar keys %UrlInfo)." entries found.");
                $urlinfoloaded=1;
        }
-       my $urltoreplace="$_[0]";
-       if ($UrlInfo{$urltoreplace}) { print "<font style=\"color: #$color_link; font-weight: bold\">$UrlInfo{$urltoreplace}</font><br>"; }
-       else { print ""; }
+       if ($urltoshow) {
+               if ($UrlInfo{$urltoshow}) { print "<font style=\"color: #$color_link; font-weight: bold\">$UrlInfo{$urltoshow}</font><br>"; }
+               else { print ""; }      # Undefined url info
+       }
+       else { print ""; }      # Url info title
        return 1;
        # ----->
 }
index 386e0036ffb86027368f7cdef48c4deb8c98e90a..dbeb39f4ed2fe8045c64c400003467278b76ffa1 100644 (file)
@@ -67,7 +67,8 @@ sub Init_userinfo {
 #-----------------------------------------------------------------------------
 sub ShowInfoUser_userinfo {
        # <-----
-       if (! $userinfoloaded) {
+       my $userinfotoshow="$_[0]";
+       if ($userinfotoshow && ! $userinfoloaded) {
                # Load userinfo file
                my $filetoload='';
                if ($SiteConfig && open(USERINFOFILE,"$PluginDir/userinfo.$SiteConfig.txt"))    { $filetoload="$PluginDir/userinfo.$SiteConfig.txt"; }
@@ -79,9 +80,11 @@ sub ShowInfoUser_userinfo {
                debug("UserInfo file loaded: ".(scalar keys %UserInfo)." entries found.");
                $userinfoloaded=1;
        }
-       my $userinfotoreplace="$_[0]";
-       if ($UserInfo{$userinfotoreplace}) { print "<TD>$UserInfo{$userinfotoreplace}</TD>"; }
-       else { print "<TD>&nbsp;</TD>"; }
+       if ($userinfotoshow) {
+               if ($UserInfo{$userinfotoshow}) { print "<TD>$UserInfo{$userinfotoshow}</TD>"; }
+               else { print "<TD>&nbsp;</TD>"; }       # Undefined user info
+       }
+       else { print "<TD>&nbsp;</TD>"; }       # User info title
        return 1;
        # ----->
 }