--- register/prgsrc/register.cgi	2001/10/13 23:19:21	1.9
+++ register/prgsrc/register.cgi	2002/12/25 21:36:01	1.15
@@ -20,11 +20,11 @@ Boris Veytsman
 
 =head1 DATE
 
-$Date: 2001/10/13 23:19:21 $
+$Date: 2002/12/25 21:36:01 $
 
 =head1 REVISION
 
-$Revision: 1.9 $
+$Revision: 1.15 $
 
 =cut
 
@@ -41,11 +41,11 @@ use POSIX qw(locale_h);
 
 setlocale(LC_CTYPE,'russian');
 $ENV{'LANG'}='ru_RU.KOI8-R';
-my ($SENDMAIL) = "/usr/sbin/sendmail";
+my ($SENDMAIL) = "mail";
 my $TO = 'borisv@lk.net, igra@gorlovka.net, erudit@mail.od.ua';
 my $FROM = 'borisv@lk.net';
 
-my $date='$Date: 2001/10/13 23:19:21 $';
+my $date='$Date: 2002/12/25 21:36:01 $';
 $date =~ s/[^ ]* ([^ ]*) .*/$1/; 
 
 
@@ -58,7 +58,7 @@ my $dbh = DBI->connect("DBI:mysql:chgk",
 	die "Can't connect to DB chgk\n";
     };
 
-print header;
+print header(-charset=>'koi8-r');
 
 
 ##################################################
@@ -86,23 +86,23 @@ my $self=url();
 # The navigation panel has three special lines
 ###############################################
 print <<END;
-<dl>
-<dt><a href="$self">Home</a></dt>
-<dt><a href="$self?rid=1&level=1000&clubs=0">Все регионы</a></dt>
-<dt><a href="$self?rid=1&level=1000&clubs=1">Все клубы</a></dt>
-<dt><a href="$self?addclub=1">Добавить клуб</a></dt>
-<dt><a href="$self?whoiswho=1">Кто есть кто</a></dt>
+<ul>
+<li><a href="$self">Home</a></li>
+<li><a href="$self?rid=1&level=1000&clubs=0">Все регионы</a></li>
+<li><a href="$self?rid=1&level=1000&clubs=1">Все клубы</a></li>
+<li><a href="$self?addclub=1">Добавить клуб</a></li>
+<li><a href="$self?whoiswho=1">Кто есть кто</a></li>
 END
 
 #################################################
 # And the navpanel itself
 ##################################################
 
-    print ListRegions(dbh=>$dbh,rid=>1,level=>1,tag=>'dt',
+    print ListRegions(dbh=>$dbh,rid=>1,level=>1,tag=>'li',
 		      self=>$self);
     
 print <<END;
-</dl>
+</ul>
 END
 
 
@@ -125,8 +125,8 @@ END
 <h1 align=center>
 Журнал "Игра"<br>
 и<br>
-<a href="http:/znatoki/klub/znat.html"><img 
-ismap border=0 src= "http:../images/logo.gif" 
+<a href="/znatoki/klub/znat.html"><img 
+ismap border=0 src= "../images/logo.gif" 
 alt="Интернет Клуб Что? Где? Когда?" width=319 height=27></a>
 <br>ПРЕДСТАВЛЯЮТ<br>
 Регистр Клубов Интеллектуальных Игр
@@ -189,10 +189,7 @@ END
     $sth->finish;
 
     print "<p align=center>";
-    print "Всего клубов: $count<br>\n";
-    print "Эту страничку посмотрели ";
-    print `/home/piataev/public_html/cgi-bin/counter.sh /znatoki/cgi-bin/register.cgi`;
-    print " раз(а)</p>\n";
+    print "Всего клубов: $count</p>\n";
     
     print <<END;
 <hr>
@@ -259,6 +256,7 @@ SELECT Name FROM Regions WHERE RID=$args
 
 	# Frist, we print clubs
 	if ($args{'clubs'}) {
+	    $result .= ListRegionURLs(%args);
 	    $result .= ListClubs(%args);
 	}
 	$sth=$args{'dbh'}->prepare("
@@ -270,7 +268,7 @@ SELECT Child FROM RegionRegion WHERE Par
 		push @kids,"rid=$kid";
 	    }
 	    my $clause = join(' OR ', @kids);
-	    $result .= "<dl>\n";
+	    $result .= "<ul>\n";
 	    $sth=$args{'dbh'}->prepare("
 SELECT rid FROM Regions WHERE $clause ORDER BY Name");
 	    $sth->execute;
@@ -278,15 +276,46 @@ SELECT rid FROM Regions WHERE $clause OR
 		$result .= ListRegions(
 				       %args,'rid'=>$kid,
 				       'level'=>$args{'level'}-1,
-				       'tag'=>'dt');
+				       'tag'=>'li');
 	    }
-	    $result .= "</dl>\n";
+	    $result .= "</ul>\n";
 	}
     }
     return $result;
 }
 
 ############################################################
+# List the URLs of a given region
+###########################################################
+sub ListRegionURLs {
+    my %args = @_;
+    my $sth;
+    $sth = $args{'dbh'}->prepare("
+SELECT URL FROM Regions WHERE rid=$args{'rid'} and NOT ISNULL(URL)");
+
+    $sth->execute;
+	
+    if (!$sth->rows) {
+	return "";
+    }
+    
+    my $result;
+	
+    $result=<<END;
+<dl><dt>Странички:</dt>
+<dd><dl>\n
+END
+    
+    while (my ($string)=$sth->fetchrow_array) {
+	$string=htmlize($string);
+	$result .= p($string);
+    }
+    $result .= "</dl></dd></dl>\n";
+    return $result;
+}
+
+
+############################################################
 # List the clubs of a given region or a given association
 ###########################################################
 sub ListClubs {
@@ -312,13 +341,12 @@ SELECT cid FROM ClubRegion WHERE rid=$ar
 
 	$result=<<END;
 <h3>Клубы:</h3>
-<dl>\n
+<ul>\n
 END
      } else {
  
 	 $result=<<END;
-<dl><dt>Клубы:</dt>
-<dd><dl>\n
+<ul>\n
 END
     }
     my @clubs=();
@@ -330,9 +358,9 @@ END
 SELECT cid, Name FROM Clubs WHERE $clause ORDER BY Name");
     $sth->execute;
     while (my ($cid,$Name)=$sth->fetchrow_array) {
-	$result .= dt("<a href=\"$self?cid=$cid\">$Name</a>\n");
+	$result .= li("<a href=\"$self?cid=$cid\">$Name</a>\n");
     }
-    $result .= "</dl></dd></dl>\n";
+    $result .= "</ul>\n";
 }
 
 
@@ -530,7 +558,7 @@ SELECT * FROM People WHERE pid=$args{'pi
 
     if (my $string=$person->{'URL'}) {
 	$string = htmlize($string);
-	push @entries, "Домашнаяя страничка: $string";
+	push @entries, "Домашняя страничка: $string";
     }
 
     if (my $string=$person->{'Phone'}) {
@@ -735,11 +763,8 @@ sub AddClub {
 # Sending the letter with results
 #####################################################################
 sub SendLetter {
-   open(MAIL,"| $SENDMAIL -t -n");
+   open(MAIL,"| $SENDMAIL -s 'Registracionnaya kartochka kluba' $TO");
     print MAIL <<END;
-To: $TO
-From: $FROM
-Subject: Registracionnaya kartochka kluba
 MIME-Version: 1.0
 Content-type: text/plain; charset=koi8-r