Menu
▾
▴
[popfile-commit] engine/UI HTML.pm,1.183,1.184 HTTP.pm,1.8,1.9 XMLRPC.pm,1.3,1.4
|
From: <jgr...@us...> - 2003-07-26 18:28:31
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv15772/UI
Modified Files:
HTML.pm HTTP.pm XMLRPC.pm
Log Message:
Remove all tabs from the source code and fix my editor so that *I* don't introduce any more
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** HTML.pm 26 Jul 2003 07:39:19 -0000 1.183
--- HTML.pm 26 Jul 2003 18:28:28 -0000 1.184
***************
*** 419,423 ****
# assigning a new one through the password page
! if ( $k ne 'session' ) {
# If we are dealing with an array of values (see parse_form__
--- 419,423 ----
# assigning a new one through the password page
! if ( $k ne 'session' ) {
# If we are dealing with an array of values (see parse_form__
***************
*** 425,436 ****
# we ignore non-array values since all values have an array equivalent
! if ( $k =~ /^(.+)_array$/ ) {
my $field = $1;
foreach my $v (@{$self->{form_}{$k}}) {
$redirect_url .= "$field=$v&"
! }
! }
! }
}
--- 425,436 ----
# we ignore non-array values since all values have an array equivalent
! if ( $k =~ /^(.+)_array$/ ) {
my $field = $1;
foreach my $v (@{$self->{form_}{$k}}) {
$redirect_url .= "$field=$v&"
! }
! }
! }
}
***************
*** 468,472 ****
if ( -e ( $self->global_config_( 'msgdir' ) . $file ) ) {
$self->http_redirect_( $client, "/view?session=$self->{session_key__}&view=$self->{form_}{view}" );
! } else {
$self->http_redirect_( $client, "/history" );
}
--- 468,472 ----
if ( -e ( $self->global_config_( 'msgdir' ) . $file ) ) {
$self->http_redirect_( $client, "/view?session=$self->{session_key__}&view=$self->{form_}{view}" );
! } else {
$self->http_redirect_( $client, "/history" );
}
***************
*** 1102,1106 ****
$body .= "<a title=\"$full_line\">$line</a><br>";
! }
$body .= '</tt>';
--- 1102,1106 ----
$body .= "<a title=\"$full_line\">$line</a><br>";
! }
$body .= '</tt>';
***************
*** 1302,1306 ****
if ( $param =~ /parameter_(.*)/ ) {
$self->{configuration__}->parameter( $1, $self->{form_}{$param} );
! }
}
--- 1302,1306 ----
if ( $param =~ /parameter_(.*)/ ) {
$self->{configuration__}->parameter( $1, $self->{form_}{$param} );
! }
}
***************
*** 1438,1442 ****
if ( defined( $self->{form_}{delete} ) ) {
for my $i ( 1 .. $self->{form_}{count} ) {
! if ( defined( $self->{form_}{"remove$i"} ) && ( $self->{form_}{"remove$i"} ) ) {
my $mtype = $self->{form_}{"type$i"};
my $mtext = $self->{form_}{"text$i"};
--- 1438,1442 ----
if ( defined( $self->{form_}{delete} ) ) {
for my $i ( 1 .. $self->{form_}{count} ) {
! if ( defined( $self->{form_}{"remove$i"} ) && ( $self->{form_}{"remove$i"} ) ) {
my $mtype = $self->{form_}{"type$i"};
my $mtext = $self->{form_}{"text$i"};
***************
*** 1444,1448 ****
$self->{classifier__}->delete_magnet( $mbucket, $mtype, $mtext );
! }
}
}
--- 1444,1448 ----
$self->{classifier__}->delete_magnet( $mbucket, $mtype, $mtext );
! }
}
}
***************
*** 1460,1464 ****
$self->{classifier__}->delete_magnet( $obucket, $otype, $otext );
! }
if ( ( defined($mbucket) ) && ( $mbucket ne '' ) && ( $mtext ne '' ) ) {
--- 1460,1464 ----
$self->{classifier__}->delete_magnet( $obucket, $otype, $otext );
! }
if ( ( defined($mbucket) ) && ( $mbucket ne '' ) && ( $mtext ne '' ) ) {
***************
*** 1491,1495 ****
}
}
! }
if ( $found == 0 ) {
--- 1491,1495 ----
}
}
! }
if ( $found == 0 ) {
***************
*** 1507,1511 ****
$magnet_message .= "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$mtype: $mtext", $mbucket ) . "</blockquote>";
}
! }
}
}
--- 1507,1511 ----
$magnet_message .= "<blockquote>" . sprintf( $self->{language__}{Magnet_Error3}, "$mtype: $mtext", $mbucket ) . "</blockquote>";
}
! }
}
}
***************
*** 1556,1562 ****
for my $magnet ($self->{classifier__}->get_magnets( $bucket, $type)) {
$count += 1;
! if ( ( $count < $start_magnet ) || ( $count > $stop_magnet ) ) {
next;
! }
$i += 1;
--- 1556,1562 ----
for my $magnet ($self->{classifier__}->get_magnets( $bucket, $type)) {
$count += 1;
! if ( ( $count < $start_magnet ) || ( $count > $stop_magnet ) ) {
next;
! }
$i += 1;
***************
*** 1585,1592 ****
$body .= ">\n<td><select name=\"type$i\" id=\"magnetsAddType\">\n";
! for my $mtype (keys %magnet_types) {
my $selected = ( $mtype eq $type )?"selected":"";
$body .= "<option value=\"$mtype\" $selected>\n$self->{language__}{$magnet_types{$mtype}}</option>\n";
! }
$body .= "</select>: <input type=\"text\" name=\"text$i\" value=\"$validatingMagnet\" size=\"" . max(length($magnet),50) . "\" /></td>\n";
$body .= "<td><select name=\"bucket$i\" id=\"magnetsAddBucket\">\n";
--- 1585,1592 ----
$body .= ">\n<td><select name=\"type$i\" id=\"magnetsAddType\">\n";
! for my $mtype (keys %magnet_types) {
my $selected = ( $mtype eq $type )?"selected":"";
$body .= "<option value=\"$mtype\" $selected>\n$self->{language__}{$magnet_types{$mtype}}</option>\n";
! }
$body .= "</select>: <input type=\"text\" name=\"text$i\" value=\"$validatingMagnet\" size=\"" . max(length($magnet),50) . "\" /></td>\n";
$body .= "<td><select name=\"bucket$i\" id=\"magnetsAddBucket\">\n";
***************
*** 1711,1745 ****
for my $i (@{$self->{classifier__}->get_bucket_word_list($self->{form_}{showbucket})}) {
if ( defined($i) ) {
! my $j = $i;
! $j =~ /^\|(.)/;
! my $first = $1;
! if ( defined( $self->{form_}{showletter} ) && ( $first eq $self->{form_}{showletter} ) ) {
! # Split the entries on the double bars
! my %temp;
! while ( $j =~ m/\G\|(.*?) L?\-?[\.\d]+\|/g ) {
! my $word = $1;
! $temp{$word} = $self->{classifier__}->get_count_for_word( $self->{form_}{showbucket}, $word );
! }
! $body .= "</td></tr><tr><td colspan=2> </td></tr><tr>\n<td valign=\"top\">\n<b>$first</b>\n</td>\n<td valign=\"top\">\n<table><tr valign=\"top\">";
! my $count = 0;
! for my $word (sort { $temp{$b} <=> $temp{$a} } keys %temp) {
! $body .= "</tr><tr valign=\"top\">" if ( ( $count % 6 ) == 0 );
! $body .= "<td><a class=\"wordListLink\" href=\"\/buckets\?session=$self->{session_key__}\&lookup=Lookup\&word=". $self->url_encode_( $word ) . "#Lookup\"><b>$word</b><\/a></td><td>$temp{$word}</td><td> </td>";
! $count += 1;
! }
! $body .= "</tr></table></td>\n</tr>\n<tr><td colspan=2> </td></tr><tr><td colspan=2>";
! } else {
! $j = '';
! $body .= "<a href=/buckets?session=$self->{session_key__}\&showbucket=$self->{form_}{showbucket}\&showletter=" . $self->url_encode_($first) . "><b>$first</b></a>\n";
! }
}
}
--- 1711,1745 ----
for my $i (@{$self->{classifier__}->get_bucket_word_list($self->{form_}{showbucket})}) {
if ( defined($i) ) {
! my $j = $i;
! $j =~ /^\|(.)/;
! my $first = $1;
! if ( defined( $self->{form_}{showletter} ) && ( $first eq $self->{form_}{showletter} ) ) {
! # Split the entries on the double bars
! my %temp;
! while ( $j =~ m/\G\|(.*?) L?\-?[\.\d]+\|/g ) {
! my $word = $1;
! $temp{$word} = $self->{classifier__}->get_count_for_word( $self->{form_}{showbucket}, $word );
! }
! $body .= "</td></tr><tr><td colspan=2> </td></tr><tr>\n<td valign=\"top\">\n<b>$first</b>\n</td>\n<td valign=\"top\">\n<table><tr valign=\"top\">";
! my $count = 0;
! for my $word (sort { $temp{$b} <=> $temp{$a} } keys %temp) {
! $body .= "</tr><tr valign=\"top\">" if ( ( $count % 6 ) == 0 );
! $body .= "<td><a class=\"wordListLink\" href=\"\/buckets\?session=$self->{session_key__}\&lookup=Lookup\&word=". $self->url_encode_( $word ) . "#Lookup\"><b>$word</b><\/a></td><td>$temp{$word}</td><td> </td>";
! $count += 1;
! }
! $body .= "</tr></table></td>\n</tr>\n<tr><td colspan=2> </td></tr><tr><td colspan=2>";
! } else {
! $j = '';
! $body .= "<a href=/buckets?session=$self->{session_key__}\&showbucket=$self->{form_}{showbucket}\&showletter=" . $self->url_encode_($first) . "><b>$first</b></a>\n";
! }
}
}
***************
*** 1790,1797 ****
$percent = sprintf( ' (%.2f%%)', int( $value * 10000 / $total_count ) / 100 );
}
! }
$body .= "\n<td align=\"right\">$count$percent</td>";
! }
$body .= "\n</tr>\n";
}
--- 1790,1797 ----
$percent = sprintf( ' (%.2f%%)', int( $value * 10000 / $total_count ) / 100 );
}
! }
$body .= "\n<td align=\"right\">$count$percent</td>";
! }
$body .= "\n</tr>\n";
}
***************
*** 2222,2226 ****
}
}
! }
foreach my $bucket (@buckets) {
--- 2222,2226 ----
}
}
! }
foreach my $bucket (@buckets) {
***************
*** 2543,2547 ****
if ( $2 > $max ) {
$max = $2;
! }
# If this file already exists in the history cache then just mark it not
--- 2543,2547 ----
if ( $2 > $max ) {
$max = $2;
! }
# If this file already exists in the history cache then just mark it not
***************
*** 2931,2935 ****
$self->{classifier__}->set_bucket_parameter( $bucket, 'count', $count );
! $count = $self->{classifier__}->get_bucket_parameter( $usedtobe, 'count' ) + 1;
$self->{classifier__}->set_bucket_parameter( $usedtobe, 'count', $count );
--- 2931,2935 ----
$self->{classifier__}->set_bucket_parameter( $bucket, 'count', $count );
! $count = $self->{classifier__}->get_bucket_parameter( $usedtobe, 'count' ) + 1;
$self->{classifier__}->set_bucket_parameter( $usedtobe, 'count', $count );
***************
*** 2941,2945 ****
$fpcount = 0 if ( $fpcount < 0 );
$self->{classifier__}->set_bucket_parameter( $usedtobe, 'fpcount', $fpcount );
! }
# Since we have just changed the classification of this file and it has
--- 2941,2945 ----
$fpcount = 0 if ( $fpcount < 0 );
$self->{classifier__}->set_bucket_parameter( $usedtobe, 'fpcount', $fpcount );
! }
# Since we have just changed the classification of this file and it has
***************
*** 3431,3445 ****
} else {
if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
! $body .= "\n$self->{language__}{History_ShouldBe}: <select name=\"$index\">\n";
! # Show a blank bucket field
! $body .= "<option selected=\"selected\"></option>\n";
! foreach my $abucket ($self->{classifier__}->get_buckets()) {
! $body .= "<option value=\"$abucket\">$abucket</option>\n";
! }
! $body .= "</select>\n<input type=\"submit\" class=\"reclassifyButton\" name=\"change\" value=\"$self->{language__}{Reclassify}\" />";
} else {
! $body .= " ($self->{language__}{History_MagnetUsed}: " . splitline( $self->{history__}{$mail_file}{magnet} , 0) . ")";
}
}
--- 3431,3445 ----
} else {
if ( $self->{history__}{$mail_file}{magnet} eq '' ) {
! $body .= "\n$self->{language__}{History_ShouldBe}: <select name=\"$index\">\n";
! # Show a blank bucket field
! $body .= "<option selected=\"selected\"></option>\n";
! foreach my $abucket ($self->{classifier__}->get_buckets()) {
! $body .= "<option value=\"$abucket\">$abucket</option>\n";
! }
! $body .= "</select>\n<input type=\"submit\" class=\"reclassifyButton\" name=\"change\" value=\"$self->{language__}{Reclassify}\" />";
} else {
! $body .= " ($self->{language__}{History_MagnetUsed}: " . splitline( $self->{history__}{$mail_file}{magnet} , 0) . ")";
}
}
***************
*** 3639,3643 ****
if ( rand(1) < rand(1) ) {
$random = lc($random);
! }
$self->{session_key__} .= $random;
--- 3639,3643 ----
if ( rand(1) < rand(1) ) {
$random = lc($random);
! }
$self->{session_key__} .= $random;
Index: HTTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** HTTP.pm 23 Jun 2003 22:34:37 -0000 1.8
--- HTTP.pm 26 Jul 2003 18:28:28 -0000 1.9
***************
*** 237,241 ****
if ( $need_array ) {
push( @{ $self->{form_}{$arg . "_array"} }, $self->{form_}{$arg} );
! }
}
}
--- 237,241 ----
if ( $need_array ) {
push( @{ $self->{form_}{$arg . "_array"} }, $self->{form_}{$arg} );
! }
}
}
***************
*** 334,339 ****
my $expires = sprintf( "%s, %02d %s %04d %02d:%02d:%02d GMT",
! $day[$wday], $mday, $month[$mon], $year+1900,
! $hour, $min, $sec);
my $header = "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nExpires: $expires\r\nContent-Length: ";
--- 334,339 ----
my $expires = sprintf( "%s, %02d %s %04d %02d:%02d:%02d GMT",
! $day[$wday], $mday, $month[$mon], $year+1900,
! $hour, $min, $sec);
my $header = "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nExpires: $expires\r\nContent-Length: ";
Index: XMLRPC.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/XMLRPC.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLRPC.pm 14 Jun 2003 21:10:13 -0000 1.3
--- XMLRPC.pm 26 Jul 2003 18:28:28 -0000 1.4
***************
*** 177,181 ****
$client->send_response( $self->{server__}->response );
$client->close();
! }
}
}
--- 177,181 ----
$client->send_response( $self->{server__}->response );
$client->close();
! }
}
}
|
