[Ipcop-svn] SF.net SVN: ipcop:[6296] ipcop/trunk/html

[dotzball]

Revision: 6296
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6296&view=rev
Author:   dotzball
Date:     2012-01-30 18:07:51 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Fix some Perl warnings.

In logurlfilter.cgi are the two constants $Header::color{green,err} are used.
How should those constants/styling be replaced?

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/logurlfilter.cgi
    ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi

Modified: ipcop/trunk/html/cgi-bin/logurlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/logurlfilter.cgi   2012-01-30 12:07:15 UTC (rev 
6295)
+++ ipcop/trunk/html/cgi-bin/logurlfilter.cgi   2012-01-30 18:07:51 UTC (rev 
6296)
@@ -29,8 +29,8 @@
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/usr/lib/ipcop/general-functions.pl';
 require '/usr/lib/ipcop/lang.pl';
@@ -55,6 +55,8 @@
 my @now  = localtime();
 my $year = $now[5] + 1900;
 
+$cgiparams{'ACTION'} = '';
+
 $cgiparams{'DAY'} = $now[3];
 $cgiparams{'MONTH'} = $now[4];
 $cgiparams{'SECTION'} = 'urlfilter';
@@ -427,10 +429,12 @@
         my $attr1 = '';
         my $attr2 = '';
         my ($date,$time,$pid,@loginfo) = split(/ /);
-        @ip = split(/\//,$loginfo[2]);
-        @category = split(/\//,$loginfo[0]);
+        @ip = split(/\//, $loginfo[2]);
+        @category = split(/\//, $loginfo[0]);
         my $dsturl = $loginfo[1];
-        $loginfo[3] =~ s/\%5c/\\/;
+        if(defined($loginfo[3])) {
+            $loginfo[3] =~ s/\%5c/\\/;
+        }
         if ((($cgiparams{'CATEGORY'}  eq 'ALL') || ($category[1] eq 
$cgiparams{'CATEGORY'})) &&
             (($cgiparams{'SOURCE_IP'} eq 'ALL') || ($ip[0] eq 
$cgiparams{'SOURCE_IP'})) &&
             (($cgiparams{'USERNAME'}  eq 'ALL') || ($loginfo[3] eq 
$cgiparams{'USERNAME'})))
@@ -438,9 +442,9 @@
             $lines++;
 
             if ($cgiparams{'SECTION'} eq 'squidGuard') {
-                if (@loginfo[0] =~ /squidGuard/) { $attr1 .= "<b>"; $attr2 .= 
"</b>"; }
-                if (@loginfo[1] =~ /ready/) { $attr1 .= "<b><font 
color='$Header::colourgreen'>"; $attr2 .= "</font></b>"; }
-                if (@loginfo[2] =~ /emergency/) { $attr1 .= "<b><font 
color='$Header::colourerr'>"; $attr2 .= "</font></b>"; }
+                if ($loginfo[0] =~ /squidGuard/) { $attr1 .= "<b>"; $attr2 .= 
"</b>"; }
+                if ($loginfo[1] =~ /ready/) { $attr1 .= "<b><font 
color='$Header::colourgreen'>"; $attr2 .= "</font></b>"; }
+                if ($loginfo[2] =~ /emergency/) { $attr1 .= "<b><font 
color='$Header::colourerr'>"; $attr2 .= "</font></b>"; }
                 print "<tr>\n";
             }
             else {

Modified: ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi
===================================================================
--- ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi       2012-01-30 12:07:15 UTC 
(rev 6295)
+++ ipcop/trunk/html/vhost81/cgi-bin/redirect.cgi       2012-01-30 18:07:51 UTC 
(rev 6296)
@@ -25,8 +25,8 @@
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/usr/lib/ipcop/general-functions.pl';
 
@@ -66,7 +66,7 @@
     $msgtext3 = $filtersettings{'MSG_TEXT_3'};
 }
 
-if ($category eq '') {
+if ( (!defined($category)) || $category eq '') {
     $category = '&nbsp;';
 }
 else {
@@ -121,7 +121,7 @@
 END
 ;
 
-if (!($url eq ""))
+if (defined($url) && (!($url eq "")))
 {
     print <<END
           <p>URL: <a href="$url">$url</a></p>
@@ -129,7 +129,7 @@
     ;
 }
 
-if (!($ip eq ""))
+if(defined($ip) && (!($ip eq "")))
 {
     print <<END
           <p>Client IP address: <span style="font-style:italic;">$ip</span></p>

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn