--- register/prgsrc/register.cgi	2002/12/25 21:36:01	1.15
+++ register/prgsrc/register.cgi	2003/09/04 21:09:47	1.17
@@ -20,11 +20,11 @@ Boris Veytsman
 
 =head1 DATE
 
-$Date: 2002/12/25 21:36:01 $
+$Date: 2003/09/04 21:09:47 $
 
 =head1 REVISION
 
-$Revision: 1.15 $
+$Revision: 1.17 $
 
 =cut
 
@@ -45,7 +45,7 @@ my ($SENDMAIL) = "mail";
 my $TO = 'borisv@lk.net, igra@gorlovka.net, erudit@mail.od.ua';
 my $FROM = 'borisv@lk.net';
 
-my $date='$Date: 2002/12/25 21:36:01 $';
+my $date='$Date: 2003/09/04 21:09:47 $';
 $date =~ s/[^ ]* ([^ ]*) .*/$1/; 
 
 
@@ -53,7 +53,7 @@ my $dbh = DBI->connect("DBI:mysql:chgk",
     or do {
 	print h1("Временные проблемы") . "База данных временно не
 			работает. Заходите попозже.";
-	print &Include_virtual("../dimrub/db/reklama.html");
+	print &Include_virtual("../../dimrub/db/reklama.html");
 	print end_html;
 	die "Can't connect to DB chgk\n";
     };
@@ -66,12 +66,12 @@ print header(-charset=>'koi8-r');
 ##################################################
 print start_html(-"title"=>'Register of Clubs',
 		 -author=>'borisv@lk.net',
-		 -background=>"../images/map.jpg");
-print &Include_virtual("../dimrub/db/reklama.html");
+		 -background=>"../../images/map.jpg");
+print &Include_virtual("../../dimrub/db/reklama.html");
 print <<END;
 <table>
 <tr>
-<td background=../images/compass.gif valign=top>
+<td background=../../images/compass.gif valign=top>
 END
 
 ################################################
@@ -126,7 +126,7 @@ END
 Журнал "Игра"<br>
 и<br>
 <a href="/znatoki/klub/znat.html"><img 
-ismap border=0 src= "../images/logo.gif" 
+ismap border=0 src= "../../images/logo.gif" 
 alt="Интернет Клуб Что? Где? Когда?" width=319 height=27></a>
 <br>ПРЕДСТАВЛЯЮТ<br>
 Регистр Клубов Интеллектуальных Игр
@@ -174,7 +174,7 @@ END
 </dl>
 <p align=center>
 END
-print &Include_virtual("../boris/register/regions.html");
+print &Include_virtual("../../boris/register/regions.html");
 print <<END;
 </p>
 END
@@ -194,7 +194,7 @@ END
     print <<END;
 <hr>
 <address>
-<img width = 60 height = 80 src="../images/owl.gif" alt = "owl"> 
+<img width = 60 height = 80 src="../../images/owl.gif" alt = "owl"> 
 <a href="http://users.lk.net/~borisv">
 Boris Veytsman</a>, $date
 </address>
@@ -323,7 +323,7 @@ sub ListClubs {
     my $sth;
     if ($args{'cid'}) {
 	$sth = $args{'dbh'}->prepare("
-SELECT Child FROM ClubClub WHERE Parent=$args{'cid'}");
+SELECT Child, Status FROM ClubClub WHERE Parent=$args{'cid'}");
     } else {
 	$sth = $args{'dbh'}->prepare("
 SELECT cid FROM ClubRegion WHERE rid=$args{'rid'}");
@@ -350,15 +350,23 @@ END
 END
     }
     my @clubs=();
-    while (my ($club)=$sth->fetchrow_array) {
+    my %stat=();
+    while (my ($club,$status)=$sth->fetchrow_array) {
 	push @clubs,"cid=$club";
+	if ($status) {
+	    $stat{$club}=$status;
+	}
     }
     my $clause = join(' OR ', @clubs);
     $sth=$args{'dbh'}->prepare("
 SELECT cid, Name FROM Clubs WHERE $clause ORDER BY Name");
     $sth->execute;
     while (my ($cid,$Name)=$sth->fetchrow_array) {
-	$result .= li("<a href=\"$self?cid=$cid\">$Name</a>\n");
+	my $res="<a href=\"$self?cid=$cid\">$Name</a>\n";
+	if (exists $stat{$cid}) {
+	    $res .= " ($stat{$cid})\n";
+	}
+	$result .= li($res);
     }
     $result .= "</ul>\n";
 }
@@ -372,7 +380,7 @@ sub ListParents {
     my $sth;
 
     $sth = $args{'dbh'}->prepare("
-SELECT Parent FROM ClubClub WHERE Child=$args{'cid'}");
+SELECT Parent, Status FROM ClubClub WHERE Child=$args{'cid'}");
 
     $sth->execute;
 	
@@ -388,15 +396,23 @@ SELECT Parent FROM ClubClub WHERE Child=
 END
 
     my @clubs=();
-    while (my ($club)=$sth->fetchrow_array) {
+    my %stat=();
+    while (my ($club,$status)=$sth->fetchrow_array) {
 	push @clubs,"cid=$club";
+	if ($status) {
+	    $stat{$club}=$status;
+	}
     }
     my $clause = join(' OR ', @clubs);
     $sth=$args{'dbh'}->prepare("
 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");
+	my $res = "<a href=\"$self?cid=$cid\">$Name</a>\n";
+	if (exists $stat{$cid}) {
+	    $res .= " ($stat{$cid})\n";
+	}
+	$result .= dt($res);
     }
     $result .= "</dl></dd></dl>\n";
 }