svnno****@sourc*****
svnno****@sourc*****
2008年 11月 26日 (水) 17:36:30 JST
Revision: 840 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=840 Author: tach Date: 2008-11-26 17:36:30 +0900 (Wed, 26 Nov 2008) Log Message: ----------- merged from 2.5.0.192-21 Modified Paths: -------------- slashjp/trunk/Slash/Apache/Apache.pm slashjp/trunk/Slash/Apache/User/User.pm slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/Slash/Utility/Data/Data.pm slashjp/trunk/Slash/Utility/Environment/Environment.pm slashjp/trunk/debian/changelog slashjp/trunk/debian/slash-backend.logcheck.ignore.server slashjp/trunk/plugins/Journal/Journal.pm slashjp/trunk/plugins/Journal/journal.pl slashjp/trunk/plugins/Journal/journal_update_slashbox.pl slashjp/trunk/plugins/Login/login.pl slashjp/trunk/plugins/Messages/Messages.pm slashjp/trunk/plugins/PollBooth/pollBooth.pl slashjp/trunk/sql/mysql/defaults.sql slashjp/trunk/themes/slashcode/htdocs/article.pl slashjp/trunk/themes/slashcode/htdocs/users.pl -------------- next part -------------- Modified: slashjp/trunk/Slash/Apache/Apache.pm =================================================================== --- slashjp/trunk/Slash/Apache/Apache.pm 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/Slash/Apache/Apache.pm 2008-11-26 08:36:30 UTC (rev 840) @@ -539,6 +539,32 @@ } } + # some static contents for slashdot.jp + if ($uri =~ m!^/(about|code|prettypictures|supporters|why_login|submit_guide|bookreview_guide)(/|\.shtml)?$!x) { + my ($word, $sl) = ($1, $2); + my @args = (); + my $fpath = "/$constants->{sfjp_wikicontents_path}/$word.shtml"; + my $file = "$constants->{basedir}$fpath"; + if ($sl) { + redirect("$constants->{absolutedir}/$word", 301); + return; + } + unless (-r $file) { + return NOT_FOUND; + } + if ($is_user) { + push @args, "name=$word"; + $r->args(join('&', @args)); + $r->uri('/wikicontents.pl'); + $r->filename($constants->{basedir} . '/wikicontents.pl'); + return OK; + } else { + $r->uri($fpath); + $r->filename($file); + return OK; + } + } + # faq for slashdot.jp if ($uri =~ m!^/faq (?: (/[^?]*) | /? ) (?: \?(.*) )? $!x) { my($word, $query) = ($1, $2); Modified: slashjp/trunk/Slash/Apache/User/User.pm =================================================================== --- slashjp/trunk/Slash/Apache/User/User.pm 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/Slash/Apache/User/User.pm 2008-11-26 08:36:30 UTC (rev 840) @@ -559,7 +559,7 @@ my $uri = $r->the_request; $uri =~ s/^\S+\s+//; $uri =~ s/\s+\S+$//; - $uri =~ s/\+/ /g; + $uri =~ s/%20/ /g; my $logtoken; if ($uri =~ s{(?:^|/)?(\d+(?::|%3[aA]){2}\w+)$}{}) { @@ -855,6 +855,16 @@ my $reader_user = $slashdb->getDB('reader'); my $reader = getObject('Slash::DB', { virtual_user => $reader_user }); my $uid = $reader->getUserUID($nick); + unless ($uid) { + my $matchname = nick2matchname($nick); + $nick = $reader->sqlSelect('nickname', 'users', "matchname='$matchname'"); + if ($nick) { + $nick = fixparam($nick); + $string =~ s!^[^/]+!!; + $query = "?$query" if ($query); + redirect($constants->{real_rootdir} . "/~$nick$string$query"); + } + } my $nick_orig = $nick; $nick = fixparam($nick); # make safe to pass back to script Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2008-11-26 08:36:30 UTC (rev 840) @@ -8213,8 +8213,20 @@ $conf{reasons} = $self->sqlSelectAllHashref( "id", "*", "modreasons" ); + $conf{reasons_base} = $self->sqlSelectAllHashref( + "id", "*", "modreasons", "m2able = 1 OR val = 0" + ); + $conf{reasons_plused} = $self->sqlSelectAllHashref( + "id", "*", "modreasons", "m2able = 1 OR val <= 0" + ); + $conf{reasons_minused} = $self->sqlSelectAllHashref( + "id", "*", "modreasons", "m2able = 1 OR val >= 0" + ); foreach my $d (split(/,/, $conf{modreasons_select_disabled} || '')) { $conf{reasons}{int($d)}{select_disabled} = 1; + $conf{reasons_base}{int($d)}{select_disabled} = 1; + $conf{reasons_plused}{int($d)}{select_disabled} = 1; + $conf{reasons_minused}{int($d)}{select_disabled} = 1; } } Modified: slashjp/trunk/Slash/Utility/Data/Data.pm =================================================================== --- slashjp/trunk/Slash/Utility/Data/Data.pm 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/Slash/Utility/Data/Data.pm 2008-11-26 08:36:30 UTC (rev 840) @@ -2260,7 +2260,7 @@ no utf8; Encode::is_utf8($url) and $url = Encode::encode_utf8($url); $url =~ s/([^$URI::unreserved ])/$URI::Escape::escapes{$1}/og; - $url =~ s/ /+/g; + $url =~ s/ /%20/g; return $url; } Modified: slashjp/trunk/Slash/Utility/Environment/Environment.pm =================================================================== --- slashjp/trunk/Slash/Utility/Environment/Environment.pm 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/Slash/Utility/Environment/Environment.pm 2008-11-26 08:36:30 UTC (rev 840) @@ -1994,7 +1994,7 @@ $data =~ s|[^a-zA-Z0-9_]+||g; } else { for my $ri (@regints) { - $data = fixint($data) if $key =~ /$ri/; + $data = fixint($data) if $ri =~ quotemeta($key); } # convert input to internal character encoding Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/debian/changelog 2008-11-26 08:36:30 UTC (rev 840) @@ -41,6 +41,46 @@ -- Taku YASUI <tach****@osdn*****> Tue, 26 Feb 2008 11:54:28 +0000 +slash (2.5.0.192-21) unstable; urgency=low + + * Fix "+" operation for "fixparam()" + - Change white-space to "%20" instead of "+" on fixparam() + - Change "%20" to white-space on userdir_handler() + - Not to change "+" to white-space on userdir_handler() + - Add to redirect when nickname is not found but matchname is found + * Add "reasons_base", "reasons_plused" and "reasons_minused" to constants + - To change modreasons by moderated score + * Select enable/disable moderation for not m2able reasons when it is not + eligible + * Fix unwanted object creation at plugin/Messages/Messages.pm + * Create messages when the journal is submission + * Add pollquestions to page title and fix title format + * Fix poll voting booth layout to use template "poll;pollBooth;default" + * Fix previewSlashbox layout to use template "previewSlashbox;users;default" + * Add some wiki page to wikicontents redirection + * Fix for invalid form input at Slash/Utility/Environment/Environment.pm + * Fix to show correct error message on new user creation + * Add to set more messaging preferences on new user creation + + -- Taku YASUI <tach****@osdn*****> Fri, 21 Nov 2008 05:03:49 +0000 + +slash (2.5.0.192-20) unstable; urgency=low + + * Back to default only 'slashboxes' when 'restore_default_slashbox' + * Fix journal preview to use new theme system + * Add pagination to journal list page + + -- Taku YASUI <tach****@osdn*****> Fri, 3 Oct 2008 12:46:08 +0000 + +slash (2.5.0.192-19) unstable; urgency=low + + * Add getThemeType() method to check theme type + into plugin/Journal/Journal.pm + * A number of entries in journal slashbox is from constant "journal_top" + * Add logcheck ignore rules for journal_update_slashbox.pl + + -- Taku YASUI <tach****@osdn*****> Wed, 24 Sep 2008 11:58:27 +0000 + slash (2.5.0.192-18) unstable; urgency=low * Use $user->{currentSkin} at $slashdb->getTemplateByName() Modified: slashjp/trunk/debian/slash-backend.logcheck.ignore.server =================================================================== --- slashjp/trunk/debian/slash-backend.logcheck.ignore.server 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/debian/slash-backend.logcheck.ignore.server 2008-11-26 08:36:30 UTC (rev 840) @@ -41,6 +41,8 @@ \[daily_archive\.pl\] (Archiving|archived) [0-9/]+ \[daily_archive\.pl\] (article\.pl|prog2file):? \[counthits\.pl\] [0-9]+ of [0-9]+ sids updated for +\[journal_update_slashbox\.pl\] Updated block +\[journal_update_slashbox\.pl\] Could not get (block|tid for) ".*", skipped \[zoo_run_people_log\.pl\] Zoo fof/eof (Begin|Processing|End) (BEGIN|END) MODERATORD EXECUTION ^Eligible: [0-9]+ Modified: slashjp/trunk/plugins/Journal/Journal.pm =================================================================== --- slashjp/trunk/plugins/Journal/Journal.pm 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/plugins/Journal/Journal.pm 2008-11-26 08:36:30 UTC (rev 840) @@ -156,11 +156,13 @@ } sub list { - my($self, $uid, $limit) = @_; + my($self, $uid, $limit, $start) = @_; $uid ||= 0; # no SQL syntax error + $start ||= 0; my $order = "ORDER BY date DESC"; - $order .= " LIMIT $limit" if $limit; - my $answer = $self->sqlSelectAll('id, date, description', 'journals', "uid = $uid", $order); + $order .= " LIMIT $start, $limit" if $limit; + my $answer = $self->sqlSelectAll('SQL_CALC_FOUND_ROWS id, date, description', 'journals', "uid = $uid", $order); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); return $answer; } @@ -340,15 +342,21 @@ sub themes { my($self) = @_; - my $uid = getCurrentUser('uid'); - my $sql; - $sql .= "SELECT name from journal_themes"; - $self->sqlConnect; - my $themes = $self->{_dbh}->selectcol_arrayref($sql); + return [ keys %{$self->{themes}} ] if ($self->{themes}); + my $sql = "SELECT name,type from journal_themes"; + $self->{themes} = $self->sqlSelectAllKeyValue('name,type', 'journal_themes'); - return $themes; + return [ keys %{$self->{themes}} ]; } +sub getThemeType { + my ($self, $theme) = @_; + + return undef unless ($theme); + $self->themes unless ($self->{themes}); + return $self->{themes}{$theme}; +} + sub searchUsers { my($self, $nickname) = @_; my $slashdb = getCurrentDB(); @@ -492,6 +500,25 @@ my $subid = $slashdb->createSubmission($submission); if ($subid) { $self->logJournalTransfer($src_journal->{id}, $subid); + + # create messages + my $messages = getObject('Slash::Messages'); + if ($messages) { + my $users = $messages->getMessageUsers(MSG_CODE_NEW_SUBMISSION); + my $messagesub = { %$submission }; + $messagesub->{subid} = $subid; + $messagesub->{story} = $story; + $messagesub->{subj} = $src_journal->{description}; + my $data = { + template_name => 'messagenew', + template_page => 'submit', + subject => { + template_name => 'messagenew_subj', + template_page => 'submit', }, + submission => $messagesub, + }; + $messages->create($users, MSG_CODE_NEW_SUBMISSION, $data) if @$users; + } } else { print STDERR ("Failed attempting to transfer journal id: $src_journal->{id}\n"); } Modified: slashjp/trunk/plugins/Journal/journal.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal.pl 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/plugins/Journal/journal.pl 2008-11-26 08:36:30 UTC (rev 840) @@ -581,17 +581,22 @@ id => $article->[3], commentcount => $commentcount, prev => $prev, - next => $next, + 'next' => $next, }; } push @sorted_articles, $collection; my $theme = _checkTheme($form->{theme} || $journal_reader->getUser($uid, 'journal_theme')); - $theme = 'mobile' if ($user->{mobile}); + my $theme_type = $journal_reader->getThemeType($theme); + if ($user->{mobile}) { + $theme = 'mobile'; + $theme_type = 'mobile'; + } my $show_discussion = $form->{id} && !$constants->{journal_no_comments_item} && $discussion; my $zoo = getObject('Slash::Zoo'); - slashDisplay($theme, { + slashDisplay("theme_$theme_type", { + theme => $theme, articles => \@sorted_articles, uid => $uid, nickname => $nickname, @@ -816,8 +821,16 @@ }; my $theme = _checkTheme($user->{'journal_theme'}); + my $theme_type = $journal_reader->getThemeType($theme); + if ($user->{mobile}) { + $theme = 'mobile'; + $theme_type = 'mobile'; + } + my $zoo = getObject('Slash::Zoo'); - slashDisplay($theme, { + slashDisplay("theme_$theme_type", { + preview => 1, + theme => $theme, articles => [{ day => $article->{date}, article => [ $disp_article ] }], uid => $article->{uid} || $user->{uid}, is_friend => $zoo->isFriend($user->{uid}, $article->{uid}), @@ -907,13 +920,16 @@ sub listArticle { my($journal, $constants, $user, $form, $journal_reader) = @_; + my $limit = $constants->{journal_list_default_display} || $constants->{journal_default_display} || 10; + my $start = $form->{start} || 0; my $uid = $form->{uid} || $user->{uid}; if (isAnon($uid)) { return displayFriends(@_); } - my $list = $journal_reader->list($uid); + my $list = $journal_reader->list($uid, $limit, $start); + my $totalhits = $journal_reader->sqlSelect('@totalhits'); my $themes = $journal_reader->themes; my $theme = _checkTheme($user->{'journal_theme'}); my $nickname = $form->{uid} @@ -931,6 +947,9 @@ articles => $list, uid => $form->{uid} || $user->{uid}, nickname => $nickname, + start => $start, + limit => $limit, + totalhits => $totalhits, }); } elsif (!$user->{is_anon} && (!$form->{uid} || $form->{uid} == $user->{uid})) { print getData('noentries'); Modified: slashjp/trunk/plugins/Journal/journal_update_slashbox.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/plugins/Journal/journal_update_slashbox.pl 2008-11-26 08:36:30 UTC (rev 840) @@ -18,26 +18,31 @@ my($virtual_user, $constants, $slashdb, $user) = @_; my $force = $constants->{task_options}{force} || undef; my $block_suffix = '_topjournals'; + my $limit = getCurrentStatic('journal_top') || 10; my $skins = $slashdb->getSkins(); foreach my $skin (values(%$skins)) { my $name = "$skin->{name}$block_suffix"; my $block = $slashdb->getBlock($name); - unless ($block) { + unless ($block->{bid}) { slashdLog("Could not get block \"$name\", skipped"); next; } my $tids = [ $slashdb->getAllChildrenTids($skin->{nexus}) ]; + unless (@$tids > 0) { + slashdLog("Could not get tid for \"$name\", skipped"); + next; + } my $where = '1=1'; - $where .= 'AND tid IN ('.join(',', @$tids).')' if ($skin->{skid} != $constants->{mainpage_skid}); - next if ($slashdb->sqlCount('journals', $where . ($force ? '' : "AND date > '$block->{last_update}'")) < 1); + $where .= ' AND tid IN ('.join(',', @$tids).')' if ($skin->{skid} != $constants->{mainpage_skid}); + next if ($slashdb->sqlCount('journals', $where . ($force ? '' : " AND date > '$block->{last_update}'")) < 1); slashdLog("Start updating block \"$name\"") if (verbosity() >= 3); my $result = $slashdb->sqlSelectAllHashrefArray( 'nickname AS author,jid,description AS title', 'users_journal JOIN users USING (uid) JOIN journals on (users_journal.jid=journals.id)', $where, - 'ORDER BY users_journal.date DESC LIMIT 20', + "ORDER BY users_journal.date DESC LIMIT $limit", ); map { $_->{'link'} = "$constants->{absolutedir}/~" . strip_paramattr($_->{author}) . "/journal/". $_->{jid} } @$result; @@ -46,6 +51,12 @@ $str .= slashDisplay('topjournals', { 'item' => $item }, { Return => 1, Nocomm => 1, Page => 'portald' }); } $str .= "\n</ul>"; + if ($skin->{skid} == $constants->{mainpage_skid}) { + my $morestr = getData('journal_slashbox_more', { + 'link' => "$constants->{absolutedir}/journals/top/recent/?start=$limit", + }, 'journal'); + $str .= $morestr if ($morestr); + } $slashdb->setBlock($name, { block => $str }); slashdLog("Updated block \"$name\"") if (verbosity() >= 2); Modified: slashjp/trunk/plugins/Login/login.pl =================================================================== --- slashjp/trunk/plugins/Login/login.pl 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/plugins/Login/login.pl 2008-11-26 08:36:30 UTC (rev 840) @@ -68,18 +68,42 @@ sub newUser { my($slashdb, $reader, $constants, $user, $form) = @_; - if (my $error = _validFormkey(qw(max_post_check valid_check formkey_check), 1)) { - return newUserForm(@_, $error); - } + #if (my $error = _validFormkey(qw(max_post_check valid_check formkey_check), 1)) { + # return newUserForm(@_, $error); + #} my $plugins = $slashdb->getDescriptions('plugins'); my @note; my $error = 0; + my $nc = $constants->{nick_chars} || join('', 'a' .. 'z'); + my $nr = $constants->{nick_regex} || '^[a-z]$'; + my $ns = $constants->{nick_regex_start} || '[a-zA-Z_]'; # check if new nick is OK and if user exists my $newnick = nickFix($form->{newusernick}); my $matchname = nick2matchname($newnick); + + if ($form->{newusernick} !~ /^$ns/) { + push @note, getData('nick_starts_unavailable_chars'); + $error = 1; + } + + if ($form->{newusernick} =~ /\s{2,}/) { + push @note, getData('nick_has_continuous_whitespace'); + $error = 1; + } + + if ($form->{newusernick} !~ /^[$nc]+$/) { + push @note, getData('nick_has_unavailable_chars'); + $error = 1; + } + + if (length($form->{newusernick}) > $constants->{nick_maxlen}) { + push @note, getData('nick_is_too_long'); + $error = 1; + } + if (!$newnick) { push @note, getData('nick_invalid'); $error = 1; @@ -135,7 +159,7 @@ ? strip_nohtml($form->{pubkey}, 1) : ''; - if ($form->{newsletter} || $form->{comment_reply} || $form->{headlines}) { + if (1) { my $messages = getObject('Slash::Messages'); my %params; $params{MSG_CODE_COMMENT_REPLY()} = MSG_MODE_EMAIL() @@ -144,6 +168,16 @@ if $form->{newsletter}; $params{MSG_CODE_HEADLINES()} = MSG_MODE_EMAIL() if $form->{headlines}; + $params{MSG_CODE_ZOO_CHANGE()} = MSG_MODE_EMAIL() + if $form->{zoo_change}; + $params{MSG_CODE_M2()} = MSG_MODE_EMAIL() + if $form->{m2}; + $params{MSG_CODE_COMMENT_MODERATE()} = MSG_MODE_EMAIL() + if $form->{comment_moderate}; + $params{MSG_CODE_JOURNAL_FRIEND()} = MSG_MODE_EMAIL() + if $form->{journal_friend}; + $params{MSG_CODE_JOURNAL_REPLY()} = MSG_MODE_EMAIL() + if $form->{journal_reply}; $messages->setPrefs($uid, \%params); } Modified: slashjp/trunk/plugins/Messages/Messages.pm =================================================================== --- slashjp/trunk/plugins/Messages/Messages.pm 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/plugins/Messages/Messages.pm 2008-11-26 08:36:30 UTC (rev 840) @@ -125,7 +125,7 @@ if (!$altto) { # check for $uid existence - my $reader = getObject('Slash::Journal', { db_type => 'reader' }); + my $reader = getObject('Slash::DB', { db_type => 'reader' }); for my $u (@$uid) { if ($reader->existsUid($u)) { push @users, $u; Modified: slashjp/trunk/plugins/PollBooth/pollBooth.pl =================================================================== --- slashjp/trunk/plugins/PollBooth/pollBooth.pl 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/plugins/PollBooth/pollBooth.pl 2008-11-26 08:36:30 UTC (rev 840) @@ -58,8 +58,16 @@ undef $form->{aid} if $form->{aid} < -1 || $form->{aid} > 8; } - header(getData('title'), $form->{section}, { tab_selected => 'poll'}) or return; + # create title + my $title = getData('title'); + if ($form->{qid}) { + my $polldb = getObject('Slash::PollBooth', { db_type => 'reader' }); + $title .= ': ' . $polldb->getPollQuestion($form->{qid})->{question}; + } + $title .= " - $constants->{sitename}"; + header($title, $form->{section}, { tab_selected => 'poll'}) or return; + $ops{$op}->($form, $slashdb, $constants); writeLog($form->{'qid'}); @@ -70,7 +78,9 @@ sub poll_booth { my($form) = @_; - print sidebox('Poll', pollbooth($form->{'qid'}, 0, 1), 'poll', 1); + slashDisplay('poll', { + pollbooth => pollbooth($form->{'qid'}, 0, 1), + }); } ################################################################# Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/sql/mysql/defaults.sql 2008-11-26 08:36:30 UTC (rev 840) @@ -1160,6 +1160,8 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('related_cid_disabled','0','If set, then disable inserting cid to related story list'); INSERT IGNORE INTO vars (name, value, description) VALUES ('modreasons_select_disabled','','Comma separated "modreasons.id"s disable to select when moderation'); INSERT IGNORE INTO vars (name, value, description) VALUES ('search_query_name','query','alternative query string form name for search.pl'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('journal_list_default_display', '50', 'Number of journals to display on a journal title list page'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('mod_limit_not_m2able_reasons', '0', 'Enable moderation limit for not m2able reasons when it is not eligible'); UPDATE vars SET value='text/html; charset=UTF-8' WHERE name='content_type_webpage'; UPDATE vars SET value='0' WHERE name='draconian_charset'; UPDATE vars SET value='UTF-8' WHERE name='rdfencoding'; Modified: slashjp/trunk/themes/slashcode/htdocs/article.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/article.pl 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/themes/slashcode/htdocs/article.pl 2008-11-26 08:36:30 UTC (rev 840) @@ -216,12 +216,14 @@ Slash::Utility::Comments::_print_cchp({ stoid => "dummy" }); } } else { - header('Error', $form->{section}) or return; my $message; if ($future_err) { + header('Error', $form->{section}) or return; $message = getData('article_nosubscription'); } else { - $message = getData('no_such_sid'); + my $r = Apache->request; + $r->status(404); + return; } print $message; } Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/users.pl 2008-11-26 08:09:00 UTC (rev 839) +++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2008-11-26 08:36:30 UTC (rev 840) @@ -540,10 +540,8 @@ title => $title, block => $block, is_editable => $is_editable, + previewbox => portalbox($constants->{fancyboxwidth}, $block->{title}, $block->{block}, '', $block->{url}), }); - - print portalbox($constants->{fancyboxwidth}, $block->{title}, - $block->{block}, '', $block->{url}); } ################################################################# @@ -3142,7 +3140,13 @@ 'noboxes' => 1, 'light' => 1, 'noicons' => 1, - 'willing' => 1 + 'willing' => 1, + 'dfid' => 1, + 'mylinks' => 1, + 'simpledesign' => 1, + 'lowbandwidth' => 1, + 'dst' => 1, + 'tzcode' => 1, }, { slashboxes => "" }); }