*** /usr/bin/websec Tue Apr 16 23:57:31 2002 --- websec Tue Jul 1 10:35:51 2003 *************** *** 57,62 **** --- 57,63 ---- Prefix => "", Diff => "webdiff", Hicolor => "blue", + Hiascii => "false", Ignore => "none", IgnoreURL => "none", Email => "", *************** *** 133,139 **** && $keyword ne "Prefix" && $keyword ne "Timeout" && $keyword ne "Retry" && $keyword ne "Retrywait" && $keyword ne "Randomwait" ! && $keyword ne "Diff" && $keyword ne "Hicolor" && $keyword ne "Ignore" && $keyword ne "Email" && $keyword ne "EmailLink" && $keyword ne "Tmin" && $keyword ne "Tmax" && $keyword ne "Proxy" && $keyword ne "IgnoreURL" && $keyword ne "ProxyAuth" --- 134,141 ---- && $keyword ne "Prefix" && $keyword ne "Timeout" && $keyword ne "Retry" && $keyword ne "Retrywait" && $keyword ne "Randomwait" ! && $keyword ne "Diff" && $keyword ne "Hicolor" ! && $keyword ne "Hiascii" && $keyword ne "Ignore" && $keyword ne "Email" && $keyword ne "EmailLink" && $keyword ne "Tmin" && $keyword ne "Tmax" && $keyword ne "Proxy" && $keyword ne "IgnoreURL" && $keyword ne "ProxyAuth" *************** *** 159,164 **** --- 161,167 ---- $prefix = $siteinfo{Prefix}; $diff = $siteinfo{Diff}; $hicolor = $siteinfo{Hicolor}; + $hiascii = $siteinfo{Hiascii}; $ignore = $siteinfo{Ignore}; $ignoreurl = $siteinfo{IgnoreURL}; $email = $siteinfo{Email}; *************** *** 198,204 **** $subj = "$addsubject $name - $today"; $webdiff = "webdiff -archive $page_previous -current $page_current -out $outgoing " . ! "-hicolor $hicolor -ignore $ignore -ignoreurl $ignoreurl -tmin $tmin -tmax $tmax"; # Download URL using LWP $ua = new LWP::UserAgent; --- 201,207 ---- $subj = "$addsubject $name - $today"; $webdiff = "webdiff -archive $page_previous -current $page_current -out $outgoing " . ! "-hicolor $hicolor -hiascii $hiascii -ignore $ignore -ignoreurl $ignoreurl -tmin $tmin -tmax $tmax"; # Download URL using LWP $ua = new LWP::UserAgent; *** /usr/bin/webdiff Tue Apr 16 23:57:31 2002 --- webdiff Tue Jul 1 10:49:05 2003 *************** *** 35,40 **** --- 35,41 ---- print " -current <pathname> Current HTML file\n"; print " -out <pathname> Output HTML file (with highlighting)\n"; print " -hicolor <color> Highlight color (Def: blue, yellow, pink, grey or #rrggbb)\n"; + print " -hiascii <boolean> Set to 'true' to include ascii markers\n"; print " -ignore <filelist> Comma-delimited list of named sections containing ignore keywords\n"; print " -ignoreurl <filelist> Comma-delimited list of named sections containing ignore urls\n"; print " -tmin <number> Don't check if token contains <= given no. of words\n"; *************** *** 47,52 **** --- 48,54 ---- 0ptionList = ( -hicolor => "blue", + -hiascii => "false", -ignore => "none", -ignoreurl => "none", -tmin => 0, *************** *** 60,65 **** --- 62,68 ---- $curpage = $optionList{-current}; $outpage = $optionList{-out}; $hicolor = $optionList{-hicolor}; + $hiascii = $optionList{-hiascii}; $ignore = $optionList{-ignore}; $ignoreurl = $optionList{-ignoreurl}; $tmin = $optionList{-tmin}; *************** *** 71,77 **** $basedir = $ENV{HOME} . "/.websec/"; # Choose highlighting color ! olorList = ( yellow => "#ffff99", blue => "#66ccff", pink => "#ffcccc", grey => "#4c4c4c" ); if (defined $colorList{$hicolor}) { $hicolor = $colorList{$hicolor}; } if ($hicolor eq "") { $hicolor = $colorList{"blue"}; } --- 74,80 ---- $basedir = $ENV{HOME} . "/.websec/"; # Choose highlighting color ! olorList = ( yellow => "#ffff99", blue => "#66ccff", pink => "#ffcccc", grey => "#4c4c4c", none => "none" ); if (defined $colorList{$hicolor}) { $hicolor = $colorList{$hicolor}; } if ($hicolor eq "") { $hicolor = $colorList{"blue"}; } *************** *** 186,192 **** { if (!defined($option = shift)) { last; } if ($option ne "-archive" && $option ne "-current" && $option ne "-out" && ! $option ne "-hicolor" && $option ne "-ignore" && $option ne "-debug" && $option ne "-tmin" && $option ne "-tmax" && $option ne "-ignoreurl") { print "Unrecognized option: $option.\n"; --- 189,196 ---- { if (!defined($option = shift)) { last; } if ($option ne "-archive" && $option ne "-current" && $option ne "-out" && ! $option ne "-hicolor" && $option ne "-hiascii" && ! $option ne "-ignore" && $option ne "-debug" && $option ne "-tmin" && $option ne "-tmax" && $option ne "-ignoreurl") { print "Unrecognized option: $option.\n"; *************** *** 296,303 **** else { if ($debug eq "true" ) { print "#### Token has been highlighted!\n"; } ! $token = "<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0><TR><TD BGCOLOR=$hicolor>" . ! $token . "</TD></TR></TABLE>"; $changeStatus = 1; } } --- 300,314 ---- else { if ($debug eq "true" ) { print "#### Token has been highlighted!\n"; } ! if ($hiascii eq "true" ) { ! $token = "###". $token ."###"; ! ! } ! if ($hicolor ne "none") { ! $token = ! "<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0><TR>". ! "<TD BGCOLOR=$hicolor>" . $token . "</TD></TR></TABLE>"; ! } $changeStatus = 1; } }