From: eldy <>
Date: Sun, 22 Jun 2003 21:26:23 +0000 (+0000)
Subject: User info file is not loaded if chart is empty in userinfo plugin..
X-Git-Tag: AWSTATS_5_6_RELEASE~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4659768058b088ba2fc23b85535d1af0d29b070;p=thirdparty%2FAWStats.git

User info file is not loaded if chart is empty in userinfo plugin..
---

diff --git a/wwwroot/cgi-bin/plugins/urlalias.pm b/wwwroot/cgi-bin/plugins/urlalias.pm
index bf3aa166..02600576 100644
--- a/wwwroot/cgi-bin/plugins/urlalias.pm
+++ b/wwwroot/cgi-bin/plugins/urlalias.pm
@@ -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;
 	# ----->
 }
diff --git a/wwwroot/cgi-bin/plugins/userinfo.pm b/wwwroot/cgi-bin/plugins/userinfo.pm
index 386e0036..dbeb39f4 100644
--- a/wwwroot/cgi-bin/plugins/userinfo.pm
+++ b/wwwroot/cgi-bin/plugins/userinfo.pm
@@ -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;
 	# ----->
 }