--- db/prgsrc/db.cgi	2008/11/09 20:02:36	1.149
+++ db/prgsrc/db.cgi	2008/11/14 11:23:03	1.150
@@ -3,8 +3,11 @@
 use DBI;
 use CGI ':all';
 #use strict;
+use Encode;
 my @softfields=("От Олега Степанова");
 use Time::Local;
+use Data::Dumper "Dumper";
+use URI::Escape;
 my $proxyredirect=1;
 use POSIX qw(locale_h);
 use locale;
@@ -714,7 +717,10 @@ sub Search {
 	my (@sar, $i, $sth,$where,$query);
 	if ($metod eq 'rus')
 	{
-	     my @tasks=russearch($dbh,$sstr,$all,$allnf);
+	     my @tasks;
+	     @tasks = russearch($dbh,$sstr,$all,$allnf);
+	     
+	    
 	     return @tasks
 	}
 	elsif ($metod eq 'proxy')
@@ -912,7 +918,9 @@ sub PrintList {
                 {
 	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
 	             $output=~s/($shablon)/\<strong\>$1\<\/strong\>/gi;
+	             $output=~s/(href="[^"]*?)(?:<.*?>)+([^"]*?)(?:<\/.*?>)+([^"]*?")/!1 $1$2$3 2!/g;#!!!!
 		}
+
 		$Output.= $output;
 	}
 	$sth->finish;
@@ -954,7 +962,7 @@ sub PrintSearch {
              		}
              	while (--$ss && (!$dbh->do ("insert into lastqueries (id,sstr,questions,allnf) 
                          values ($was, $qsstr,$tmp,$nf)")));
-             	$Output.= "Something is wrong...".br unless $ss;
+             	$Output.= "Something is wrong...".br."\n" unless $ss;
  	      }
         }
 
@@ -1276,7 +1284,7 @@ sub PrintTour {
 
 	$output .= h2({align=>"center"}, $Tournament{"Title"},
 		      $Tournament{'PlayedAt'}||'',
-		      "<br>", $Tour{"Title"} .
+		      "<br>\n", $Tour{"Title"} .
 		" ($qnum вопрос$suffix)\n") . p;
 	$output .=&PrintEditor(\%Tour);
 
@@ -1307,7 +1315,6 @@ sub PrintTour {
 		$output .= p($Tour{'Info'});
 	}
 
-
 	$output.=p("<a href='/dbxml.php?tour=".param('tour')."'>XML</a>");
 
 	my $n=$Tour{'Number'};
@@ -1317,7 +1324,7 @@ sub PrintTour {
 	        
 		$bottom .=
 			"[" . a({href=>tourhref("$fname$nn",1)}, 
-                         "ответы") .  "] " . br;
+                         "ответы") .  "] " . br."\n";
 	}
 	if ($n>1) {
 		$bottom .=
@@ -1325,7 +1332,7 @@ sub PrintTour {
 			"предыдущий тур") . "] ";
 		$bottom .=
 			"[" . a({href=>tourhref("$fname.".($n-1),1)},
-			"предыдущий тур с ответами") . "] " . br;
+			"предыдущий тур с ответами") . "] " . br."\n";
 	}
 	if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) {
 		$bottom .=
@@ -1342,6 +1349,14 @@ sub PrintTour {
 	return $output;
 }
 
+
+sub escapeUrl {
+	my $uri = shift;
+	$uri=~s/<.*?>//g;
+	$uri =~ s/([Ю-Ъю-ъ]+)/URI::Escape::uri_escape_utf8(decode("koi8-r",$1))/eg;
+	return $uri;	
+}
+
 sub PrintField {
 	my ($header, $value, $text) = @_;
 	if ($text) {
@@ -1349,15 +1364,20 @@ sub PrintField {
 	} else {
 	    if ($header=~/Комментар/)
 	    {
-		$value=~s/^\s*$_[\.:]/p."\n".strong("$_").":"/me foreach @softfields;
+		$value=~s/^\s*$_[\.:]/p."\n".strong("$_").":\n"/me foreach @softfields;
 	    }
 
-	    $value =~ s/^\s+/<br>&nbsp;&nbsp;&nbsp;&nbsp;/mg;
+	    $value =~ s/^\s+/<br>\n&nbsp;&nbsp;&nbsp;&nbsp;/mg;
 	    $value =~ s/(\s+)-+(\s+)/$1&#0150;$2/mg;
 	    $value =~ s/\s+\&#0150/&nbsp;\&#0150/mg 
 			if $value !~ /^\|/;
 	    $value =~ s/^\|([^\n]*)/<pre>$1<\/pre>/mg;
-	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/<a href="$1">$1<\/a>/g if $header !~ /^Авто/;
+
+	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/a({href=>escapeUrl($1)},$1)/egm if $header !~ /^Авто/;#!!!
+
+
+#	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/make/eg if $header !~ /^Авто/;#!!!
+#	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/<a href="$1">$1<\/a>/g if $header !~ /^Авто/;
 #	    $value =~ s/(http:\/\/(?:\w+.)+[\w\\\~]+(\?[^\s.]+)?)/<a href="$1">$1<\/a>/g if $header !~ /^Авто/;
 #	    $value =~ s/(\s)"/$1&#147;/mg;
 #	    $value =~ s/^"/&#147;/mg;
@@ -1369,7 +1389,7 @@ sub PrintField {
 			$value . p . "\n";
 	}
 	return $text ? "$header:\n$value\n\n" :
-		strong("$header: ") . $value . p . "\n";
+		strong("$header: ") . "\n".$value . p . "\n";
 }
 
 # Gets a DB handler (ofcourse) and a question Id. Prints
@@ -1512,8 +1532,6 @@ $output.="</span>"
 
 	}
 	$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text;
-	$output=~s/\(aud: ([^\)]*)\)/<p><embed src="\/znatoki\/sounds\/db\/$1"><\/embed><p>/g unless $text;
-
 	$output=~s/⌡/\&iuml;/g;
 	$output=~s/⌠/\&Iuml;/g;
 
@@ -1522,7 +1540,7 @@ $output.="</span>"
 $fname||=param('tour');
 	my $qid=$fname ? ($fname.".$Question{'Number'}" ): '';
 
-	$output.=br.a({href=> "/search/"."?metod=proxy&
+	$output.=br."\n".a({href=> "/search/"."?metod=proxy&
 qid=$qid"}, 'Близкие вопросы').p
              if $answer>0 && !$text && $qid && $showNearQuestions;
 	return $output;
@@ -2006,15 +2024,15 @@ MAIN:
 		    print end_html;
 			die "Can't connect to DB chgk\n";
 		};
-	$dbh->do("set names koi8r");
+        $dbh->do("set names koi8r");
 
-#	if (param('qid') && (param('qid')=~/^\d+$/) || $tour && $tour=~/^\d+$/) {
+	if (param('qid') && (param('qid')=~/^\d+$/) || $tour && $tour=~/^\d+$/) {
 #	   my $destination='http://chgk.zaba.ru/search.html';
 #		print header (-'Content-Type' => 'text/html',
 #                -'Location:'=> 'http:\\db.chgk.info');
-#		Redirect($destination);
-#                exit
-#	}
+		Redirect($destination);
+                exit
+	}
 
 	if (0 && $tour && !param('qnumber') && (!param('answers')||(param('answers')<=1)))
 	{