From: Victor Wagner Date: Mon, 24 Mar 2008 09:16:46 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=b0ea5cc3b32d51b49fd6ef9f6d06a172e3fe36c7;p=oss%2Fstilllife.git *** empty log message *** --- diff --git a/forum/forum b/forum/forum index d630445..cad48ef 100755 --- a/forum/forum +++ b/forum/forum @@ -82,7 +82,7 @@ if ($cgi->request_method ne "POST") { exit; } else { if (!$forum->{"authenticated"}) { - $cgi->param("returnto",$cgi->uri(-full=>1)); + $cgi->param("returnto",$cgi->url(-full=>1)); show_template("login",$cgi,$forum); exit; @@ -252,6 +252,7 @@ sub gettemplate { } my $tree = HTML::TreeBuilder->new_from_file($filename); fix_forum_links($forum,$tree,$url); + return $tree; } # # Вывод шаблона формы. В шаблоне должна присутстовать форма с @@ -261,7 +262,8 @@ sub gettemplate { # sub show_template { my ($form,$cgi,$forum) = @_; - my $tree = get_template($forum,$form,$ENV{'PATH_INFO'}); + my $tree = gettemplate($forum,$form,$ENV{'PATH_INFO'}); + # Находим форму с классом $form my $f = $tree->look_down("_tag","form", "name",$form); diff --git a/templates/basicset/forum.html b/templates/basicset/forum.html index e24bb87..4b9bbd4 100644 --- a/templates/basicset/forum.html +++ b/templates/basicset/forum.html @@ -5,7 +5,7 @@ - + Зарегистрироваться Войти Создать тему diff --git a/templates/basicset/topic.html b/templates/basicset/topic.html index b005a3b..851b913 100644 --- a/templates/basicset/topic.html +++ b/templates/basicset/topic.html @@ -5,7 +5,7 @@ - + Зарегистрироваться Войти Создать тему