X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=forum%2Fforum;h=8c966e93bec89259db459e407268233edc289762;hb=577989dad1f989210c7b3a7a6917c08ae3b95c8b;hp=9f12ad841445c91abe6aa7519661e8fef9b86df5;hpb=809e934942f2d61eb11e7ce0461e8854cc72c8c5;p=oss%2Fstilllife.git
diff --git a/forum/forum b/forum/forum
index 9f12ad8..8c966e9 100755
--- a/forum/forum
+++ b/forum/forum
@@ -28,99 +28,48 @@ use Net::OpenID::Consumer;
# ÐÐ°Ð±Ð¾Ñ Ð¿Ð¾Ð´Ð´ÐµÑживаемÑÑ
дейÑÑвий. Ð¥ÑÑ Ð²Ð¸Ð´Ð°
# "Ð¸Ð¼Ñ Ð¿Ð¾Ð»Ñ Ð² запÑоÑе" => "ÑÑнкÑÐ¸Ñ Ð¾Ð±ÑабоÑÑик"
#
-my %actions = (
- reply => \&reply,
- edit => \&edit_comment,
- delete => \&delete_comment,
- move => \&move_comment,
- newtopic=> \&new_topic,
- newforum=> \&new_forum,
- login => \&login,
- register=>\®ister,
- profile=>\&profile,
- setrights=>\&set_rights,
- openidlogin=>\&openid_login,
- openidvfy =>\&openid_verify
+my @actions = (
+ {name=>"openidvfy",GET=>\&openid_verify,POST=>\&openid_verify},
+ {name=>"logout",GET=>\&logout,POST=>\&logout},
+ {name=>"reply", POST => \&reply, GET=>\&show_template,rights=>"login"},
+ {name=>"edit", POST => \&edit_item, GET=>\&show_editable,rights=>"author"},
+ {name=>"delete",POST => \&delete_item, GET=>\&delete_item,rights=>"author"},
+ {name=>"move",POST => \&move_item, GET=>\&show_move_dest,rights=>"moderator"},
+ {name=>"newtopic",POST=> \&new_topic,GET=>\&show_template,rights=>"normal"},
+ {name=>"newforum",POST=> \&new_forum,GET=>\&show_template,rights=>"moderator"},
+ {name=>"login",POST => \&login,GET=>\&show_template},
+ {name=>"register",POST=>\®ister,GET=>\&show_template},
+ {name=>"profile",POST=>\&profile,GET=>\&show_profile,rights=>"normal"},
+ {name=>"setrights",POST=>\&set_rights,GET=>\&show_rights,rights=>"admin"},
+ {name=>"reapply",POST=>\&apply_templates,GET=>\&apply_templates,rights=>"admin"}
);
#
-# УÑÐ¾Ð²ÐµÐ½Ñ Ð¿Ñав, коÑоÑÑе необÑ
одимо имеÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð´Ð»Ñ ÑовеÑÑениÑ
-# опÑеделенного дейÑÑвиÑ
-# иеÑаÑÑ
Ð¸Ñ Ð²Ð¸Ð´Ð° undef < banned < normal < author < moderator "login",
- edit => "author",
- delete => "author",
- newtopic => "normal",
- move => "moderator",
- newforum => "moderator",
- 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. Ðадо показаÑÑ ÑоÑмÑ, еÑли ÑолÑко ÑÑо не
-# ÑедиÑÐµÐºÑ Ð¾Ñ OpenId-ÑеÑвеÑа
- if ($cgi->param('openidvfy')) {
- openid_verify($cgi,$forum);
- } elsif ($cgi->param("logout")) {
- logout('logout',$cgi,$forum);
- } else {
- for my $param ($cgi->param) {
-# СÑеди паÑамеÑÑов, ÑказаннÑÑ
в URL иÑем ÑоÑ, коÑоÑÑй задаеÑ
-# дейÑÑвие
- if (exists $actions{$param}) {
-# ÐÑ, конеÑно Ñже пÑовеÑили, ÑÑо в названии паÑамеÑÑа
-# неÑ
оÑоÑиÑ
Ñимволов неÑ, но ÑÑÐ¾Ð±Ñ 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 {
- if (!$forum->{"authenticated"}) {
- $cgi->param("returnto",$cgi->url(-full=>1));
- show_template("login",$cgi,$forum);
- exit;
-
- } else {
- show_error($forum,"У ÐÐ°Ñ Ð½ÐµÑ Ð¿Ñав на вÑполнение ÑÑой
- опеÑаÑии")
- }
- }
- }
- }
- if (index($path_translated,$forum->{userdir})==0) {
- show_user_page($cgi,$forum);
- }
- show_error($forum,"ÐекоÑÑекÑнÑй вÑзов ÑкÑипÑа. ÐÑÑÑÑÑÑвÑÐµÑ Ð¿Ð°ÑамеÑÑ
- дейÑÑвиÑ");
- }
-} else {
- # ÐапÑÐ¾Ñ Ð¼ÐµÑодом POST. ÐÑзÑваем обÑабоÑÑик
- for my $param ($cgi->param) {
- if (exists $actions{$param}) {
- if (allow_operation($param,$cgi,$forum)) {
- $actions{$param}->($param,$cgi,$forum);
- exit;
- } else {
- show_error($forum,"У ÐÐ°Ñ Ð½ÐµÑ Ð¿Ñав на вÑполнение ÑÑой
- опеÑаÑии")
- }
-
+my $method = $cgi->request_method;
+$method = "GET" if ($method eq "HEAD");
+for my $action (@actions) {
+ if ($cgi->param($action->{name})) {
+ if (allow_operation($action,$cgi,$forum)) {
+ $action->{$method}->($action->{name},$cgi,$forum);
+ } elsif (!$forum->{"authenticated"}) {
+ $cgi->param("returnto",$cgi->url(-full=>1));
+ show_template("login",$cgi,$forum);
+ } else {
+ show_error($forum,"У ÐÐ°Ñ Ð½ÐµÑ Ð¿Ñав на вÑполнение ÑÑой опеÑаÑии")
}
}
- print STDERR "ÐолÑÑÐµÐ½Ñ Ð¿Ð°ÑамеÑÑÑ ",join(" ",$cgi->param),"\n";
- show_error($forum,"ÐекоÑÑекÑнÑй вÑзов ÑкÑипÑа. ÐÑÑÑÑÑÑвÑÐµÑ Ð¿Ð°ÑамеÑÑ Ð´ÐµÐ¹ÑÑвиÑ");
}
+if (index($path_translated,$forum->{userdir})==0) {
+ show_user_page($cgi,$forum);
+}
+show_error($forum,"ÐекоÑÑекÑнÑй вÑзов ÑкÑипÑа. ÐÑÑÑÑÑÑвÑÐµÑ Ð¿Ð°ÑамеÑÑ
+ дейÑÑвиÑ");
+
#--------------------------------------------------------------
#-------- ЧÑение конÑигÑÑаÑионного Ñайла и ÑвÑзаннÑе Ñ ÑÑим дейÑÑвиÑ
@@ -165,7 +114,6 @@ sub get_forum_config {
$path_translated=~s/\/+$//;
my @path=split("/",$path_translated);
while (@path>1) {
- print STDERR "Searching for config in ",join("/",@path),"\n";
if (-r (my $config=join("/",@path,".forum")) ) {
open F,"<",$config;
my %config;
@@ -243,7 +191,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) {
@@ -254,12 +202,12 @@ 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 "ÐÑибка конÑигÑÑаÑии ÑоÑÑма",
"ÐÑибка конÑигÑÑаÑии ÑоÑÑма
",
- $cgi->escapeHTML($msg),"
",
+ escapeHTML($msg),"
",
"ÐÑи обÑабоÑке ÑÑой оÑибки не обнаÑÑжен Ñаблон ÑообÑÐµÐ½Ð¸Ñ Ð¾Ð± оÑибке
";
}
exit;
@@ -272,6 +220,18 @@ sub show_error {
# подÑÑавлÑÑÑÑÑ
#
sub show_template {
+ my $tree = prepare_template(@_);
+ send_to_user($tree,@_);
+ exit;
+}
+sub send_to_user {
+ my ($tree,$form,$cgi,$forum) = @_;
+ print
+ $cgi->header(-type=>"text/html",-charset=>"utf-8",($forum->{cookies}?(-cookie=>$forum->{cookies}):())),
+ output_html($tree);
+ exit;
+}
+sub prepare_template {
my ($form,$cgi,$forum) = @_;
my $tree = gettemplate($forum,$form,$ENV{'PATH_INFO'});
@@ -315,20 +275,19 @@ sub show_template {
for my $element ($f->find_by_tag_name("textarea","input","select")) {
my $name = $element->attr("name");
$substituted{$name} = 1;
- #print STDERR "substituting form element name $name tag ",$element->tag,
- # "value='",$cgi->param($name),"'\n";
if (defined $cgi->param($name)) {
if ($element->tag eq "input") {
- next ELEMENT if grep ($element->attr("type") eq
- $_,"button","submit","reset");
- if ($element->attr("type") eq "check") {
+ my $type=$element->attr('type') || "text";
+ next ELEMENT if grep($type eq $_,
+ "button","submit","reset");
+ if ($type eq "check") {
if (grep($element->attr("value") eq $_,$cgi->param($name))) {
$element->attr("checked","");
} else {
$element->attr("checked",undef);
}
- } elsif ($element->attr("type") eq
+ } elsif ($type eq
"radio") {
if ($element->attr("value") eq $cgi->param($name)) {
$element->attr("checked","");
@@ -339,12 +298,26 @@ sub show_template {
$element->attr("value",$cgi->param($name));
}
} elsif ($element->tag eq "textarea") {
+ my $data=$cgi->param($name);
+ if ($data=~/^<(div|p)\b/ && !defined($cgi->param($name."_format"))) {
+ if ($data=~/^(.*)<\/div>$/) {
+ $cgi->param($name."_format","bbcode");
+ my $parser = HTML::BBReverse->new();
+ $data = $parser->reverse($1);
+ # FIXME elsif ($data=~/
)
+ } 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")) {
- if (grep($option->attr("value") eq $_, $cgi->param($name))) {
- $option->attr("selected","");
+ my $value = $option->attr("value") ||
+ $option->as_text();
+ if (grep($value eq $_, $cgi->param($name))) {
+ $option->attr("selected","selected");
} else {
$option->attr("selected",undef);
}
@@ -363,13 +336,8 @@ sub show_template {
$f->push_content($element);
}
}
-
-
- print
- $cgi->header(-type=>"text/html",-charset=>"utf-8",($forum->{cookies}?(-cookie=>$forum->{cookies}):())),
- $tree->as_HTML("<>&");
- exit;
-}
+ return $tree;
+}
#
# ÐопÑавлÑÐµÑ ÑÑÑлки на ÑлÑжебнÑе ÑÐ°Ð¹Ð»Ñ Ð¸ ÑкÑипÑÑ ÑоÑÑма
#
@@ -392,10 +360,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);
@@ -408,6 +377,11 @@ sub fix_forum_links {
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}) ;
@@ -416,13 +390,26 @@ 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
}
$element->attr($attr,$link);
}
}
+sub makeuserlink {
+ my ($forum,$tree,$linkclass,$userinfo) = @_;
+
+ my $userpage;
+ if ($userinfo->{"openiduser"}) {
+ $userpage = "http://".$userinfo->{"user"};
+ } else {
+ $userpage =
+ $cgi->url(-absolute=>1).$forum->{"userurl"}."/".$cgi->escape($userinfo->{"user"});
+ }
+ substinfo($tree,["_tag"=>"a","class"=>$linkclass],
+ href=>$userpage,_content=>$userinfo->{"user"});
+}
#
# ÐодÑÑавлÑÐµÑ Ð² заданное поддеÑево инÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑеле
#
@@ -441,15 +428,7 @@ if (defined $user) {
#
# СпеÑиалÑно обÑабаÑÑваем Ð¿Ð¾Ð»Ñ user (должна бÑÑÑ ÑÑÑлка) и avatar
# (должен бÑÑÑ img).
- my $userpage;
- if ($userinfo{"openiduser"}) {
- $userpage = "http://".$userinfo{"user"};
- } else {
- $userpage =
- $cgi->url(-absolute=>1).$forum->{"userurl"}."/".$cgi->escape($userinfo{"user"});
- }
- substinfo($tree,["_tag"=>"a","class"=>"author"],
- href=>$userpage,_content=>$userinfo{"user"});
+ makeuserlink($forum,$tree,"author",\%userinfo);
delete $userinfo{"user"};
if (ref $userinfo{"avatar"} eq "HASH") {
substinfo($tree,["_tag"=>"img","class"=>"avatar"],
@@ -462,7 +441,6 @@ if (defined $user) {
src=>$forum->{templatesurl}."/1x1.gif",
width=>1,height=>1);
}
- delete $userinfo{"avatar"};
for my $element ( $tree->look_down("class",qr/^ap-/)) {
my $field=$1 if $element->attr("class")=~/^ap-(.*)$/;
@@ -475,15 +453,12 @@ if (defined $user) {
my $data;
if ($field eq "registered" || substr($field,0,5) eq "last_") {
$data = strftime("%d.%m.%Y %H:%M",localtime($userinfo{$field}))
- } elsif ($field=~/^<\w+/) {
+ } elsif ($userinfo{$field}=~/^<\w+/) {
$data = str2tree($userinfo{$field});
} else {
$data = $userinfo{$field}
}
$element->push_content($data);
- if (ref($data)) {
- $data->delete;
- }
$element->attr(href=>"mailto:$userinfo{$field}")
if ($element->tag eq "a" && $field eq "email");
}
@@ -497,7 +472,7 @@ if (defined $user) {
#
sub authorize_user {
- ($cgi,$forum) = @_;
+ my ($cgi,$forum) = @_;
if (my $session=$cgi->cookie("slsession")) {
# ÐолÑзоваÑÐµÐ»Ñ Ð¸Ð¼ÐµÐµÑ ÐºÑкÑ
my %sessbase;
@@ -515,7 +490,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;
@@ -649,11 +623,131 @@ 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));
+ if ($value =~/^<(div|p)\b/) {
+ my $tree = str2tree($value);
+ tree2input($cgi,$field,$tree);
+ $tree->delete;
+ } else {
+ $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);
+}
+#
# ÐбÑабоÑка ÑезÑлÑÑаÑов Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑоÑÐ¼Ñ ÑегиÑÑÑаÑии.
#
#
@@ -684,6 +778,7 @@ sub register {
}
}
}
+ $cgi->delete("required");
my %userbase;
dbmopen %userbase,datafile($forum,"passwd"),0644
or form_error($formname,$cgi,$forum,"ÐÑибка оÑкÑÑÑÐ¸Ñ Ñайла паÑолей $!");
@@ -691,77 +786,87 @@ 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;
- binmode $out,":bytes";
- my $buffer;
- while (my $bytes = read($f,$buffer,4096)) {
- print $out $buffer;
- }
- close $f;
- close $out;
- my ($w,$h) = imgsize($forum->{"userdir"}."/".$filename);
- $userinfo->{'avatar'}= {src=>$forum->{"userurl"}."/".$filename,
+ my $filename =
+ (save_attached_images($cgi,$forum,$forum->{userdir},"${userprefix}_%f",
+ "avatarfile"))[1];
+ my $path = $forum->{"userdir"}."/".$filename;
+ my ($w,$h) = imgsize($path);
+ $userinfo->{'avatar'}= {src=>$forum->{"userurl"}."/".$userprefix."_".$filename,
width=>$w,height=>$h};
- $cgi->delete("avatar");
- $cgi->delete("avatarfile");
+ } 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 = split /\s*,\s*/, $forum->{restricted_user_info};
- set_default_user_attrs($forum,$userinfo);
+ my @restrict=();
+ @restrict = split /\s*,\s*/, $forum->{restricted_user_info}
+ unless $isadmin;
+
foreach my $param ($cgi->param) {
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();
+ if ($tree) {
+ $userinfo->{$param} = tree2str($tree);
+ $tree->delete();
+ } else {
+ delete $userinfo->{$param};
+ }
} else {
$userinfo->{$param} = $cgi->param($param);
}
}
- $userinfo->{registered} = time;
- if (exists $forum->{default_status}) {
- $userinfo->{status} = $forum->{default_status};
- }
- 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,$returnto);
- } else {
- # FIXME Email validation
- # Email to admin
- show_template("newuser",$cgi,$forum);
- }
+}
+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 {
@@ -791,7 +896,7 @@ sub show_user_page {
my $userinfo =thaw($base{$user});
$userinfo->{"user"} = $user;
substitute_user_info($block,$forum,$userinfo);
- profile_links($block,$user,$rights,$forum);
+ profile_links($block,$user,$rights,$cgi,$forum);
}
$usertpl->delete;
} else {
@@ -805,7 +910,7 @@ sub show_user_page {
$tree = gettemplate($forum,"user");
substinfo($tree,[_tag=>"title"],_content=>"Stilllife user: $user");
substitute_user_info($tree,$forum,$userinfo);
- profile_links($tree,$user,$rights,$forum);
+ profile_links($tree,$user,$rights,$cgi,$forum);
unless ($userinfo->{openiduser}) {
for my $userlink ($tree->look_down(_tag => "a",class=>"author")) {
$userlink->attr("href",undef);
@@ -813,23 +918,22 @@ sub show_user_page {
}
}
}
- my $page =
- $tree->as_HTML("<>&");
+ 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,$forum)=@_;
+ 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->{autheticated}{user} &&
+ (defined $forum->{authenticated}{user} &&
$forum->{authenticated}{user} eq $user)) {
$profile_link->attr("href",
- $cgi->url(-absolute=>1,-path_info=>0).$forum->{userurl}.
+ $ENV{'SCRIPT_NAME'}.$forum->{userurl}.
"/".$user."?profile=1");
} else {
$profile_link->delete();
@@ -871,24 +975,18 @@ sub logout {
}
sub allow_operation {
my ($operation,$cgi,$forum) = @_;
- return 1 if (!exists($permissions{$operation}));
+ return 1 if (!exists($operation->{rights}));
if (!$forum->{authenticated}) {
- return 1 if ($permissions{$operation} eq "login");
+ return 1 if ($operation->{rights} eq "login");
return 0;
}
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 0 if ($operation->{rights} 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;
}
@@ -905,13 +1003,12 @@ sub reply {
if (!$newmsg) {
show_error($forum,"Шаблон ÑÐµÐ¼Ñ Ð½Ðµ ÑодеÑÐ¶Ð¸Ñ ÑлеменÑа Ñ ÐºÐ»Ð°ÑÑом
message");
- exit;
}
#
# ÐенеÑиÑÑем иденÑиÑикаÑÐ¾Ñ Ð·Ð°Ð¿Ð¸Ñи.
#
- my $id = get_uid($forum);
+ my $id = "m".get_uid($forum);
#
@@ -920,25 +1017,8 @@ sub reply {
my $dir = $path_translated;
$dir=~ s/[^\/]+$// if (-f $dir);
- my %attached;
- for (my $i=1;$cgi->param("image$i"); $i++) {
- my $userpath=$cgi->param("image$i");
- my $filename=lc($1) if $userpath =~ /([^\/\\]+)$/;
- $attached{$filename} = $id."_".$filename;
- my $in = $cgi->upload("image$i");
- if (!$in) {
- show_error($forum,"ÐÑибка пÑи загÑÑзке каÑÑинки $filename");
- exit;
- }
- my $out;
- open $out,">$dir/$attached{$filename}";
- binmode $out,":bytes";
- local $/=undef;
- my $data = <$in>;
- print $out $data;
- close $in;
- close $out;
- }
+ my %attached=save_attached_images($cgi,$forum,$dir,"${id}_%f",
+ grep(/^image\d+/,$cgi->param));
#
# ÐÑеобÑазÑем ÑекÑÑ Ð·Ð°Ð¿Ð¸Ñи в html и ÑиÑÑим его
#
@@ -947,15 +1027,7 @@ sub reply {
# ÐаÑ
одим в ÑекÑÑе URL на пÑиаÑÑаÑеннÑе каÑÑинки и менÑем на Ñе
# имена, под коÑоÑÑми Ð¼Ñ Ð¸Ñ
ÑоÑ
Ñанили.
#
- for my $image ($txtree->find_by_tag_name("img")) {
- my $file=lc($image->attr("src"));
- if ( exists $attached{$file}) {
- $image->attr("src" => $attached{$file});
- my ($width,$height) = imgsize($dir ."/".$attached{$file});
- $image->attr("width" =>$width);
- $image->attr("height" => $height);
- }
- }
+ fix_image_links($txtree,\%attached,$dir);
#
# ÐодÑÑавлÑем даннÑе ÑообÑениÑ
#
@@ -984,8 +1056,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");
@@ -995,7 +1068,7 @@ 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) {
@@ -1005,15 +1078,213 @@ sub reply {
substinfo($newmsg,[_tag => "a",class=>"mparent"],
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"),
- forum_redirect($cgi,$forum);
-
+ update_topic_list($forum,$path_translated,$msgcount,$posted);
+ forum_redirect($cgi,$forum,$cgi->path_info."#$id");
+}
+sub fix_image_links {
+ my ($txtree,$attached,$dir) =@_;
+ for my $image ($txtree->find_by_tag_name("img")) {
+ my $file=lc($image->attr("src"));
+ if ( exists $attached->{$file}) {
+ $image->attr("src" => $attached->{$file});
+ my ($width,$height) = imgsize($dir ."/".$attached->{$file});
+ $image->attr("width" =>$width);
+ $image->attr("height" => $height);
+ }
+ }
+}
+sub save_attached_images {
+ my ($cgi,$forum,$dir,$nametemplate,@params) = @_;
+ my %attached;
+ for my $param (@params) {
+ my $userpath=$cgi->param($param);
+ next unless $userpath;
+ my $filename=lc($1) if $userpath =~ /([^\/\\]+)$/;
+ my $ext = $1 if $filename =~/([^.]+)$/;
+ my %subst=(f=>$filename,e=>$ext);
+ $attached{$filename} = $nametemplate;
+ $attached{$filename}=~s/\%([fe])/$subst{$1}/eg;
+ my $in = $cgi->upload($param);
+ if (!$in) {
+ show_error($forum,"ÐÑибка пÑи загÑÑзке каÑÑинки $filename");
+ exit;
+ }
+ my $out;
+ open $out,">$dir/$attached{$filename}";
+ binmode $out,":bytes";
+ local $/=undef;
+ my $data = <$in>;
+ print $out $data;
+ close $in;
+ close $out;
+ }
+ return %attached;
+
+}
+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 $old_copy = $msglist->look_down(id=>$msg->attr("id"));
+ if ($old_copy) {
+ $old_copy->replace_with($msg)->delete;
+ } else {
+ my $style = $msglist->attr("style");
+ 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 getperms {
+ my $dir = shift;
+ local $_;
+ my $key;
+ my %users=(admins=>"",moderators=>"",banned=>"");
+ if (open F,"<",$dir."/perms.txt") {
+ while () {
+ next if /^\s*$/;
+ next if /^\s*#/;
+ if (/^\s*\[\s*(\w+)\s*\]\s*$/) {
+ $key = $1;
+ } else {
+ $users{$key} .= $_ if ($key);
+ }
+ }
+ close F;
+ }
+ return %users;
+}
+#
+# ÐÐ·Ð²Ð»ÐµÐºÐ°ÐµÑ Ð¸Ð· Ñказанного html Ñайла ÑодеÑжимое ÑÑга title
+#
+sub gettitle {
+our $gettitle_flag=0;
+our $gettitle_text="";
+
+ open F,"<",shift or return undef;
+ my $parser = HTML::Parser->new(api_version=>3,
+ text_h=>[sub { $gettitle_text .=
+ shift if $gettitle_flag;}, "dtext"],
+ start_h=>[sub { $gettitle_flag =1 if $_[0] eq 'title'}, "tagname" ],
+ end_h => [sub { $_[1]->eof if $_[0] eq 'title'}, "tagname, self" ]);
+ while (!eof F) {
+ my $data;
+ read F,$data,4096;
+ $parser->parse($data) or last;
+ }
+ return $gettitle_text;
+}
+
+#
+# Ðоказ ÑоÑÐ¼Ñ ÑеакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñав
+#
+
+sub show_rights {
+ my ($form,$cgi,$forum) = @_;
+ # ÐолÑÑаем ÑекÑÑие пÑава доÑÑÑпа
+ my %users=getperms($path_translated);
+ while (my($key,$val) = each %users) {
+ $cgi->param($key,$val);
+ }
+
+ my $tree = prepare_template(@_);
+ # ÐÑобегаемÑÑ Ð²Ð²ÐµÑÑ
по деÑевÑ
+
+ hide_list($tree,"dirlist");
+ if ($path_translated ne $forum->{forumroot}) {
+ my $d = $path_translated;
+ my @dirs;
+ while ($d) {
+ # и полÑÑаем ÑпиÑок Ñайлов perms.txt
+ $d=~s/\/[^\/]+$//;
+ unshift @dirs,$d if -f "$d/perms.txt";
+ last if $d eq $forum->{forumroot};
+
+ }
+ # ÐодÑÑавлÑем иÑ
кÑда надо
+ for $d (@dirs) {
+ my %users = getperms($d);
+ my $title=gettitle($d."/".$forum->{indexfile});
+ my $item = newlistelement($tree,"dir","dirlist");
+ substinfo($item,[_tag => 'a',class=>'dirlink'],
+ href=>$d,_content=>$title);
+
+ substinfo($item,[_tag=>'a',class=>'rights'],
+ href=>$cgi->url(-absolute=>1,-path_info=>0).dir2url($cgi,$d)."?setrights=1");
+ while (my ($key,$val) = each %users) {
+ my @data = map {$_=>new HTML::Element("br")} split /\r?\n/, $val;
+ substinfo($item,[class=>$key],_content=>\@data);
+ }
+ }
+ }
+ my $f = $tree->look_down(_tag=>'form',name=>'setrights');
+ substinfo($f,[_tag=>'a',class=>'dirlink'],
+ href=>$cgi->path_info,
+ _content=>gettitle($path_translated."/".$forum->{indexfile}));
+ # ÐÑдаем ÑзеÑÑ.
+ send_to_user($tree,@_);
+}
+
+sub set_rights {
+ my ($form,$cgi,$forum) = @_;
+ my $newperm = "";
+ for my $section ('admins','moderators','banned') {
+ my $data = $cgi->param($section);
+ $data=~s/\r?\n/\n/gs;
+ $data.="\n" unless $data =~/\n$/s;
+ $newperm .= "[ $section ]\n$data";
+ }
+ if (replacefile($path_translated."/perms.txt",$newperm)) {
+ set_error($forum,"СпиÑки модеÑаÑоÑов Ñаздела обновленÑ");
+ }
+ show_rights(@_);
+}
+
#
# ÐбÑабоÑка опеÑаÑии ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ ÑемÑ.
#
@@ -1087,10 +1358,12 @@ sub new_topic {
$newtopic->attr("id",$urlname);
my $controlform = $newtopic->look_down(_tag=>"form",class=>"topicinfo");
if ($controlform) {
- $controlform->attr("action"=>$url);
+ $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);
@@ -1131,21 +1404,7 @@ sub new_forum {
#
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_name=(save_attached_images($cgi,$forum,$newname,"logo.%e","logo"))[1];
($logo_width,$logo_height) = imgsize("$newname/$logo_name");
} else {
$logo_name = $forum->{"templatesurl"}."/1x1.gif";
@@ -1159,8 +1418,15 @@ sub new_forum {
#
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);
@@ -1209,13 +1475,457 @@ sub new_forum {
$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);
}
-
+#
+# ÐбÑабоÑка опеÑаÑий, коÑоÑÑе вÑзÑваÑÑÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ð¾,
+# но вÑполнÑÑÑÑÑ Ð¿Ð¾-ÑÐ°Ð·Ð½Ð¾Ð¼Ñ Ð´Ð»Ñ ÑазнÑÑ
Ñипов обÑекÑов
+#
+# ÐаÑамеÑÑÑ $cgi,$forum, Ñип => ÑÑÑлка на ÑÑнкÑÐ¸Ñ ...
+# где Ñип - message, topic или forum. ÐпÑеделÑÐµÑ Ð¾Ð±ÑабаÑÑваемÑй обÑекÑ
+# и вÑзÑÐ²Ð°ÐµÑ ÑооÑвеÑÑÑвÑÑÑÑÑ ÑÑнÑкиÑ. ÐÐ¶Ð¸Ð´Ð°ÐµÑ ÑÑо ÑÑнкÑÐ¸Ñ Ð·Ð°Ð²ÐµÑÑиÑÑÑ
+#вÑзовом exit.
+sub dispatch_objtype {
+ my $cgi=shift;
+ my $forum = shift;
+ my %actions=@_;
+ if (-f $path_translated) {
+ if ($cgi->param("id")) {
+ $actions{"message"}->($cgi,$forum,$path_translated,$cgi->param("id"))
+ if exists($actions{'message'});
+ } else {
+ $actions{topic}->($cgi,$forum,$path_translated)
+ if exists($actions{'topic'});
+ }
+ } elsif (-d $path_translated && -f $path_translated ."/". $forum->{indexfile}) {
+ $actions{'forum'}->($cgi,$forum,$path_translated)
+ if exists($actions{'forum'});
+
+ }
+ return undef;
+}
+#Удаление
+sub delete_item {
+ my ($formname,$cgi,$forum) = @_;
+ #
+ # СнаÑала ÑазбеÑемÑÑ, ÑÑо Ð¼Ñ ÑобÑÑвенно ÑдалÑем
+ #
+ if ($cgi->param("user")) {
+ delete_user($cgi,$forum,$cgi->param("user"));
+ }
+ dispatch_objtype($cgi,$forum,topic=>\&delete_topic,
+ message=>\&delete_comment,
+ forum=>\&delete_forum);
+ show_error($forum,"Ðевозможно ÑдалиÑÑ Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ñй обÑекÑ");
+}
+# Ðоказ ÑоÑÐ¼Ñ ÑедакÑиÑованиÑ
+sub show_editable {
+ my ($formname,$cgi,$forum) = @_;
+ dispatch_objtype($cgi,$forum,"message"=>\&show_messageedit,
+ topic=>\&show_topicedit,
+ forum=>\&show_forumedit);
+ show_error($forum,"Ðевозможно ÑедакÑиÑоваÑÑ Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ñй обÑекÑ");
+}
+# ÐÑименение ÑезÑлÑÑаÑов ÑедакÑиÑованиÑ
+sub edit_item {
+ my ($formname,$cgi,$forum) = @_;
+ dispatch_objtype($cgi,$forum,"message"=>\&messageedit,
+ topic=>\&topicedit,
+ forum=>\&forumedit);
+ show_error($forum,"Ðевозможно ÑедакÑиÑоваÑÑ Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ñй обÑекÑ");
+}
+sub move_item {
+ my ($formname,$cgi,$forum) = @_;
+ dispatch_objtype($cgi,$forum,"message"=>\&move_message,
+ topic=>\&move_topic,
+ forum=>\&move_forum);
+ show_error($forum,"Ðевозможно пеÑемеÑÑиÑÑ Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ñй обÑекÑ");
+}
+sub show_move_dest {
+ my ($formname,$cgi,$forum) = @_;
+ dispatch_objtype($cgi,$forum,"message"=>\&show_move_message,
+ topic=>\&show_move_topic,
+ forum=>\&show_move_forum);
+ 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 moderator_or_author {
+ my ($cgi,$forum,$msg)=@_;
+ return 1 if getrights($cgi,$forum) eq "moderator"
+ || getrights($cgi,$forum) eq "admin";
+ my $author= $msg->look_down(_tag=>"input",name=>"author");
+ if ($author) {
+ return $author->attr("value") eq $forum->{authenticated}{user};
+ } elsif ($author = $msg->look_down(class=>"author",_tag=>"a")) {
+ return $author->as_text eq $forum->{authenticated}{user};
+ } else {
+ return undef;
+ }
+}
+#
+# Удаление Ñеплики
+#
+sub delete_comment {
+ my ($cgi,$forum,$topic,$id) = @_;
+ my ($tree,$lockfd) = gettree($topic);
+ my ($msg) = $tree->look_down(id => $id);
+ show_error($forum,"Рданной Ñеме Ð½ÐµÑ Ñеплики Ñ id=$id") if (!$msg);
+ show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на Ñдаление ÑÑого ÑообÑениÑ")
+ unless moderator_or_author($cgi,$forum,$msg);
+ 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($dir ."/".$forum->{indexfile},$tree);
+ 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($forum,"ÐелÑÐ·Ñ ÑдалÑÑÑ Ð½ÐµÐ¿ÑÑÑой ÑоÑÑм") 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 show_messageedit {
+ my ($cgi,$forum,$path,$id)=@_;
+ my ($tree,$lockfd) = gettree($path);
+ my $dirname = $path;
+ $dirname =~ s/\/[^\/]+$//;
+ my ($msg) = $tree->look_down(id => $id);
+ show_error($forum,"Рданной Ñеме Ð½ÐµÑ Ñеплики Ñ id=$id") if (!$msg);
+ show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на ÑедакÑиÑованиее ÑÑого ÑообÑениÑ")
+ unless moderator_or_author($cgi,$forum,$msg);
+ # ÐÑбиÑаем даннÑе ÑообÑениÑ
+ my ($text) = $msg->look_down(class=>"mtext")->content_list;
+ my ($subject) = $msg->look_down(class=>"subject");
+ tree2input($cgi,"text",$text);
+ $cgi->param("subject"=> $subject->as_text);
+ discardtree($tree,$lockfd);
+ # ÐодгоÑавливаем Ñаблон
+ my $form = prepare_template("edit_message",$cgi,$forum);
+ # ÐодÑÑавлÑем инÑоÑмаÑÐ¸Ñ Ð¾ каÑÑинкаÑ
.
+ opendir D,$dirname;
+ while ( my $filename=readdir D) {
+ next unless $filename =~/^${id}_/;
+ my $pic = "$dirname/$filename";
+ my $picitem = newlistelement($form,"picture","picturelist");
+ my ($w,$h) = imgsize($pic);
+ substinfo($picitem,[_tag=>"img", class=>"msgpicture"],
+ src=>dir2url($cgi,$pic),width=>$w,height=>$h);
+ substinfo($picitem,[_tag=>"input",name=>"delpicture"],
+ value=>$filename);
+ substinfo($picitem,[class=>"filename"],_content =>$filename);
+ }
+ closedir D;
+ send_to_user($form,"edit_message",$cgi,$forum);
+}
+# Ðоказ ÑÐµÐ¼Ñ Ð´Ð»Ñ ÑедакÑиÑованиÑ
+sub show_topicedit {
+ my ($cgi,$forum,$path)=@_;
+ my ($tree,$lockfd) = gettree($path);
+ my $dirname = $path;
+ $dirname =~ s/\/([^\/]+).html$//;
+ my $urlname=$1;
+ my $topic = $tree->look_down("class"=>"topic");
+ show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на ÑедакÑиÑованиее ÑÑой ÑемÑ")
+ unless moderator_or_author($cgi,$forum,$topic);
+ # ÐÑбиÑаем даннÑе ÑообÑениÑ
+ my ($text) = $topic->look_down(class=>"abstract")->content_list;
+ my ($subject) = $topic->look_down(class=>"title");
+ tree2input($cgi,"abstract",$text);
+ $cgi->param("title"=> $subject->as_text);
+ discardtree($tree,$lockfd);
+ # ÐодгоÑавливаем Ñаблон
+ my $form = prepare_template("edit_topic",$cgi,$forum);
+ # ÐодÑÑавлÑем инÑоÑмаÑÐ¸Ñ Ð¾Ð± URL.
+ substinfo($form,[class=>"urlname"],_content=>$urlname);
+ send_to_user($form,"edit_topic",$cgi,$form);
+}
+# Ðоказ ÑоÑÑма Ð´Ð»Ñ ÑедакÑиÑованиÑ
+sub show_forumedit {
+ my ($cgi,$forum,$path) = @_;
+ show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на ÑедакÑиÑованиее ÑÑого ÑоÑÑма")
+ unless (getrights($cgi,$forum) eq 'moderator' || getrights($cgi,$forum) eq
+ 'admin');
+
+ my ($tree,$lockfd) = gettree($path."/".$forum->{indexfile});
+ my $dirname = $path;
+ $dirname =~ s/\/([^\/]+)$//;
+ my $urlname=$1;
+ my $anno = $tree->look_down("class"=>"annotation");
+ # ÐÑбиÑаем даннÑе ÑообÑениÑ
+ my ($text) = $anno->look_down(class=>"abstract")->content_list;
+ my ($subject) = $anno->look_down(class=>"title");
+ tree2input($cgi,"abstract",$text);
+ $cgi->param("title"=> $subject->as_text);
+ discardtree($tree,$lockfd);
+ # ÐодгоÑавливаем Ñаблон
+ my $form = prepare_template("edit_forum",$cgi,$forum);
+ # ÐодÑÑавлÑем инÑоÑмаÑÐ¸Ñ Ð¾Ð± URL.
+ substinfo($form,[class=>"urlname"],_content=>$urlname);
+ # ÐодÑÑавлÑем логоÑип
+ opendir D,$path;
+ my $logo=0;
+ while (my $file = readdir(D)) {
+ next unless $file =~ /^logo.\w+$/;
+ my ($w,$h) = imgsize($path."/".$file);
+ substinfo ($form,[_tag =>"img",class=>"logo"],
+ src=>$cgi->path_info."/".$file,
+ width=>$w,
+ height=>$h);
+ substinfo($form,[_tag=>"input",
+ name=>"delpicture"],value=>$file);
+ $logo=1;
+ last;
+ }
+ closedir D;
+ unless ($logo) {
+ substinfo($form,[class=>"picture"],
+ style=>"display: none;");
+ }
+ send_to_user($form,"edit_forum",$cgi,$form);
+}
+
+sub messageedit {
+ my ($cgi,$forum,$topic,$id) = @_;
+ my ($tree,$lockfd) = gettree($path_translated);
+ my ($msg) = $tree->look_down(id=>$id);
+ show_error($forum,"Рданной Ñеме Ð½ÐµÑ Ñеплики Ñ id=$id") if (!$msg);
+ show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на ÑедакÑиÑованиее ÑÑого ÑообÑениÑ")
+ unless moderator_or_author($cgi,$forum,$msg);
+ # ÐбÑабоÑка каÑÑинок
+ my ($dirname,$topic_id)=($1,$2) if $path_translated=~/(.+)\/([^\/]+).html/;
+ # 1. УдалÑем помеÑеннÑе как ÑаковÑе
+ for my $file ($cgi->param("delpictire")) {
+ unlink $dirname."/".$file;
+ }
+ # 2. СоÑ
ÑанÑем ÑвежепÑиаÑÑаÑеннÑе
+ my %attached=save_attached_images($cgi,$forum,$dirname,"${id}_%f",grep(/^image\d+/,$cgi->param));
+
+ # ÐÑеобÑазÑем ÑекÑÑ Ð² html
+ my $txtree = input2tree($cgi,$forum,"text");
+ fix_image_links($txtree,\%attached,$dirname);
+ my $edited = strftime("%d.%m.%Y %H:%M",localtime());
+ substinfo($msg,[class=>"subject"],_content=>$cgi->param("subject"));
+ substinfo($msg,[class=>"editdate"],_content=>$edited);
+ makeuserlink($forum,$msg,"editor",$forum->{authenticated});
+ unhide_list($msg,"edited");
+ my $textnode = $msg->look_down(class=>"mtext");
+ my ($old_text)=$textnode->splice_content(0,1,$txtree);
+ $old_text->delete;
+ $msg = $msg->clone;
+ my @msgs = $tree->look_down(class=>"message");
+ my $msgcount=@msgs;
+ savetree($path_translated,$tree,$lockfd);
+ record_as_recent($forum,$msg);
+ update_topic_list($forum,$path_translated,$msgcount,$edited);
+ forum_redirect($cgi,$forum,$cgi->url(-base=>1).$cgi->path_info()."#$id");
+}
+
+
+sub topicedit {
+ my ($cgi,$forum,$topic) = @_;
+ show_error($forum,"ÐÐµÑ Ñакой ÑÐµÐ¼Ñ ".$cgi->path_info)
+ if (!-f $path_translated);
+ show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на ÑедакÑиÑованиее ÑÑой ÑемÑ")
+ unless moderator_or_author($cgi,$forum,$topic);
+ form_error("edit_topic",$cgi,$forum,"Тема должна имеÑÑ Ð½ÐµÐ¿ÑÑÑое название")
+ if (!$cgi->param("title"));
+ my $abstract = input2tree($cgi,$forum,"abstract");
+ my ($tree,$lockfd) = gettree($path_translated);
+ my $subtree = $tree->look_down("class"=>"topic");
+ if ($subtree) {
+ substinfo($subtree,["class"=>"title"],
+ _content=>$cgi->param("title"));
+ # ÐÑÑавлÑем в ÑÑÑаниÑÑ ÐÐÐÐЮ анноÑаÑии, поÑколÑÐºÑ Ð°Ð½Ð½Ð¾ÑаÑиÑ
+ # нам еÑе понадобиÑÑÑ Ð² ÑпиÑке Ñем.
+ substinfo($subtree,["class"=>"abstract"],_content=>$abstract->clone);
+ } else {
+ substinfo($tree,["class"=>"title"],
+ _content=>$cgi->param("title"));
+ }
+ savetree($path_translated,$tree,$lockfd);
+ $tree->destroy;
+ my ($dir,$id) = ($1,$2) if $path_translated=~/^(.*)\/([^\/]+).html$/;
+ ($tree,$lockfd) = gettree($dir."/".$forum->{indexfile});
+ my $item = $tree->look_down(id=>$id);
+ substinfo($item,[_tag=>"a","class"=>"title"],
+ _content=>$cgi->param("title"));
+ substinfo($item,["class"=>"abstract"],_content=>$abstract);
+ savetree($dir."/".$forum->{"indexfile"},$tree,$lockfd);
+ forum_redirect($cgi,$forum);
+}
+
+sub forumedit {
+ my ($cgi,$forum,$dir) = @_;
+ show_error($forum,"У Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на ÑедакÑиÑованиее ÑÑого ÑоÑÑма")
+ unless (getrights($cgi,$forum) eq 'moderator' || getrights($cgi,$forum) eq
+ 'admin');
+
+ if (!-d $path_translated) {
+ show_error($forum,"ÐпеÑаÑÐ¸Ñ ÑедакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑоÑÑÐ¼Ð°Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ñзвана ÑолÑко Ñо
+ ÑÑÑаниÑÑ ÑоÑÑма");
+ }
+ if (!$cgi->param("title")) {
+ form_error("edit_forum",$cgi,$forum,"ФоÑÑм должен имеÑÑ Ð½ÐµÐ¿ÑÑÑое название");
+ }
+ my ($logo_name,$logo_width,$logo_height);
+ if ($cgi->param("delpicture")) {
+ # УдалÑем ÑÑаÑÑй логоÑип
+ unlink $path_translated ."/".$cgi->param("delpicture");
+ $logo_name = $forum->{"templatesurl"}."/1x1.gif";
+ $logo_width = 1;
+ $logo_height=1;
+ }
+ if ($cgi->param("logo")) {
+ # УдалÑем вÑе, ÑÑо поÑ
оже на логоÑип
+ opendir D, $path_translated;
+ for my $f (readdir(D)) {
+ next unless -f $path_translated."/".$f && $f=~/^logo\.\w+$/;
+ unlink $path_translated."/".$f;
+ }
+ closedir D;
+ $logo_name=(save_attached_images($cgi,$forum,$path_translated,"logo.%e","logo"))[1];
+ ($logo_width,$logo_height) = imgsize("$path_translated/$logo_name");
+ }
+ my ($tree,$lockfd) = gettree($path_translated . "/".$forum->{indexfile});
+ 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");
+ substinfo($subtree,["class"=>"title"],
+ _content=>$cgi->param("title"));
+ # ÐÑÑавлÑем в ÑÑÑаниÑÑ ÐÐÐÐЮ анноÑаÑии, поÑколÑÐºÑ Ð°Ð½Ð½Ð¾ÑаÑиÑ
+ # нам еÑе понадобиÑÑÑ Ð² ÑпиÑке Ñем.
+ substinfo($subtree,["class"=>"abstract"],_content=>$abstract->clone);
+ substinfo($subtree,[_tag=>"img","class"=>"logo"],
+ src=> $logo_name, width=>$logo_width, height=>$logo_height)
+ if defined($logo_name);
+ savetree($path_translated ."/".$forum->{indexfile},$tree,$lockfd);
+ $tree->destroy;
+ if ($path_translated ne $forum->{forumroot}) {
+ my ($updir,$id) = ($1,$2) if $path_translated=~/^(.*)\/([^\/]+)$/;
+ ($tree,$lockfd) = gettree($updir . "/".$forum->{indexfile});
+ my $item = $tree->look_down(id=>$id);
+ substinfo($item,[_tag=>"a","class"=>"title"],
+ _content=>$cgi->param("title"));
+ substinfo($item,["class"=>"abstract"],_content=>$abstract);
+ substinfo($item,[_tag=>"img","class"=>"logo"],src=>"$id/$logo_name",
+ width=>$logo_width,height=>$logo_height) if $logo_name;
+ savetree($updir."/".$forum->{"indexfile"},$tree,$lockfd);
+ }
+ forum_redirect($cgi,$forum);
+}
+
#----------------------------------------------------------
# Ðаза полÑзоваÑелей и пÑава доÑÑÑпа
#----------------------------------------------------------
@@ -1244,6 +1954,8 @@ sub getrights {
if (!$forum->{authenticated}) {
return undef;
}
+ return $forum->{authenticated}{rights} if
+ exists $forum->{authenticated}{rights};
my $user = $forum->{authenticated}{user};
my $dir = $path_translated;
$dir =~s/\/$//;
@@ -1252,7 +1964,6 @@ sub getrights {
my $user_status = "normal";
LEVEL:
while (length($dir)) {
- print STDERR "Searcghing for perms in $dir\n";
if (-f "$dir/perms.txt") {
open $f,"<","$dir/perms.txt";
my $status = undef;
@@ -1263,10 +1974,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";
}
@@ -1278,7 +1989,7 @@ sub getrights {
# Strip last path component.
$dir =~s/\/[^\/]+$//
}
- return $user_status;
+ return $forum->{authenticated}{rights}=$user_status;
}
@@ -1297,25 +2008,45 @@ 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);
return ($tree,$f);
}
#
# СоÑ
ÑаниÑÑ Ð´ÐµÑево и закÑÑÑÑ lockfd.
#
#
-
-sub savetree {
- my ($filename,$tree,$lockfd) = @_;
- my $f;
+sub replacefile {
+ my $filename = shift;
+ my $content = shift;
+ my $f;
open $f,">",$filename . ".new" or return undef;
- print $f $tree->as_HTML("<>&");
+ print $f $content;
close $f;
# FIXME - ÑолÑко Ð´Ð»Ñ POSIX.
unlink $filename;
rename $filename.".new",$filename;
+}
+sub savetree {
+ my ($filename,$tree,$lockfd) = @_;
+ replacefile($filename,output_html($tree));
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 не Ñказана, ÑÑиÑаеÑÑÑ ÑÑо Ñаблон бÑÐ´ÐµÑ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½ как ÑезÑлÑÑаÑ
@@ -1329,12 +2060,33 @@ sub gettemplate {
show_error($forum,"ÐÐµÑ Ñаблона $template");
exit;
}
- my $tree = HTML::TreeBuilder->new_from_file($filename);
+ 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;
+}
#
# ÐолÑÑÐ°ÐµÑ ÑникалÑнÑй ÑиÑловой иденÑиÑикаÑоÑ.
#
@@ -1363,6 +2115,7 @@ sub create_openid_consumer {
required_root => $cgi->url(-base=>1));
}
+
# openidstart - вÑзÑваеÑÑÑ ÐºÐ¾Ð³Ð´Ð° обнаÑÑжено ÑÑо ÑекÑÑее имÑ
# полÑзоваÑелÑ, пÑÑаÑÑегоÑÑ Ð°ÑÑенÑиÑиÑиÑоваÑÑÑÑ, ÑодеÑÐ¶Ð¸Ñ http://
#
@@ -1398,7 +2151,7 @@ sub openidstart {
# Ñеплики)
#
sub openid_verify {
- my ($cgi,$forum) = @_;
+ my ($action,$cgi,$forum) = @_;
my $csr = create_openid_consumer($cgi,$forum);
if (my $setup_url = $csr->user_setup_url) {
print $cgi->redirect(-location=>$setup_url);
@@ -1425,7 +2178,6 @@ sub openid_verify {
}
$info{"openiduser"}=1;
$info{"registered"}=time;
- print STDERR "forum $forum info ".\%info."\n";
set_default_user_attrs($forum,\%info);
$info{'status'} = $forum->{openid_status} if $forum->{openid_status};
$forum->{authenticated}=\%info;
@@ -1453,6 +2205,20 @@ sub openid_verify {
}
}
+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);
@@ -1463,17 +2229,11 @@ sub get_foaf {
my $foaf = $response->content;
my %info = foaf_parse($foaf);
if ($info{avatar}) {
- $response = $ua->get($info{avatar});
- if ($response->is_success) {
- my $image = $response->content;
- my ($w,$h,$type) = imgsize(\$image);
- $info{avatar}={width=>$w,height=>$h,type=>$type,src=>$info{avatar}};
- } else {
- print STDERR "Error getting $info{avatar}: ".$response->status_line,"\n";
- }
+ $info{avatar} = get_avatar_info($info{avatar},$ua);
}
return %info;
}
+
sub foaf_parse {
my $foaf = shift;
my ($starttag) = $foaf =~ /<(\w+(:\w+)?[^>]+)>/sg;
@@ -1497,13 +2257,15 @@ sub input2tree {
my ($cgi,$forum,$field_name) = @_;
my $format = $cgi->param($field_name."_format");
my $text = $cgi->param($field_name);
+ return "" if (!$text);
if ($format eq "bbcode") {
my $parser = HTML::BBReverse->new();
$text="".$parser->parse($text)."
";
} elsif ($format eq "text") {
- $text=~s/\r?\n\r?\n/<\/p>/;
- $text=~s/\r?\n/
/;
- $text = "
";
+ $text = escapeHTML($text);
+ $text=~s/\r?\n\r?\n/<\/p>/sg;
+ $text=~s/\r?\n/
/sg;
+ $text = "
";
}
my $txtree = str2tree($text);
for my $badtag
@@ -1513,21 +2275,31 @@ sub input2tree {
$element->delete() if defined $element;
}
}
- # ÐÑовеÑÑем на налиÑие URL-ок не оÑоÑмленнÑÑ
ÑÑÑлками.
+ # FIXME ÐÑовеÑÑем на налиÑие URL-ок не оÑоÑмленнÑÑ
ÑÑÑлками.
return $txtree;
}
+sub tree2input {
+ my ($cgi,$field_name,$tree) = @_;
+ $cgi->param($field_name=>$tree->as_HTML('<>&"'));
+ $cgi->param("${field_name}_format"=>"html");
+}
sub str2tree {
my ($data)=@_;
- my $tree = HTML::TreeBuilder->new();
+ my $tree = make_tree();
+ $tree->ignore_ignorable_whitespace(1);
# Set parser options here
$tree->parse("$data
");
$tree->eof;
my $element=$tree->find("body");
while (($element =($element->content_list)[0])->tag ne "div") {
}
+ while ($element->content_list==1&& $element->tag eq "div" &&
+ !defined $element->attr("style")) {
+ $element = ($element->content_list)[0]
+ }
$element->detach;
$tree->destroy;
return $element;
@@ -1578,6 +2350,24 @@ sub hide_list {
return 1;
}
#
+# УдалÑÐµÑ Ð¸Ð· ÑпиÑка ÑлеменÑ, еÑли он не поÑледий. ÐÑли поÑледний -
+# ÑкÑÑÐ²Ð°ÐµÑ Ð²ÐµÑÑ ÑпиÑок. ÐÐ»ÐµÐ¼ÐµÐ½Ñ Ð¼Ð¾Ð¶Ð½Ð¾ ÑказÑваÑÑ ÐºÐ°Ðº ÑÑÑлкой на обÑекÑ
+# HTML::Element, Ñак и знаÑением аÑÑибÑÑа id
+#
+sub delete_from_list {
+ my ($tree,$listclass,$itemclass,$item) = @_;
+ my $list = $tree->look_down(class =>$listclass);
+ ($item) = $list->look_down(id =>$item) unless ref($item);
+ return undef unless $item;
+ my (@items)=$tree->look_down(class=>$itemclass);
+ if (@items == 1) {
+ hide_list($tree,$listclass);
+ } else {
+ $item->delete;
+ }
+ return 1;
+}
+#
# ÐайÑи вÑе ÑлеменÑÑ, ÑдоволеÑвоÑÑÑÑие Ð·Ð°Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ ÐºÑиÑеÑÐ¸Ñ Ð¸ подÑÑавиÑÑ Ð²
# ниÑ
ÑказаннÑе аÑÑибÑÑÑ
#
@@ -1602,7 +2392,11 @@ sub substinfo {
my $value = shift @attrs;
if ($attr eq "_content") {
$element->delete_content;
+ if (ref($value) eq 'ARRAY') {
+ $element->push_content(@$value) ;
+ } else {
$element->push_content($value);
+ }
} else {
$element->attr($attr,$value);
}
@@ -1634,3 +2428,11 @@ sub newlistelement {
return undef;
}
}
+
+sub escapeHTML {
+ local $_ = shift;
+ s/\&/&/g;
+ s/\</g;
+ s/\>/>/g;
+ return $_;
+}