X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forum%2Fforum;h=7cb882b48c9c9234da43ab5d6d0ec89cd5dadeb5;hb=394bfadb608997e0366304e916f97e5ceb898161;hp=faba997cc181f294633e91966e5d9e9001bfa8ef;hpb=07b26cc8c68fec7ce82e3cab703b676228f07da4;p=oss%2Fstilllife.git diff --git a/forum/forum b/forum/forum index faba997..7cb882b 100755 --- a/forum/forum +++ b/forum/forum @@ -31,7 +31,7 @@ use Net::OpenID::Consumer; my %actions = ( reply => \&reply, edit => \&edit_comment, - delete => \&delete_comment, + delete => \&delete_item, move => \&move_comment, newtopic=> \&new_topic, newforum=> \&new_forum, @@ -60,12 +60,11 @@ my %permissions = ( profile => "normal", setrights => "admin", ); - +our $path_translated; # Untainted value of PATH_TRANSLATED env var my $cgi = new CGI; print STDERR "--------------------\n"; my $forum=get_forum_config(); - authorize_user($cgi,$forum); if ($cgi->request_method ne "POST") { # ÐапÑÐ¾Ñ Ðº ÑкÑипÑÑ Ð¼ÐµÑодом GET. Ðадо показаÑÑ ÑоÑмÑ, еÑли ÑолÑко ÑÑо не @@ -74,6 +73,10 @@ if ($cgi->request_method ne "POST") { openid_verify($cgi,$forum); } elsif ($cgi->param("logout")) { logout('logout',$cgi,$forum); + } elsif ($cgi->param("profile")) { + show_profile("profile",$cgi,$forum); + } elsif ($cgi->param('delete')) { + delete_item("delete",$cgi,$forum); } else { for my $param ($cgi->param) { # СÑеди паÑамеÑÑов, ÑказаннÑÑ Ð² URL иÑем ÑоÑ, коÑоÑÑй Ð·Ð°Ð´Ð°ÐµÑ @@ -83,6 +86,7 @@ if ($cgi->request_method ne "POST") { # Ð½ÐµÑ Ð¾ÑоÑÐ¸Ñ Ñимволов неÑ, но ÑÑÐ¾Ð±Ñ perl в taint mode не # ÑÑгалÑÑ... if (allow_operation($param,$cgi,$forum)) { + print STDERR "Allow_operation completed\n"; show_template($1,$cgi,$forum) if $param=~/^(\w+)$/; exit; } else { @@ -98,6 +102,9 @@ if ($cgi->request_method ne "POST") { } } } + if (index($path_translated,$forum->{userdir})==0) { + show_user_page($cgi,$forum); + } show_error($forum,"ÐекоÑÑекÑнÑй вÑзов ÑкÑипÑа. ÐÑÑÑÑÑÑвÑÐµÑ Ð¿Ð°ÑамеÑÑ Ð´ÐµÐ¹ÑÑвиÑ"); } @@ -119,6 +126,13 @@ if ($cgi->request_method ne "POST") { show_error($forum,"ÐекоÑÑекÑнÑй вÑзов ÑкÑипÑа. ÐÑÑÑÑÑÑвÑÐµÑ Ð¿Ð°ÑамеÑÑ Ð´ÐµÐ¹ÑÑвиÑ"); } +#-------------------------------------------------------------- +#-------- ЧÑение конÑигÑÑаÑионного Ñайла и ÑвÑзаннÑе Ñ ÑÑим дейÑÑÐ²Ð¸Ñ +#------------------------------------------------------------------ + +# +# ÐÑеобÑазование пÑÑи в Ñайловой ÑиÑÑеме ÑеÑвеÑа в пÑÑÑ Ð² URL +# sub dir2url { my ($cgi,$dir) = @_; my $prefix=""; @@ -144,14 +158,16 @@ sub dir2url { return $prefix.substr($dir,length($root)); } # -# ÐоиÑк Ñайла .forum ввеÑÑ Ð¿Ð¾ деÑÐµÐ²Ñ Ð¾Ñ $ENV{PATH_TRANSLATED} +# ÐоиÑк Ñайла .forum ввеÑÑ Ð¿Ð¾ деÑÐµÐ²Ñ Ð¾Ñ $path_translated # ÐнаÑение PATH_TRANSLATED ÑÑиÑаем безопаÑнÑм - Ð½Ð°Ñ web-ÑеÑÐ²ÐµÑ Ð½Ð°Ð¼ не # вÑаг. # ÐозвÑаÑÐ°ÐµÑ ÑпиÑок имÑ,знаÑение, имÑ, знаÑение коÑоÑÑй пÑививаеÑÑÑ Ð² # Ñ ÑÑ - +# sub get_forum_config { - my @path=split("/",$1) if $ENV{PATH_TRANSLATED}=~/^(\S+)$/; + $path_translated = $1 if $ENV{PATH_TRANSLATED}=~/^(.+)$/; + $path_translated=~s/\/+$//; + my @path=split("/",$path_translated); while (@path>1) { if (-r (my $config=join("/",@path,".forum")) ) { open F,"<",$config; @@ -166,6 +182,7 @@ sub get_forum_config { # Ñайл .forum $config{"forumtop"} = dir2url($cgi,join("/",@path)); + $config{"forumroot"} = join("/",@path); # ÐÑли в конÑиге оÑÑÑÑÑÑвÑÐµÑ Ð¿ÐµÑÐµÐ¼ÐµÐ½Ð½Ð°Ñ templates, но # ÑÑдом Ñ ÐºÐ¾Ð½Ñигом пÑиÑÑÑÑÑвÑÐµÑ Ð´Ð¸ÑекÑоÑÐ¸Ñ templates, # Ñо ÑÐ°Ð±Ð»Ð¾Ð½Ñ Ñам. @@ -186,7 +203,6 @@ sub get_forum_config { } $config{"userurl"} = dir2url($cgi,$config{"userdir"}); - # # ÐÑли Ð½ÐµÑ ÑÑÑлки в конÑиге на Ñайл паÑолей или он не # ÑÑÑеÑÑвÑеÑ, вÑдаем оÑибкÑ. С оÑоÑомлением, Ñак как ÑÐ°Ð±Ð»Ð¾Ð½Ñ @@ -200,9 +216,13 @@ sub get_forum_config { show_error(\%config,"РконÑигÑÑаÑии ÑоÑÑма Ñказана неÑÑÑеÑÑвÑÑÑÐ°Ñ Ð´Ð¸ÑекÑоÑÐ¸Ñ Ð´Ð°Ð½Ð½ÑÑ "); exit; } + # + # ÐекоÑоÑÑе ÑмолÑÐ°Ð½Ð¸Ñ + # $config{"authperiod"}="+1M" if (! exists $config{"authperiod"}); $config{"renewtime"} = "86000" if (!exists $config{"renewtime"}); $config{"replies_per_page"} = 50 if (!exists $config{"replies_per_page"}); + $config{"indexfile"} = "index.html" if (!exists $config{"indexfile"}); return \%config; } pop @path; @@ -226,7 +246,7 @@ sub get_forum_config { sub show_error { my ($cfg,$msg) = @_; if ( -r $cfg->{"templates"}."/error.html") { - my $tree = HTML::TreeBuilder->new_from_file($cfg->{"templates"}."/error.html"); + my $tree = treefromfile($cfg->{"templates"}."/error.html"); my $node= $tree->find_by_attribute('class','error'); my $body; if (!$node) { @@ -237,7 +257,7 @@ sub show_error { $node->delete_content; $node->push_content($msg); print $cgi->header(-type=>'text/html',-charset=>'utf-8'); - print $tree->as_HTML("<>&"); + print output_html($tree); } else { print $cgi->header(-type=>'text/html',-charset=>'utf-8'); print "
) + } else { + $cgi->param($name."_format","html"); + } + + } + $element->delete_content; + $element->push_content($cgi->param($name)); + } elsif ($element->tag eq "select") { + for my $option ($element->find_by_tag_name("option")) { + my $value = $option->attr("value") || + $option->as_text(); + if (grep($value eq $_, $cgi->param($name))) { + $option->attr("selected","selected"); } else { $option->attr("selected",undef); } @@ -357,18 +390,17 @@ sub show_template { $f->push_content($element); } } - - - print - $cgi->header(-type=>"text/html",-charset=>"utf-8",($forum->{cookies}?(-cookie=>$forum->{cookies}):())), - $tree->as_HTML("<>&"); -} + return $tree; +} # # ÐопÑавлÑÐµÑ ÑÑÑлки на ÑлÑжебнÑе ÑÐ°Ð¹Ð»Ñ Ð¸ ÑкÑипÑÑ ÑоÑÑма # sub fix_forum_links { my ($forum,$tree,$path_info) = @_; - $path_info=$ENV{'PATH_INFO'} if (!defined $path_info); + if (!defined $path_info) { + $path_info = $ENV{PATH_INFO}; + $path_info =~ s/\/+/\//g; + } my $script_with_path = $ENV{SCRIPT_NAME}.$path_info; ELEMENT: for my $element ($tree->find_by_tag_name("form","img","link","script","a")) { @@ -382,10 +414,11 @@ sub fix_forum_links { } # ÐбÑабаÑÑваем наÑи ÑпеÑиалÑнÑе link rel="" + my $userlist = $cgi->url(-absolute=>1, + -path_info=>0,-query_string=>0).$forum->{userurl}; if ($element->tag eq "link") { if ($element->attr("rel") eq "forum-user-list") { - $element->attr("href" => $cgi->url(-absolute=>1, - -path_info=>0,-query_string=>0).$forum->{userurl}); + $element->attr("href" => $userlist); next ELEMENT; } elsif ($element->attr("rel") eq "forum-script") { $element->attr("href" => $script_with_path); @@ -394,9 +427,15 @@ sub fix_forum_links { } my $link = $element->attr($attr); # ÐбÑолÑÑÐ½Ð°Ñ ÑÑÑлка - оÑÑавлÑем как еÑÑÑ. - next ELEMENT if (! defined $link || $link=~/^\w+:/); + next ELEMENT if (! defined $link || $link=~/^\w+:/ || $link + eq"."||$link eq ".."); # СÑÑлка Ð¾Ñ ÐºÐ¾ÑÐ½Ñ ÑайÑа. if (substr($link,0,1) eq "/") { + # ÐÑли Ñам два ÑлÑÑа, заменÑем Ð¸Ñ Ð½Ð° forumtop + if (substr($link,0,2) eq '//') { + $element->attr($attr, $forum->{forumtop}.substr($link,1)); + next ELEMENT; + } # ÐÑли она не Ð²ÐµÐ´ÐµÑ Ð½Ð° Ð½Ð°Ñ ÑкÑипÑ, не обÑабаÑÑваем next ELEMENT if substr($link,0,length($ENV{SCRIPT_NAME}) ne $ENV{SCRIPT_NAME}) ; @@ -405,7 +444,7 @@ sub fix_forum_links { $link =~ s/^[^\?]+/forum/; } if (!($link =~ s!^templates/!$forum->{templatesurl}/!) && - !($link =~ s!^users/!$forum->{usersurl}/!) && + !($link =~ s!^users/!$userlist/!) && !($link =~ s!^forum\b!$script_with_path!)) { $link = $forum->{"forumtop"}."/".$link } @@ -421,17 +460,12 @@ sub substitute_user_info { my ($tree,$forum,$user) = @_; my %userinfo; if (defined $user) { - my %users; - dbmopen %users,datafile($forum,"passwd"),0644; - if (!$users{$user}) { - show_error($forum,"ÐеизвеÑÑнÑй полÑзоваÑÐµÐ»Ñ $user"); - my $record = thaw($users{$user}); - %userinfo = %$record; - $userinfo{"user"} = $user; + %userinfo=%$user; } else { # ÐÑли не Ñказано, какой ÑзеÑ, Ñо ÑекÑÑий. %userinfo = %{$forum->{"authenticated"}} -}} +} + # # СпеÑиалÑно обÑабаÑÑваем Ð¿Ð¾Ð»Ñ user (должна бÑÑÑ ÑÑÑлка) и avatar # (должен бÑÑÑ img). @@ -445,18 +479,39 @@ if (defined $user) { substinfo($tree,["_tag"=>"a","class"=>"author"], href=>$userpage,_content=>$userinfo{"user"}); delete $userinfo{"user"}; - substinfo($tree,["_tag"=>"img","class"=>"avatar"], - src=>$userinfo{"avatar"}||$forum->{templatesurl}."/1x1.gif"); - delete $userinfo{"avatar"}; + if (ref $userinfo{"avatar"} eq "HASH") { + substinfo($tree,["_tag"=>"img","class"=>"avatar"], + %{$userinfo{'avatar'}}); + } elsif ($userinfo{'avatar'}) { + substinfo($tree,["_tag"=>"img","class"=>"avatar"], + src=>$userinfo{"avatar"}); + } else { + substinfo($tree,["_tag"=>"img","class"=>"avatar"], + src=>$forum->{templatesurl}."/1x1.gif", + width=>1,height=>1); + } for my $element ( $tree->look_down("class",qr/^ap-/)) { my $field=$1 if $element->attr("class")=~/^ap-(.*)$/; $element->delete_content(); - $element->push_content(str2tree($userinfo{$field})) - if $userinfo{$field}; - $element->attr(href=>"mailto:$userinfo{$field}") - if ($element->tag eq "a" && $field eq "email"); - } + $field =~ tr/-/_/; + $userinfo{$field} = 0 if (!exists $userinfo{$field} && grep ($field eq + $_,"forums","messages","topics")); + if (exists $userinfo{$field}) { + + my $data; + if ($field eq "registered" || substr($field,0,5) eq "last_") { + $data = strftime("%d.%m.%Y %H:%M",localtime($userinfo{$field})) + } elsif ($userinfo{$field}=~/^<\w+/) { + $data = str2tree($userinfo{$field}); + } else { + $data = $userinfo{$field} + } + $element->push_content($data); + $element->attr(href=>"mailto:$userinfo{$field}") + if ($element->tag eq "a" && $field eq "email"); + } + } } @@ -484,7 +539,6 @@ sub authorize_user { my %userbase; dbmopen %userbase,datafile($forum,"passwd"),0644; if ( $userbase{$user}) { - print STDERR "getting user info for $user\n"; my $userinfo = thaw($userbase{$user}); delete $userinfo->{"passwd"}; $userinfo->{"user"} = $user; @@ -568,6 +622,11 @@ sub authenticate { my $userinfo = thaw($userbase{$user}) ; dbmclose %userbase; #while (my ($key,$val)=each %$userinfo) { print STDERR "$key => '$val'\n";} + if (defined $forum->{denied_status} && $userinfo->{status} eq + $forum->{denied_status}) { + set_error($forum,"ÐÑ Ð¾Ð´ полÑзоваÑÐµÐ»Ñ $user в ÑиÑÑÐµÐ¼Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñован"); + return undef; + } if (crypt($password,$userinfo->{passwd}) eq $userinfo->{passwd}) { delete $userinfo->{"passwd"}; $cgi->delete("password"); @@ -613,11 +672,125 @@ sub forum_redirect { $url = $cgi->url(-base=>1).($cgi->path_info()||$forum->{forumtop}) if !$url ; } + $url = $cgi->url(-base=>1).$url if substr($url,0,1) eq "/"; print $cgi->redirect(-url=>$url, ($forum->{cookies}?(-cookie=>$forum->{cookies}):())); exit; } # +# Ðаполнение ÑоÑÐ¼Ñ ÑедакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑоÑÐ¸Ð»Ñ Ð´Ð°Ð½Ð½Ñми полÑзоваÑÐµÐ»Ñ + +sub show_profile { + my ($formname,$cgi,$forum) = @_; + my $rights = getrights($cgi,$forum); + my $user = $cgi->param("user"); + if (!$user && substr($path_translated,length($forum->{userdir}) eq + $forum->{userdir})) { + $user = substr($path_translated,length($forum->{userdir})+1); + } + $user = $forum->{authenticated}{user} unless $user; + show_error($forum,"Чей пÑоÑÐ¸Ð»Ñ Ð²Ñ Ñ Ð¾ÑиÑе ÑедакÑиÑоваÑÑ?") + unless $user; + my %base; + dbmopen %base,datafile($forum,"passwd"),0664; + show_error($forum,"ÐÐµÑ Ñакого полÑзоваÑÐµÐ»Ñ $user") + unless $base{$user}; + my $userinfo = thaw($base{$user}); + dbmclose(%base); + delete $userinfo->{passwd}; + $userinfo->{user}=$user; + while(my ($field,$value) = each %$userinfo) { + $value = $value->{src} if ($field eq 'avatar' && ref($value)); + $cgi->param($field,$value); + } + my $tree = prepare_template(@_); + # ÐапÑеÑаем ÑедакÑиÑование полей, Ð²Ñ Ð¾Ð´ÑÑÐ¸Ñ Ð² restricted_user_info + my $form = $tree->look_down(_tag=>"form",name=>"profile"); + if ($rights ne "admin" && $forum->{restricted_user_info}) { + for my $field (split /\s*,\s*/,$forum->{restricted_user_info}) { + ELEMENT: + for my $element ($form->look_down(name=>$field)) { + my $tag= $element->tag; + if ($tag eq 'input') { + my $newel=new HTML::Element("span", + "class"=>"restricted-field"); + + $newel->push_content($element->attr("value")); + $element->replace_with($newel)->delete(); + } elsif ($tag eq 'textarea') { + $element->replace_with_content(new HTML::Element("div", + class=>"restricted-field"))->delete(); + } elsif ($tag eq 'select') { + my $newel = new HTML::Element("span", + class=>"restricted-field"); + OPTION: + for my $option ($element->content_list) { + if (ref $option eq "HTML::Element" && + $option->attr("selected")) { + $newel->push_content($option->detach_content()); + last OPTION; + } + } + if (!$newel->content_list) { + $newel->push_content(($element->content_list)[0]); + } + $element->replace_with($newel)->delete; + } + } + } + } + # ÐодÑÑавлÑем аваÑаÑÐºÑ + substinfo($tree,[_tag=>'img',class=>'avatar'],(ref($userinfo->{avatar})?(%{$userinfo->{avatar}}):(src=>$userinfo->{avatar}))); + for my $userlink ($tree->look_down(_tag => "a",class=>"author")) { + $userlink->delete_content; + $userlink->push_content($user); + if ($forum->{authenticated}{openiduser}) { + $userlink->attr('href'=>"http://$user"); + } else { + $userlink->attr('href'=>undef); + $userlink->tag('span'); + } + } + send_to_user($tree,@_); +} +# ÐбÑабоÑка ÑезÑлÑÑаÑов ÑедакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑоÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑзваÑÐµÐ»Ñ +# +sub profile { + my ($formname,$cgi,$forum) = @_; + if (!$cgi->param("user")) { + show_error($forum,"Ð ÑоÑме Ð½ÐµÑ Ð¸Ð¼ÐµÐ½Ð¸ полÑзоваÑелÑ"); + } + my $user = $cgi->param('user'); + my $rights = getrights($cgi,$forum); + if ($user ne $forum->{authenticated}{user} && + $rights ne "admin") { + show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на изменение пÑоÑÐ¸Ð»Ñ ÑÑого + полÑзоваÑелÑ"); + } + my %base; + dbmopen %base,datafile($forum,"passwd"),0644; + if (!$base{$user}) { + show_error($forum,"ÐеÑÑÑеÑÑвÑÑÑий полÑзоваÑÐµÐ»Ñ $user"); + } + my $userinfo = thaw $base{$user}; + $userinfo->{user}=$user; + # + # If password fields are filled, change password + # + if ($cgi->param('pass1')) { + if ($cgi->param('pass1') eq $cgi->param('pass2')) { + $userinfo->{passwd}=crypt_password($cgi->param('pass1')); + } else { + form_error($formname,$cgi,$forum,"ÐÑибка пÑи вводе паÑолÑ"); + } + } + make_profile($formname,$cgi,$forum,$userinfo,$rights eq "admin"); + delete $userinfo->{user}; + $base{$user} = freeze $userinfo; + dbmclose %base; + show_profile($formname,$cgi,$forum); +} +# # ÐбÑабоÑка ÑезÑлÑÑаÑов Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑоÑÐ¼Ñ ÑегиÑÑÑаÑии. # # @@ -648,6 +821,7 @@ sub register { } } } + $cgi->delete("required"); my %userbase; dbmopen %userbase,datafile($forum,"passwd"),0644 or form_error($formname,$cgi,$forum,"ÐÑибка оÑкÑÑÑÐ¸Ñ Ñайла паÑолей $!"); @@ -655,35 +829,50 @@ sub register { dbmclose %userbase; form_error($formname,$cgi,$forum,"ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ '".$cgi->param("user"). "' Ñже занÑÑо"); } - if ($cgi->param("email") && ! Email::Valid->address($cgi->param("email"))) { - form_error($formname,$cgi,$forum,"ÐекоÑÑекÑнÑй E-Mail адÑеÑ"); + my $userinfo = {passwd=>crypt_password($cgi->param('pass1'))}; + make_profile($formname,$cgi,$forum,$userinfo,0); + $userinfo->{registered} = time; + set_default_user_attrs($forum,$userinfo); + print STDERR "stilllife forum: registering user $user\n"; + $userbase{$user} = freeze($userinfo); + dbmclose %userbase; + if (!defined $forum->{denied_status} || $userinfo->{status} ne + $forum->{denied_status}) { + newsession(undef,$forum,$user); + forum_redirect($cgi,$forum,$cgi->param("returnto")); + } else { + # FIXME Email validation + # Email to admin + show_template("newuser",$cgi,$forum); } - my $saltstring = 'ABCDEFGHIJKLMNOPQRSTUVWXUZabcdefghijklmnopqrstuvwxuz0123456789./'; - my $salt = substr($saltstring,int(rand(64)),1). - substr($saltstring,int(rand(64)),1); - my $password=crypt($cgi->param("pass1"),$salt); - my $userinfo = {passwd=>$password}; +} +sub make_profile { + my ($formname,$cgi,$forum,$userinfo,$isadmin) =@_; # УдалÑем лиÑние Ð¿Ð¾Ð»Ñ - $cgi->delete("required"); - $cgi->delete("register"); - $cgi->delete("user"); - $cgi->delete("pass1"); - $cgi->delete("pass2"); foreach my $field (split(/\s*,\s*/,$cgi->param('ignore'))) { if (!$cgi->param($field)) { $cgi->delete($field); } } - my $returnto = $cgi->param("returnto"); - $cgi->delete("returnto"); + if ($cgi->param("email") && ! Email::Valid->address($cgi->param("email"))) { + form_error($formname,$cgi,$forum,"ÐекоÑÑекÑнÑй E-Mail адÑеÑ"); + } + my $user = $userinfo->{user}; + my $userprefix=$user; + $userprefix=~tr!\\/: !_!; # ÐÑли еÑÑÑ Ð°Ð²Ð°ÑÐ°Ñ Ð² Ñайле, Ñо ÑÐ¾Ñ ÑанÑем ÑÑÐ¾Ñ Ñайл и ÑоÑмиÑÑем URL # на него. + $cgi->delete($formname); + $cgi->delete("user"); + $cgi->delete("pass1"); + $cgi->delete("pass2"); if ($cgi->param("avatarfile" )) { my $f = $cgi->upload("avatarfile"); binmode $f,":bytes"; my $out; my $filename = $1 if $cgi->param("avatarfile")=~/([^\/\\]+)$/; - open $out,">",$forum->{"userdir"}."/".$filename; + my $path = $forum->{"userdir"}."/".$userprefix."_".$filename; + open $out,">",$path; binmode $out,":bytes"; my $buffer; while (my $bytes = read($f,$buffer,4096)) { @@ -691,24 +880,120 @@ sub register { } close $f; close $out; - $userinfo->{'avatar'}= $forum->{"userurl"}."/".$filename; - $cgi->delete("avatar"); - $cgi->delete("avatarfile"); + my ($w,$h) = imgsize($path); + $userinfo->{'avatar'}= {src=>$forum->{"userurl"}."/".$userprefix."_".$filename, + width=>$w,height=>$h}; + } elsif ($cgi->param('avatar')) { + if (!ref($userinfo->{'avatar'}) || + $userinfo->{avatar}{'src'} ne $cgi->param('avatar')) { + $userinfo->{avatar}=get_avatar_info($cgi->param('avatar')); + } } - + my @restrict=(); + @restrict = split /\s*,\s*/, $forum->{restricted_user_info} + unless $isadmin; + foreach my $param ($cgi->param) { - $userinfo->{$param} = $cgi->param($param); - } - $userinfo->{registered} = time; - if (exists $forum->{default_status}) { - $userinfo->{status} = $forum->{default_status}; + next if (grep $_ eq $param,@restrict); + next if $param eq 'avatar'; + next if $param eq 'avatarfile'; + next if $param eq 'returnto'; + next if $param =~ /_format$/; + if (defined $cgi->param("${param}_format")) { + my $tree = input2tree($cgi,$forum,$param); + $userinfo->{$param} = tree2str($tree); + $tree->delete(); + } else { + $userinfo->{$param} = $cgi->param($param); + } } - print STDERR "stilllife forum: registering user $user\n"; - $userbase{$user} = freeze($userinfo); - dbmclose %userbase; - newsession(undef,$forum,$user); - forum_redirect($cgi,$forum,$returnto) +} +sub crypt_password { + my $open_password=shift; + my $saltstring = 'ABCDEFGHIJKLMNOPQRSTUVWXUZabcdefghijklmnopqrstuvwxuz0123456789./'; + my $salt = substr($saltstring,int(rand(64)),1). + substr($saltstring,int(rand(64)),1); + my $password=crypt($open_password,$salt); + return $password; } + +sub set_default_user_attrs { + my ($forum,$userinfo) = @_; + while (my($key,$val) = each %$forum) { + next unless $key =~ /^default_(.*)$/; + $userinfo->{$1} = $val; + } +} + +sub show_user_page { + my ($cgi,$forum) = @_; + my $rights; + $rights=getrights($cgi,$forum) if ($forum->{authenticated}); + my %base; + my $tree; + dbmopen %base,datafile($forum,"passwd"),0664; + if ($path_translated eq $forum->{userdir}) { + # показаÑÑ ÑпиÑок полÑзоваÑелей + $tree = gettemplate($forum,"userlist"); + my $usertpl = $tree->look_down(class=>"userinfo"); + my $userlist = $usertpl->parent; + $usertpl->detach; + for my $user (sort keys %base) { + my $block = $usertpl->clone; + $userlist->push_content($block); + my $userinfo =thaw($base{$user}); + $userinfo->{"user"} = $user; + substitute_user_info($block,$forum,$userinfo); + profile_links($block,$user,$rights,$cgi,$forum); + } + $usertpl->delete; + } else { + my $user = substr($path_translated,length($forum->{userdir})+1); + if (!$base{$user}) { + print $cgi->header(-status=>"404 NOT FOUND"); + exit; + } + my $userinfo = thaw($base{$user}); + $userinfo->{"user"} = $user; + $tree = gettemplate($forum,"user"); + substinfo($tree,[_tag=>"title"],_content=>"Stilllife user: $user"); + substitute_user_info($tree,$forum,$userinfo); + profile_links($tree,$user,$rights,$cgi,$forum); + unless ($userinfo->{openiduser}) { + for my $userlink ($tree->look_down(_tag => "a",class=>"author")) { + $userlink->attr("href",undef); + $userlink->tag("span"); + } + } + } + my $page = output_html($tree); + my $length = do {use bytes; length($page);}; + print $cgi->header(-type=>"text/html",-content_length=>$length, + -charset=>"utf-8",($forum->{cookies}?(-cookie=>$forum->{cookies}):())), + $page; +} +sub profile_links { + my ($tree,$user,$rights,$cgi,$forum)=@_; + foreach my $profile_link ($tree->look_down(_tag=>"a", + href=>qr/profile=/)) { + if ((defined $rights && $rights eq "admin")|| + (defined $forum->{authenticated}{user} && + $forum->{authenticated}{user} eq $user)) { + + $profile_link->attr("href", + $ENV{'SCRIPT_NAME'}.$forum->{userurl}. + "/".$user."?profile=1"); + } else { + $profile_link->delete(); + } + } +} +sub clear_user_cookies { + my ($cgi,$forum) = @_; + $forum->{cookies}=[ $cgi->cookie(-name=>"sluser", -value=>"0", + -expires=>"-1m"),$cgi->cookie(-name=>"slsession", -value=>"0", + -expires => "-1m")]; +} # # ÐбÑабоÑÑик ÑоÑÐ¼Ñ Ð»Ð¾Ð³Ð¸Ð½Ð°. СводиÑÑÑ Ðº вÑÐ·Ð¾Ð²Ñ ÑÑнкÑии authenticate, # поÑколÑÐºÑ Ð¼Ñ Ð¿Ð¾Ð´Ð´ÐµÑживаем логин одновÑеменнÑй Ñ Ð¾ÑпÑавкой Ñеплики. @@ -721,12 +1006,6 @@ sub login { show_template(@_); } } -sub clear_user_cookies { - my ($cgi,$forum) = @_; - $forum->{cookies}=[ $cgi->cookie(-name=>"sluser", -value=>"0", - -expires=>"-1m"),$cgi->cookie(-name=>"slsession", -value=>"0", - -expires => "-1m")]; -} # # ÐбÑабоÑÑик ÑоÑÐ¼Ñ logout. РоÑлиÑие Ð¾Ñ Ð±Ð¾Ð»ÑÑинÑÑва обÑабоÑÑиков ÑоÑм, # поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð¾Ð±ÑабоÑÐºÑ Ð¼ÐµÑодом GET @@ -751,17 +1030,11 @@ sub allow_operation { } my $user = $forum->{authenticated}{user} ; my $accesslevel=getrights($cgi,$forum); - # ÐÑли permissions{$operation} ÑÐ°Ð²Ð½Ñ author, нам нÑжно извлеÑÑ - # ÑекÑÑ Ð¸Ð· ÑооÑвеÑÑÑвÑÑÑего Ñайла и положиÑÑ ÐµÐ³Ð¾ в - # cgi->param("text"); Ðаодно опÑеделим и авÑоÑа - my ($itemauthor,$itemtext)=get_message_by_id($cgi->param("id")) if - $permissions{$operation} eq "author"; return 1 if ($accesslevel eq "admin"); return 0 if ($permissions{$operation} eq "admin"); return 1 if ($accesslevel eq "moderator"); return 0 if $accesslevel eq "banned"; - return 0 if $permissions{$operation} eq "author" && $user ne $itemauthor; return 1; } @@ -773,9 +1046,9 @@ sub reply { # # ÐÐ°Ñ Ð¾Ð´Ð¸Ð¼ Ñайл диÑкÑÑÑии, в коÑоÑÑй надо помеÑÑиÑÑ ÑÐµÐ¿Ð»Ð¸ÐºÑ # - my ($tree,$lockfd)=gettree($ENV{'PATH_TRANSLATED'}); - my $messagetpl = $tree->look_down(class=>"message"); - if (!$messagetpl) { + my ($tree,$lockfd)=gettree($path_translated); + my $newmsg = newlistelement($tree,"message","messagelist"); + if (!$newmsg) { show_error($forum,"Шаблон ÑÐµÐ¼Ñ Ð½Ðµ ÑодеÑÐ¶Ð¸Ñ ÑлеменÑа Ñ ÐºÐ»Ð°ÑÑом message"); exit; @@ -784,13 +1057,14 @@ sub reply { # # ÐенеÑиÑÑем иденÑиÑикаÑÐ¾Ñ Ð·Ð°Ð¿Ð¸Ñи. # - my $id = get_uid($forum); + my $id = "m".get_uid($forum); # # Ð¡Ð¾Ñ ÑанÑем пÑиаÑÑаÑеннÑе каÑÑинки, еÑли еÑÑÑ. # - my $dir = $1 if $ENV{PATH_TRANSLATED}=~/^(.*)$/; + my $dir = $path_translated; + $dir=~ s/[^\/]+$// if (-f $dir); my %attached; for (my $i=1;$cgi->param("image$i"); $i++) { @@ -829,12 +1103,6 @@ sub reply { } } # - # ÐопиÑÑем ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ñ ÐºÐ»Ð°ÑÑом message - # - my $newmsg = $messagetpl->clone; - my $parent = $messagetpl->parent; - $parent->push_content($newmsg); - # # ÐодÑÑавлÑем даннÑе ÑообÑÐµÐ½Ð¸Ñ # $newmsg->attr("id"=>$id); @@ -862,8 +1130,9 @@ sub reply { show_error($forum,"Ð ÑоÑме ÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑообÑением Ð½ÐµÑ Ð¿Ð¾Ð»Ñ author"); } # ÐодÑÑавлÑем mdate + my $posted = strftime("%d.%m.%Y %H:%M",localtime()); substinfo($newmsg,["class"=>"mdate"], - _content =>strftime("%d.%m.%Y %H:%M",localtime())); + _content =>$posted); # ÐодÑÑавлÑем mreply substinfo($newmsg,[_tag=>"a","class"=>"mreply"],"href" => $cgi->url(-absolute=>1,-path_info=>1)."?reply=1&id=$id"); @@ -873,32 +1142,458 @@ sub reply { show_error($forum,"Ð Ñаблоне ÑообÑÐµÐ½Ð¸Ñ Ð¾ÑÑÑÑÑÑвÑÐµÑ ÑкоÑÑ Ð´Ð»Ñ ÑÑÑлок на него"); # подÑÑавлÑем mlink substinfo($newmsg,[_tag=>"a","class"=>"mlink"], - href=>$cgi->path_info."#id"); + href=>$cgi->path_info."#$id"); # подÑÑавлÑем mparent my $parent_id=$cgi->param("id"); if ($parent_id) { substinfo($newmsg,[_tag => "a",class=>"mparent"], - "href"=>$cgi->path_info."#$parent_id"); + "href"=>$cgi->path_info."#$parent_id",style=>undef); } else { substinfo($newmsg,[_tag => "a",class=>"mparent"], - "_content"=>""); + style=>"display: none;"); } - + my $msgcount=0; + for my $msg ($newmsg->parent->look_down("class"=>"message")) { + $msgcount ++; + } + # - # ÐÑовеÑÑем видимоÑÑÑ ÑпиÑка ÑообÑений + # Ðелаем УÑÑ Ð¸ ÑÐ¾Ñ ÑанÑем Ñо, ÑÑо полÑÑилоÑÑ # + $newmsg = $newmsg->clone; + savetree($path_translated,$tree,$lockfd); + record_as_recent($forum,$newmsg); + record_statistics($forum,"message"), + update_topic_list($forum,$path_translated,$msgcount,$posted); + forum_redirect($cgi,$forum,$cgi->path_info."#$id"); +} +sub update_topic_list { + my ($forum,$topic,$count,$date) = @_; + my ($tree,$lockfd,$block,$index); + if (!ref ($topic)) { + # ÐÑли $topic - Ð¸Ð¼Ñ Ñайла, найдем ÑооÑвеÑÑÑвÑÑÑий Ð¸Ð½Ð´ÐµÐºÑ Ð¸ в нем + # ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ñ ÑооÑвеÑÑÑвÑÑÑим id; + my ($dir,$id)=($1,$2) if $topic =~/(.+)\/([^\/]+).html/; + $index = $dir."/".$forum->{indexfile}; + ($tree,$lockfd) = gettree($index); + $block = $tree->look_down("id"=>$id); + return unless $block; + } else { + # ÐнаÑе нам пеÑедали кÑÑок гоÑового ÑаÑпаÑÑенного деÑева + $block = $topic; + } + substinfo($block,[class=>"msgcount"],_content=>$count); + substinfo($block,[class=>"last-updated"],_content=>$date); + # и еÑли Ð¼Ñ Ð¿Ð°ÑÑили деÑево, Ñо Ð¼Ñ ÐµÐ³Ð¾ и ÑÐ¾Ñ ÑанÑем + savetree($index,$tree,$lockfd); +} + +sub record_as_recent { + my ($forum,$msg) = @_; + my ($tree,$lockfd) = gettree($forum->{forumroot}."/recent.html"); my $msglist = $tree->look_down("class"=>"messagelist"); if ($msglist) { my $style = $msglist->attr("style"); - $msglist->attr("style",$style) if $style && $style =~ s/display: none;//; + if ($style && $style =~ s/display: none;//) { + $msglist->attr("style",$style); + $msglist->look_down(class=>"message")->replace_with($msg); + } else { + my @msgs = $msglist->look_down("class"=>"message"); + if (@msgs >= $forum->{replies_per_page}) { + for (my $i=$#msgs;$i>=$forum->{replies_per_page}-1;$i--) { + $msgs[$i]->delete; + } + } + $msgs[0]->preinsert($msg); + } + } + savetree($forum->{forumroot}."/recent.html",$tree,$lockfd); +} +# +# ÐбÑабоÑка опеÑаÑии ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ÑемÑ. +# + +sub new_topic { + my ($form,$cgi,$forum) = @_; + # + # ÐÑовеÑÑем коÑÑекÑноÑÑÑ urlname и пÑоÑÐ¸Ñ Ð¿Ð¾Ð»ÐµÐ¹ + # + my $urlname; + if (!$cgi->param("urlname")) { + $urlname = get_uid($forum); + } else { + $urlname=$1 if $cgi->param("urlname") =~ /^([-\w]+)$/; + form_error($form,$cgi,$forum,"ÐекоÑÑекÑнÑе ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ Ð² urlname. + ÐопÑÑÑÐ¸Ð¼Ñ ÑолÑко лаÑинÑкие бÑквÑ, ÑиÑÑÑ Ð¸ минÑÑ") unless $urlname; + } + if (!-d $path_translated) { + show_error($forum,"ÐпеÑаÑÐ¸Ñ $form Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ñзвана ÑолÑко Ñо + ÑÑÑаниÑÑ ÑоÑÑма"); + } + my $filename = "$path_translated/$urlname.html"; + if (-f $filename) { + form_error($form,$cgi,$forum,"Тема Ñ urlname $urlname Ñже + ÑÑÑеÑÑвÑеÑ"); + } + my $url = $cgi->path_info."/$urlname.html"; + $url =~ s/\/+/\//g; + if (!$cgi->param("title")) { + form_error($form,$cgi,$forum,"Тема должна имеÑÑ Ð½ÐµÐ¿ÑÑÑое название"); } # - # Ðелаем УÑÑ Ð¸ ÑÐ¾Ñ ÑанÑем Ñо, ÑÑо полÑÑилоÑÑ + # Создаем ÑобÑÑвенно ÑÐµÐ¼Ñ # - savetree($ENV{PATH_TRANSLATED},$tree,$lockfd); - forum_redirect($cgi,$forum); - + my $tree = gettemplate($forum,"topic",$url); + # ÐаполниÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ и анноÑаÑÐ¸Ñ + my $abstract = input2tree($cgi,$forum,"abstract"); + substinfo($tree,[_tag=>"meta","name"=>"description"],content=>$abstract->as_trimmed_text); + substinfo($tree,[_tag=>"title"],_content=>$cgi->param("title")); + my $subtree = $tree->look_down("class"=>"topic"); + my $creation_time=strftime("%d.%m.%Y %H:%M",localtime()); + if ($subtree) { + substinfo($subtree,["class"=>"title"], + _content=>$cgi->param("title")); + substinfo($subtree,["class"=>"date"], + _content=>$creation_time); + # ÐÑÑавлÑем в ÑÑÑаниÑÑ ÐÐÐÐЮ анноÑаÑии, поÑколÑÐºÑ Ð°Ð½Ð½Ð¾ÑаÑÐ¸Ñ + # нам еÑе понадобиÑÑÑ Ð² ÑпиÑке Ñем. + substinfo($subtree,["class"=>"abstract"],_content=>$abstract->clone); + substitute_user_info($subtree,$forum); + } else { + substinfo($tree,["class"=>"title"], + _content=>$cgi->param("title")); + } + # СкÑÑÑÑ ÑпиÑок ÑообÑений. + hide_list($tree,"messagelist"); + savetree($filename,$tree,undef); + $tree->destroy; + # + # ÐобавлÑем ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ð² ÑпиÑок Ñем ÑекÑÑего ÑоÑÑма + # + + my $lockfd; + ($tree,$lockfd)=gettree($path_translated."/".$forum->{"indexfile"}); + my $newtopic = newlistelement($tree,"topic","topiclist"); + substinfo($newtopic,[_tag=>"a","class"=>"title"], + _content=>$cgi->param("title"), href=>"$urlname.html"); + substinfo($newtopic,["class"=>"date"], _content=>$creation_time); + substinfo($newtopic,["class"=>"abstract"],_content=>$abstract); + substitute_user_info($newtopic,$forum); + $newtopic->attr("id",$urlname); + my $controlform = $newtopic->look_down(_tag=>"form",class=>"topicinfo"); + if ($controlform) { + $controlform->attr("action"=>$cgi->url(-absolute=>1,-path_info=>0, + -query_string=>0).$url); + substinfo($controlform,[_tag=>"input",name=>"author"],value=> + $forum->{authenticated}{user}); + } + update_topic_list($forum,$newtopic,0,$creation_time); + savetree($path_translated."/".$forum->{"indexfile"},$tree,$lockfd); + record_statistics($forum,"topic"); + forum_redirect($cgi,$forum,$cgi->url(-base=>1).$url); +} + +sub new_forum { + my ($form,$cgi,$forum) = @_; + # + # ÐÑовеÑÑем коÑÑекÑноÑÑÑ urlname и пÑоÑÐ¸Ñ Ð¿Ð¾Ð»ÐµÐ¹ + # + my $urlname; + if (!$cgi->param("urlname")) { + form_error($form,$cgi,$forum,"ФоÑÑÐ¼Ñ Ð½ÐµÐ¾Ð±Ñ Ð¾Ð´Ð¸Ð¼Ð¾ задаÑÑ Ð½ÐµÐ¿ÑÑÑое urlname"); + } + if ($cgi->param("urlname") eq ".") { + $urlname = "." + } else { + $urlname=$1 if $cgi->param("urlname") =~ /^([-\w]+)$/ ; + form_error($form,$cgi,$forum,"ÐекоÑÑекÑнÑе ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ Ð² urlname. + ÐопÑÑÑÐ¸Ð¼Ñ ÑолÑко лаÑинÑкие бÑквÑ, ÑиÑÑÑ Ð¸ минÑÑ") unless $urlname; + } + if (!-d $path_translated) { + show_error($forum,"ÐпеÑаÑÐ¸Ñ $form Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ñзвана ÑолÑко Ñо + ÑÑÑаниÑÑ ÑоÑÑма"); + } + my $newname = "$path_translated/$urlname"; + $newname=$path_translated if ($urlname eq "."); + my $filename = "$newname/$forum->{indexfile}"; + if (-f $filename) { + form_error($form,$cgi,$forum,"ФоÑÑм $urlname Ñже ÑÑÑеÑÑвÑеÑ"); + } + if (!$cgi->param("title")) { + form_error($form,$cgi,$forum,"ФоÑÑм должен имеÑÑ Ð½ÐµÐ¿ÑÑÑое название"); + } + mkdir $newname unless -d $newname; + # + # Ð¡Ð¾Ñ ÑанÑем логоÑип + # + my ($logo_name,$logo_width,$logo_height); + if ($cgi->param("logo")) { + my $userpath = $cgi->param("logo"); + $logo_name="logo.".lc($1) if $userpath=~/\.([^.]+)$/; + my $in = $cgi->upload("logo"); + if (!$in) { + show_error($forum,"ÐÑибка пÑи загÑÑзке каÑÑинки $userpath"); + exit; + } + my $out; + open $out,">$newname/$logo_name"; + binmode $out,":bytes"; + local $/=undef; + my $data = <$in>; + print $out $data; + close $in; + close $out; + ($logo_width,$logo_height) = imgsize("$newname/$logo_name"); + } else { + $logo_name = $forum->{"templatesurl"}."/1x1.gif"; + $logo_width = 1; + $logo_height=1; + } + + + # + # Создаем ÑобÑÑвенно оглавление ÑоÑÑма + # + + my $url = $cgi->path_info."/$urlname"; + $url= $cgi->path_info if $urlname eq "."; + $url =~ s/\/+/\//g; + my $tree = gettemplate($forum,"forum",$url); + # УдалиÑÑ ÑлеменÑÑ, коÑоÑÑй пÑиÑÑÑÑÑвÑÑÑ ÑолÑко на главной ÑÑÑаниÑе + if ($urlname ne ".") { + for my $element ($tree->look_down("class"=>"top-page")) { + $element->delete; + } + } + # ÐаполниÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ и анноÑаÑÐ¸Ñ + my $abstract = input2tree($cgi,$forum,"abstract"); + substinfo($tree,[_tag=>"meta","name"=>"description"],content=>$abstract->as_trimmed_text); + substinfo($tree,[_tag=>"title"],_content=>$cgi->param("title")); + my $subtree = $tree->look_down("class"=>"annotation") + or show_error($forum,"Ð Ñаблоне ÑоÑÑма оÑÑÑÑÑÑвÑÐµÑ ÐºÐ»Ð°ÑÑ annotation"); + my $creation_time=strftime("%d.%m.%Y %H:%M",localtime()); + substinfo($subtree,["class"=>"title"], + _content=>$cgi->param("title")); + substinfo($subtree,["class"=>"date"], + _content=>$creation_time); + # ÐÑÑавлÑем в ÑÑÑаниÑÑ ÐÐÐÐЮ анноÑаÑии, поÑколÑÐºÑ Ð°Ð½Ð½Ð¾ÑаÑÐ¸Ñ + # нам еÑе понадобиÑÑÑ Ð² ÑпиÑке Ñем. + substinfo($subtree,["class"=>"abstract"],_content=>$abstract->clone); + substitute_user_info($subtree,$forum); + substinfo($subtree,[_tag=>"img","class"=>"logo"], + src=> $logo_name, width=>$logo_width, height=>$logo_height); + # СкÑÑÑÑ ÑпиÑки подÑоÑÑмов и Ñем . + hide_list($tree,"forumlist"); + hide_list($tree,"topiclist"); + if ($urlname eq ".") { + for my $link_up ($tree->look_down(_tag=>"a",href=>"..")) { + $link_up->delete; + } + } + savetree($filename,$tree,undef); + $tree->destroy; + # + # ÐобавлÑем ÑÐ»ÐµÐ¼ÐµÐ½Ñ Ð² ÑпиÑок Ñем ÑекÑÑего ÑоÑÑма + # + if ($urlname ne ".") { + my $lockfd; + ($tree,$lockfd)=gettree($path_translated."/".$forum->{"indexfile"}); + my $newforum = newlistelement($tree,"forum","forumlist"); + substinfo($newforum,[_tag=>"a","class"=>"title"], + _content=>$cgi->param("title"), href=>"$urlname/"); + substinfo($newforum,["class"=>"date"], _content=>$creation_time); + substinfo($newforum,["class"=>"abstract"],_content=>$abstract); + substinfo($newforum,[_tag=>"img","class"=>"logo"],src=>"$urlname/$logo_name", + width=>$logo_width,height=>$logo_height); + substitute_user_info($newforum,$forum); + $newforum->attr("id",$urlname); + my $controlform = $newforum->look_down(_tag=>"form",class=>"foruminfo"); + if ($controlform) { + $controlform->attr("action"=>$cgi->url(-absolute=>1,-path_info=>0). + $url); + substinfo($controlform,[_tag=>"input",name=>"author"],value=> + $forum->{authenticated}{user}); + } + savetree($path_translated."/".$forum->{"indexfile"},$tree,$lockfd); + record_statistics($forum,"forum"); + } else { + # Создаем ÑÐµÐ¼Ñ Ð´Ð»Ñ "ÑÐ²ÐµÐ¶Ð¸Ñ Ñеплик" + my $recent = gettemplate($forum,"topic",$url."/recent.html"); + # remove reply link from page itself + for my $link ($recent->look_down(_tag =>"a", href=>qr/reply=/)) { + $link->delete; + } + substinfo($recent,["_tag"=>"title"],$cgi->param("title").": Свежие ÑообÑениÑ"); + substinfo($recent,["class"=>"title"], + _content=>$cgi->param("title"). ": Свежие ÑообÑениÑ"); + hide_list($recent,"messagelist"); + savetree($path_translated."/recent.html",$recent,undef); + + } + + forum_redirect($cgi,$forum,$cgi->url(-base=>1).$url); +} + +# +# ÐбÑабоÑка опеÑаÑии ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ñего на ÑвеÑе +# +sub delete_item { + my ($formname,$cgi,$forum) = @_; + # + # СнаÑала ÑазбеÑемÑÑ, ÑÑо Ð¼Ñ ÑобÑÑвенно ÑдалÑем + # + if ($cgi->param("user")) { + delete_user($cgi,$forum,$cgi->param("user")); + } elsif (-f $path_translated) { + if ($cgi->param("id")) { + delete_comment($cgi,$forum,$path_translated,$cgi->param("id")); + } else { + delete_topic($cgi,$forum,$path_translated); + } + } elsif (-d $path_translated && -f $path_translated ."/". $forum->{indexfile}) { + delete_forum($cgi,$forum,$path_translated); + } else { + show_error($forum,"Ðевозможно ÑдалиÑÑ Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ñй обÑекÑ"); + } +} +# +# Удаление полÑзоваÑÐµÐ»Ñ +# +sub delete_user { + my ($cgi,$forum,$user) = @_; + if ($forum->{authenticated}{user} ne $user && + getrights($cgi,$forum) ne "admin") { + show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÐ´Ð¾ÑÑаÑоÑно пÑав Ð´Ð»Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ + полÑзоваÑÐµÐ»Ñ $user"); + } + my %base; + dbmopen %base,datafile($forum,"passwd"),0644; + delete $base{$user}; + dbmclose %base; + forum_redirect($cgi,$forum,$forum->{forumtop}); +} +# +# Удаление Ñеплики +# +sub delete_comment { + my ($cgi,$forum,$topic,$id) = @_; + my ($tree,$lockfd) = gettree($topic); + my ($msg) = $tree->look_down(id => $id); + show_error("Рданной Ñеме Ð½ÐµÑ Ñеплики Ñ id=$id") if (!$msg); + if (getrights($cgi,$forum) ne "moderator" + && getrights($cgi,$forum) ne "admin") { + my $author= $msg->look_down(_tag=>"input",name=>"author"); + if ($author->attr("value") ne $forum->{authenticated}{user}) { + show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на Ñдаление ÑÑого ÑообÑениÑ"); + } + } + delete_from_list($tree,"messagelist","message",$msg); + savetree($topic,$tree,$lockfd); + $tree->delete; + ($tree,$lockfd) = gettree($forum->{forumroot}."/recent.html"); + ($msg) = $tree->look_down(id => $id); + if ($msg) { + delete_from_list($tree,"messagelist","message",$msg); + savetree($forum->{forumroot}."/recent.html",$tree,$lockfd); + } else { + discardtree($tree,$lockfd); + } + # ÐÑли Ñ Ñеплики бÑли каÑÑинки, Ñо Ð¸Ñ Ñоже надо гÑÐ¾Ñ Ð½ÑÑÑ + for my $pic (<$id."_*.*">) { + unlink $pic; + } + forum_redirect($cgi,$forum,$cgi->path_info); +} +# +# Удаление ÑÐµÐ¼Ñ +# +sub delete_topic { + my ($cgi,$forum,$topic) = @_; + # ÐÑли модеÑаÑоÑ, Ñо в ÑÐµÐ¼Ñ Ð¸ не заглÑдÑваем + my ($dir,$id) = ($1,$2) if $topic=~/^(.*)\/([^\/]+).html$/; + show_error($forum,"ÐевеÑное Ð¸Ð¼Ñ ÑÐµÐ¼Ñ $topic") unless ($dir && $id); + if (getrights($cgi,$forum) ne "moderator" && + getrights($cgi,$forum) ne "admin") { + # ÐÑовеÑÑем авÑоÑÑÑво ÑÐµÐ¼Ñ Ð¸ налиÑие в ней ÑообÑений + my ($tree,$lockfd) = gettree($topic); + my $info = $tree->look_down(class=>"topic"); + my $author = $tree->look_down(class=>"author"); + if ($author->as_text() ne $forum->{authenticated}{user}) { + show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñава ÑдалÑÑÑ ÑÑÑ ÑемÑ"); + } + $info = $tree->look_down(class=>"messagelist"); + if ($info->attr("style") !~ /display: none;/) { + show_error($forum,"Ðевозможно ÑдалиÑÑ ÑемÑ, ÑодеÑжаÑÑÑ ÑообÑениÑ"); + } + discardtree($tree,$lockfd); + } # FIXME пÑи Ñдалении непÑÑÑой ÑÐµÐ¼Ñ Ð¼Ð¾Ð´ÐµÑаÑоÑом поÑиÑÑиÑÑ recent.html + my ($tree,$lockfd) = gettree($dir . "/".$forum->{indexfile}); + delete_from_list($tree,"topiclist","topic",$id); + savetree($tree,$dir ."/".$forum->{indexfile}); + unlink $topic; + my $redirect_url = $cgi->path_info; + $redirect_url =~ s/\/[^\/]*$//; + forum_redirect($cgi,$forum,$redirect_url); +} +# +# Удаление ÑоÑÑма +# +sub delete_forum { + my ($cgi,$forum,$dir) = @_; + if (getrights($cgi,$forum) ne "moderator" && getrights($cgi,$forum) + ne "admin") { + show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñава ÑдалÑÑÑ ÑоÑÑмÑ"); + } + opendir DIR,$dir; + my $count = 0; + while ( my $entry=readdir DIR) { + next if $entry eq $forum->{indexfile}; + next if $entry eq "perms.txt"; + next if $entry =~ /^logo.[^.]+/; + show_error($forum,"ÐелÑÐ·Ñ ÑдалÑÑÑ ÐºÐ¾ÑÐµÐ½Ñ ÑоÑÑма" ) + if $entry eq ".forum"; + $count ++; + } + closedir DIR; + show_error("ÐелÑÐ·Ñ ÑдалÑÑÑ Ð½ÐµÐ¿ÑÑÑой ÑоÑÑм") if $count; + # ÐÐ°Ñ Ð¾Ð´Ð¸Ð¼ ÑодиÑелÑÑкий ÑоÑÑм + my $upper = $dir; + $upper=~s/([\/]+)$/$forum->{indexfile}/; + my $id = $1 if $dir =~ /\/([\/]+)$/; + # УдалÑем ÑоÑÑм из ÑпиÑка. + my ($tree,$lockfd) = gettree($upper); + delete_from_list($tree,"forumlist","forum",$id); + savetree($upper,$tree,$lockfd); + # УдалÑем из Ñайловой ÑиÑÑÐµÐ¼Ñ + opendir DIR,$dir; + for my $entry ( readdir DIR) { + unlink "$dir/$entry"; + } + rmdir $dir; + my $redirect_url = $cgi->path_info; + $redirect_url =~s/\/$//; + $redirect_url =~ s/\/[^\/]*$//; + forum_redirect($cgi,$forum,$redirect_url); } + +#---------------------------------------------------------- +# Ðаза полÑзоваÑелей и пÑава доÑÑÑпа +#---------------------------------------------------------- +# +# ÐапиÑÑÐ²Ð°ÐµÑ Ð² Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ Ð¿Ð¾Ð»ÑзоваÑелей, ÑколÑко ÐºÐ°ÐºÐ¸Ñ Ð¾Ð±ÑекÑов +# Ñоздал ÑекÑÑий полÑзоваÑÐµÐ»Ñ +# +sub record_statistics { + my ($forum,$type) = @_; + my $user = $forum->{authenticated}{user}; + my %base; + dbmopen %base,datafile($forum,"passwd"),0664; + my $userinfo = thaw($base{$user}); + $userinfo->{$type."s"}++; + $userinfo->{"last_$type"}=time; + $base{$user} = freeze($userinfo); + dbmclose %base; +} # # ÑиÑÐ°ÐµÑ ÑÐ°Ð¹Ð»Ñ Ð¿Ñав доÑÑÑпа в деÑеве ÑоÑÑма, и возвÑаÑÐ°ÐµÑ # ÑÑаÑÑÑ ÑекÑÑего полÑзоваÑÐµÐ»Ñ (undef - аноним, banned, normal, @@ -909,8 +1604,11 @@ sub getrights { if (!$forum->{authenticated}) { return undef; } + return $forum->{authenticated}{rights} if + exists $forum->{authenticated}{rights}; my $user = $forum->{authenticated}{user}; - my $dir = $ENV{'PATH_TRANSLATED'}; + my $dir = $path_translated; + $dir =~s/\/$//; $dir =~s/\/[^\/]+$// if (!-d $dir); my $f; my $user_status = "normal"; @@ -926,10 +1624,10 @@ sub getrights { chomp; if ($user eq $_ && defined $status) { if ($status eq "banned") { - return $status; + return $forum->{authenticated}{rights}=$status; } if ($status eq "admins" ) { - return "admin"; + return $forum->{authenticated}{rights}="admin"; } $user_status = "moderator"; } @@ -937,15 +1635,20 @@ sub getrights { } close $f; last LEVEL if -f "$dir/.forum"; - # Strip last path component. - $dir =~s/\/[^\/]+$// } + # Strip last path component. + $dir =~s/\/[^\/]+$// } - return $user_status; + return $forum->{authenticated}{rights}=$user_status; } + +#------------------------------------------------------------------ +# РабоÑа Ñ Ñайлами и иденÑиÑикÑоÑами +#------------------------------------------------------------------ + # # ÐалоÑиÑÑ Ñайл и полÑÑиÑÑ ÐµÐ³Ð¾ ÑаÑпÑаÑенное пÑедÑÑавление. # ÐозвÑаÑÐ°ÐµÑ Ð¿Ð°ÑÑ ($tree,$lockfd) @@ -955,7 +1658,8 @@ sub gettree { my $f; open $f,"<",$filename or return undef; flock $f, LOCK_EX; - my $tree = HTML::TreeBuilder->new_from_file($f); + my $tree = treefromfile($f); + $tree->parse_file($f); return ($tree,$f); } # @@ -966,9 +1670,8 @@ sub gettree { sub savetree { my ($filename,$tree,$lockfd) = @_; my $f; - $filename = $1 if $filename =~ /^(.*)$/; open $f,">",$filename . ".new" or return undef; - print $f $tree->as_HTML("<>&"); + print $f output_html($tree); close $f; # FIXME - ÑолÑко Ð´Ð»Ñ POSIX. unlink $filename; @@ -976,8 +1679,61 @@ sub savetree { close $lockfd if defined($lockfd); } +sub discardtree { + my ($tree,$lockfd) = @_; + flock $lockfd,LOCK_UN; + close $lockfd; + $tree->delete; +} +# +# CеÑиализоваÑÑ HTML-докÑÐ¼ÐµÐ½Ñ Ñ DOCTYPE (workaround вокÑÑг баги в +# HTML::TreeBuilder) +# +sub output_html { + my $tree=shift; + return ''. + $tree->as_HTML("<>&"); +} +# +# ЧиÑÐ°ÐµÑ Ñаблон и подгоÑÐ°Ð²Ð»Ð¸Ð²Ð°ÐµÑ ÐµÐ³Ð¾ к ÑазмеÑÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñказанной URL. +# ÐÑли url не Ñказана, ÑÑиÑаеÑÑÑ ÑÑо Ñаблон бÑÐ´ÐµÑ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½ как ÑезÑлÑÑÐ°Ñ +# ÑекÑÑего http-запÑоÑа. + +sub gettemplate { + my ($forum, $template,$url) = @_; + $url =~ s/\/+/\//g if defined $url; + my $filename=$forum->{"templates"}."/$template.html"; + if (! -r $filename) { + show_error($forum,"ÐÐµÑ Ñаблона $template"); + exit; + } + my $tree = treefromfile($filename); + fix_forum_links($forum,$tree,$url); + return $tree; +} +# +# Ð¡Ð¾Ð·Ð´Ð°ÐµÑ Ð¾Ð±ÑÐµÐºÑ HTML::TreeBuilder и вÑÑÑавлÑÐµÑ ÑÑд опÑий. +# + +sub make_tree { + my $tree = HTML::TreeBuilder->new; + # Set some options for treebuilder + # Comments are neccessary to convert HTML back to BBCode + $tree->store_comments(1); + # Avoid converting html into one long-long string + $tree->ignore_ignorable_whitespace(0); + $tree->no_space_compacting(1); + $tree->p_strict(1); + return $tree; +} +sub treefromfile { + my ($f) = shift; + my $tree = make_tree(); + $tree->parse_file($f); + return $tree; +} # # ÐолÑÑÐ°ÐµÑ ÑникалÑнÑй ÑиÑловой иденÑиÑикаÑоÑ. # @@ -1000,12 +1756,13 @@ sub get_uid { sub create_openid_consumer { my ($cgi,$forum) = @_; return Net::OpenID::Consumer ->new( - ua => LWP::UserAgent->new(), + ua => LWP::UserAgent->new( agent => "Stilllife/1.0"), args => $cgi, consumer_secret=>"X9RWPo0rBE7yLja6VB3d", required_root => $cgi->url(-base=>1)); } + # openidstart - вÑзÑваеÑÑÑ ÐºÐ¾Ð³Ð´Ð° обнаÑÑжено ÑÑо ÑекÑÑее Ð¸Ð¼Ñ # полÑзоваÑелÑ, пÑÑаÑÑегоÑÑ Ð°ÑÑенÑиÑиÑиÑоваÑÑÑÑ, ÑодеÑÐ¶Ð¸Ñ http:// # @@ -1061,11 +1818,25 @@ sub openid_verify { my $username = $user; $username =~ s/^http:\/\///; if (!$userbase{$username}) { - $userbase{$username} = freeze($forum->{authenticated}={"openiduser"=>1}); + # ТаÑим foaf, еÑли полÑÑиÑÑÑ + my %info=get_foaf($csr->ua,$vident->declared_foaf); + if (ref($info{'avatar'}) eq "HASH" ) { + delete $info{'avatar'}{'type'}; + } + $info{"openiduser"}=1; + $info{"registered"}=time; + set_default_user_attrs($forum,\%info); + $info{'status'} = $forum->{openid_status} if $forum->{openid_status}; + $forum->{authenticated}=\%info; + $userbase{$username} = freeze(\%info); } else { $forum->{authenticated} = thaw ($userbase{$username}); } dbmclose %userbase; + if (defined $forum->{denied_status} && + ($forum->{authenticated}{status} eq $forum->{denied_status})) { + show_error($forum,"ÐÑ Ð¾Ð´ полÑзоваÑÐµÐ»Ñ $username в ÑиÑÑÐµÐ¼Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñован"); + } $forum->{"authenticated"}{"user"} = $username; newsession(undef,$forum,$user); # ÐÑли Ñказан паÑамеÑÑ reply, вÑзÑваем обÑабоÑÐºÑ Ñеплики @@ -1080,6 +1851,51 @@ sub openid_verify { exit; } } + +sub get_avatar_info { + my ($url,$ua) = @_; + $ua = LWP::UserAgent->new( agent => "Stilllife/1.0") unless $ua; + my $response = $ua->get($url); + if ($response->is_success) { + my $image = $response->content; + my ($w,$h,$type) = imgsize(\$image); + return {width=>$w,height=>$h,type=>$type,src=>$url}; + } else { + print STDERR "Error getting $url: ".$response->status_line,"\n"; + return undef; + } +} + +sub get_foaf { + my ($ua,$foaf_url) = @_; + my $response = $ua->get($foaf_url); + unless ($response->is_success) { + print STDERR "Error geting foaf from $foaf_url\n"; + return (); + } + my $foaf = $response->content; + my %info = foaf_parse($foaf); + if ($info{avatar}) { + $info{avatar} = get_avatar_info($info{avatar},$ua); + } + return %info; +} + +sub foaf_parse { + my $foaf = shift; + my ($starttag) = $foaf =~ /<(\w+(:\w+)?[^>]+)>/sg; + my %ns = reverse ($starttag =~ /xmlns:(\w+)="([^"]+)"/sg); + my $foaf_prefix = $ns{"http://xmlns.com/foaf/0.1/"}; + my $rdf_prefix = $ns{"http://www.w3.org/1999/02/22-rdf-syntax-ns#"}; + my ($userpic) = $foaf=~/<$foaf_prefix:img[^>]* $rdf_prefix:resource="([^"]+)"/s; + my @info; + push @info, avatar =>$userpic if $userpic; + my ($icq) = $foaf =~/<$foaf_prefix:icqChatID>([^<]*)<\/$foaf_prefix:icqChatID>/s; + push @info, icq => $icq if ($icq); + my ($jabber) = $foaf =~/<$foaf_prefix:jabberID>([^<]*)<\/$foaf_prefix:jabberID>/s; + push @info, jabber => $jabber if ($jabber); + return @info; +} #----------------------------------------------------------------- # ÐбÑабоÑка ÑоÑмаÑиÑованнÑÑ ÑекÑÑовÑÑ Ð¿Ð¾Ð»ÐµÐ¹ #----------------------------------------------------------------- @@ -1112,13 +1928,18 @@ sub input2tree { sub str2tree { my ($data)=@_; - my $tree = HTML::TreeBuilder->new(); + my $tree = make_tree(); + $tree->ignore_ignorable_whitespace(1); # Set parser options here $tree->parse("