]> wagner.pp.ru Git - oss/stilllife.git/commitdiff
projects / oss / stilllife.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: efcea79)
*** empty log message ***
authorVictor Wagner <vitus@wagner.pp.ru>
Mon, 24 Mar 2008 09:16:46 +0000 (09:16 +0000)
committerVictor Wagner <vitus@wagner.pp.ru>
Mon, 24 Mar 2008 09:16:46 +0000 (09:16 +0000)
forum/forum patch | blob | history
templates/basicset/forum.html patch | blob | history
templates/basicset/topic.html patch | blob | history

diff --git a/forum/forum b/forum/forum
index d6304459f3f485a8a6f90d52e43caaf6bfece69b..cad48eff0feae9f0dd226426a1de8c39a7121839 100755 (executable)
--- 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 e24bb8705be33e6c5df9f702e69c790ad5d99655..4b9bbd4a879e6389f27d0aaa61f9e905df1c7cbb 100644 (file)
--- a/templates/basicset/forum.html
+++ b/templates/basicset/forum.html
@@ -5,7 +5,7 @@
 <script language="JavaScript" src="templates/page.js">
 <script language="JavaScript" src="templates/common.js">
 </script>
-</HEAD><BODY bgcolor="#ccffcc">
+</HEAD><BODY bgcolor="#ccffcc" onload="showUser(getUserName());">
 <a class="userurl" href="forum?register=1">Зарегистрироваться</a> <a
 class="login" href="forum?login=1">Войти</a> 
 <a class="moderator" href="forum?newtopic=1">Создать тему</a>
diff --git a/templates/basicset/topic.html b/templates/basicset/topic.html
index b005a3bb2962ccf058dd637ae75290501f502e78..851b9136fef418e3d1e266162991b9a8c4d1c701 100644 (file)
--- a/templates/basicset/topic.html
+++ b/templates/basicset/topic.html
@@ -5,7 +5,7 @@
 <script language="JavaScript" src="templates/common.js">
 </script>
 <link rel="forum-script" href="forum">
-</HEAD><BODY bgcolor="#ccffcc">
+</HEAD><BODY bgcolor="#ccffcc" onload="showUser(getUserName());">
 <a class="userurl" href="forum?register=1">Зарегистрироваться</a> <a
 class="login" href="forum?login=1">Войти</a> 
 <a class="moderator" href="forum?newtopic=1">Создать тему</a>
Proof-of-concept web forum on static files and CGI