From svnnotify → sourceforge.jp Mon Oct 15 13:52:41 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Mon, 15 Oct 2007 13:52:41 +0900 Subject: [Slashdotjp-dev 677] [181] remove garbage file Message-ID: <1192423961.879569.6971.nullmailer@users.sourceforge.jp> Revision: 181 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=181 Author: tach Date: 2007-10-15 13:52:41 +0900 (Mon, 15 Oct 2007) Log Message: ----------- remove garbage file Removed Paths: ------------- slashjp/branches/upstream/current/svn-commit.tmp -------------- next part -------------- Deleted: slashjp/branches/upstream/current/svn-commit.tmp =================================================================== --- slashjp/branches/upstream/current/svn-commit.tmp 2007-10-15 04:49:46 UTC (rev 180) +++ slashjp/branches/upstream/current/svn-commit.tmp 2007-10-15 04:52:41 UTC (rev 181) @@ -1,4 +0,0 @@ -import new version --- 仇及墊動票反拑骰今木引允 -- - -A . From svnnotify → sourceforge.jp Mon Oct 15 14:33:59 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Mon, 15 Oct 2007 14:33:59 +0900 Subject: [Slashdotjp-dev 678] [183] reverse sort of related stories Message-ID: <1192426439.517482.514.nullmailer@users.sourceforge.jp> Revision: 183 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=183 Author: tach Date: 2007-10-15 14:33:58 +0900 (Mon, 15 Oct 2007) Log Message: ----------- reverse sort of related stories Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2007-10-15 04:54:42 UTC (rev 182) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2007-10-15 05:33:58 UTC (rev 183) @@ -13645,7 +13645,7 @@ } my $i = 1; - foreach my $rel (sort keys %$rel_sid_hr) { + foreach my $rel (reverse sort keys %$rel_sid_hr) { my $rel_stoid = $self->getStoidFromSidOrStoid($rel); $self->sqlInsert("related_stories", { stoid => $stoid, From svnnotify → sourceforge.jp Mon Oct 15 15:15:43 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Mon, 15 Oct 2007 15:15:43 +0900 Subject: [Slashdotjp-dev 679] [184] merged from otp code Message-ID: <1192428943.163099.17483.nullmailer@users.sourceforge.jp> Revision: 184 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=184 Author: tach Date: 2007-10-15 15:15:42 +0900 (Mon, 15 Oct 2007) Log Message: ----------- merged from otp code Modified Paths: -------------- slashjp/trunk/plugins/Admin/admin.pl slashjp/trunk/plugins/Admin/dump slashjp/trunk/plugins/Login/login.pl -------------- next part -------------- Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2007-10-15 05:33:58 UTC (rev 183) +++ slashjp/trunk/plugins/Admin/admin.pl 2007-10-15 06:15:42 UTC (rev 184) @@ -1162,9 +1162,11 @@ $storyref->{commentstatus} = $form->{commentstatus}; $storyref->{uid} ||= $user->{uid}; - $storyref->{dept} =~ s/[-\s]+/-/g; - $storyref->{dept} =~ s/^-//; - $storyref->{dept} =~ s/-$//; + if ($constants->{use_dept_space2dash}){ + $storyref->{dept} =~ s/[-\s]+/-/g; + $storyref->{dept} =~ s/^-//; + $storyref->{dept} =~ s/-$//; + } my($related_sids_hr, $related_urls_hr, $related_cids_hr) = extractRelatedStoriesFromForm($form); $storyref->{related_sids_hr} = $related_sids_hr; @@ -1345,7 +1347,7 @@ $authors->{$storyref->{uid}} = $slashdb->getUser($storyref->{uid}, 'nickname') if $storyref->{uid} && !defined($authors->{$storyref->{uid}}); my $author_select = createSelect('uid', $authors, $storyref->{uid}, 1); - $storyref->{dept} =~ s/ /-/gi; + $storyref->{dept} =~ s/ /-/gi if $constants->{use_dept_space2dash}; $locktest = lockTest($storyref->{title}); @@ -1927,7 +1929,7 @@ my $tid_ref; my $default_set = 0; - $form->{dept} =~ s/ /-/g; + $form->{dept} =~ s/ /-/g if $constants->{use_dept_space2dash}; $form->{aid} = $slashdb->getStory($form->{sid}, 'aid', 1) unless $form->{aid}; @@ -2254,7 +2256,7 @@ my $tid_ref; my $default_set = 0; - $form->{dept} =~ s/ /-/g; + $form->{dept} =~ s/ /-/g if $constants->{use_dept_space2dash}; my($chosen_hr) = extractChosenFromForm($form); my($tids) = $slashdb->getTopiclistFromChosen($chosen_hr); Modified: slashjp/trunk/plugins/Admin/dump =================================================================== --- slashjp/trunk/plugins/Admin/dump 2007-10-15 05:33:58 UTC (rev 183) +++ slashjp/trunk/plugins/Admin/dump 2007-10-15 06:15:42 UTC (rev 184) @@ -41,6 +41,7 @@ INSERT INTO menus(id, menu, label, sel_label, value, seclev, showanon, menuorder) VALUES (NULL,'security','Config','config','[% gSkin.rootdir %]/admin.pl?op=topics',10000,0,9); INSERT INTO vars (name, value, description) VALUES ('admin_maxdays_divider', '14', 'Max number of days on the admin.pl story list to bother showing the day-dividers'); +INSERT INTO vars (name, value, description) VALUES ('use_dept_space2dash','1','convert spaces to dashes in dept. field'); INSERT INTO vars (name, value, description) VALUES ('ispell', 'ispell', 'Location of ispell binary or empty string to turn off'); INSERT INTO vars (name, value, description) VALUES ('ispell_is_really_aspell_with_lang', '', 'Some systems install aspell and a script that mimics the behavior of ispell; if yours does, set this to your preferred language name, e.g. "english"'); INSERT INTO vars (name, value, description) VALUES ('similarstorydays', '30', 'Number of days to look back for uncommon words when determining similar stories'); Modified: slashjp/trunk/plugins/Login/login.pl =================================================================== --- slashjp/trunk/plugins/Login/login.pl 2007-10-15 05:33:58 UTC (rev 183) +++ slashjp/trunk/plugins/Login/login.pl 2007-10-15 06:15:42 UTC (rev 184) @@ -11,6 +11,7 @@ use Slash::Utility; use Slash::XML; use Slash::LDAPDB; + use vars qw($VERSION); ($VERSION) = ' $Revision$ ' =~ /\$Revision:\s+([^\s]+)/; From svnnotify → sourceforge.jp Mon Oct 15 20:10:51 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Mon, 15 Oct 2007 20:10:51 +0900 Subject: [Slashdotjp-dev 680] [185] remove miniAdminMenu: unnessesary Message-ID: <1192446651.344047.7389.nullmailer@users.sourceforge.jp> Revision: 185 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=185 Author: tach Date: 2007-10-15 20:10:51 +0900 (Mon, 15 Oct 2007) Log Message: ----------- remove miniAdminMenu: unnessesary Removed Paths: ------------- slashjp/trunk/themes/slashcode/templates/miniAdminMenu;users;default -------------- next part -------------- Deleted: slashjp/trunk/themes/slashcode/templates/miniAdminMenu;users;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/miniAdminMenu;users;default 2007-10-15 06:15:42 UTC (rev 184) +++ slashjp/trunk/themes/slashcode/templates/miniAdminMenu;users;default 2007-10-15 11:10:51 UTC (rev 185) @@ -1,28 +0,0 @@ -__section__ -default -__description__ -A little admin menu ... should this be deleted? Is it used anymore? - -No specially passed variables. -__title__ - -__page__ -users -__lang__ -en_US -__name__ -miniAdminMenu -__template__ -
- [ - Admin | - - - - ] -
- -__seclev__ -10000 -__version__ -$Id$ From svnnotify → sourceforge.jp Tue Oct 16 12:05:01 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 12:05:01 +0900 Subject: [Slashdotjp-dev 681] [186] fix default maxstories value ( but user defined value has not been used yet) Message-ID: <1192503901.198733.31912.nullmailer@users.sourceforge.jp> Revision: 186 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=186 Author: tach Date: 2007-10-16 12:05:00 +0900 (Tue, 16 Oct 2007) Log Message: ----------- fix default maxstories value (but user defined value has not been used yet) Modified Paths: -------------- slashjp/trunk/themes/slashcode/htdocs/users.pl -------------- next part -------------- Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/users.pl 2007-10-15 11:10:51 UTC (rev 185) +++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2007-10-16 03:05:00 UTC (rev 186) @@ -2759,6 +2759,7 @@ my $user = getCurrentUser(); my $form = getCurrentForm(); my $constants = getCurrentStatic(); + my $gSkin = getCurrentSkin(); my($uid, $error); if ($user->{is_admin}) { @@ -2927,7 +2928,7 @@ slashboxes => checkList($slashboxes, 1024), - maxstories => (($form->{maxstories} > 0 && $form->{maxstories} <= 90) ? $form->{maxstories} : 30), + maxstories => (($form->{maxstories} > 0 && $form->{maxstories} <= 90) ? $form->{maxstories} : ($gSkin->{artcount_max} || 30)), noboxes => ($form->{useslashboxes} ? 0 : 1), lowbandwidth => ($form->{lowbandwidth} ? 1 : 0), simpledesign => ($form->{simpledesign} ? 1 : 0), @@ -2981,8 +2982,8 @@ getOtherUserParams($user_edits_table); if ($form->{restore_defaults}) { setToDefaults($user_edits_table, {}, { - maxstories => 30, - tzcode => "EST", + maxstories => $gSkin->{artcount_max} || 30, + tzcode => "JST", # XXX shouldn't this reset ALL the defaults, # not just these two? }); From svnnotify → sourceforge.jp Tue Oct 16 12:05:40 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 12:05:40 +0900 Subject: [Slashdotjp-dev 682] [187] merged from otp(slash original?) code Message-ID: <1192503940.566802.403.nullmailer@users.sourceforge.jp> Revision: 187 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=187 Author: tach Date: 2007-10-16 12:05:40 +0900 (Tue, 16 Oct 2007) Log Message: ----------- merged from otp(slash original?) code Modified Paths: -------------- slashjp/trunk/themes/slashcode/htdocs/index.pl -------------- next part -------------- Modified: slashjp/trunk/themes/slashcode/htdocs/index.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/index.pl 2007-10-16 03:05:00 UTC (rev 186) +++ slashjp/trunk/themes/slashcode/htdocs/index.pl 2007-10-16 03:05:40 UTC (rev 187) @@ -780,7 +780,7 @@ } if ($user->{seclev} >= 100) { - push @links, [ "$gSkin->{absolutedir}/admin.pl?op=edit&sid=$story->{sid}", getData('edit'), '', 'edit' ]; + push @links, [ "$gSkin->{rootdir}/admin.pl?op=edit&sid=$story->{sid}", getData('edit'), '', 'edit' ]; if ($constants->{plugin}{Ajax}) { my $signoff = slashDisplay("signoff", { stoid => $story->{stoid}, storylink => 1 }, { Return => 1 } ); push @links, $signoff; From svnnotify → sourceforge.jp Tue Oct 16 12:14:55 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 12:14:55 +0900 Subject: [Slashdotjp-dev 683] [188] * Change running time for JST Message-ID: <1192504495.553397.7222.nullmailer@users.sourceforge.jp> Revision: 188 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=188 Author: tach Date: 2007-10-16 12:14:55 +0900 (Tue, 16 Oct 2007) Log Message: ----------- * Change running time for JST * Fix line folding nums (calc correctly for double-width charactors) - However, This fix will break renderd text format Modified Paths: -------------- slashjp/trunk/themes/slashcode/tasks/daily.pl slashjp/trunk/themes/slashcode/tasks/run_portald.pl -------------- next part -------------- Modified: slashjp/trunk/themes/slashcode/tasks/daily.pl =================================================================== --- slashjp/trunk/themes/slashcode/tasks/daily.pl 2007-10-16 03:05:40 UTC (rev 187) +++ slashjp/trunk/themes/slashcode/tasks/daily.pl 2007-10-16 03:14:55 UTC (rev 188) @@ -16,7 +16,7 @@ # GMT if you installed everything correctly. So 2:00 AM GMT is a good # sort of midnightish time for the Western Hemisphere. Adjust for # your audience and admins. -$task{$me}{timespec} = '2 0 * * *'; +$task{$me}{timespec} = '5 0 * * *'; # 9:05 AM JST $task{$me}{timespec_panic_2} = ''; # if major panic, dailyStuff can wait $task{$me}{fork} = SLASHD_NOWAIT; $task{$me}{code} = sub { @@ -117,7 +117,15 @@ my $asciitext = $story{introtext}; $asciitext .= "\n\n" . $story{bodytext} if $constants->{newsletter_body}; - ($story{asciitext}, @ref) = html2text($asciitext, 74); + if ($constants->{tweak_japanese}) { + require Jcode; + @ref = (); + $story{asciitext} = strip_notags($asciitext); + $story{asciitext} =~ tr/\n//; + $story{asciitext} = Encode::decode('utf-8', join("\n", Jcode->new(Encode::encode('utf-8', $story{asciitext}), 'utf8')->jfold(74))); + } else { + ($story{asciitext}, @ref) = html2text($asciitext, 74); + } $story{refs} = \@ref; push @$stories, \%story; Modified: slashjp/trunk/themes/slashcode/tasks/run_portald.pl =================================================================== --- slashjp/trunk/themes/slashcode/tasks/run_portald.pl 2007-10-16 03:05:40 UTC (rev 187) +++ slashjp/trunk/themes/slashcode/tasks/run_portald.pl 2007-10-16 03:14:55 UTC (rev 188) @@ -10,7 +10,7 @@ use vars qw( %task $me ); -$task{$me}{timespec} = '37 * * * *'; +$task{$me}{timespec} = '7,37 * * * *'; $task{$me}{timespec_panic_1} = ''; # not that important $task{$me}{fork} = SLASHD_NOWAIT; $task{$me}{code} = sub { From svnnotify → sourceforge.jp Tue Oct 16 13:15:40 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 13:15:40 +0900 Subject: [Slashdotjp-dev 684] [189] merge senna search code from OTP Message-ID: <1192508140.686652.10826.nullmailer@users.sourceforge.jp> Revision: 189 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=189 Author: tach Date: 2007-10-16 13:15:40 +0900 (Tue, 16 Oct 2007) Log Message: ----------- merge senna search code from OTP Modified Paths: -------------- slashjp/trunk/plugins/Search/Search.pm slashjp/trunk/plugins/Search/search.pl slashjp/trunk/plugins/Search/templates/searchform;search;default -------------- next part -------------- Modified: slashjp/trunk/plugins/Search/Search.pm =================================================================== --- slashjp/trunk/plugins/Search/Search.pm 2007-10-16 03:14:55 UTC (rev 188) +++ slashjp/trunk/plugins/Search/Search.pm 2007-10-16 04:15:40 UTC (rev 189) @@ -38,9 +38,10 @@ # select comment ID, comment Title, Author, Email, link to comment # and SID, article title, type and a link to the article $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); + my $query = $self->_fixupQuerySql($form->{query}); my $constants = getCurrentStatic(); my $columns; + $columns .= "SQL_CALC_FOUND_ROWS "; $columns .= "primaryskid, url, discussions.uid AS author_uid, discussions.title AS title, "; $columns .= "pid, subject, ts, date, comments.uid AS uid, cid, "; $columns .= "discussions.id AS did, dkid, discussions.sid"; @@ -91,6 +92,7 @@ $other .= " LIMIT $start, $limit" if $limit; my $search = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other ); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); my $desc = $reader->getDescriptions('discussion_kinds'); foreach my $c (@$search) { @@ -111,10 +113,10 @@ # userSearch REALLY doesn't need to be ordered by keyword since you # only care if the substring is found. $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); + my $query = $self->_fixupQuerySql($form->{query}); my $constants = getCurrentStatic(); - my $columns = 'fakeemail,nickname,users.uid as uid,journal_last_entry_date '; + my $columns = 'SQL_CALC_FOUND_ROWS fakeemail,nickname,users.uid as uid,journal_last_entry_date '; $columns .= ", TRUNCATE( " . $self->_score('nickname', $form->{query}, $constants->{search_method}) . ", 1) as score " if $form->{query}; @@ -138,6 +140,7 @@ $other .= " LIMIT $start, $limit" if $limit; my $users = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other ); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); return $users; } @@ -150,9 +153,10 @@ my $constants = getCurrentStatic(); $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); + my $query = $self->_fixupQuerySql($form->{query}); my $columns; - $columns .= "title, stories.stoid AS stoid, sid, "; + $columns .= "SQL_CALC_FOUND_ROWS "; + $columns .= "title, stories.stoid AS stoid, sid, dept, "; $columns .= "time, commentcount, stories.primaryskid AS skid, "; $columns .= "introtext "; if ($form->{query}) { @@ -196,7 +200,7 @@ map { $reader->sqlQuote($_) } grep { $_ != $gSkin->{skid} } # allow searching on THIS skid @{$constants->{search_ignore_skids}}; - $where .= " AND primaryskid NOT IN ($skid_list) "; + $where .= " AND primaryskid NOT IN ($skid_list) " if ($skid_list); } my $skin = $reader->getSkin($form->{section} || $gSkin->{skid}); @@ -269,6 +273,7 @@ $other .= " LIMIT $start, $limit" if $limit; my $stories = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); # Don't return just one topic id in tid, also return an arrayref # in tids, with all topic ids in the preferred order. @@ -305,8 +310,9 @@ my $constants = getCurrentStatic(); $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); + my $query = $self->_fixupQuerySql($form->{query}); my $columns; + $columns .= "SQL_CALC_FOUND_ROWS "; $columns .= "users.nickname as nickname, journals.description as description, "; $columns .= "journals.id as id, date, users.uid as uid, article"; $columns .= ", TRUNCATE((( " . $self->_score('description', $form->{query}, $constants->{search_method}) . " + " . $self->_score('article', $form->{query}, $constants->{search_method}) .") / 2), 1) as score " @@ -334,6 +340,7 @@ $other .= " LIMIT $start, $limit" if $limit; my $stories = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other ); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); return $stories; } @@ -345,8 +352,8 @@ my $constants = getCurrentStatic(); $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); - my $columns = "*"; + my $query = $self->_fixupQuerySql($form->{query}); + my $columns = "SQL_CALC_FOUND_ROWS *"; $columns .= ", TRUNCATE( " . $self->_score('question', $form->{query}, $constants->{search_method}) . ", 1) as score " if $form->{query}; my $tables = "pollquestions"; @@ -377,6 +384,7 @@ $other .= " LIMIT $start, $limit" if $limit; my $stories = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); return $stories; } @@ -389,8 +397,8 @@ my $reader = getObject('Slash::DB', { db_type => 'reader' }); $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); - my $columns = "*"; + my $query = $self->_fixupQuerySql($form->{query}); + my $columns = "SQL_CALC_FOUND_ROWS *"; $columns .= ", TRUNCATE( " . $self->_score('subj,story', $form->{query}, $constants->{search_method}) . ", 1) as score " if $form->{query}; my $tables = "submissions"; @@ -421,6 +429,7 @@ $other .= " LIMIT $start, $limit" if $limit; my $stories = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other ); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); return $stories; } @@ -432,8 +441,8 @@ my $constants = getCurrentStatic(); $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); - my $columns = "title, link, description, created"; + my $query = $self->_fixupQuerySql($form->{query}); + my $columns = "SQL_CALC_FOUND_ROWS title, link, description, created"; $columns .= ", TRUNCATE( " . $self->_score('title,description', $form->{query}, $constants->{search_method}) . ", 1) as score " if $form->{query}; my $tables = "rss_raw"; @@ -455,6 +464,7 @@ $other .= " LIMIT $start, $limit" if $limit; my $stories = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other ); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); return $stories; } @@ -463,11 +473,11 @@ sub findDiscussion { my($self, $form, $start, $limit, $sort) = @_; $form->{query} = $self->_cleanQuery($form->{query}); - my $query = $self->sqlQuote($form->{query}); + my $query = $self->_fixupQuerySql($form->{query}); my $constants = getCurrentStatic(); $start ||= 0; - my $columns = "*"; + my $columns = "SQL_CALC_FOUND_ROWS *"; $columns .= ", TRUNCATE( " . $self->_score('title', $form->{query}, $constants->{search_method}) . ", 1) as score " if $form->{query}; my $tables = "discussions"; @@ -509,6 +519,7 @@ $other .= " LIMIT $start, $limit" if $limit; # print STDERR "select $columns from $tables where $where $other\n"; my $stories = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other ); + $self->sqlDo('SET @totalhits = FOUND_ROWS();'); return $stories; } @@ -557,7 +568,7 @@ } return "($method($col, $terms))"; } else { - $query = $self->sqlQuote($query); + $query = $self->_fixupQuerySql($query); return "\n(MATCH ($col) AGAINST ($query))\n"; } } @@ -567,17 +578,25 @@ my ($self, $query) = @_; # This next line could be removed -Brian # get rid of bad characters - $query =~ s/[^A-Z0-9'. :\/_]/ /gi; + #$query =~ s/[^A-Z0-9'. :\/_]/ /gi; + $query =~ s/[\x00-\x20\x27\x60\x7f]+/ /gi; # This should be configurable -Brian # truncate query length - if (length($query) > 40) { - $query = substr($query, 0, 40); + if (length($query) > 200) { + $query = substr($query, 0, 200); } return $query; } +sub _fixupQuerySql { + my ($self, $query) = @_; + if (substr($query, 0, 1) ne '*') { + $query = "*D+ ${query}"; + } + return $self->sqlQuote($query) . ' IN BOOLEAN MODE'; +} ################################################################# sub DESTROY { Modified: slashjp/trunk/plugins/Search/search.pl =================================================================== --- slashjp/trunk/plugins/Search/search.pl 2007-10-16 03:14:55 UTC (rev 188) +++ slashjp/trunk/plugins/Search/search.pl 2007-10-16 04:15:40 UTC (rev 189) @@ -81,7 +81,7 @@ $form->{op} = 'stories' if !exists($ops_rss{$form->{op}}); $ops_rss{$form->{op}}->($form, $constants, $slashdb, $searchDB, $gSkin); } else { - my $text = strip_notags($form->{query}); + my $text = strip_attribute($form->{query}); my $header_title = getData('search_header_title', { text => $text }); my $titlebar_title = getData('search_titlebar_title', { text => $text }); header($header_title) or return; @@ -171,6 +171,7 @@ my $start = $form->{start} || 0; my $comments = $searchDB->findComments($form, $start, $constants->{search_default_display} + 1, $form->{sort}); + my $totalhits = $searchDB->sqlSelect('@totalhits'); my $formats = $slashdb->getDescriptions('threshcodes'); my $threshold_select = createSelect( @@ -186,6 +187,7 @@ 'sort' => _sort(), threshhold => 1, threshold_select => $threshold_select, + totalhits => $totalhits, }); if ($comments && @$comments) { @@ -216,6 +218,7 @@ forward => $forward, args => _buildargs($form), start => $start, + totalhits => $totalhits, }); } else { print getData('nocomments'); @@ -228,10 +231,12 @@ my $start = $form->{start} || 0; my $users = $searchDB->findUsers($form, $start, $constants->{search_default_display} + 1, $form->{sort}, $form->{journal_only}); + my $totalhits = $searchDB->sqlSelect('@totalhits'); slashDisplay('searchform', { op => $form->{op}, 'sort' => _sort(), journal_option => 1, + totalhits => $totalhits, }); if ($users && @$users) { @@ -261,6 +266,7 @@ back => $back, forward => $forward, args => _buildargs($form), + totalhits => $totalhits, }); } else { print getData('nousers'); @@ -273,6 +279,7 @@ my $start = $form->{start} || 0; my $stories = $searchDB->findStory($form, $start, $constants->{search_default_display} + 1, $form->{sort}); + my $totalhits = $searchDB->sqlSelect('@totalhits'); my $topic_ref = $form->{tid} ? $slashdb->getTopic($form->{tid}) : { }; slashDisplay('searchform', { @@ -282,6 +289,7 @@ op => $form->{op}, authors => _authors(), 'sort' => _sort(), + totalhits => $totalhits, }); if ($stories && @$stories) { @@ -316,6 +324,7 @@ forward => $forward, args => _buildargs($form), start => $start, + totalhits => $totalhits, }); } else { print getData('nostories'); @@ -328,6 +337,7 @@ my $start = $form->{start} || 0; my $polls = $searchDB->findPollQuestion($form, $start, $constants->{search_default_display} + 1, $form->{sort}); + my $totalhits = $searchDB->sqlSelect('@totalhits'); my $topic_ref = $form->{tid} ? $slashdb->getTopic($form->{tid}) : { }; slashDisplay('searchform', { op => $form->{op}, @@ -335,6 +345,7 @@ # sections => 1, # _skins(), tref => $topic_ref, 'sort' => _sort(), + totalhits => $totalhits, }); if ($polls && @$polls) { @@ -365,6 +376,7 @@ forward => $forward, args => _buildargs($form), start => $start, + totalhits => $totalhits, }); } else { print getData('nopolls'); @@ -522,9 +534,11 @@ my $start = $form->{start} || 0; my $entries = $searchDB->findJournalEntry($form, $start, $constants->{search_default_display} + 1, $form->{sort}); + my $totalhits = $searchDB->sqlSelect('@totalhits'); slashDisplay('searchform', { op => $form->{op}, 'sort' => _sort(), + totalhits => $totalhits, }); # check for extra articles ... we request one more than we need @@ -559,6 +573,7 @@ forward => $forward, args => _buildargs($form), start => $start, + totalhits => $totalhits, }); } else { print getData('nojournals'); @@ -603,6 +618,7 @@ my $start = $form->{start} || 0; my $entries = $searchDB->findSubmission($form, $start, $constants->{search_default_display} + 1, $form->{sort}); + my $totalhits = $searchDB->sqlSelect('@totalhits'); my $topic_ref = $form->{tid} ? $slashdb->getTopic($form->{tid}) : { }; slashDisplay('searchform', { op => $form->{op}, @@ -611,6 +627,7 @@ submission_notes => $slashdb->getDescriptions('submission-notes'), tref => $topic_ref, 'sort' => _sort(), + totalhits => $totalhits, }); # check for extra articles ... we request one more than we need @@ -645,6 +662,7 @@ forward => $forward, args => _buildargs($form), start => $start, + totalhits => $totalhits, }); } else { print getData('nosubmissions'); Modified: slashjp/trunk/plugins/Search/templates/searchform;search;default =================================================================== --- slashjp/trunk/plugins/Search/templates/searchform;search;default 2007-10-16 03:14:55 UTC (rev 188) +++ slashjp/trunk/plugins/Search/templates/searchform;search;default 2007-10-16 04:15:40 UTC (rev 189) @@ -22,9 +22,9 @@
- Search [% form.query %] + Search [% form.query | strip_attribute %] - + [% IF authors %] [% Slash.createSelect("author", authors, form.author, 1, 0, 1) %] [% END %] @@ -58,7 +58,7 @@ [% IF threshhold %] Threshold [% threshold_select %] - + [% END %]
@@ -94,7 +94,7 @@ IF thisparent %] :: [% topics.$thisparent.textname %] [% END; END; IF form.tid %] -:: [% topics.${form.tid}.textname %] +:: [% topics.${form.tid}.textname %] [% END; IF listnames.size %] Topics [% END %] From svnnotify → sourceforge.jp Tue Oct 16 13:16:30 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 13:16:30 +0900 Subject: [Slashdotjp-dev 685] [190] merge changelog from OTP Message-ID: <1192508190.198688.11666.nullmailer@users.sourceforge.jp> Revision: 190 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=190 Author: tach Date: 2007-10-16 13:16:30 +0900 (Tue, 16 Oct 2007) Log Message: ----------- merge changelog from OTP Modified Paths: -------------- slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-16 04:15:40 UTC (rev 189) +++ slashjp/trunk/debian/changelog 2007-10-16 04:16:30 UTC (rev 190) @@ -1,3 +1,78 @@ +slash (2.5.0.119-otp-13) unstable; urgency=low + + * Merged from OTP + + -- Taku YASUI Tue, 16 Oct 2007 13:12:18 +0900 + +slash (2.5.0.119-otp-12) unstable; urgency=low + + * Add: hide stories of specfied tid at admin story list + - use constant "admin_hide_tids" like "17,24,32" ... + + -- Taku YASUI Wed, 3 Oct 2007 09:49:09 +0900 + +slash (2.5.0.119-otp-11) unstable; urgency=low + + * add dependency (libgd-gd2-perl libgd-text-perl) for humanconf plugin. + + -- Tatsuki Sugiura Wed, 15 Aug 2007 17:31:56 +0900 + +slash (2.5.0.119-otp-10) unstable; urgency=low + + * Blob.pm: revert to upsatrem for increase max_allowed_packet. + + -- Tatsuki Sugiura Fri, 27 Jul 2007 15:23:46 +0900 + +slash (2.5.0.119-otp-9) unstable; urgency=low + + [ Taku YASUI ] + * Fix: sql syntax error when "$skid_list" is empty + + [ Tatsuki Sugiura ] + * Blob.pm: fix calculation of packet length when entering chunked mode + + -- Tatsuki Sugiura Fri, 27 Jul 2007 14:02:42 +0900 + +slash (2.5.0.119-otp-8) unstable; urgency=low + + [ Tatsuki Sugiura ] + * search plugin: check total hits + * search plugin: fetch dept column + + [ Taku YASUI ] + * Change debian/changelog time + * Make to get "Content-Transfer-Encoding" value from vars + + -- Taku YASUI Tue, 19 Jun 2007 20:01:40 +0900 + +slash (2.5.0.119-otp-5) unstable; urgency=low + + * Search plugin: senna full query support + * Search plugin: add '*D+' pragma in default + + -- Tatsuki Sugiura Fri, 25 May 2007 05:23:46 +0000 + +slash (2.5.0.119-otp-4) unstable; urgency=low + + * plugin/Search/Search.pm: search query was forced IN BOOLEAN MODE + * Utility::Data.pm: encode URL each single byte + + -- Tatsuki Sugiura Fri, 25 May 2007 14:08:12 +0900 + +slash (2.5.0.119-otp-3) unstable; urgency=low + + * change query string filter to enable japanese search. + + -- Tatsuki Sugiura Thu, 24 May 2007 14:18:47 +0900 + +slash (2.5.0.119-otp-2) unstable; urgency=low + + * Fix for binary data mangle: escape blob column as hex + before sending to SQL server. + * reverse order of related stories. + + -- Tatsuki Sugiura Wed, 09 May 2007 18:37:56 +0900 + slash (2.5.0.119-16) unstable; urgency=low * Hex encoding was applied for all binary columns. From svnnotify → sourceforge.jp Tue Oct 16 13:29:44 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 13:29:44 +0900 Subject: [Slashdotjp-dev 686] [191] fix version Message-ID: <1192508984.237097.19295.nullmailer@users.sourceforge.jp> Revision: 191 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=191 Author: tach Date: 2007-10-16 13:29:43 +0900 (Tue, 16 Oct 2007) Log Message: ----------- fix version Modified Paths: -------------- slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-16 04:16:30 UTC (rev 190) +++ slashjp/trunk/debian/changelog 2007-10-16 04:29:43 UTC (rev 191) @@ -1,8 +1,8 @@ -slash (2.5.0.119-otp-13) unstable; urgency=low +slash (2.5.0.119-17) unstable; urgency=low * Merged from OTP - -- Taku YASUI Tue, 16 Oct 2007 13:12:18 +0900 + -- Taku YASUI Tue, 16 Oct 2007 13:29:13 +0900 slash (2.5.0.119-otp-12) unstable; urgency=low From svnnotify → sourceforge.jp Tue Oct 16 13:33:39 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 13:33:39 +0900 Subject: [Slashdotjp-dev 687] [192] Change Maintainer and add Uploaders Message-ID: <1192509219.147291.22574.nullmailer@users.sourceforge.jp> Revision: 192 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=192 Author: tach Date: 2007-10-16 13:33:38 +0900 (Tue, 16 Oct 2007) Log Message: ----------- Change Maintainer and add Uploaders Modified Paths: -------------- slashjp/trunk/debian/control -------------- next part -------------- Modified: slashjp/trunk/debian/control =================================================================== --- slashjp/trunk/debian/control 2007-10-16 04:29:43 UTC (rev 191) +++ slashjp/trunk/debian/control 2007-10-16 04:33:38 UTC (rev 192) @@ -1,9 +1,10 @@ Source: slash Section: web Priority: extra -Maintainer: Tatsuki Sugiura +Maintainer: OSDN Japan Build-Depends: debhelper (>= 5), cdbs, libperl-dev (>= 5.8.8), apache-dev, libapache-mod-perl, libcompress-zlib-perl, libdbix-password-perl, libsoap-lite-perl Standards-Version: 3.7.2 +Uploaders: Taku YASUI , Tatsuki SUGIURA , Tatsuki SUGIURA Package: slash-common Architecture: any From svnnotify → sourceforge.jp Tue Oct 16 20:10:46 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 16 Oct 2007 20:10:46 +0900 Subject: [Slashdotjp-dev 688] [193] deluser impl Message-ID: <1192533046.533051.28826.nullmailer@users.sourceforge.jp> Revision: 193 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=193 Author: caesar Date: 2007-10-16 20:10:46 +0900 (Tue, 16 Oct 2007) Log Message: ----------- deluser impl Added Paths: ----------- slashjp/branches/deluser/ -------------- next part -------------- Copied: slashjp/branches/deluser (from rev 192, slashjp/trunk) From svnnotify → sourceforge.jp Thu Oct 18 23:00:13 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Thu, 18 Oct 2007 23:00:13 +0900 Subject: [Slashdotjp-dev 689] [195] import from slash T_2_5_0_180 Message-ID: <1192716013.900058.25588.nullmailer@users.sourceforge.jp> Revision: 195 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=195 Author: tach Date: 2007-10-18 23:00:11 +0900 (Thu, 18 Oct 2007) Log Message: ----------- import from slash T_2_5_0_180 Modified Paths: -------------- slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm slashjp/branches/upstream/current/Slash/DB/Static/MySQL/MySQL.pm slashjp/branches/upstream/current/Slash/Slash.pm slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm slashjp/branches/upstream/current/plugins/Admin/admin.pl slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default slashjp/branches/upstream/current/plugins/HumanConf/HumanConf.pm slashjp/branches/upstream/current/plugins/HumanConf/Static/Static.pm slashjp/branches/upstream/current/plugins/HumanConf/mysql_schema slashjp/branches/upstream/current/plugins/Login/login.pl slashjp/branches/upstream/current/sql/mysql/defaults.sql slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql slashjp/branches/upstream/current/sql/mysql/upgrades slashjp/branches/upstream/current/tagboxes/FHActivity/FHActivity.pm slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm slashjp/branches/upstream/current/tagboxes/FHPopularity/FHPopularity.pm slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm slashjp/branches/upstream/current/tagboxes/FireHoseScores/mysql_dump.sql slashjp/branches/upstream/current/tagboxes/TagCountUser/TagCountUser.pm slashjp/branches/upstream/current/tagboxes/Top/Top.pm slashjp/branches/upstream/current/tagboxes/Top/mysql_dump.sql slashjp/branches/upstream/current/themes/slashcode/THEME slashjp/branches/upstream/current/themes/slashcode/htdocs/users.pl slashjp/branches/upstream/current/themes/slashcode/templates/editComm;users;default slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default Added Paths: ----------- slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl -------------- next part -------------- Modified: slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: MySQL.pm,v 1.984 2007/10/09 18:57:09 jamiemccarthy Exp $ +# $Id: MySQL.pm,v 1.987 2007/10/16 23:04:51 tvroom Exp $ package Slash::DB::MySQL; use strict; @@ -20,7 +20,7 @@ use base 'Slash::DB::Utility'; use Slash::Constants ':messages'; -($VERSION) = ' $Revision: 1.984 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.987 $ ' =~ /\$Revision:\s+([^\s]+)/; # Fry: How can I live my life if I can't tell good from evil? @@ -267,6 +267,9 @@ => sub { $_[0]->sqlSelectMany('dkid, name', 'discussion_kinds') }, 'd2_comment_q' + => sub { $_[0]->sqlSelectMany('code, name', 'code_param', "type='d2_comment_q' AND code != 0") }, + + 'd2_comment_q_all' => sub { $_[0]->sqlSelectMany('code, name', 'code_param', "type='d2_comment_q'") }, 'd2_comment_limits' @@ -274,7 +277,6 @@ 'd2_comment_order' => sub { $_[0]->sqlSelectMany('code, name', 'code_param', "type='d2_comment_order'") }, - ); ######################################################## @@ -10279,7 +10281,7 @@ my %old_values = ( ); my %new_values = ( ); if ($constants->{plugin}{Tags}) { - my @update_keys = sort keys %$hashref; + my @update_keys = sort map { s/^-//; $_ } keys %$hashref; my $tagboxdb = getObject('Slash::Tagbox'); my @log_keys = $tagboxdb->userKeysNeedTagLog(\@update_keys); %old_values = ( map { ($_, undef) } @log_keys ); @@ -10308,7 +10310,7 @@ } # If a tagbox needs copies of before-and-after data, first # get a copy of the old data. - my @columns_needed = grep { exists $old_values{$_} } keys %minihash; + my @columns_needed = sort grep { exists $old_values{$_} } map { s/^-//; $_ } keys %minihash; if (@columns_needed) { my $old_hr = $self->sqlSelectHashref( join(',', @columns_needed), $table, $where); @@ -12445,6 +12447,37 @@ } } +sub addFileToQueue { + my($self, $file) = @_; + $self->sqlInsert("file_queue", $file); +} + +sub numPendingFilesForStory { + my($self, $stoid) = @_; + my $stoid_q = $self->sqlQuote($stoid); + $self->sqlCount("file_queue", "stoid=$stoid_q"); +} + +sub addStoryStaticFile { + my($self, $data) = @_; + $data ||= ""; + + # Guess at file type if it isn't set + if ($data->{name} =~ /\.(jpg|gif|png)$/) { + $data->{filetype} ||= "image"; + } elsif ($data->{name} =~ /\.(jpg|gif|png)$/) { + $data->{filetype} ||= "audio"; + } + + $self->sqlInsert("story_static_files", $data); +} + +sub getStaticFilesForStory { + my($self, $stoid) = @_; + my $stoid_q = $self->sqlQuote($stoid); + return $self->sqlSelectAllHashrefArray("*", "story_static_files", "stoid=$stoid_q"); +} + ######################################################## sub DESTROY { my($self) = @_; Modified: slashjp/branches/upstream/current/Slash/DB/Static/MySQL/MySQL.pm =================================================================== --- slashjp/branches/upstream/current/Slash/DB/Static/MySQL/MySQL.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/Slash/DB/Static/MySQL/MySQL.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: MySQL.pm,v 1.259 2007/08/01 17:31:12 jamiemccarthy Exp $ +# $Id: MySQL.pm,v 1.260 2007/10/16 23:04:51 tvroom Exp $ package Slash::DB::Static::MySQL; @@ -20,7 +20,7 @@ use vars qw($VERSION); use base 'Slash::DB::MySQL'; -($VERSION) = ' $Revision: 1.259 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.260 $ ' =~ /\$Revision:\s+([^\s]+)/; # FRY: Hey, thinking hurts 'em! Maybe I can think of a way to use that. @@ -1917,6 +1917,17 @@ ); } +sub getNextFileQueueCmds { + my($self) = @_; + return $self->sqlSelectAllHashrefArray("*", "file_queue", "", "ORDER BY fqid LIMIT 10"); +} + +sub deleteFileQueueCmd { + my($self,$fqid) = @_; + my $fqid_q = $self->sqlQuote($fqid); + $self->sqlDelete("file_queue", "fqid=$fqid_q"); +} + 1; __END__ Modified: slashjp/branches/upstream/current/Slash/Slash.pm =================================================================== --- slashjp/branches/upstream/current/Slash/Slash.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/Slash/Slash.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Slash.pm,v 1.335 2007/10/04 19:41:22 pudge Exp $ +# $Id: Slash.pm,v 1.336 2007/10/16 22:31:22 pudge Exp $ package Slash; @@ -145,7 +145,7 @@ my $d2_comment_q = $user->{d2_comment_q}; if ($discussion2 && !$d2_comment_q) { if ($user->{is_anon}) { - $d2_comment_q = 5; + $d2_comment_q = 5; # medium } } Modified: slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm =================================================================== --- slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Environment.pm,v 1.219 2007/10/09 20:01:08 pudge Exp $ +# $Id: Environment.pm,v 1.222 2007/10/17 06:31:24 pudge Exp $ package Slash::Utility::Environment; @@ -33,7 +33,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT); -($VERSION) = ' $Revision: 1.219 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.222 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( dbAvailable @@ -1580,7 +1580,7 @@ my $i = $2; # # for (0..255) { $x = ((($_-1)/256) < .1); last if !$x; printf "%d:%d\n", $_, $x; } - if ($ENV{GATEWAY_INTERFACE} && ( $i == 144 || $i == 113 || ((($i-1)/256) < .1) ) ) { # 10 percent, x.(0..3).y.z + if ($ENV{GATEWAY_INTERFACE} && ( $i == 144 || ((($i-1)/256) < .5) ) ) { # 10 percent, x.(0..3).y.z my $d2 = 'slashdot'; # get user-agent (ENV not populated yet) @@ -1844,7 +1844,7 @@ url_id spider_id miner_id keyword_id st_main_select stc_main_select parent_topic child_topic - skid primaryskid + skid primaryskid d2_comment_q d2_comment_order ), # Survey qw( @@ -3168,13 +3168,28 @@ an SQL function or value which can be used as part of a test against or an assignment into an SQL integer value. This value should _not_ be quoted but rather inserted directly into an SQL request. For example, -if passed "123" (a user id), will return "'123'" (same value, -quoted); if passed "200123456789abcd" (an encoded IP), will return -"CONV('200123456789abcd', 16, 10)" which can be used as an assignment -into or test against a BIGINT column. +if passed "123" (a user id), will return "CAST('123' AS UNSIGNED)" +(same value, quoted); if passed "200123456789abcd" (an encoded IP), +will return "CAST(CONV('200123456789abcd', 16, 10) AS UNSIGNED" which +can be used as an assignment into or test against a BIGINT column. For speed, does not do error-checking against the value passed in. +There are tricky technical reasons why all values that are used in +comparisons to srcid columns must be wrapped in a CAST(x AS UNSIGNED). +Tricky enough that I submitted a MySQL bug report which turned out to +be not a bug: . The short +explanation is that any comparison of a number (the srcid column in +the table) to a string results in both being internally converted to +a float before the comparison, and floats with more bits of data than +will fit in their mantissa do not always compare "equal to themselves." +We must ensure that the values compared against the BIGINT column are not +strings, and that means wrapping both a quoted uid ('123' is a string) +and a CONV (which returns a string) in a CAST. Note that even integers +known to have fewer bits than a float's mantissa, such as uid's, cannot +be quoted strings, as that can break equality testing even for other +properly-CAST values in an IN list. + Usage: $slashdb->sqlInsert("al2", { srcid => get_srcid_sql_in($srcid) }); @@ -3197,10 +3212,9 @@ my $slashdb = getCurrentDB(); my $srcid_q = $slashdb->sqlQuote($srcid); my $type = get_srcid_type($srcid); - if ($type eq 'uid') { - return $srcid_q; - } - return "CAST(CONV($srcid_q, 16, 10) AS UNSIGNED)"; + return $type eq 'uid' + ? "CAST($srcid_q AS UNSIGNED)" + : "CAST(CONV($srcid_q, 16, 10) AS UNSIGNED)"; } #======================================================================== @@ -3486,4 +3500,4 @@ =head1 VERSION -$Id: Environment.pm,v 1.219 2007/10/09 20:01:08 pudge Exp $ +$Id: Environment.pm,v 1.222 2007/10/17 06:31:24 pudge Exp $ Modified: slashjp/branches/upstream/current/plugins/Admin/admin.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Admin/admin.pl 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/Admin/admin.pl 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: admin.pl,v 1.319 2007/10/07 14:09:15 jamiemccarthy Exp $ +# $Id: admin.pl,v 1.321 2007/10/17 06:13:44 pudge Exp $ use strict; use File::Temp 'tempfile'; @@ -209,6 +209,11 @@ seclev => 500, adminmenu => 'info', tab_selected => 'pw' + }, + static_files => { + function => \&showStaticFiles, + seclev => 100, + adminmenu => 'info', } }; @@ -1136,25 +1141,6 @@ 'stoid', 1); } - # handle any media files that were given - if ($form->{media_file}) { - my $upload = $form->{query_apache}->upload; - if ($upload) { - my $fh = $upload->fh; - mkpath("/tmp/upload", 0, 0777) unless -e "/tmp/upload"; - $form->{media_file} =~ s|^.*?([^/:\\]+)$|$1|; - my $name = $form->{media_file}; - my $ofh = gensym(); - if (!open $ofh, ">/tmp/upload/$name\0") { - } else { - while (<$fh>) { - print $ofh $_; - } - close $ofh; - $slashdb->insertMediaFile($stoid, $name); - } - } - } # Basically, we upload the bodytext if we realize a name has been passed in -Brian if ($form->{bodytext_file}) { @@ -1311,6 +1297,7 @@ $storyref->{$field}); } $display_check = $storyref->{neverdisplay} ? '' : $constants->{markup_checked_attribute}; + handleMediaFileForStory($stoid); } else { # New Story @@ -1525,7 +1512,11 @@ tags_example => \@tags_example, }, { Return => 1 }); } - + my $pending_file_count = 0; + my $story_static_files = []; + if ($stoid) { + $pending_file_count = $slashdb->numPendingFilesForStory($stoid); $story_static_files = $slashdb->getStaticFilesForStory($stoid); + } slashDisplay('editStory', { stoid => $stoid, storyref => $storyref, @@ -1555,6 +1546,8 @@ user_signoff => $user_signoff, add_related_text => $add_related_text, yoogli_similar_stories => $yoogli_similar_stories, + pending_file_count => $pending_file_count, + story_static_files => $story_static_files }); } @@ -2105,12 +2098,50 @@ $slashdb->setRelatedStoriesForStory($form->{sid}, $related_sids_hr, $related_urls_hr, $related_cids_hr, $related_firehose_hr); $slashdb->createSignoff($st->{stoid}, $user->{uid}, "updated"); + + + # handle any media files that were given + handleMediaFileForStory($st->{stoid}); + # make sure you pass it the goods listStories(@_); } } ################################################################## +sub handleMediaFileForStory { + my($stoid) = @_; + my $form = getCurrentForm(); + my $slashdb = getCurrentDB(); + if ($form->{media_file}) { + my $upload = $form->{query_apache}->upload; + if ($upload) { + my $fh = $upload->fh; + use File::Path; + mkpath("/tmp/upload", 0, 0755) unless -e "/tmp/upload"; + $form->{media_file} =~ s|^.*?([^/:\\]+)$|$1|; + my $name = $form->{media_file}; + my $suffix; + ($suffix) = $name =~ /(\.\w+)$/; + use File::Temp qw(:mktemp); + my ($ofh, $tmpname) = mkstemps("/tmp/upload/fileXXXXXX", $suffix ); + + while (<$fh>) { + print $ofh $_; + } + close $ofh; + my $file = { + stoid => $stoid, + file => "$tmpname", + action => "upload", + }; + $slashdb->addFileToQueue($file); + } + } + +} + +################################################################## sub displaySlashd { my($form, $slashdb, $user, $constants) = @_; my $answer = $slashdb->getSlashdStatuses(); @@ -2423,6 +2454,7 @@ slashHook('admin_save_story_success', { story => $data }); my $st = $slashdb->getStory($data->{sid}); my $stoid = $st->{stoid}; + handleMediaFileForStory($stoid); my %warn_skids = map {$_ => 1 } split('\|', $constants->{admin_warn_primaryskid}); my $data = {}; if ($warn_skids{$st->{primaryskid}}) { @@ -2626,6 +2658,13 @@ } +sub showStaticFiles { + my($form, $slashdb, $user, $constants) = @_; + my $story = $slashdb->getStory($form->{sid}); + my $story_static_files = $slashdb->getStaticFilesForStory($story->{stoid}); + slashDisplay("static_files", { story_static_files => $story_static_files, sid => $form->{sid} }); +} + createEnvironment(); main(); 1; Modified: slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default =================================================================== --- slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default 2007-10-18 14:00:11 UTC (rev 195) @@ -246,17 +246,25 @@ [% PROCESS editbuttons %] - [% IF story_media_ref %] + [% IF story_static_files && story_static_files.size %] - - [% FOREACH mfile = story_media_ref %] - +
mfile.smidmfile.name
+ [% FOREACH mfile = story_static_files %] + [% trunc_name = mfile.name %] + [% trunc_name = trunc_name.replace('^\d+',"") %] + + + [% END %]
[% mfile.sfid %][% mfile.name %][% constants.imagedir %]/articles/[% sid %][% trunc_name %] +[% IF mfile.filetype == "image" %] + +[% END %] +
[% END %] @@ -280,4 +288,4 @@ __seclev__ 10000 __version__ -$Id: editStory;admin;default,v 1.76 2007/07/31 13:36:49 entweichen Exp $ +$Id: editStory;admin;default,v 1.77 2007/10/16 22:59:06 tvroom Exp $ Added: slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default =================================================================== --- slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default 2007-10-18 14:00:11 UTC (rev 195) @@ -0,0 +1,31 @@ +__section__ +default +__description__ +You should describe stuff here. +__title__ +Useless title to template +__page__ +admin +__lang__ +en_US +__name__ +static_files +__seclev__ +10000 +__template__ + +[% FOREACH mfile = story_static_files %] + [% trunc_name = mfile.name %] + [% trunc_name = trunc_name.replace('^\d+',"") %] + + [% IF mfile.filetype == "image" %] + + [% END %] + +[% END %] +
[% mfile.sfid %][% mfile.name %][% constants.imagedir %]/articles/[% sid %][% trunc_name %]
+ + + +__version__ +$Id: static_files;admin;default,v 1.1 2007/10/16 22:59:06 tvroom Exp $ Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: ajax.pl,v 1.56 2007/10/09 23:03:34 pudge Exp $ +# $Id: ajax.pl,v 1.57 2007/10/16 17:22:23 entweichen Exp $ use strict; use warnings; @@ -14,7 +14,7 @@ use Slash::Utility; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.56 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.57 $ ' =~ /\$Revision:\s+([^\s]+)/; ################################################################## sub main { @@ -526,7 +526,6 @@ d2_comment_order => $params{'d2_comment_order'} || undef, emaildisplay => $params{'emaildisplay'} || undef, nosigs => ($params{'nosigs'} ? 1 : 0), - no_spell => ($params{'no_spell'} ? 1 : 0), }; $slashdb->setUser($params{uid}, $user_edits_table); Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js 2007-10-18 14:00:11 UTC (rev 195) @@ -1,5 +1,5 @@ // _*_ Mode: JavaScript; tab-width: 8; indent-tabs-mode: true _*_ -// $Id: common.js,v 1.145 2007/10/11 22:14:06 pudge Exp $ +// $Id: common.js,v 1.146 2007/10/16 17:35:25 entweichen Exp $ var fh_play = 0; var fh_is_timed_out = 0; @@ -1415,7 +1415,8 @@ return; } -function getModalPrefs(section) { +function getModalPrefs(section, title) { + document.getElementById('preference_title').innerHTML = title; var params = []; params['op'] = 'getModalPrefs'; params['section'] = section; Modified: slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-18 14:00:11 UTC (rev 195) @@ -23,16 +23,16 @@ [% IF user.discussion2 && user.discussion2 == "slashdot" %]
- How Many Comments - [% comment_q = Slash.db.getDescriptions('d2_comment_q'); - comment_q_def = user.d2_comment_q || 0; - Slash.createSelect('d2_comment_q', comment_q, comment_q_def, 1) %]
- + How Many Comments + [% comment_q_name = (user.is_subscriber || user.is_admin) ? 'd2_comment_q_all' : 'd2_comment_q'; + comment_q = Slash.db.getDescriptions(comment_q_name); + Slash.createSelect('d2_comment_q', comment_q, user.d2_comment_q, 1) %]
+ Comment Retrieval Order - [% comment_order = Slash.db.getDescriptions('d2_comment_order'); - comment_order_def = user.d2_comment_order || 0; - Slash.createSelect('d2_comment_order', comment_order, comment_order_def, 1) %] -
+ [% comment_order = Slash.db.getDescriptions('d2_comment_order'); + comment_order_def = user.d2_comment_order || 0; # score + Slash.createSelect('d2_comment_order', comment_order, comment_order_def, 1) %] +
[% END %] @@ -68,14 +68,6 @@ [% PROCESS formNote note='Strip sig quotes from comments' %] - - [% IF user.is_admin; - nospell_check = ''; - IF user.no_spell; - nospell_check = constants.markup_checked_attribute; - END %] - - [% END %] @@ -85,4 +77,4 @@ __seclev__ 500 __version__ -$Id: prefs_d2;ajax;default,v 1.3 2007/10/09 23:03:34 pudge Exp $ +$Id: prefs_d2;ajax;default,v 1.5 2007/10/16 22:31:22 pudge Exp $ Modified: slashjp/branches/upstream/current/plugins/HumanConf/HumanConf.pm =================================================================== --- slashjp/branches/upstream/current/plugins/HumanConf/HumanConf.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/HumanConf/HumanConf.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: HumanConf.pm,v 1.11 2005/05/29 15:02:29 jamiemccarthy Exp $ +# $Id: HumanConf.pm,v 1.12 2007/10/12 07:23:03 jamiemccarthy Exp $ package Slash::HumanConf; @@ -16,7 +16,7 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; -($VERSION) = ' $Revision: 1.11 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.12 $ ' =~ /\$Revision:\s+([^\s]+)/; sub new { my($class, $user) = @_; @@ -78,7 +78,7 @@ "hcpid, html", "humanconf_pool", "hcqid=" . $slashdb->sqlQuote($hcqid) - . " AND filename != ''" + . " AND filename_img != ''" . " AND created_at < DATE_SUB(NOW(), INTERVAL $secs SECOND)" . " AND inuse = 0", "ORDER BY RAND() LIMIT 1" Modified: slashjp/branches/upstream/current/plugins/HumanConf/Static/Static.pm =================================================================== --- slashjp/branches/upstream/current/plugins/HumanConf/Static/Static.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/HumanConf/Static/Static.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Static.pm,v 1.39 2007/10/09 20:44:48 jamiemccarthy Exp $ +# $Id: Static.pm,v 1.40 2007/10/12 07:23:03 jamiemccarthy Exp $ package Slash::HumanConf::Static; @@ -19,7 +19,7 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; -($VERSION) = ' $Revision: 1.39 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.40 $ ' =~ /\$Revision:\s+([^\s]+)/; sub new { my($class, $user) = @_; @@ -266,7 +266,7 @@ my $success = $self->sqlInsert("humanconf_pool", { hcqid => $question, answer => $answer, - filename => "", + filename_img => "", html => "", inuse => 1, }); @@ -348,7 +348,8 @@ my $filename_mp3 = sprintf("%02d/%s%s", $hcpid % 100, $encoded_name, '.mp3'); my $full_filename_mp3 = "$dir/$filename_mp3"; my $ssml_text = join('', - map { uc } split //, $answer); + "\u$answer.", + map { "\u$_." } split //, $answer); my @voices = split / /, ($constants->{hc_cepstral_voices} || 'William'); my $voice = $voices[rand @voices]; @@ -357,19 +358,19 @@ my $logdir = $constants->{logdir}; my $cepstral_prefix = catfile($logdir, "cepstral."); my $ssml_fh = undef; - my $ssml_file = File::Temp::mktemp("${cepstral_prefix}XXXXXXXXXX.ssml"); + my $ssml_file = File::Temp::mktemp("${cepstral_prefix}.ssml.XXXXXXXXXX"); if (open(my $ssml_fh, ">$ssml_file")) { print $ssml_fh $ssml_text; close $ssml_fh; } - my $wav_file = $ssml_file; $wav_file =~ s/\.ssml$/.wav/; + my $wav_file = $ssml_file; $wav_file =~ s/\.ssml\./.wav./; system("swift -f $ssml_file -o $wav_file"); unlink($ssml_file); if ($constants->{hc_cepstral_mp3encoder}) { system("$constants->{hc_cepstral_mp3encoder} -S --resample 22.05 $wav_file $full_filename_mp3"); } unlink($wav_file); - return $full_filename_mp3; + return $filename_mp3; } sub get_sizediff { Modified: slashjp/branches/upstream/current/plugins/HumanConf/mysql_schema =================================================================== --- slashjp/branches/upstream/current/plugins/HumanConf/mysql_schema 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/HumanConf/mysql_schema 2007-10-18 14:00:11 UTC (rev 195) @@ -1,5 +1,5 @@ # -# $Id: mysql_schema,v 1.7 2007/10/09 20:44:48 jamiemccarthy Exp $ +# $Id: mysql_schema,v 1.8 2007/10/12 07:23:03 jamiemccarthy Exp $ # DROP TABLE IF EXISTS humanconf; @@ -23,7 +23,7 @@ inuse TINYINT DEFAULT '0' NOT NULL, filename_img VARCHAR(63) NOT NULL, filename_mp3 VARCHAR(63) DEFAULT NULL, - html VARCHAR(255) NOT NULL, + html TEXT NOT NULL, PRIMARY KEY (hcpid), KEY answer (answer), KEY lastused (lastused) Modified: slashjp/branches/upstream/current/plugins/Login/login.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Login/login.pl 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/plugins/Login/login.pl 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: login.pl,v 1.27 2007/01/11 19:58:49 pudge Exp $ +# $Id: login.pl,v 1.28 2007/10/16 22:31:22 pudge Exp $ use strict; use Slash 2.003; @@ -12,7 +12,7 @@ use Slash::XML; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.27 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.28 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $slashdb = getCurrentDB(); @@ -446,10 +446,10 @@ my $params = $reader->getDescriptions('otherusersparam'); for my $param (keys %$params) { - if (exists $form->{$param}) { - # set user too for output in this request - $data->{$param} = $user->{$param} = $form->{$param} || undef; - } + # set user too for output in this request + $data->{$param} = $user->{$param} = defined($form->{$param}) + ? $form->{$param} + : $params->{$param}; } } Modified: slashjp/branches/upstream/current/sql/mysql/defaults.sql =================================================================== --- slashjp/branches/upstream/current/sql/mysql/defaults.sql 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/sql/mysql/defaults.sql 2007-10-18 14:00:11 UTC (rev 195) @@ -3,7 +3,7 @@ #-------------------------------------------------------- # Server version 3.23.26-beta-log # -# $Id: defaults.sql,v 1.371 2007/10/11 22:17:00 pudge Exp $ +# $Id: defaults.sql,v 1.372 2007/10/17 06:13:44 pudge Exp $ # # @@ -829,7 +829,7 @@ INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_lastid', '0', 'accesslogid to start searching at'); INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_weeks', '8', 'number of weeks back to compare current stats to'); INSERT INTO vars (name, value, description) VALUES ('currentqid',1,'The Current Question on the homepage pollbooth'); -INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_179','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records'); +INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_180','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records'); INSERT INTO vars (name, value, description) VALUES ('datadir','/usr/local/slash/www.example.com','What is the root of the install for Slash'); INSERT INTO vars (name, value, description) VALUES ('db_auto_increment_increment','1','If your master DB uses auto_increment_increment, i.e. multiple master replication, echo its value into this var'); INSERT INTO vars (name, value, description) VALUES ('dbsparklines_disp','0','Display dbsparklines in the currentAdminUsers box?'); Modified: slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql =================================================================== --- slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql 2007-10-18 14:00:11 UTC (rev 195) @@ -4,7 +4,7 @@ #-------------------------------------------------------- # Server version 3.23.26-beta # -# $Id: slashschema_create.sql,v 1.250 2007/10/10 20:45:08 jamiemccarthy Exp $ +# $Id: slashschema_create.sql,v 1.252 2007/10/17 06:13:44 pudge Exp $ # # @@ -509,7 +509,21 @@ PRIMARY KEY (region) ) TYPE=InnoDB; + # +# Table structure for table 'file_queue' +# + +CREATE TABLE file_queue ( + fqid int(10) unsigned NOT NULL auto_increment, + stoid mediumint(8) unsigned default NULL, + fhid mediumint(8) unsigned default NULL, + file varchar(255) default NULL, + action enum('upload','thumbnails') default NULL, + PRIMARY KEY (fqid) +) ENGINE=InnoDB; + +# # Table structure for table 'formkeys' # @@ -1048,7 +1062,22 @@ INDEX tid_stoid (tid, stoid) ) TYPE=InnoDB; + # +# Table structure for table 'story_static_files' +# + +DROP TABLE IF EXISTS story_static_files; +CREATE TABLE story_static_files( + sfid mediumint unsigned NOT NULL auto_increment, + stoid mediumint unsigned NOT NULL, + filetype ENUM("file", "image", "audio") not null default "file", + name varchar(255) default '' NOT NULL, + PRIMARY KEY (sfid), + INDEX stoid(stoid) +) ENGINE=InnoDB; + +# # Table structure for table 'string_param' # Modified: slashjp/branches/upstream/current/sql/mysql/upgrades =================================================================== --- slashjp/branches/upstream/current/sql/mysql/upgrades 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/sql/mysql/upgrades 2007-10-18 14:00:11 UTC (rev 195) @@ -10,7 +10,7 @@ # after X started at the same time that X was tagged. # -# $Id: upgrades,v 1.1255 2007/10/11 22:17:00 pudge Exp $ +# $Id: upgrades,v 1.1261 2007/10/18 03:01:38 pudge Exp $ # # BEGIN tf23's additions @@ -4885,13 +4885,9 @@ # 2007-10-04 UPDATE vars SET value = 'T_2_5_0_177' WHERE name = 'cvs_tag_currentcode'; -# SLASHCODE/USEPERL LAST UPDATED HERE - # 2007-10-05 UPDATE vars SET value = 'T_2_5_0_178' WHERE name = 'cvs_tag_currentcode'; -# SLASHDOT LAST UPDATED HERE - # For modal preferences INSERT INTO vars (name, value, description) VALUES ('modal_prefs_active', 1, 'Toggles modal preferences on/off'); @@ -4907,3 +4903,45 @@ # 2007-10-11 UPDATE vars SET value = 'T_2_5_0_179' WHERE name = 'cvs_tag_currentcode'; +# SLASHDOT LAST UPDATED HERE + + +# default prefs for new /. accounts +INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','discussion2','slashdot'); +INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','d2_comment_q','5'); # medium +INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','d2_comment_order','0'); # score + +# For plugins/HumanConf +ALTER TABLE humanconf_pool MODIFY html TEXT NOT NULL; + +# For tagboxes/FireHoseScores +INSERT INTO tagbox_userkeyregexes VALUES ('FireHoseScores', '^tag_clout$'); + +# For tagboxes/Top +INSERT INTO tagbox_userkeyregexes VALUES ('Top', '^tag_clout$'); + + +CREATE TABLE file_queue ( + fqid int(10) unsigned NOT NULL auto_increment, + stoid mediumint(8) unsigned default NULL, + fhid mediumint(8) unsigned default NULL, + file varchar(255) default NULL, + action enum('upload','thumbnails') default NULL, + PRIMARY KEY (fqid) +) ENGINE=InnoDB; + +CREATE TABLE story_static_files( + sfid mediumint unsigned NOT NULL auto_increment, + stoid mediumint unsigned NOT NULL, + filetype ENUM("file", "image", "audio") not null default "file", + name varchar(255) default '' NOT NULL, + PRIMARY KEY (sfid), + INDEX stoid(stoid) +) ENGINE=InnoDB; + + +# 2007-10-16 +UPDATE vars SET value = 'T_2_5_0_180' WHERE name = 'cvs_tag_currentcode'; + +# SLASHCODE/USEPERL LAST UPDATED HERE + Modified: slashjp/branches/upstream/current/tagboxes/FHActivity/FHActivity.pm =================================================================== --- slashjp/branches/upstream/current/tagboxes/FHActivity/FHActivity.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/FHActivity/FHActivity.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: FHActivity.pm,v 1.5 2007/09/26 21:25:51 jamiemccarthy Exp $ +# $Id: FHActivity.pm,v 1.6 2007/10/18 03:02:50 jamiemccarthy Exp $ package Slash::Tagbox::FHActivity; @@ -28,7 +28,7 @@ use Data::Dumper; use vars qw( $VERSION ); -$VERSION = ' $Revision: 1.5 $ ' =~ /\$Revision:\s+([^\s]+)/; +$VERSION = ' $Revision: 1.6 $ ' =~ /\$Revision:\s+([^\s]+)/; use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm =================================================================== --- slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/FHEditorPop/FHEditorPop.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: FHEditorPop.pm,v 1.18 2007/09/26 21:25:51 jamiemccarthy Exp $ +# $Id: FHEditorPop.pm,v 1.19 2007/10/18 03:02:50 jamiemccarthy Exp $ # This goes by seclev right now but perhaps should define "editor" # to be more about author than admin seclev. In which case the @@ -32,7 +32,7 @@ use Data::Dumper; use vars qw( $VERSION ); -$VERSION = ' $Revision: 1.18 $ ' =~ /\$Revision:\s+([^\s]+)/; +$VERSION = ' $Revision: 1.19 $ ' =~ /\$Revision:\s+([^\s]+)/; use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge @@ -41,15 +41,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -61,6 +58,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/branches/upstream/current/tagboxes/FHPopularity/FHPopularity.pm =================================================================== --- slashjp/branches/upstream/current/tagboxes/FHPopularity/FHPopularity.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/FHPopularity/FHPopularity.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: FHPopularity.pm,v 1.17 2007/09/26 21:25:51 jamiemccarthy Exp $ +# $Id: FHPopularity.pm,v 1.18 2007/10/18 03:02:50 jamiemccarthy Exp $ package Slash::Tagbox::FHPopularity; @@ -28,7 +28,7 @@ use Data::Dumper; use vars qw( $VERSION ); -$VERSION = ' $Revision: 1.17 $ ' =~ /\$Revision:\s+([^\s]+)/; +$VERSION = ' $Revision: 1.18 $ ' =~ /\$Revision:\s+([^\s]+)/; use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm =================================================================== --- slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/FireHoseScores/FireHoseScores.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: FireHoseScores.pm,v 1.2 2007/10/04 16:34:25 jamiemccarthy Exp $ +# $Id: FireHoseScores.pm,v 1.4 2007/10/18 03:02:50 jamiemccarthy Exp $ package Slash::Tagbox::FireHoseScores; @@ -28,7 +28,7 @@ use Data::Dumper; use vars qw( $VERSION ); -$VERSION = ' $Revision: 1.2 $ ' =~ /\$Revision:\s+([^\s]+)/; +$VERSION = ' $Revision: 1.4 $ ' =~ /\$Revision:\s+([^\s]+)/; use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); @@ -116,11 +120,44 @@ sub feed_userchanges { my($self, $users_ar) = @_; my $constants = getCurrentStatic(); + my $tagsdb = getObject('Slash::Tags'); main::tagboxLog("FireHoseScores->feed_userchanges called: users_ar='" . join(' ', map { $_->{tuid} } @$users_ar) . "'"); - # XXX need to fill this in, and check FirstMover feed_userchanges too + my %max_tuid = ( ); + my %uid_change_sum = ( ); + my %globj_change = ( ); + for my $hr (@$users_ar) { + next unless $hr->{user_key} eq 'tag_clout'; + $max_tuid{$hr->{uid}} ||= $hr->{tuid}; + $max_tuid{$hr->{uid}} = $hr->{tuid} + if $max_tuid{$hr->{uid}} < $hr->{tuid}; + $uid_change_sum{$hr->{uid}} ||= 0; + $uid_change_sum{$hr->{uid}} += abs(($hr->{value_old} || 1) - $hr->{value_new}); + } + my $upvoteid = $tagsdb->getTagnameidCreate($constants->{tags_upvote_tagname} || 'nod'); + my $downvoteid = $tagsdb->getTagnameidCreate($constants->{tags_downvote_tagname} || 'nix'); + for my $uid (keys %uid_change_sum) { + my $tags_ar = $tagsdb->getAllTagsFromUser($uid); + for my $tag_hr (@$tags_ar) { + next unless $tag_hr->{tagnameid} == $upvoteid || $tag_hr->{tagnameid} == $downvoteid; + $globj_change{$tag_hr->{globjid}}{max_tuid} ||= $max_tuid{$uid}; + $globj_change{$tag_hr->{globjid}}{max_tuid} = $max_tuid{$uid} + if $globj_change{$tag_hr->{globjid}}{max_tuid} < $max_tuid{$uid}; + $globj_change{$tag_hr->{globjid}}{sum} ||= 0; + $globj_change{$tag_hr->{globjid}}{sum} += $uid_change_sum{$uid}; + } + } + my $ret_ar = [ ]; + for my $globjid (sort { $a <=> $b } keys %globj_change) { + push @$ret_ar, { + tuid => $globj_change{$globjid}{max_tuid}, + affected_id => $globjid, + importance => $globj_change{$globjid}{sum}, + }; + } - return [ ]; + main::tagboxLog("FireHoseScores->feed_userchanges returning " . scalar(@$ret_ar)); + return $ret_ar; } sub run { Modified: slashjp/branches/upstream/current/tagboxes/FireHoseScores/mysql_dump.sql =================================================================== --- slashjp/branches/upstream/current/tagboxes/FireHoseScores/mysql_dump.sql 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/FireHoseScores/mysql_dump.sql 2007-10-18 14:00:11 UTC (rev 195) @@ -1,5 +1,5 @@ -# $Id: mysql_dump.sql,v 1.1 2007/09/28 03:33:20 jamiemccarthy Exp $ -INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FHPopularity2', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); +# $Id: mysql_dump.sql,v 1.2 2007/10/13 11:52:33 jamiemccarthy Exp $ +INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FireHoseScores', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_maxudcmult', '5', 'Maximum multiplier for an up/down tag based on the tags_udc table'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_udcbasis', '1000', 'Basis for tags_udc vote clout weighting'); @@ -7,3 +7,5 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_gracemult', '3', 'Multiplier factor for a firehose item during the grace period'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_gracevotes', '4', 'Max number of votes for which the grace period will apply'); +INSERT INTO tagbox_userkeyregexes VALUES ('FireHoseScores', '^tag_clout$'); + Modified: slashjp/branches/upstream/current/tagboxes/TagCountUser/TagCountUser.pm =================================================================== --- slashjp/branches/upstream/current/tagboxes/TagCountUser/TagCountUser.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/TagCountUser/TagCountUser.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: TagCountUser.pm,v 1.7 2007/02/22 22:45:21 jamiemccarthy Exp $ +# $Id: TagCountUser.pm,v 1.9 2007/10/18 03:07:52 jamiemccarthy Exp $ package Slash::Tagbox::TagCountUser; @@ -28,7 +28,7 @@ use Data::Dumper; use vars qw( $VERSION ); -$VERSION = ' $Revision: 1.7 $ ' =~ /\$Revision:\s+([^\s]+)/; +$VERSION = ' $Revision: 1.9 $ ' =~ /\$Revision:\s+([^\s]+)/; use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; if (scalar(@$tags_ar) < 9) { Modified: slashjp/branches/upstream/current/tagboxes/Top/Top.pm =================================================================== --- slashjp/branches/upstream/current/tagboxes/Top/Top.pm 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/Top/Top.pm 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Top.pm,v 1.12 2007/09/26 21:25:51 jamiemccarthy Exp $ +# $Id: Top.pm,v 1.13 2007/10/18 03:02:50 jamiemccarthy Exp $ package Slash::Tagbox::Top; @@ -28,7 +28,7 @@ use Data::Dumper; use vars qw( $VERSION ); -$VERSION = ' $Revision: 1.12 $ ' =~ /\$Revision:\s+([^\s]+)/; +$VERSION = ' $Revision: 1.13 $ ' =~ /\$Revision:\s+([^\s]+)/; use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/branches/upstream/current/tagboxes/Top/mysql_dump.sql =================================================================== --- slashjp/branches/upstream/current/tagboxes/Top/mysql_dump.sql 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/tagboxes/Top/mysql_dump.sql 2007-10-18 14:00:11 UTC (rev 195) @@ -1,7 +1,9 @@ -# $Id: mysql_dump.sql,v 1.2 2007/09/28 02:47:09 jamiemccarthy Exp $ +# $Id: mysql_dump.sql,v 1.3 2007/10/13 11:52:33 jamiemccarthy Exp $ INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'Top', 'globj', 1, 1, '2000-01-01 00:00:00', 0, 0, 0); INSERT INTO tagbox_userkeyregexes VALUES ('Top', '^tag_clout$'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_top_minscore_stories', '2', 'Minimum score a tag must have to make it into the top tags for a story'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_top_minscore_urls', '2', 'Minimum score a tag must have to make it into the top tags for a URL'); +INSERT INTO tagbox_userkeyregexes VALUES ('Top', '^tag_clout$'); + Modified: slashjp/branches/upstream/current/themes/slashcode/THEME =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/THEME 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/themes/slashcode/THEME 2007-10-18 14:00:11 UTC (rev 195) @@ -1,4 +1,4 @@ -# $Id: THEME,v 1.124 2007/10/11 22:14:06 pudge Exp $ +# $Id: THEME,v 1.125 2007/10/16 23:01:19 tvroom Exp $ name=slashcode description="Slashcode.com theme" topic=htdocs/images/topics/topicbug.jpg @@ -160,6 +160,7 @@ task=tasks/p2f_hof_topics.pl task=tasks/performance_stats.pl task=tasks/precache_gse.pl +task=tasks/process_file_queue.pl task=tasks/refresh_authors_cache.pl task=tasks/refresh_section_metakeywords.pl task=tasks/report_slashd_errors.pl Modified: slashjp/branches/upstream/current/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/htdocs/users.pl 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/themes/slashcode/htdocs/users.pl 2007-10-18 14:00:11 UTC (rev 195) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: users.pl,v 1.339 2007/08/23 20:28:04 pudge Exp $ +# $Id: users.pl,v 1.340 2007/10/16 22:31:24 pudge Exp $ use strict; use Digest::MD5 'md5_hex'; @@ -2743,6 +2743,13 @@ my $clsmall_bonus = ($form->{clsmall_bonus} !~ /^[\-+]?\d+$/) ? 0 : $form->{clsmall_bonus}; my $clbig_bonus = ($form->{clbig_bonus} !~ /^[\-+]?\d+$/) ? 0 : $form->{clbig_bonus}; + # plum + $form->{d2_comment_q} = (isSubscriber($user_edit) || $user_edit->{seclev} >= 100) + ? $form->{d2_comment_q} + : ($form->{d2_comment_q} eq '0') + ? 1 + : $form->{d2_comment_q}; + my $user_edits_table = { discussion2 => $form->{discussion2} || undef, d2_comment_q => $form->{d2_comment_q} || undef, Added: slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl 2007-10-18 14:00:11 UTC (rev 195) @@ -0,0 +1,142 @@ +#!/usr/bin/perl -w +# This code is a part of Slash, and is released under the GPL. +# Copyright 1997-2005 by Open Source Technology Group. See README +# and COPYING for more information, or see http://slashcode.com/. +# $Id: process_file_queue.pl,v 1.1 2007/10/16 22:59:52 tvroom Exp $ + +use File::Path; +use File::Temp; +use File::Copy; +use Slash::Constants ':slashd'; + +use strict; + +use vars qw( %task $me $task_exit_flag ); + +$task{$me}{timespec} = '* * * * *'; +$task{$me}{timespec_panic_1} = '* * * * *'; +$task{$me}{timespec_panic_2} = ''; +$task{$me}{on_startup} = 1; +$task{$me}{fork} = SLASHD_NOWAIT; +$task{$me}{code} = sub { + my($virtual_user, $constants, $slashdb, $user, $info, $gSkin) = @_; + + my $file_queue_cmds = []; + my $cmd; + while (!$task_exit_flag) { + if(!@$file_queue_cmds) { + $file_queue_cmds = $slashdb->getNextFileQueueCmds(); + } + $cmd = shift @$file_queue_cmds; + if($cmd) { + handleFileCmd($cmd); + } + last if $task_exit_flag; + sleep(10); + } +}; + +sub handleFileCmd { + my($cmd) = @_; + my $slashdb = getCurrentDB(); + if ($cmd->{action} eq "upload") { + uploadFile($cmd); + } + $slashdb->deleteFileQueueCmd($cmd->{fqid}); + if (verifyFileLocation($cmd->{file})) { + unlink $cmd->{file}; + } +} + +sub getStoryFileDir { + my($sid) = @_; + my $bd = getCurrentStatic("basedir"); + my $yearid = substr($sid, 0, 2); + my $monthid = substr($sid, 3, 2); + my $dayid = substr($sid, 6, 2); + my $path = catdir($bd, "images", "articles", $yearid, $monthid, $dayid); + return $path; +} + +sub getFireHoseFileDir { + my($fhid) = @_; + my $bd = getCurrentStatic("basedir"); + my ($numdir) = sprintf("%09d",$fhid); + my ($i,$j) = $numdir =~ /(\d\d\d)(\d\d\d)\d\d\d/; + my $path = catdir($bd, "images", "firehose", $i, $j); + return $path; +} + +sub makeFileDir { + my($dir) = @_; + mkpath $dir, 0, 0775; +} + +# verify any file we're copying or deleting meets our expectations +sub verifyFileLocation { + my($file) = @_; + return $file =~ /^\/tmp\/upload\/\w+(\.\w+)?$/ +} + +sub uploadFile { + my($cmd) = @_; + my @suffixlist = (); + my $slashdb = getCurrentDB(); + my $story = $slashdb->getStory($cmd->{stoid}); + if ($story->{sid}) { + my $destpath = getStoryFileDir($story->{sid}); + makeFileDir($destpath); + my ($prefix) = $story->{sid} =~ /^\d\d\/\d\d\/\d\d\/(\d+)$/; + + my ($name,$path,$suffix) = fileparse($cmd->{file}, → suffixlist); + ($suffix) = $name =~ /(\.\w+)$/; + if (verifyFileLocation($cmd->{file})) { + my $destfile = copyFileToLocation($cmd->{file}, $destpath, $prefix); + my $name = fileparse($destfile); + my $data = { + stoid => $cmd->{stoid}, + name => $name + }; + + $slashdb->addStoryStaticFile($data); + } + + } + if ($cmd->{fhid}) { + my $destpath = getFireHoseFileDir($cmd->{fhid}); + makeFileDir($destpath); + my $numdir = sprintf("%09d",$cmd->{fhid}); + my ($prefix) = $numdir =~ /\d\d\d\d\d\d(\d\d\d)/; + copyFileToLocation($cmd->{file}, $destpath, $prefix); + } +} + +sub copyFileToLocation { + my ($srcfile, $destpath, $prefix) = @_; + slashdLog("$srcfile | $destpath | $prefix\n"); + my @suffixlist; + my ($name,$path,$suffix) = fileparse($srcfile, @suffixlist); + ($suffix) = $name =~ /(\.\w+)$/; + $suffix = lc($suffix); + my $destfile; + my $foundfile = 0; + my $i = 1; + my $ret_val = ""; + while(!$foundfile && $i < 20) { + $destfile = $destpath . "/". $prefix . "-$i" . $suffix; + if (!-e $destfile) { + $foundfile = 1; + } else { + $i++; + } + } + if ($foundfile) { + copy($srcfile, $destfile); + $ret_val = $destfile; + } else { + slashdLog("Couldn't save file to dir - too many already exist"); + } + return $ret_val; +} + +1; Modified: slashjp/branches/upstream/current/themes/slashcode/templates/editComm;users;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/editComm;users;default 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/themes/slashcode/templates/editComm;users;default 2007-10-18 14:00:11 UTC (rev 195) @@ -64,9 +64,10 @@ [% IF user_edit.discussion2 && user_edit.discussion2 == "slashdot" %]
How Many Comments - [% comment_q = Slash.db.getDescriptions('d2_comment_q'); - comment_q_def = user_edit.d2_comment_q || 0; - Slash.createSelect('d2_comment_q', comment_q, comment_q_def, 1) %]
+ [% comment_q_name = ( Slash.isSubscriber(user_edit) || (user_edit.seclev >= 100) ) ? 'd2_comment_q_all' : 'd2_comment_q'; + comment_q = Slash.db.getDescriptions(comment_q_name); + Slash.createSelect('d2_comment_q', comment_q, user_edit.d2_comment_q, 1) %]
+ Comment Retrieval Order [% comment_order = Slash.db.getDescriptions('d2_comment_order'); comment_order_def = user_edit.d2_comment_order || 0; @@ -306,4 +307,4 @@ __seclev__ 500 __version__ -$Id: editComm;users;default,v 1.64 2007/10/11 08:35:53 pudge Exp $ +$Id: editComm;users;default,v 1.65 2007/10/16 22:31:25 pudge Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default 2007-10-18 13:48:23 UTC (rev 194) +++ slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default 2007-10-18 14:00:11 UTC (rev 195) @@ -186,7 +186,7 @@ return_url = gSkin.rootdir _ '/comments.pl?sid=' _ sid %] Login [% ELSE %] - Prefs + Prefs [% END %] [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] @@ -272,7 +272,7 @@ return_url = gSkin.rootdir _ '/comments.pl?sid=' _ sid %] Login [% ELSE %] - Prefs + Prefs [% END %] [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] | [% Slash.linkComment({ @@ -296,7 +296,7 @@ @@ -304,4 +304,4 @@ __seclev__ 10000 __version__ -$Id: printCommentsMain;misc;default,v 1.92 2007/10/11 22:14:06 pudge Exp $ +$Id: printCommentsMain;misc;default,v 1.93 2007/10/16 17:43:39 entweichen Exp $ From svnnotify → sourceforge.jp Thu Oct 18 23:07:12 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Thu, 18 Oct 2007 23:07:12 +0900 Subject: [Slashdotjp-dev 690] [197] remove unnessesary upstream branch: 2.5.0.165 Message-ID: <1192716432.882089.29643.nullmailer@users.sourceforge.jp> Revision: 197 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=197 Author: tach Date: 2007-10-18 23:07:12 +0900 (Thu, 18 Oct 2007) Log Message: ----------- remove unnessesary upstream branch: 2.5.0.165 Removed Paths: ------------- slashjp/branches/upstream/2.5.0.165/ -------------- next part -------------- From svnnotify → sourceforge.jp Thu Oct 18 23:21:50 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Thu, 18 Oct 2007 23:21:50 +0900 Subject: [Slashdotjp-dev 691] [198] merged from upstram T_2_5_0_180 Message-ID: <1192717310.555451.8222.nullmailer@users.sourceforge.jp> Revision: 198 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=198 Author: tach Date: 2007-10-18 23:21:49 +0900 (Thu, 18 Oct 2007) Log Message: ----------- merged from upstram T_2_5_0_180 Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm slashjp/trunk/Slash/Slash.pm slashjp/trunk/Slash/Utility/Environment/Environment.pm slashjp/trunk/plugins/Admin/admin.pl slashjp/trunk/plugins/Admin/templates/editStory;admin;default slashjp/trunk/plugins/Ajax/htdocs/ajax.pl slashjp/trunk/plugins/Ajax/htdocs/images/common.js slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default slashjp/trunk/plugins/HumanConf/HumanConf.pm slashjp/trunk/plugins/HumanConf/Static/Static.pm slashjp/trunk/plugins/HumanConf/mysql_schema slashjp/trunk/plugins/Login/login.pl slashjp/trunk/sql/mysql/defaults.sql slashjp/trunk/sql/mysql/slashschema_create.sql slashjp/trunk/sql/mysql/upgrades slashjp/trunk/tagboxes/FHActivity/FHActivity.pm slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm slashjp/trunk/tagboxes/FireHoseScores/mysql_dump.sql slashjp/trunk/tagboxes/TagCountUser/TagCountUser.pm slashjp/trunk/tagboxes/Top/Top.pm slashjp/trunk/themes/slashcode/THEME slashjp/trunk/themes/slashcode/htdocs/users.pl slashjp/trunk/themes/slashcode/templates/editComm;users;default slashjp/trunk/themes/slashcode/templates/printCommentsMain;misc;default Added Paths: ----------- slashjp/trunk/plugins/Admin/templates/static_files;admin;default slashjp/trunk/themes/slashcode/tasks/process_file_queue.pl -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -272,6 +272,9 @@ => sub { $_[0]->sqlSelectMany('dkid, name', 'discussion_kinds') }, 'd2_comment_q' + => sub { $_[0]->sqlSelectMany('code, name', 'code_param', "type='d2_comment_q' AND code != 0") }, + + 'd2_comment_q_all' => sub { $_[0]->sqlSelectMany('code, name', 'code_param', "type='d2_comment_q'") }, 'd2_comment_limits' @@ -279,7 +282,6 @@ 'd2_comment_order' => sub { $_[0]->sqlSelectMany('code, name', 'code_param', "type='d2_comment_order'") }, - ); ######################################################## @@ -10316,7 +10318,7 @@ my %old_values = ( ); my %new_values = ( ); if ($constants->{plugin}{Tags}) { - my @update_keys = sort keys %$hashref; + my @update_keys = sort map { s/^-//; $_ } keys %$hashref; my $tagboxdb = getObject('Slash::Tagbox'); my @log_keys = $tagboxdb->userKeysNeedTagLog(\@update_keys); %old_values = ( map { ($_, undef) } @log_keys ); @@ -10345,7 +10347,7 @@ } # If a tagbox needs copies of before-and-after data, first # get a copy of the old data. - my @columns_needed = grep { exists $old_values{$_} } keys %minihash; + my @columns_needed = sort grep { exists $old_values{$_} } map { s/^-//; $_ } keys %minihash; if (@columns_needed) { my $old_hr = $self->sqlSelectHashref( join(',', @columns_needed), $table, $where); @@ -12484,6 +12486,37 @@ } } +sub addFileToQueue { + my($self, $file) = @_; + $self->sqlInsert("file_queue", $file); +} + +sub numPendingFilesForStory { + my($self, $stoid) = @_; + my $stoid_q = $self->sqlQuote($stoid); + $self->sqlCount("file_queue", "stoid=$stoid_q"); +} + +sub addStoryStaticFile { + my($self, $data) = @_; + $data ||= ""; + + # Guess at file type if it isn't set + if ($data->{name} =~ /\.(jpg|gif|png)$/) { + $data->{filetype} ||= "image"; + } elsif ($data->{name} =~ /\.(jpg|gif|png)$/) { + $data->{filetype} ||= "audio"; + } + + $self->sqlInsert("story_static_files", $data); +} + +sub getStaticFilesForStory { + my($self, $stoid) = @_; + my $stoid_q = $self->sqlQuote($stoid); + return $self->sqlSelectAllHashrefArray("*", "story_static_files", "stoid=$stoid_q"); +} + ######################################################## sub DESTROY { my($self) = @_; Modified: slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/Slash/DB/Static/MySQL/MySQL.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -1917,6 +1917,17 @@ ); } +sub getNextFileQueueCmds { + my($self) = @_; + return $self->sqlSelectAllHashrefArray("*", "file_queue", "", "ORDER BY fqid LIMIT 10"); +} + +sub deleteFileQueueCmd { + my($self,$fqid) = @_; + my $fqid_q = $self->sqlQuote($fqid); + $self->sqlDelete("file_queue", "fqid=$fqid_q"); +} + 1; __END__ Modified: slashjp/trunk/Slash/Slash.pm =================================================================== --- slashjp/trunk/Slash/Slash.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/Slash/Slash.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -145,7 +145,7 @@ my $d2_comment_q = $user->{d2_comment_q}; if ($discussion2 && !$d2_comment_q) { if ($user->{is_anon}) { - $d2_comment_q = 5; + $d2_comment_q = 5; # medium } } Modified: slashjp/trunk/Slash/Utility/Environment/Environment.pm =================================================================== --- slashjp/trunk/Slash/Utility/Environment/Environment.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/Slash/Utility/Environment/Environment.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -1582,7 +1582,7 @@ my $i = $2; # # for (0..255) { $x = ((($_-1)/256) < .1); last if !$x; printf "%d:%d\n", $_, $x; } - if ($ENV{GATEWAY_INTERFACE} && ( $i == 144 || $i == 113 || ((($i-1)/256) < .1) ) ) { # 10 percent, x.(0..3).y.z + if ($ENV{GATEWAY_INTERFACE} && ( $i == 144 || ((($i-1)/256) < .5) ) ) { # 10 percent, x.(0..3).y.z my $d2 = 'slashdot'; # get user-agent (ENV not populated yet) @@ -1847,7 +1847,7 @@ url_id spider_id miner_id keyword_id st_main_select stc_main_select parent_topic child_topic - skid primaryskid + skid primaryskid d2_comment_q d2_comment_order ), # Survey qw( @@ -3198,13 +3198,28 @@ an SQL function or value which can be used as part of a test against or an assignment into an SQL integer value. This value should _not_ be quoted but rather inserted directly into an SQL request. For example, -if passed "123" (a user id), will return "'123'" (same value, -quoted); if passed "200123456789abcd" (an encoded IP), will return -"CONV('200123456789abcd', 16, 10)" which can be used as an assignment -into or test against a BIGINT column. +if passed "123" (a user id), will return "CAST('123' AS UNSIGNED)" +(same value, quoted); if passed "200123456789abcd" (an encoded IP), +will return "CAST(CONV('200123456789abcd', 16, 10) AS UNSIGNED" which +can be used as an assignment into or test against a BIGINT column. For speed, does not do error-checking against the value passed in. +There are tricky technical reasons why all values that are used in +comparisons to srcid columns must be wrapped in a CAST(x AS UNSIGNED). +Tricky enough that I submitted a MySQL bug report which turned out to +be not a bug: . The short +explanation is that any comparison of a number (the srcid column in +the table) to a string results in both being internally converted to +a float before the comparison, and floats with more bits of data than +will fit in their mantissa do not always compare "equal to themselves." +We must ensure that the values compared against the BIGINT column are not +strings, and that means wrapping both a quoted uid ('123' is a string) +and a CONV (which returns a string) in a CAST. Note that even integers +known to have fewer bits than a float's mantissa, such as uid's, cannot +be quoted strings, as that can break equality testing even for other +properly-CAST values in an IN list. + Usage: $slashdb->sqlInsert("al2", { srcid => get_srcid_sql_in($srcid) }); @@ -3227,10 +3242,9 @@ my $slashdb = getCurrentDB(); my $srcid_q = $slashdb->sqlQuote($srcid); my $type = get_srcid_type($srcid); - if ($type eq 'uid') { - return $srcid_q; - } - return "CAST(CONV($srcid_q, 16, 10) AS UNSIGNED)"; + return $type eq 'uid' + ? "CAST($srcid_q AS UNSIGNED)" + : "CAST(CONV($srcid_q, 16, 10) AS UNSIGNED)"; } #======================================================================== Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/Admin/admin.pl 2007-10-18 14:21:49 UTC (rev 198) @@ -209,6 +209,11 @@ seclev => 500, adminmenu => 'info', tab_selected => 'pw' + }, + static_files => { + function => \&showStaticFiles, + seclev => 100, + adminmenu => 'info', } }; @@ -1136,25 +1141,6 @@ 'stoid', 1); } - # handle any media files that were given - if ($form->{media_file}) { - my $upload = $form->{query_apache}->upload; - if ($upload) { - my $fh = $upload->fh; - mkpath("/tmp/upload", 0, 0777) unless -e "/tmp/upload"; - $form->{media_file} =~ s|^.*?([^/:\\]+)$|$1|; - my $name = $form->{media_file}; - my $ofh = gensym(); - if (!open $ofh, ">/tmp/upload/$name\0") { - } else { - while (<$fh>) { - print $ofh $_; - } - close $ofh; - $slashdb->insertMediaFile($stoid, $name); - } - } - } # Basically, we upload the bodytext if we realize a name has been passed in -Brian if ($form->{bodytext_file}) { @@ -1313,6 +1299,7 @@ $storyref->{$field}); } $display_check = $storyref->{neverdisplay} ? '' : $constants->{markup_checked_attribute}; + handleMediaFileForStory($stoid); } else { # New Story @@ -1527,7 +1514,11 @@ tags_example => \@tags_example, }, { Return => 1 }); } - + my $pending_file_count = 0; + my $story_static_files = []; + if ($stoid) { + $pending_file_count = $slashdb->numPendingFilesForStory($stoid); $story_static_files = $slashdb->getStaticFilesForStory($stoid); + } slashDisplay('editStory', { stoid => $stoid, storyref => $storyref, @@ -1557,6 +1548,8 @@ user_signoff => $user_signoff, add_related_text => $add_related_text, yoogli_similar_stories => $yoogli_similar_stories, + pending_file_count => $pending_file_count, + story_static_files => $story_static_files }); } @@ -2107,12 +2100,50 @@ $slashdb->setRelatedStoriesForStory($form->{sid}, $related_sids_hr, $related_urls_hr, $related_cids_hr, $related_firehose_hr); $slashdb->createSignoff($st->{stoid}, $user->{uid}, "updated"); + + + # handle any media files that were given + handleMediaFileForStory($st->{stoid}); + # make sure you pass it the goods listStories(@_); } } ################################################################## +sub handleMediaFileForStory { + my($stoid) = @_; + my $form = getCurrentForm(); + my $slashdb = getCurrentDB(); + if ($form->{media_file}) { + my $upload = $form->{query_apache}->upload; + if ($upload) { + my $fh = $upload->fh; + use File::Path; + mkpath("/tmp/upload", 0, 0755) unless -e "/tmp/upload"; + $form->{media_file} =~ s|^.*?([^/:\\]+)$|$1|; + my $name = $form->{media_file}; + my $suffix; + ($suffix) = $name =~ /(\.\w+)$/; + use File::Temp qw(:mktemp); + my ($ofh, $tmpname) = mkstemps("/tmp/upload/fileXXXXXX", $suffix ); + + while (<$fh>) { + print $ofh $_; + } + close $ofh; + my $file = { + stoid => $stoid, + file => "$tmpname", + action => "upload", + }; + $slashdb->addFileToQueue($file); + } + } + +} + +################################################################## sub displaySlashd { my($form, $slashdb, $user, $constants) = @_; my $answer = $slashdb->getSlashdStatuses(); @@ -2425,6 +2456,7 @@ slashHook('admin_save_story_success', { story => $data }); my $st = $slashdb->getStory($data->{sid}); my $stoid = $st->{stoid}; + handleMediaFileForStory($stoid); my %warn_skids = map {$_ => 1 } split('\|', $constants->{admin_warn_primaryskid}); my $data = {}; if ($warn_skids{$st->{primaryskid}}) { @@ -2628,6 +2660,13 @@ } +sub showStaticFiles { + my($form, $slashdb, $user, $constants) = @_; + my $story = $slashdb->getStory($form->{sid}); + my $story_static_files = $slashdb->getStaticFilesForStory($story->{stoid}); + slashDisplay("static_files", { story_static_files => $story_static_files, sid => $form->{sid} }); +} + createEnvironment(); main(); 1; Modified: slashjp/trunk/plugins/Admin/templates/editStory;admin;default =================================================================== --- slashjp/trunk/plugins/Admin/templates/editStory;admin;default 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/Admin/templates/editStory;admin;default 2007-10-18 14:21:49 UTC (rev 198) @@ -246,17 +246,25 @@ [% PROCESS editbuttons %] - [% IF story_media_ref %] + [% IF story_static_files && story_static_files.size %] - - [% FOREACH mfile = story_media_ref %] - +
mfile.smidmfile.name
+ [% FOREACH mfile = story_static_files %] + [% trunc_name = mfile.name %] + [% trunc_name = trunc_name.replace('^\d+',"") %] + + + [% END %]
[% mfile.sfid %][% mfile.name %][% constants.imagedir %]/articles/[% sid %][% trunc_name %] +[% IF mfile.filetype == "image" %] + +[% END %] +
[% END %] Added: slashjp/trunk/plugins/Admin/templates/static_files;admin;default =================================================================== --- slashjp/trunk/plugins/Admin/templates/static_files;admin;default 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/Admin/templates/static_files;admin;default 2007-10-18 14:21:49 UTC (rev 198) @@ -0,0 +1,31 @@ +__section__ +default +__description__ +You should describe stuff here. +__title__ +Useless title to template +__page__ +admin +__lang__ +en_US +__name__ +static_files +__seclev__ +10000 +__template__ + +[% FOREACH mfile = story_static_files %] + [% trunc_name = mfile.name %] + [% trunc_name = trunc_name.replace('^\d+',"") %] + + [% IF mfile.filetype == "image" %] + + [% END %] + +[% END %] +
[% mfile.sfid %][% mfile.name %][% constants.imagedir %]/articles/[% sid %][% trunc_name %]
+ + + +__version__ +$Id: static_files;admin;default,v 1.1 2007/10/16 22:59:06 tvroom Exp $ Modified: slashjp/trunk/plugins/Ajax/htdocs/ajax.pl =================================================================== --- slashjp/trunk/plugins/Ajax/htdocs/ajax.pl 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/Ajax/htdocs/ajax.pl 2007-10-18 14:21:49 UTC (rev 198) @@ -526,7 +526,6 @@ d2_comment_order => $params{'d2_comment_order'} || undef, emaildisplay => $params{'emaildisplay'} || undef, nosigs => ($params{'nosigs'} ? 1 : 0), - no_spell => ($params{'no_spell'} ? 1 : 0), }; $slashdb->setUser($params{uid}, $user_edits_table); Modified: slashjp/trunk/plugins/Ajax/htdocs/images/common.js =================================================================== --- slashjp/trunk/plugins/Ajax/htdocs/images/common.js 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/Ajax/htdocs/images/common.js 2007-10-18 14:21:49 UTC (rev 198) @@ -1415,7 +1415,8 @@ return; } -function getModalPrefs(section) { +function getModalPrefs(section, title) { + document.getElementById('preference_title').innerHTML = title; var params = []; params['op'] = 'getModalPrefs'; params['section'] = section; Modified: slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default =================================================================== --- slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-18 14:21:49 UTC (rev 198) @@ -23,16 +23,16 @@ [% IF user.discussion2 && user.discussion2 == "slashdot" %]
- How Many Comments - [% comment_q = Slash.db.getDescriptions('d2_comment_q'); - comment_q_def = user.d2_comment_q || 0; - Slash.createSelect('d2_comment_q', comment_q, comment_q_def, 1) %]
- + How Many Comments + [% comment_q_name = (user.is_subscriber || user.is_admin) ? 'd2_comment_q_all' : 'd2_comment_q'; + comment_q = Slash.db.getDescriptions(comment_q_name); + Slash.createSelect('d2_comment_q', comment_q, user.d2_comment_q, 1) %]
+ Comment Retrieval Order - [% comment_order = Slash.db.getDescriptions('d2_comment_order'); - comment_order_def = user.d2_comment_order || 0; - Slash.createSelect('d2_comment_order', comment_order, comment_order_def, 1) %] -
+ [% comment_order = Slash.db.getDescriptions('d2_comment_order'); + comment_order_def = user.d2_comment_order || 0; # score + Slash.createSelect('d2_comment_order', comment_order, comment_order_def, 1) %] +
[% END %] @@ -68,14 +68,6 @@ [% PROCESS formNote note='Strip sig quotes from comments' %] - - [% IF user.is_admin; - nospell_check = ''; - IF user.no_spell; - nospell_check = constants.markup_checked_attribute; - END %] - - [% END %] Modified: slashjp/trunk/plugins/HumanConf/HumanConf.pm =================================================================== --- slashjp/trunk/plugins/HumanConf/HumanConf.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/HumanConf/HumanConf.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -78,7 +78,7 @@ "hcpid, html", "humanconf_pool", "hcqid=" . $slashdb->sqlQuote($hcqid) - . " AND filename != ''" + . " AND filename_img != ''" . " AND created_at < DATE_SUB(NOW(), INTERVAL $secs SECOND)" . " AND inuse = 0", "ORDER BY RAND() LIMIT 1" Modified: slashjp/trunk/plugins/HumanConf/Static/Static.pm =================================================================== --- slashjp/trunk/plugins/HumanConf/Static/Static.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/HumanConf/Static/Static.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -266,7 +266,7 @@ my $success = $self->sqlInsert("humanconf_pool", { hcqid => $question, answer => $answer, - filename => "", + filename_img => "", html => "", inuse => 1, }); @@ -348,7 +348,8 @@ my $filename_mp3 = sprintf("%02d/%s%s", $hcpid % 100, $encoded_name, '.mp3'); my $full_filename_mp3 = "$dir/$filename_mp3"; my $ssml_text = join('', - map { uc } split //, $answer); + "\u$answer.", + map { "\u$_." } split //, $answer); my @voices = split / /, ($constants->{hc_cepstral_voices} || 'William'); my $voice = $voices[rand @voices]; @@ -357,19 +358,19 @@ my $logdir = $constants->{logdir}; my $cepstral_prefix = catfile($logdir, "cepstral."); my $ssml_fh = undef; - my $ssml_file = File::Temp::mktemp("${cepstral_prefix}XXXXXXXXXX.ssml"); + my $ssml_file = File::Temp::mktemp("${cepstral_prefix}.ssml.XXXXXXXXXX"); if (open(my $ssml_fh, ">$ssml_file")) { print $ssml_fh $ssml_text; close $ssml_fh; } - my $wav_file = $ssml_file; $wav_file =~ s/\.ssml$/.wav/; + my $wav_file = $ssml_file; $wav_file =~ s/\.ssml\./.wav./; system("swift -f $ssml_file -o $wav_file"); unlink($ssml_file); if ($constants->{hc_cepstral_mp3encoder}) { system("$constants->{hc_cepstral_mp3encoder} -S --resample 22.05 $wav_file $full_filename_mp3"); } unlink($wav_file); - return $full_filename_mp3; + return $filename_mp3; } sub get_sizediff { Modified: slashjp/trunk/plugins/HumanConf/mysql_schema =================================================================== --- slashjp/trunk/plugins/HumanConf/mysql_schema 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/HumanConf/mysql_schema 2007-10-18 14:21:49 UTC (rev 198) @@ -23,7 +23,7 @@ inuse TINYINT DEFAULT '0' NOT NULL, filename_img VARCHAR(63) NOT NULL, filename_mp3 VARCHAR(63) DEFAULT NULL, - html VARCHAR(255) NOT NULL, + html TEXT NOT NULL, PRIMARY KEY (hcpid), KEY answer (answer), KEY lastused (lastused) Modified: slashjp/trunk/plugins/Login/login.pl =================================================================== --- slashjp/trunk/plugins/Login/login.pl 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/plugins/Login/login.pl 2007-10-18 14:21:49 UTC (rev 198) @@ -468,10 +468,10 @@ my $params = $reader->getDescriptions('otherusersparam'); for my $param (keys %$params) { - if (exists $form->{$param}) { - # set user too for output in this request - $data->{$param} = $user->{$param} = $form->{$param} || undef; - } + # set user too for output in this request + $data->{$param} = $user->{$param} = defined($form->{$param}) + ? $form->{$param} + : $params->{$param}; } } Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/sql/mysql/defaults.sql 2007-10-18 14:21:49 UTC (rev 198) @@ -829,7 +829,7 @@ INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_lastid', '0', 'accesslogid to start searching at'); INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_weeks', '8', 'number of weeks back to compare current stats to'); INSERT INTO vars (name, value, description) VALUES ('currentqid',1,'The Current Question on the homepage pollbooth'); -INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_179','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records'); +INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_180','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records'); INSERT INTO vars (name, value, description) VALUES ('datadir','/usr/local/slash/www.example.com','What is the root of the install for Slash'); INSERT INTO vars (name, value, description) VALUES ('db_auto_increment_increment','1','If your master DB uses auto_increment_increment, i.e. multiple master replication, echo its value into this var'); INSERT INTO vars (name, value, description) VALUES ('dbsparklines_disp','0','Display dbsparklines in the currentAdminUsers box?'); Modified: slashjp/trunk/sql/mysql/slashschema_create.sql =================================================================== --- slashjp/trunk/sql/mysql/slashschema_create.sql 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/sql/mysql/slashschema_create.sql 2007-10-18 14:21:49 UTC (rev 198) @@ -509,7 +509,21 @@ PRIMARY KEY (region) ) TYPE=InnoDB; + # +# Table structure for table 'file_queue' +# + +CREATE TABLE file_queue ( + fqid int(10) unsigned NOT NULL auto_increment, + stoid mediumint(8) unsigned default NULL, + fhid mediumint(8) unsigned default NULL, + file varchar(255) default NULL, + action enum('upload','thumbnails') default NULL, + PRIMARY KEY (fqid) +) ENGINE=InnoDB; + +# # Table structure for table 'formkeys' # @@ -1048,7 +1062,22 @@ INDEX tid_stoid (tid, stoid) ) TYPE=InnoDB; + # +# Table structure for table 'story_static_files' +# + +DROP TABLE IF EXISTS story_static_files; +CREATE TABLE story_static_files( + sfid mediumint unsigned NOT NULL auto_increment, + stoid mediumint unsigned NOT NULL, + filetype ENUM("file", "image", "audio") not null default "file", + name varchar(255) default '' NOT NULL, + PRIMARY KEY (sfid), + INDEX stoid(stoid) +) ENGINE=InnoDB; + +# # Table structure for table 'string_param' # Modified: slashjp/trunk/sql/mysql/upgrades =================================================================== --- slashjp/trunk/sql/mysql/upgrades 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/sql/mysql/upgrades 2007-10-18 14:21:49 UTC (rev 198) @@ -4885,13 +4885,9 @@ # 2007-10-04 UPDATE vars SET value = 'T_2_5_0_177' WHERE name = 'cvs_tag_currentcode'; -# SLASHCODE/USEPERL LAST UPDATED HERE - # 2007-10-05 UPDATE vars SET value = 'T_2_5_0_178' WHERE name = 'cvs_tag_currentcode'; -# SLASHDOT LAST UPDATED HERE - # For modal preferences INSERT INTO vars (name, value, description) VALUES ('modal_prefs_active', 1, 'Toggles modal preferences on/off'); @@ -4907,3 +4903,45 @@ # 2007-10-11 UPDATE vars SET value = 'T_2_5_0_179' WHERE name = 'cvs_tag_currentcode'; +# SLASHDOT LAST UPDATED HERE + + +# default prefs for new /. accounts +INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','discussion2','slashdot'); +INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','d2_comment_q','5'); # medium +INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','d2_comment_order','0'); # score + +# For plugins/HumanConf +ALTER TABLE humanconf_pool MODIFY html TEXT NOT NULL; + +# For tagboxes/FireHoseScores +INSERT INTO tagbox_userkeyregexes VALUES ('FireHoseScores', '^tag_clout$'); + +# For tagboxes/Top +INSERT INTO tagbox_userkeyregexes VALUES ('Top', '^tag_clout$'); + + +CREATE TABLE file_queue ( + fqid int(10) unsigned NOT NULL auto_increment, + stoid mediumint(8) unsigned default NULL, + fhid mediumint(8) unsigned default NULL, + file varchar(255) default NULL, + action enum('upload','thumbnails') default NULL, + PRIMARY KEY (fqid) +) ENGINE=InnoDB; + +CREATE TABLE story_static_files( + sfid mediumint unsigned NOT NULL auto_increment, + stoid mediumint unsigned NOT NULL, + filetype ENUM("file", "image", "audio") not null default "file", + name varchar(255) default '' NOT NULL, + PRIMARY KEY (sfid), + INDEX stoid(stoid) +) ENGINE=InnoDB; + + +# 2007-10-16 +UPDATE vars SET value = 'T_2_5_0_180' WHERE name = 'cvs_tag_currentcode'; + +# SLASHCODE/USEPERL LAST UPDATED HERE + Modified: slashjp/trunk/tagboxes/FHActivity/FHActivity.pm =================================================================== --- slashjp/trunk/tagboxes/FHActivity/FHActivity.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/tagboxes/FHActivity/FHActivity.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm =================================================================== --- slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -41,15 +41,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -61,6 +58,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm =================================================================== --- slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm =================================================================== --- slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags} || !$plugin->{FireHose}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); @@ -116,11 +120,44 @@ sub feed_userchanges { my($self, $users_ar) = @_; my $constants = getCurrentStatic(); + my $tagsdb = getObject('Slash::Tags'); main::tagboxLog("FireHoseScores->feed_userchanges called: users_ar='" . join(' ', map { $_->{tuid} } @$users_ar) . "'"); - # XXX need to fill this in, and check FirstMover feed_userchanges too + my %max_tuid = ( ); + my %uid_change_sum = ( ); + my %globj_change = ( ); + for my $hr (@$users_ar) { + next unless $hr->{user_key} eq 'tag_clout'; + $max_tuid{$hr->{uid}} ||= $hr->{tuid}; + $max_tuid{$hr->{uid}} = $hr->{tuid} + if $max_tuid{$hr->{uid}} < $hr->{tuid}; + $uid_change_sum{$hr->{uid}} ||= 0; + $uid_change_sum{$hr->{uid}} += abs(($hr->{value_old} || 1) - $hr->{value_new}); + } + my $upvoteid = $tagsdb->getTagnameidCreate($constants->{tags_upvote_tagname} || 'nod'); + my $downvoteid = $tagsdb->getTagnameidCreate($constants->{tags_downvote_tagname} || 'nix'); + for my $uid (keys %uid_change_sum) { + my $tags_ar = $tagsdb->getAllTagsFromUser($uid); + for my $tag_hr (@$tags_ar) { + next unless $tag_hr->{tagnameid} == $upvoteid || $tag_hr->{tagnameid} == $downvoteid; + $globj_change{$tag_hr->{globjid}}{max_tuid} ||= $max_tuid{$uid}; + $globj_change{$tag_hr->{globjid}}{max_tuid} = $max_tuid{$uid} + if $globj_change{$tag_hr->{globjid}}{max_tuid} < $max_tuid{$uid}; + $globj_change{$tag_hr->{globjid}}{sum} ||= 0; + $globj_change{$tag_hr->{globjid}}{sum} += $uid_change_sum{$uid}; + } + } + my $ret_ar = [ ]; + for my $globjid (sort { $a <=> $b } keys %globj_change) { + push @$ret_ar, { + tuid => $globj_change{$globjid}{max_tuid}, + affected_id => $globjid, + importance => $globj_change{$globjid}{sum}, + }; + } - return [ ]; + main::tagboxLog("FireHoseScores->feed_userchanges returning " . scalar(@$ret_ar)); + return $ret_ar; } sub run { Modified: slashjp/trunk/tagboxes/FireHoseScores/mysql_dump.sql =================================================================== --- slashjp/trunk/tagboxes/FireHoseScores/mysql_dump.sql 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/tagboxes/FireHoseScores/mysql_dump.sql 2007-10-18 14:21:49 UTC (rev 198) @@ -1,9 +1,11 @@ +# $Id: mysql_dump.sql,v 1.1 2007/09/28 03:33:20 jamiemccarthy Exp $ +INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FireHoseScores', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); -INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FHPopularity2', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); - INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_maxudcmult', '5', 'Maximum multiplier for an up/down tag based on the tags_udc table'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_udcbasis', '1000', 'Basis for tags_udc vote clout weighting'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_gracetime', '1200', 'Number of initial seconds of a firehose item life let it float higher in the hose'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_gracemult', '3', 'Multiplier factor for a firehose item during the grace period'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_gracevotes', '4', 'Max number of votes for which the grace period will apply'); +INSERT INTO tagbox_userkeyregexes VALUES ('FireHoseScores', '^tag_clout$'); + Modified: slashjp/trunk/tagboxes/TagCountUser/TagCountUser.pm =================================================================== --- slashjp/trunk/tagboxes/TagCountUser/TagCountUser.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/tagboxes/TagCountUser/TagCountUser.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; if (scalar(@$tags_ar) < 9) { Modified: slashjp/trunk/tagboxes/Top/Top.pm =================================================================== --- slashjp/trunk/tagboxes/Top/Top.pm 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/tagboxes/Top/Top.pm 2007-10-18 14:21:49 UTC (rev 198) @@ -37,15 +37,12 @@ sub new { my($class, $user) = @_; - my $plugin = getCurrentStatic('plugin'); - return undef if !$plugin->{Tags}; - my($tagbox_name) = $class =~ /(\w+)$/; - my $tagbox = getCurrentStatic('tagbox'); - return undef if !$tagbox->{$tagbox_name}; + return undef if !$class->isInstalled(); # Note that getTagboxes() would call back to this new() function # if the tagbox objects have not yet been created -- but the # no_objects option prevents that. See getTagboxes() for details. + my($tagbox_name) = $class =~ /(\w+)$/; my %self_hash = %{ getObject('Slash::Tagbox')->getTagboxes($tagbox_name, undef, { no_objects => 1 }) }; my $self = \%self_hash; return undef if !$self || !keys %$self; @@ -57,6 +54,13 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + my($tagbox_name) = $class =~ /(\w+)$/; + return $constants->{plugin}{Tags} && $constants->{tagbox}{$tagbox_name} || 0; +} + sub feed_newtags { my($self, $tags_ar) = @_; my $constants = getCurrentStatic(); Modified: slashjp/trunk/themes/slashcode/THEME =================================================================== --- slashjp/trunk/themes/slashcode/THEME 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/themes/slashcode/THEME 2007-10-18 14:21:49 UTC (rev 198) @@ -160,6 +160,7 @@ task=tasks/p2f_hof_topics.pl task=tasks/performance_stats.pl task=tasks/precache_gse.pl +task=tasks/process_file_queue.pl task=tasks/refresh_authors_cache.pl task=tasks/refresh_section_metakeywords.pl task=tasks/report_slashd_errors.pl Modified: slashjp/trunk/themes/slashcode/htdocs/users.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/users.pl 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/themes/slashcode/htdocs/users.pl 2007-10-18 14:21:49 UTC (rev 198) @@ -2744,6 +2744,13 @@ my $clsmall_bonus = ($form->{clsmall_bonus} !~ /^[\-+]?\d+$/) ? 0 : $form->{clsmall_bonus}; my $clbig_bonus = ($form->{clbig_bonus} !~ /^[\-+]?\d+$/) ? 0 : $form->{clbig_bonus}; + # plum + $form->{d2_comment_q} = (isSubscriber($user_edit) || $user_edit->{seclev} >= 100) + ? $form->{d2_comment_q} + : ($form->{d2_comment_q} eq '0') + ? 1 + : $form->{d2_comment_q}; + my $user_edits_table = { discussion2 => $form->{discussion2} || undef, d2_comment_q => $form->{d2_comment_q} || undef, Added: slashjp/trunk/themes/slashcode/tasks/process_file_queue.pl =================================================================== --- slashjp/trunk/themes/slashcode/tasks/process_file_queue.pl 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/themes/slashcode/tasks/process_file_queue.pl 2007-10-18 14:21:49 UTC (rev 198) @@ -0,0 +1,142 @@ +#!/usr/bin/perl -w +# This code is a part of Slash, and is released under the GPL. +# Copyright 1997-2005 by Open Source Technology Group. See README +# and COPYING for more information, or see http://slashcode.com/. +# $Id: process_file_queue.pl,v 1.1 2007/10/16 22:59:52 tvroom Exp $ + +use File::Path; +use File::Temp; +use File::Copy; +use Slash::Constants ':slashd'; + +use strict; + +use vars qw( %task $me $task_exit_flag ); + +$task{$me}{timespec} = '* * * * *'; +$task{$me}{timespec_panic_1} = '* * * * *'; +$task{$me}{timespec_panic_2} = ''; +$task{$me}{on_startup} = 1; +$task{$me}{fork} = SLASHD_NOWAIT; +$task{$me}{code} = sub { + my($virtual_user, $constants, $slashdb, $user, $info, $gSkin) = @_; + + my $file_queue_cmds = []; + my $cmd; + while (!$task_exit_flag) { + if(!@$file_queue_cmds) { + $file_queue_cmds = $slashdb->getNextFileQueueCmds(); + } + $cmd = shift @$file_queue_cmds; + if($cmd) { + handleFileCmd($cmd); + } + last if $task_exit_flag; + sleep(10); + } +}; + +sub handleFileCmd { + my($cmd) = @_; + my $slashdb = getCurrentDB(); + if ($cmd->{action} eq "upload") { + uploadFile($cmd); + } + $slashdb->deleteFileQueueCmd($cmd->{fqid}); + if (verifyFileLocation($cmd->{file})) { + unlink $cmd->{file}; + } +} + +sub getStoryFileDir { + my($sid) = @_; + my $bd = getCurrentStatic("basedir"); + my $yearid = substr($sid, 0, 2); + my $monthid = substr($sid, 3, 2); + my $dayid = substr($sid, 6, 2); + my $path = catdir($bd, "images", "articles", $yearid, $monthid, $dayid); + return $path; +} + +sub getFireHoseFileDir { + my($fhid) = @_; + my $bd = getCurrentStatic("basedir"); + my ($numdir) = sprintf("%09d",$fhid); + my ($i,$j) = $numdir =~ /(\d\d\d)(\d\d\d)\d\d\d/; + my $path = catdir($bd, "images", "firehose", $i, $j); + return $path; +} + +sub makeFileDir { + my($dir) = @_; + mkpath $dir, 0, 0775; +} + +# verify any file we're copying or deleting meets our expectations +sub verifyFileLocation { + my($file) = @_; + return $file =~ /^\/tmp\/upload\/\w+(\.\w+)?$/ +} + +sub uploadFile { + my($cmd) = @_; + my @suffixlist = (); + my $slashdb = getCurrentDB(); + my $story = $slashdb->getStory($cmd->{stoid}); + if ($story->{sid}) { + my $destpath = getStoryFileDir($story->{sid}); + makeFileDir($destpath); + my ($prefix) = $story->{sid} =~ /^\d\d\/\d\d\/\d\d\/(\d+)$/; + + my ($name,$path,$suffix) = fileparse($cmd->{file}, → suffixlist); + ($suffix) = $name =~ /(\.\w+)$/; + if (verifyFileLocation($cmd->{file})) { + my $destfile = copyFileToLocation($cmd->{file}, $destpath, $prefix); + my $name = fileparse($destfile); + my $data = { + stoid => $cmd->{stoid}, + name => $name + }; + + $slashdb->addStoryStaticFile($data); + } + + } + if ($cmd->{fhid}) { + my $destpath = getFireHoseFileDir($cmd->{fhid}); + makeFileDir($destpath); + my $numdir = sprintf("%09d",$cmd->{fhid}); + my ($prefix) = $numdir =~ /\d\d\d\d\d\d(\d\d\d)/; + copyFileToLocation($cmd->{file}, $destpath, $prefix); + } +} + +sub copyFileToLocation { + my ($srcfile, $destpath, $prefix) = @_; + slashdLog("$srcfile | $destpath | $prefix\n"); + my @suffixlist; + my ($name,$path,$suffix) = fileparse($srcfile, @suffixlist); + ($suffix) = $name =~ /(\.\w+)$/; + $suffix = lc($suffix); + my $destfile; + my $foundfile = 0; + my $i = 1; + my $ret_val = ""; + while(!$foundfile && $i < 20) { + $destfile = $destpath . "/". $prefix . "-$i" . $suffix; + if (!-e $destfile) { + $foundfile = 1; + } else { + $i++; + } + } + if ($foundfile) { + copy($srcfile, $destfile); + $ret_val = $destfile; + } else { + slashdLog("Couldn't save file to dir - too many already exist"); + } + return $ret_val; +} + +1; Modified: slashjp/trunk/themes/slashcode/templates/editComm;users;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/editComm;users;default 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/themes/slashcode/templates/editComm;users;default 2007-10-18 14:21:49 UTC (rev 198) @@ -64,9 +64,10 @@ [% IF user_edit.discussion2 && user_edit.discussion2 == "slashdot" %]
How Many Comments - [% comment_q = Slash.db.getDescriptions('d2_comment_q'); - comment_q_def = user_edit.d2_comment_q || 0; - Slash.createSelect('d2_comment_q', comment_q, comment_q_def, 1) %]
+ [% comment_q_name = ( Slash.isSubscriber(user_edit) || (user_edit.seclev >= 100) ) ? 'd2_comment_q_all' : 'd2_comment_q'; + comment_q = Slash.db.getDescriptions(comment_q_name); + Slash.createSelect('d2_comment_q', comment_q, user_edit.d2_comment_q, 1) %]
+ Comment Retrieval Order [% comment_order = Slash.db.getDescriptions('d2_comment_order'); comment_order_def = user_edit.d2_comment_order || 0; Modified: slashjp/trunk/themes/slashcode/templates/printCommentsMain;misc;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/printCommentsMain;misc;default 2007-10-18 14:07:12 UTC (rev 197) +++ slashjp/trunk/themes/slashcode/templates/printCommentsMain;misc;default 2007-10-18 14:21:49 UTC (rev 198) @@ -186,7 +186,7 @@ return_url = gSkin.rootdir _ '/comments.pl?sid=' _ sid %] Login [% ELSE %] - Prefs + Prefs [% END %] [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] @@ -272,7 +272,7 @@ return_url = gSkin.rootdir _ '/comments.pl?sid=' _ sid %] Login [% ELSE %] - Prefs + Prefs [% END %] [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] | [% Slash.linkComment({ @@ -296,7 +296,7 @@ From svnnotify → sourceforge.jp Fri Oct 19 00:19:57 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 00:19:57 +0900 Subject: [Slashdotjp-dev 692] [199] update svn:keyward things from T_2_5_0_180 Message-ID: <1192720797.128624.11722.nullmailer@users.sourceforge.jp> Revision: 199 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=199 Author: tach Date: 2007-10-19 00:19:56 +0900 (Fri, 19 Oct 2007) Log Message: ----------- update svn:keyward things from T_2_5_0_180 Modified Paths: -------------- slashjp/trunk/INSTALL slashjp/trunk/Slash/Slashboxes/Slashboxes.pm slashjp/trunk/docs/INSTALL.pod slashjp/trunk/plugins/Admin/templates/neverdisplay;misc;default slashjp/trunk/plugins/Admin/templates/peer_weights;admin;default slashjp/trunk/plugins/Ajax/htdocs/images/sd_autocomplete.js slashjp/trunk/plugins/Ajax/htdocs/images/sd_calendar.js slashjp/trunk/plugins/Ajax/templates/datewidget;misc;default slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default slashjp/trunk/plugins/Console/templates/display;console;default slashjp/trunk/plugins/FAQSlashdot/faq/badges.shtml slashjp/trunk/plugins/FAQSlashdot/faq/firehose.shtml slashjp/trunk/plugins/FireHose/FireHose.pm slashjp/trunk/plugins/FireHose/PLUGIN slashjp/trunk/plugins/FireHose/firehose.pl slashjp/trunk/plugins/FireHose/firehose_backend.pl slashjp/trunk/plugins/FireHose/firehose_reject_old.pl slashjp/trunk/plugins/FireHose/mysql_dump.sql slashjp/trunk/plugins/FireHose/mysql_schema.sql slashjp/trunk/plugins/FireHose/set_color_ranges.pl slashjp/trunk/plugins/FireHose/templates/admin_extras;misc;default slashjp/trunk/plugins/FireHose/templates/adv_pref_firehose;misc;default slashjp/trunk/plugins/FireHose/templates/data;firehose;default slashjp/trunk/plugins/FireHose/templates/daybreak;firehose;default slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default slashjp/trunk/plugins/FireHose/templates/fhadvprefpane;misc;default slashjp/trunk/plugins/FireHose/templates/fireHoseForm;misc;default slashjp/trunk/plugins/FireHose/templates/firehose_options;misc;default slashjp/trunk/plugins/FireHose/templates/firehose_pages;misc;default slashjp/trunk/plugins/FireHose/templates/firehose_tabs;misc;default slashjp/trunk/plugins/FireHose/templates/firehose_tags_top;misc;default slashjp/trunk/plugins/FireHose/templates/formatHoseIntro;misc;default slashjp/trunk/plugins/FireHose/templates/formatHoseTitle;misc;default slashjp/trunk/plugins/FireHose/templates/list;firehose;default slashjp/trunk/plugins/FireHose/templates/nodnix_menus;firehose;default slashjp/trunk/plugins/FireHose/templates/paginate;firehose;default slashjp/trunk/plugins/FireHose/templates/portalmap;firehose;default slashjp/trunk/plugins/FireHose/templates/reject;firehose;default slashjp/trunk/plugins/FireHose/templates/reject_firehose;misc;default slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivuser;misc;default slashjp/trunk/plugins/FireHose/templates/view;firehose;default slashjp/trunk/plugins/Messages/templates/storynew;messages;default slashjp/trunk/plugins/Messages/templates/storynew_msg_subj;messages;default slashjp/trunk/plugins/Metamod/Metamod.pm slashjp/trunk/plugins/Metamod/PLUGIN slashjp/trunk/plugins/Metamod/Static/Static.pm slashjp/trunk/plugins/Metamod/metamod.pl slashjp/trunk/plugins/Metamod/mysql_dump.sql slashjp/trunk/plugins/Metamod/mysql_schema.sql slashjp/trunk/plugins/Metamod/process_metamod.pl slashjp/trunk/plugins/Metamod/templates/data;metamod;default slashjp/trunk/plugins/Metamod/templates/dispTheComments;metamod;default slashjp/trunk/plugins/Metamod/templates/isEligible;metamod;default slashjp/trunk/plugins/Moderation/Moderation.pm slashjp/trunk/plugins/Moderation/PLUGIN slashjp/trunk/plugins/Moderation/moderate.pl slashjp/trunk/plugins/Moderation/mysql_dump.sql slashjp/trunk/plugins/Moderation/mysql_schema.sql slashjp/trunk/plugins/Moderation/process_moderation.pl slashjp/trunk/plugins/ResKey/ResKey/Checks/Moderate.pm slashjp/trunk/plugins/SearchToo/schema.sql slashjp/trunk/plugins/SearchToo/search_index.pl -------------- next part -------------- Modified: slashjp/trunk/INSTALL =================================================================== --- slashjp/trunk/INSTALL 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/INSTALL 2007-10-18 15:19:56 UTC (rev 199) @@ -71,8 +71,8 @@ The version of this file that you are currently reading is: + $Id$ - If there are more recent versions of this file, you can find a list of those changes at: Modified: slashjp/trunk/Slash/Slashboxes/Slashboxes.pm =================================================================== --- slashjp/trunk/Slash/Slashboxes/Slashboxes.pm 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/Slash/Slashboxes/Slashboxes.pm 2007-10-18 15:19:56 UTC (rev 199) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: Slashboxes.pm,v 1.2 2007/02/21 02:49:11 pudge Exp $ - package Slash::Slashboxes; use strict; @@ -13,7 +13,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT); - +($VERSION) = ' $Revision: 1.2 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw(getUserSlashboxes displaySlashboxes); ################################################################# Modified: slashjp/trunk/docs/INSTALL.pod =================================================================== --- slashjp/trunk/docs/INSTALL.pod 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/docs/INSTALL.pod 2007-10-18 15:19:56 UTC (rev 199) @@ -104,8 +104,8 @@ The version of this file that you are currently reading is: +$Id$ - If there are more recent versions of this file, you can find a list of those changes at: @@ -1748,3 +1748,4 @@ =head1 VERSION $Id$ + Modified: slashjp/trunk/plugins/Admin/templates/neverdisplay;misc;default =================================================================== --- slashjp/trunk/plugins/Admin/templates/neverdisplay;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Admin/templates/neverdisplay;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -22,4 +22,4 @@ __seclev__ 10000 __version__ - +$Id$ Modified: slashjp/trunk/plugins/Admin/templates/peer_weights;admin;default =================================================================== --- slashjp/trunk/plugins/Admin/templates/peer_weights;admin;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Admin/templates/peer_weights;admin;default 2007-10-18 15:19:56 UTC (rev 199) @@ -44,5 +44,5 @@ __version__ +$Id: peer_weights;admin;default,v 1.2 2007/04/05 19:46:52 jamiemccarthy Exp $ - Modified: slashjp/trunk/plugins/Ajax/htdocs/images/sd_autocomplete.js =================================================================== --- slashjp/trunk/plugins/Ajax/htdocs/images/sd_autocomplete.js 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Ajax/htdocs/images/sd_autocomplete.js 2007-10-18 15:19:56 UTC (rev 199) @@ -1,6 +1,6 @@ // _*_ Mode: JavaScript; tab-width: 8; indent-tabs-mode: true _*_ +// $Id: sd_autocomplete.js,v 1.41 2007/09/28 21:21:20 scc Exp $ - YAHOO.namespace("slashdot"); YAHOO.slashdot.DS_JSArray = function(aData, oConfigs) Modified: slashjp/trunk/plugins/Ajax/htdocs/images/sd_calendar.js =================================================================== --- slashjp/trunk/plugins/Ajax/htdocs/images/sd_calendar.js 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Ajax/htdocs/images/sd_calendar.js 2007-10-18 15:19:56 UTC (rev 199) @@ -1,6 +1,6 @@ // _*_ Mode: JavaScript; tab-width: 8; indent-tabs-mode: true _*_ +// $Id: sd_calendar.js,v 1.7 2007/06/05 19:04:12 scc Exp $ - YAHOO.namespace("slashdot"); function _datesToSelector( selectorFormat, dates ) { Modified: slashjp/trunk/plugins/Ajax/templates/datewidget;misc;default =================================================================== --- slashjp/trunk/plugins/Ajax/templates/datewidget;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Ajax/templates/datewidget;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -34,4 +34,4 @@ __seclev__ 10000 __version__ - +$Id: datewidget;misc;default,v 1.7 2007/05/16 19:01:42 scc Exp $ Modified: slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default =================================================================== --- slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-18 15:19:56 UTC (rev 199) @@ -77,4 +77,4 @@ __seclev__ 500 __version__ - +$Id: prefs_d2;ajax;default,v 1.5 2007/10/16 22:31:22 pudge Exp $ Modified: slashjp/trunk/plugins/Console/templates/display;console;default =================================================================== --- slashjp/trunk/plugins/Console/templates/display;console;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Console/templates/display;console;default 2007-10-18 15:19:56 UTC (rev 199) @@ -50,4 +50,4 @@ __seclev__ 10000 __version__ - +$Id$ Modified: slashjp/trunk/plugins/FAQSlashdot/faq/badges.shtml =================================================================== --- slashjp/trunk/plugins/FAQSlashdot/faq/badges.shtml 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FAQSlashdot/faq/badges.shtml 2007-10-18 15:19:56 UTC (rev 199) @@ -3,7 +3,7 @@ Slashdot FAQ - Badges How-To - + Modified: slashjp/trunk/plugins/FAQSlashdot/faq/firehose.shtml =================================================================== --- slashjp/trunk/plugins/FAQSlashdot/faq/firehose.shtml 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FAQSlashdot/faq/firehose.shtml 2007-10-18 15:19:56 UTC (rev 199) @@ -3,7 +3,7 @@ Slashdot FAQ - Firehose - + Modified: slashjp/trunk/plugins/FireHose/FireHose.pm =================================================================== --- slashjp/trunk/plugins/FireHose/FireHose.pm 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/FireHose.pm 2007-10-18 15:19:56 UTC (rev 199) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: FireHose.pm,v 1.176 2007/10/04 15:47:38 jamiemccarthy Exp $ - package Slash::FireHose; =head1 NAME @@ -42,7 +42,7 @@ use base 'Slash::DB::MySQL'; use vars qw($VERSION); - +($VERSION) = ' $Revision: 1.176 $ ' =~ /\$Revision:\s+([^\s]+)/; sub createFireHose { my($self, $data) = @_; $data->{dept} ||= ""; @@ -2392,4 +2392,4 @@ =head1 VERSION - +$Id: FireHose.pm,v 1.176 2007/10/04 15:47:38 jamiemccarthy Exp $ Modified: slashjp/trunk/plugins/FireHose/PLUGIN =================================================================== --- slashjp/trunk/plugins/FireHose/PLUGIN 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/PLUGIN 2007-10-18 15:19:56 UTC (rev 199) @@ -1,4 +1,4 @@ - +# $Id: PLUGIN,v 1.25 2007/09/13 18:52:50 tvroom Exp $ name=FireHose description="FireHose" css=firehose.css Modified: slashjp/trunk/plugins/FireHose/firehose.pl =================================================================== --- slashjp/trunk/plugins/FireHose/firehose.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/firehose.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: firehose.pl,v 1.44 2007/09/13 18:44:11 pudge Exp $ - use strict; use warnings; @@ -14,9 +14,9 @@ use Slash::XML; use vars qw($VERSION); +($VERSION) = ' $Revision: 1.44 $ ' =~ /\$Revision:\s+([^\s]+)/; - sub main { my $slashdb = getCurrentDB(); my $constants = getCurrentStatic(); Modified: slashjp/trunk/plugins/FireHose/firehose_backend.pl =================================================================== --- slashjp/trunk/plugins/FireHose/firehose_backend.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/firehose_backend.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: firehose_backend.pl,v 1.1 2007/09/13 18:51:46 tvroom Exp $ - use strict; use Slash; use Slash::XML; Modified: slashjp/trunk/plugins/FireHose/firehose_reject_old.pl =================================================================== --- slashjp/trunk/plugins/FireHose/firehose_reject_old.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/firehose_reject_old.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: firehose_reject_old.pl,v 1.2 2007/08/15 03:07:29 tvroom Exp $ - use strict; use Time::HiRes; Modified: slashjp/trunk/plugins/FireHose/mysql_dump.sql =================================================================== --- slashjp/trunk/plugins/FireHose/mysql_dump.sql 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) @@ -1,5 +1,5 @@ # - +# $Id: mysql_dump.sql,v 1.34 2007/09/26 21:25:50 jamiemccarthy Exp $ # INSERT INTO ajax_ops VALUES (NULL, 'firehose_fetch_text', 'Slash::FireHose', 'fetchItemText', 'ajax_user_static', 'createuse'); INSERT INTO ajax_ops VALUES (NULL, 'firehose_reject', 'Slash::FireHose', 'rejectItem', 'ajax_admin_static', 'use'); Modified: slashjp/trunk/plugins/FireHose/mysql_schema.sql =================================================================== --- slashjp/trunk/plugins/FireHose/mysql_schema.sql 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/mysql_schema.sql 2007-10-18 15:19:56 UTC (rev 199) @@ -1,5 +1,5 @@ # - +# $Id: mysql_schema.sql,v 1.22 2007/09/04 07:16:37 pudge Exp $ # DROP TABLE IF EXISTS firehose; CREATE TABLE firehose ( Modified: slashjp/trunk/plugins/FireHose/set_color_ranges.pl =================================================================== --- slashjp/trunk/plugins/FireHose/set_color_ranges.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/set_color_ranges.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: set_color_ranges.pl,v 1.7 2007/04/25 18:25:16 jamiemccarthy Exp $ - use strict; use Time::HiRes; Modified: slashjp/trunk/plugins/FireHose/templates/admin_extras;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/admin_extras;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/admin_extras;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -77,4 +77,4 @@ [% END %] __version__ - +$Id: admin_extras;misc;default,v 1.11 2007/08/07 21:00:22 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/adv_pref_firehose;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/adv_pref_firehose;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/adv_pref_firehose;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -30,4 +30,4 @@
[% END %] __version__ - +$Id: adv_pref_firehose;misc;default,v 1.12 2007/05/09 18:51:57 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/data;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/data;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/data;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -98,4 +98,4 @@ [% END %] __version__ - +$Id: data;firehose;default,v 1.22 2007/09/25 16:25:48 scc Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/daybreak;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/daybreak;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/daybreak;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -25,4 +25,4 @@ [% cur_days.0.1 %]
__version__ - +$Id: daybreak;firehose;default,v 1.9 2007/09/14 23:43:27 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/dispFireHose;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -158,4 +158,4 @@ [% END %] [% END %] __version__ - +$Id: dispFireHose;firehose;default,v 1.62 2007/09/04 20:53:21 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/fhadvprefpane;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/fhadvprefpane;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/fhadvprefpane;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -91,4 +91,4 @@ __version__ - +$Id: fhadvprefpane;misc;default,v 1.17 2007/08/15 14:23:40 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/fireHoseForm;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/fireHoseForm;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/fireHoseForm;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -52,4 +52,4 @@ [% END %] __version__ - +$Id: fireHoseForm;misc;default,v 1.9 2006/12/19 22:17:55 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/firehose_options;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/firehose_options;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/firehose_options;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -49,4 +49,4 @@ [% END %] __version__ - +$Id: firehose_options;misc;default,v 1.5 2007/08/15 03:08:50 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/firehose_pages;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/firehose_pages;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/firehose_pages;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -74,4 +74,4 @@ __seclev__ 10000 __version__ - +$Id: firehose_pages;misc;default,v 1.14 2007/09/04 20:53:21 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/firehose_tabs;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/firehose_tabs;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/firehose_tabs;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -40,4 +40,4 @@ [% END %] [% UNLESS nodiv %][% END %] __version__ - +$Id: firehose_tabs;misc;default,v 1.19 2007/08/22 20:26:14 scc Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/firehose_tags_top;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/firehose_tags_top;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/firehose_tags_top;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -35,4 +35,4 @@ __seclev__ 10000 __version__ - +$Id: firehose_tags_top;misc;default,v 1.22 2007/08/22 20:26:14 scc Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/formatHoseIntro;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/formatHoseIntro;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/formatHoseIntro;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -42,4 +42,4 @@ %] __version__ - +$Id: formatHoseIntro;misc;default,v 1.9 2007/09/04 20:53:21 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/formatHoseTitle;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/formatHoseTitle;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/formatHoseTitle;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -109,4 +109,4 @@ __seclev__ 10000 __version__ - +$Id: formatHoseTitle;misc;default,v 1.36 2007/09/04 20:53:21 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/list;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/list;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/list;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -196,4 +196,4 @@ __version__ - +$Id: list;firehose;default,v 1.103 2007/10/11 22:14:06 pudge Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/nodnix_menus;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/nodnix_menus;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/nodnix_menus;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -35,4 +35,4 @@ __version__ - +$Id: nodnix_menus;firehose;default,v 1.3 2007/07/18 18:22:21 scc Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/paginate;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/paginate;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/paginate;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -153,4 +153,4 @@ [% END %] __version__ - +$Id: paginate;firehose;default,v 1.28 2007/09/14 23:34:58 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/portalmap;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/portalmap;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/portalmap;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -20,4 +20,4 @@ __seclev__ 500 __version__ - +$Id: portalmap;firehose;default,v 1.1 2007/02/23 02:47:36 scc Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/reject;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/reject;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/reject;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -15,4 +15,4 @@ __template__ __version__ - +$Id: reject;firehose;default,v 1.3 2006/08/30 16:13:26 lancelot Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/reject_firehose;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/reject_firehose;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/reject_firehose;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -15,4 +15,4 @@ __template__ __version__ - +$Id: reject_firehose;misc;default,v 1.2 2006/10/27 15:56:36 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -26,4 +26,4 @@ __seclev__ 10000 __version__ - +$Id: tagsfirehosedivadmin;misc;default,v 1.2 2006/10/31 17:05:38 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -59,4 +59,4 @@ __seclev__ 10000 __version__ - +$Id: tagsfirehosedivtagbox;misc;default,v 1.35 2007/08/22 20:57:09 tvroom Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivuser;misc;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivuser;misc;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/tagsfirehosedivuser;misc;default 2007-10-18 15:19:56 UTC (rev 199) @@ -20,4 +20,4 @@ __seclev__ 10000 __version__ - +$Id: tagsfirehosedivuser;misc;default,v 1.7 2007/08/22 20:26:14 scc Exp $ Modified: slashjp/trunk/plugins/FireHose/templates/view;firehose;default =================================================================== --- slashjp/trunk/plugins/FireHose/templates/view;firehose;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/FireHose/templates/view;firehose;default 2007-10-18 15:19:56 UTC (rev 199) @@ -22,4 +22,4 @@ END %] [% firehosetext %] __version__ - +$Id: view;firehose;default,v 1.8 2007/10/11 22:14:06 pudge Exp $ Modified: slashjp/trunk/plugins/Messages/templates/storynew;messages;default =================================================================== --- slashjp/trunk/plugins/Messages/templates/storynew;messages;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Messages/templates/storynew;messages;default 2007-10-18 15:19:56 UTC (rev 199) @@ -27,4 +27,4 @@ __seclev__ 500 __version__ - +$Id: storynew;messages;default,v 1.2 2007/07/31 17:28:24 entweichen Exp $ Modified: slashjp/trunk/plugins/Messages/templates/storynew_msg_subj;messages;default =================================================================== --- slashjp/trunk/plugins/Messages/templates/storynew_msg_subj;messages;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Messages/templates/storynew_msg_subj;messages;default 2007-10-18 15:19:56 UTC (rev 199) @@ -15,4 +15,4 @@ __seclev__ 500 __version__ - +$Id: storynew_msg_subj;messages;default,v 1.1 2007/07/31 18:11:43 entweichen Exp $ Modified: slashjp/trunk/plugins/Metamod/Metamod.pm =================================================================== --- slashjp/trunk/plugins/Metamod/Metamod.pm 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/Metamod.pm 2007-10-18 15:19:56 UTC (rev 199) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: Metamod.pm,v 1.7 2007/10/09 18:57:09 jamiemccarthy Exp $ - package Slash::Metamod; use strict; @@ -16,8 +16,8 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; +($VERSION) = ' $Revision: 1.7 $ ' =~ /\$Revision:\s+([^\s]+)/; - sub new { my($class, $user) = @_; Modified: slashjp/trunk/plugins/Metamod/PLUGIN =================================================================== --- slashjp/trunk/plugins/Metamod/PLUGIN 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/PLUGIN 2007-10-18 15:19:56 UTC (rev 199) @@ -1,4 +1,4 @@ - +# $Id: PLUGIN,v 1.2 2006/10/26 17:33:04 jamiemccarthy Exp $ name=Metamod description="Metamoderation" htdoc=metamod.pl Modified: slashjp/trunk/plugins/Metamod/Static/Static.pm =================================================================== --- slashjp/trunk/plugins/Metamod/Static/Static.pm 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/Static/Static.pm 2007-10-18 15:19:56 UTC (rev 199) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: Static.pm,v 1.4 2007/06/19 21:20:46 jamiemccarthy Exp $ - package Slash::Metamod::Static; use strict; @@ -13,8 +13,8 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; +($VERSION) = ' $Revision: 1.4 $ ' =~ /\$Revision:\s+([^\s]+)/; - sub new { my($class, $user) = @_; my $self = {}; Modified: slashjp/trunk/plugins/Metamod/metamod.pl =================================================================== --- slashjp/trunk/plugins/Metamod/metamod.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/metamod.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: metamod.pl,v 1.4 2006/10/26 17:33:04 jamiemccarthy Exp $ - use strict; use Slash; use Slash::Display; Modified: slashjp/trunk/plugins/Metamod/mysql_dump.sql =================================================================== --- slashjp/trunk/plugins/Metamod/mysql_dump.sql 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) @@ -1,5 +1,5 @@ # - +# $Id: mysql_dump.sql,v 1.1 2006/09/03 15:46:00 jamiemccarthy Exp $ # INSERT INTO vars (name, value, description) VALUES ('m2', '0', 'Allows use of the metamoderation system'); Modified: slashjp/trunk/plugins/Metamod/mysql_schema.sql =================================================================== --- slashjp/trunk/plugins/Metamod/mysql_schema.sql 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/mysql_schema.sql 2007-10-18 15:19:56 UTC (rev 199) @@ -1,5 +1,5 @@ # - +# $Id: mysql_schema.sql,v 1.2 2006/10/23 16:40:41 jamiemccarthy Exp $ # ALTER TABLE users_info ADD COLUMN m2info varchar(64) DEFAULT '' NOT NULL AFTER lastgranted, ADD COLUMN lastm2 datetime DEFAULT '1970-01-01 00:00' NOT NULL AFTER totalcomments, ADD COLUMN m2_mods_saved varchar(120) DEFAULT '' NOT NULL AFTER lastm2; Modified: slashjp/trunk/plugins/Metamod/process_metamod.pl =================================================================== --- slashjp/trunk/plugins/Metamod/process_metamod.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/process_metamod.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: process_metamod.pl,v 1.5 2006/10/26 17:33:04 jamiemccarthy Exp $ - use strict; use Slash::Utility; use Slash::Constants qw( :messages :slashd ); Modified: slashjp/trunk/plugins/Metamod/templates/data;metamod;default =================================================================== --- slashjp/trunk/plugins/Metamod/templates/data;metamod;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/templates/data;metamod;default 2007-10-18 15:19:56 UTC (rev 199) @@ -50,4 +50,4 @@ __seclev__ 1000 __version__ - +$Id: data;metamod;default,v 1.2 2006/10/26 17:33:04 jamiemccarthy Exp $ Modified: slashjp/trunk/plugins/Metamod/templates/dispTheComments;metamod;default =================================================================== --- slashjp/trunk/plugins/Metamod/templates/dispTheComments;metamod;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/templates/dispTheComments;metamod;default 2007-10-18 15:19:56 UTC (rev 199) @@ -86,4 +86,4 @@ __seclev__ 1000 __version__ - +$Id: dispTheComments;metamod;default,v 1.1 2006/09/03 15:46:00 jamiemccarthy Exp $ Modified: slashjp/trunk/plugins/Metamod/templates/isEligible;metamod;default =================================================================== --- slashjp/trunk/plugins/Metamod/templates/isEligible;metamod;default 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Metamod/templates/isEligible;metamod;default 2007-10-18 15:19:56 UTC (rev 199) @@ -36,4 +36,4 @@ __seclev__ 1000 __version__ - +$Id: isEligible;metamod;default,v 1.1 2006/09/03 15:46:00 jamiemccarthy Exp $ Modified: slashjp/trunk/plugins/Moderation/Moderation.pm =================================================================== --- slashjp/trunk/plugins/Moderation/Moderation.pm 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Moderation/Moderation.pm 2007-10-18 15:19:56 UTC (rev 199) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: Moderation.pm,v 1.3 2006/12/01 04:25:32 jamiemccarthy Exp $ - package Slash::Moderation; use strict; @@ -17,8 +17,8 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; +($VERSION) = ' $Revision: 1.3 $ ' =~ /\$Revision:\s+([^\s]+)/; - sub new { my($class, $user) = @_; my $self = {}; Modified: slashjp/trunk/plugins/Moderation/PLUGIN =================================================================== --- slashjp/trunk/plugins/Moderation/PLUGIN 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Moderation/PLUGIN 2007-10-18 15:19:56 UTC (rev 199) @@ -1,4 +1,4 @@ - +# $Id: PLUGIN,v 1.2 2006/10/26 17:28:44 jamiemccarthy Exp $ name=Moderation description="Moderation (Classic)" mysql_dump=mysql_dump.sql Modified: slashjp/trunk/plugins/Moderation/moderate.pl =================================================================== --- slashjp/trunk/plugins/Moderation/moderate.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Moderation/moderate.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: moderate.pl,v 1.2 2006/10/26 17:28:44 jamiemccarthy Exp $ - # This script is not all that useful since moderation is largely # done by ajax now. Users with browsers that don't support it # should be the only ones who submit the form that triggers Modified: slashjp/trunk/plugins/Moderation/mysql_dump.sql =================================================================== --- slashjp/trunk/plugins/Moderation/mysql_dump.sql 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Moderation/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) @@ -1,5 +1,5 @@ # - +# $Id: mysql_dump.sql,v 1.2 2006/10/26 17:28:44 jamiemccarthy Exp $ # REPLACE INTO ajax_ops VALUES (NULL, 'comments_moderate_cid', 'Slash::Moderation', 'ajaxModerateCid', 'comments-moderation-ajax', 'use'); Modified: slashjp/trunk/plugins/Moderation/mysql_schema.sql =================================================================== --- slashjp/trunk/plugins/Moderation/mysql_schema.sql 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Moderation/mysql_schema.sql 2007-10-18 15:19:56 UTC (rev 199) @@ -1,5 +1,5 @@ # - +# $Id: mysql_schema.sql,v 1.2 2006/10/31 19:12:44 jamiemccarthy Exp $ # CREATE TABLE IF NOT EXISTS moderatorlog ( Modified: slashjp/trunk/plugins/Moderation/process_moderation.pl =================================================================== --- slashjp/trunk/plugins/Moderation/process_moderation.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/Moderation/process_moderation.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: process_moderation.pl,v 1.3 2006/11/06 17:04:43 jamiemccarthy Exp $ - use strict; use Slash::Utility; use Slash::Constants qw( :messages :slashd ); Modified: slashjp/trunk/plugins/ResKey/ResKey/Checks/Moderate.pm =================================================================== --- slashjp/trunk/plugins/ResKey/ResKey/Checks/Moderate.pm 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/ResKey/ResKey/Checks/Moderate.pm 2007-10-18 15:19:56 UTC (rev 199) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: Moderate.pm,v 1.4 2006/10/26 17:33:04 jamiemccarthy Exp $ - # XXX right now we have checks for moderation in many places. # we must consolidate as much as possible. -- pudge # * Slash::ResKey::Checks::Moderate::doCheck() @@ -25,8 +25,8 @@ use base 'Slash::ResKey::Key'; +our($VERSION) = ' $Revision: 1.4 $ ' =~ /\$Revision:\s+([^\s]+)/; - sub doCheck { my($self) = @_; Modified: slashjp/trunk/plugins/SearchToo/schema.sql =================================================================== --- slashjp/trunk/plugins/SearchToo/schema.sql 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/SearchToo/schema.sql 2007-10-18 15:19:56 UTC (rev 199) @@ -1,5 +1,5 @@ # - +# $Id: schema.sql,v 1.1 2006/09/28 21:42:35 pudge Exp $ # DROP TABLE IF EXISTS search_index_dump; Modified: slashjp/trunk/plugins/SearchToo/search_index.pl =================================================================== --- slashjp/trunk/plugins/SearchToo/search_index.pl 2007-10-18 14:21:49 UTC (rev 198) +++ slashjp/trunk/plugins/SearchToo/search_index.pl 2007-10-18 15:19:56 UTC (rev 199) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: search_index.pl,v 1.9 2007/09/14 21:52:28 pudge Exp $ - use strict; use Slash::Constants ':slashd'; From svnnotify → sourceforge.jp Fri Oct 19 04:57:02 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 04:57:02 +0900 Subject: [Slashdotjp-dev 693] [200] merged from T2_5_0_180 Message-ID: <1192737422.228230.6226.nullmailer@users.sourceforge.jp> Revision: 200 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=200 Author: tach Date: 2007-10-19 04:57:01 +0900 (Fri, 19 Oct 2007) Log Message: ----------- merged from T2_5_0_180 Modified Paths: -------------- slashjp/trunk/plugins/TagDataView/PLUGIN slashjp/trunk/plugins/TagDataView/TagDataView.pm slashjp/trunk/plugins/TagDataView/mysql_schema.sql slashjp/trunk/plugins/TagDataView/tagdataview.pl slashjp/trunk/plugins/TagDataView/templates/display;tagdataview;default slashjp/trunk/plugins/TagModeration/PLUGIN slashjp/trunk/plugins/TagModeration/TagModeration.pm slashjp/trunk/plugins/TagModeration/mysql_dump.sql slashjp/trunk/plugins/TagModeration/mysql_schema.sql slashjp/trunk/plugins/TagModeration/process_tagmoderation.pl slashjp/trunk/plugins/Tags/Clout/Describe.pm slashjp/trunk/plugins/Tags/Clout/Moderate.pm slashjp/trunk/plugins/Tags/Clout/Vote.pm slashjp/trunk/plugins/Tags/Clout.pm slashjp/trunk/plugins/Tags/tags_udc.pl slashjp/trunk/plugins/Tags/tags_updateclouts.pl slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/UPD-MathML2-20021015/xhtml-math11.dtd slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/html-old.decl slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30-s.dtd slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30.dtd slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30tables.dtd slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml-s.dtd slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml.dtd slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ietables.dtd slashjp/trunk/tagboxes/CommentScoreReason/CommentScoreReason.pm slashjp/trunk/tagboxes/CommentScoreReason/Makefile.PL slashjp/trunk/tagboxes/CommentScoreReason/TAGBOX slashjp/trunk/tagboxes/CommentScoreReason/mysql_dump.sql slashjp/trunk/tagboxes/FHActivity/FHActivity.pm slashjp/trunk/tagboxes/FHActivity/Makefile.PL slashjp/trunk/tagboxes/FHActivity/TAGBOX slashjp/trunk/tagboxes/FHActivity/mysql_dump.sql slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm slashjp/trunk/tagboxes/FHEditorPop/Makefile.PL slashjp/trunk/tagboxes/FHEditorPop/TAGBOX slashjp/trunk/tagboxes/FHEditorPop/mysql_dump.sql slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm slashjp/trunk/tagboxes/FHPopularity/Makefile.PL slashjp/trunk/tagboxes/FHPopularity/TAGBOX slashjp/trunk/tagboxes/FHPopularity/mysql_dump.sql slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm slashjp/trunk/tagboxes/FHPopularity2/Makefile.PL slashjp/trunk/tagboxes/FHPopularity2/TAGBOX slashjp/trunk/tagboxes/FHPopularity2/mysql_dump.sql slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm slashjp/trunk/tagboxes/FireHoseScores/Makefile.PL slashjp/trunk/tagboxes/FireHoseScores/TAGBOX slashjp/trunk/tagboxes/Top/mysql_dump.sql slashjp/trunk/themes/slashcode/tasks/im_messages.pl slashjp/trunk/themes/slashcode/templates/autocomplete;misc;default slashjp/trunk/themes/slashcode/templates/d2prefs;misc;default slashjp/trunk/themes/slashcode/templates/dispCommentDetails;misc;default slashjp/trunk/themes/slashcode/templates/firehose_related;misc;default slashjp/trunk/themes/slashcode/templates/userFireHose;users;default slashjp/trunk/themes/slashcode/templates/userlogin_cover;misc;default -------------- next part -------------- Modified: slashjp/trunk/plugins/TagDataView/PLUGIN =================================================================== --- slashjp/trunk/plugins/TagDataView/PLUGIN 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagDataView/PLUGIN 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=TagDataView description="Tag-related stats data for admins" htdoc=tagdataview.pl Modified: slashjp/trunk/plugins/TagDataView/TagDataView.pm =================================================================== --- slashjp/trunk/plugins/TagDataView/TagDataView.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagDataView/TagDataView.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - package Slash::TagDataView; =head1 NAME @@ -33,8 +33,8 @@ use base 'Slash::DB::MySQL'; use vars qw($VERSION); +($VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - sub getGlobjidsMissingHistory { my($self, $max_mins, $max_min_incrs, $max_globjids) = @_; return $self->sqlSelectColArrayref( @@ -132,5 +132,5 @@ =head1 VERSION +$Id: $ - Modified: slashjp/trunk/plugins/TagDataView/mysql_schema.sql =================================================================== --- slashjp/trunk/plugins/TagDataView/mysql_schema.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagDataView/mysql_schema.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,5 +1,5 @@ # - +# $Id: $ # DROP TABLE IF EXISTS firehose_history; Modified: slashjp/trunk/plugins/TagDataView/tagdataview.pl =================================================================== --- slashjp/trunk/plugins/TagDataView/tagdataview.pl 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagDataView/tagdataview.pl 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - use strict; use warnings; @@ -15,9 +15,9 @@ use GD::Graph::lines; use vars qw($VERSION); +($VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - sub main { my $slashdb = getCurrentDB(); my $constants = getCurrentStatic(); Modified: slashjp/trunk/plugins/TagDataView/templates/display;tagdataview;default =================================================================== --- slashjp/trunk/plugins/TagDataView/templates/display;tagdataview;default 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagDataView/templates/display;tagdataview;default 2007-10-18 19:57:01 UTC (rev 200) @@ -70,4 +70,4 @@ __seclev__ 10000 __version__ - +$Id: $ Modified: slashjp/trunk/plugins/TagModeration/PLUGIN =================================================================== --- slashjp/trunk/plugins/TagModeration/PLUGIN 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagModeration/PLUGIN 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=TagModeration description="Moderation (Tags)" mysql_dump=mysql_dump.sql Modified: slashjp/trunk/plugins/TagModeration/TagModeration.pm =================================================================== --- slashjp/trunk/plugins/TagModeration/TagModeration.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagModeration/TagModeration.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - package Slash::TagModeration; use strict; @@ -17,8 +17,8 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; +($VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - sub new { my($class, $user) = @_; my $self = {}; Modified: slashjp/trunk/plugins/TagModeration/mysql_dump.sql =================================================================== --- slashjp/trunk/plugins/TagModeration/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagModeration/mysql_dump.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,5 +1,5 @@ # - +# $Id: $ # REPLACE INTO ajax_ops VALUES (NULL, 'comments_moderate_cid', 'Slash::TagModeration', 'ajaxModerateCid', 'comments-moderation-ajax', 'use'); Modified: slashjp/trunk/plugins/TagModeration/mysql_schema.sql =================================================================== --- slashjp/trunk/plugins/TagModeration/mysql_schema.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagModeration/mysql_schema.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,5 +1,5 @@ # - +# $Id: $ # CREATE TABLE IF NOT EXISTS moderatorlog ( Modified: slashjp/trunk/plugins/TagModeration/process_tagmoderation.pl =================================================================== --- slashjp/trunk/plugins/TagModeration/process_tagmoderation.pl 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/TagModeration/process_tagmoderation.pl 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - use strict; use Slash::Utility; use Slash::Constants qw( :messages :slashd ); Modified: slashjp/trunk/plugins/Tags/Clout/Describe.pm =================================================================== --- slashjp/trunk/plugins/Tags/Clout/Describe.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Tags/Clout/Describe.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ use vars qw($VERSION); +($VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - # Hard-coded constants should be in the vars table. # cumfrac is the cumulative fraction of how much weight is propagated Modified: slashjp/trunk/plugins/Tags/Clout/Moderate.pm =================================================================== --- slashjp/trunk/plugins/Tags/Clout/Moderate.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Tags/Clout/Moderate.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ use vars qw($VERSION); +($VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - sub getUserClout { my($class, $user_stub) = @_; return 1; Modified: slashjp/trunk/plugins/Tags/Clout/Vote.pm =================================================================== --- slashjp/trunk/plugins/Tags/Clout/Vote.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Tags/Clout/Vote.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ use vars qw($VERSION); +($VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - my $cumfrac = 0.45; my $months_back = 4; my $clid = 2; Modified: slashjp/trunk/plugins/Tags/Clout.pm =================================================================== --- slashjp/trunk/plugins/Tags/Clout.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Tags/Clout.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -1,8 +1,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - package Slash::Clout; use strict; @@ -13,8 +13,8 @@ use vars qw($VERSION); +($VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - #sub insert_nextgen { # my($g, $insert_ar) = @_; # my $slashdb = getCurrentDB(); Modified: slashjp/trunk/plugins/Tags/tags_udc.pl =================================================================== --- slashjp/trunk/plugins/Tags/tags_udc.pl 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Tags/tags_udc.pl 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - # Tags Upvote/Downvote Count # # Count the sum of clouts of upvote and downvote tags each hour. @@ -21,8 +21,8 @@ use Slash::Utility; use Slash::Constants ':slashd'; +(my $VERSION) = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - $task{$me}{timespec} = '2-59/5 * * * *'; $task{$me}{timespec_panic_1} = ''; # not that important $task{$me}{fork} = SLASHD_NOWAIT; Modified: slashjp/trunk/plugins/Tags/tags_updateclouts.pl =================================================================== --- slashjp/trunk/plugins/Tags/tags_updateclouts.pl 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Tags/tags_updateclouts.pl 2007-10-18 19:57:01 UTC (rev 200) @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # - +# $Id: $ # # Slashd Task (c) OSTG 2004-2007 Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/UPD-MathML2-20021015/xhtml-math11.dtd =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/UPD-MathML2-20021015/xhtml-math11.dtd 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/UPD-MathML2-20021015/xhtml-math11.dtd 2007-10-18 19:57:01 UTC (rev 200) @@ -1,9 +1,9 @@ - - - - - -%driver; - - - + + + + + +%driver; + + + Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/html-old.decl =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/html-old.decl 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/html-old.decl 2007-10-18 19:57:01 UTC (rev 200) @@ -1,79 +1,79 @@ - - - + + + Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30-s.dtd =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30-s.dtd 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30-s.dtd 2007-10-18 19:57:01 UTC (rev 200) @@ -1,23 +1,23 @@ - - - - - ... - - -- - > - - - - - -%html; + + + + + ... + + -- + > + + + + + +%html; Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30.dtd =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30.dtd 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30.dtd 2007-10-18 19:57:01 UTC (rev 200) @@ -1,853 +1,853 @@ - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - -%ISOlat1; - - - - - - - - - - - - - - - - - - - - -]]> - - - - -]]> - - - - - - - - -]]> - - - - - - -]]> - - - - - - - - -]]> - - - - - -]]> - - - - - -]]> - - - - -]]> - - - - -]]> - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - -]]> - - -]]> - - - - - - - -]]> - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -%ietables; - - - - - - -]]> - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + +%ISOlat1; + + + + + + + + + + + + + + + + + + + + +]]> + + + + +]]> + + + + + + + + +]]> + + + + + + +]]> + + + + + + + + +]]> + + + + + +]]> + + + + + +]]> + + + + +]]> + + + + +]]> + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + +]]> + + +]]> + + + + + + + +]]> + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%ietables; + + + + + + +]]> + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30tables.dtd =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30tables.dtd 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ie30tables.dtd 2007-10-18 19:57:01 UTC (rev 200) @@ -1,181 +1,181 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml-s.dtd =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml-s.dtd 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml-s.dtd 2007-10-18 19:57:01 UTC (rev 200) @@ -1,24 +1,24 @@ - - - - - ... - - -- - > - - - - - -%html; + + + + + ... + + -- + > + + + + + +%html; Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml.dtd =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml.dtd 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/iehtml.dtd 2007-10-18 19:57:01 UTC (rev 200) @@ -1,835 +1,835 @@ - - - - - - - - - - -]]> - - - - - - - - - - - - - - -%ISOlat1; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - -]]> - - - - -]]> - - - - - - -]]> - - - - -]]> - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Heading - is preferred to -

Heading

- --> -]]> - - - - -" - > - - - - - - - - - - - - - -#AttVal(Alt)" - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Directory" - > -Menu" - > - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Form:" - %SDASUFF; "Form End." - > - - - - - - - - - - - - - - - - - - - - - -Select #AttVal(Multiple)" - > - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - -" > - - - - - - - - - - -[Document is indexed/searchable.]" - PROMPT CDATA #IMPLIED - ACTION CDATA #IMPLIED - > - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - -]]> - - - - - - - - - - - -%ietables; + + + + + + + + + + +]]> + + + + + + + + + + + + + + +%ISOlat1; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + +]]> + + + + +]]> + + + + + + +]]> + + + + +]]> + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Heading + is preferred to +

Heading

+ --> +]]> + + + + +" + > + + + + + + + + + + + + + +#AttVal(Alt)" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Directory" + > +Menu" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Form:" + %SDASUFF; "Form End." + > + + + + + + + + + + + + + + + + + + + + + +Select #AttVal(Multiple)" + > + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + +" > + + + + + + + + + + +[Document is indexed/searchable.]" + PROMPT CDATA #IMPLIED + ACTION CDATA #IMPLIED + > + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + +]]> + + + + + + + + + + + +%ietables; Modified: slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ietables.dtd =================================================================== --- slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ietables.dtd 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/plugins/Validator/validator/htdocs/sgml-lib/ietables.dtd 2007-10-18 19:57:01 UTC (rev 200) @@ -1,110 +1,110 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: slashjp/trunk/tagboxes/CommentScoreReason/CommentScoreReason.pm =================================================================== --- slashjp/trunk/tagboxes/CommentScoreReason/CommentScoreReason.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/CommentScoreReason/CommentScoreReason.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - # Requires TagModeration plugin (not (just) Moderation) package Slash::Tagbox::CommentScoreReason; @@ -30,8 +30,8 @@ use Data::Dumper; use vars qw( $VERSION ); +$VERSION = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge use base 'Slash::DB::MySQL'; Modified: slashjp/trunk/tagboxes/CommentScoreReason/Makefile.PL =================================================================== --- slashjp/trunk/tagboxes/CommentScoreReason/Makefile.PL 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/CommentScoreReason/Makefile.PL 2007-10-18 19:57:01 UTC (rev 200) @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. - +# $Id: $ WriteMakefile( 'NAME' => 'Slash::Tagbox::CommentScoreReason', 'VERSION_FROM' => 'CommentScoreReason.pm', # finds $VERSION Modified: slashjp/trunk/tagboxes/CommentScoreReason/TAGBOX =================================================================== --- slashjp/trunk/tagboxes/CommentScoreReason/TAGBOX 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/CommentScoreReason/TAGBOX 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=CommentScoreReason description=Track comment score and reason mysql_dump=mysql_dump.sql Modified: slashjp/trunk/tagboxes/CommentScoreReason/mysql_dump.sql =================================================================== --- slashjp/trunk/tagboxes/CommentScoreReason/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/CommentScoreReason/mysql_dump.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'CommentScoreReason', 'globj', 3, 1, '2000-01-01 00:00:00', 0, 0, 0); #INSERT INTO tagbox_userkeyregexes VALUES ('CommentScoreReason', '^tag_clout$'); Modified: slashjp/trunk/tagboxes/FHActivity/FHActivity.pm =================================================================== --- slashjp/trunk/tagboxes/FHActivity/FHActivity.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHActivity/FHActivity.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - package Slash::Tagbox::FHActivity; =head1 NAME @@ -28,8 +28,8 @@ use Data::Dumper; use vars qw( $VERSION ); +$VERSION = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge use base 'Slash::DB::MySQL'; Modified: slashjp/trunk/tagboxes/FHActivity/Makefile.PL =================================================================== --- slashjp/trunk/tagboxes/FHActivity/Makefile.PL 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHActivity/Makefile.PL 2007-10-18 19:57:01 UTC (rev 200) @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. - +# $Id: $ WriteMakefile( 'NAME' => 'Slash::Tagbox::FHActivity', 'VERSION_FROM' => 'FHActivity.pm', # finds $VERSION Modified: slashjp/trunk/tagboxes/FHActivity/TAGBOX =================================================================== --- slashjp/trunk/tagboxes/FHActivity/TAGBOX 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHActivity/TAGBOX 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=FHActivity description=Keep track of activity of firehose entries mysql_dump=mysql_dump.sql Modified: slashjp/trunk/tagboxes/FHActivity/mysql_dump.sql =================================================================== --- slashjp/trunk/tagboxes/FHActivity/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHActivity/mysql_dump.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FHActivity', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); #INSERT INTO tagbox_userkeyregexes VALUES ('FHActivity', '^tag_clout$'); Modified: slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm =================================================================== --- slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - # This goes by seclev right now but perhaps should define "editor" # to be more about author than admin seclev. In which case the # getAdmins() calls should be getAuthors(). @@ -32,8 +32,8 @@ use Data::Dumper; use vars qw( $VERSION ); +$VERSION = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge use base 'Slash::DB::MySQL'; Modified: slashjp/trunk/tagboxes/FHEditorPop/Makefile.PL =================================================================== --- slashjp/trunk/tagboxes/FHEditorPop/Makefile.PL 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHEditorPop/Makefile.PL 2007-10-18 19:57:01 UTC (rev 200) @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. - +# $Id: $ WriteMakefile( 'NAME' => 'Slash::Tagbox::FHEditorPop', 'VERSION_FROM' => 'FHEditorPop.pm', # finds $VERSION Modified: slashjp/trunk/tagboxes/FHEditorPop/TAGBOX =================================================================== --- slashjp/trunk/tagboxes/FHEditorPop/TAGBOX 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHEditorPop/TAGBOX 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=FHEditorPop description=Keep track of popularity of firehose entries for editors mysql_dump=mysql_dump.sql Modified: slashjp/trunk/tagboxes/FHEditorPop/mysql_dump.sql =================================================================== --- slashjp/trunk/tagboxes/FHEditorPop/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHEditorPop/mysql_dump.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FHEditorPop', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_fheditorpop_edmult', '10', 'Multiplier by which editor nod/nixes are weighted for editor view'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_fheditorpop_udcbasis', '1000', 'Basis for tags_udc vote clout weighting'); Modified: slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm =================================================================== --- slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - package Slash::Tagbox::FHPopularity; =head1 NAME @@ -28,8 +28,8 @@ use Data::Dumper; use vars qw( $VERSION ); +$VERSION = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge use base 'Slash::DB::MySQL'; Modified: slashjp/trunk/tagboxes/FHPopularity/Makefile.PL =================================================================== --- slashjp/trunk/tagboxes/FHPopularity/Makefile.PL 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity/Makefile.PL 2007-10-18 19:57:01 UTC (rev 200) @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. - +# $Id: $ WriteMakefile( 'NAME' => 'Slash::Tagbox::FHPopularity', 'VERSION_FROM' => 'FHPopularity.pm', # finds $VERSION Modified: slashjp/trunk/tagboxes/FHPopularity/TAGBOX =================================================================== --- slashjp/trunk/tagboxes/FHPopularity/TAGBOX 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity/TAGBOX 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=FHPopularity description=Keep track of popularity of firehose entries mysql_dump=mysql_dump.sql Modified: slashjp/trunk/tagboxes/FHPopularity/mysql_dump.sql =================================================================== --- slashjp/trunk/tagboxes/FHPopularity/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity/mysql_dump.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FHPopularity', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); #INSERT INTO tagbox_userkeyregexes VALUES ('FHPopularity', '^tag_clout$'); Modified: slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm =================================================================== --- slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - package Slash::Tagbox::FHPopularity2; =head1 NAME @@ -28,8 +28,8 @@ use Data::Dumper; use vars qw( $VERSION ); +$VERSION = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge use base 'Slash::DB::MySQL'; Modified: slashjp/trunk/tagboxes/FHPopularity2/Makefile.PL =================================================================== --- slashjp/trunk/tagboxes/FHPopularity2/Makefile.PL 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity2/Makefile.PL 2007-10-18 19:57:01 UTC (rev 200) @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. - +# $Id: $ WriteMakefile( 'NAME' => 'Slash::Tagbox::FHPopularity2', 'VERSION_FROM' => 'FHPopularity2.pm', # finds $VERSION Modified: slashjp/trunk/tagboxes/FHPopularity2/TAGBOX =================================================================== --- slashjp/trunk/tagboxes/FHPopularity2/TAGBOX 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity2/TAGBOX 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=FHPopularity2 description=Keep track of popularity of firehose entries (improved) mysql_dump=mysql_dump.sql Modified: slashjp/trunk/tagboxes/FHPopularity2/mysql_dump.sql =================================================================== --- slashjp/trunk/tagboxes/FHPopularity2/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FHPopularity2/mysql_dump.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ INSERT INTO tagboxes (tbid, name, affected_type, clid, weight, last_run_completed, last_tagid_logged, last_tdid_logged, last_tuid_logged) VALUES (NULL, 'FHPopularity2', 'globj', 2, 1, '2000-01-01 00:00:00', 0, 0, 0); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_firehosescores_maxudcmult', '5', 'Maximum multiplier for an up/down tag based on the tags_udc table'); Modified: slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm =================================================================== --- slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - package Slash::Tagbox::FireHoseScores; =head1 NAME @@ -28,8 +28,8 @@ use Data::Dumper; use vars qw( $VERSION ); +$VERSION = ' $Revision: $ ' =~ /\$Revision:\s+([^\s]+)/; - use base 'Slash::DB::Utility'; # first for object init stuff, but really # needs to be second! figure it out. -- pudge use base 'Slash::DB::MySQL'; Modified: slashjp/trunk/tagboxes/FireHoseScores/Makefile.PL =================================================================== --- slashjp/trunk/tagboxes/FireHoseScores/Makefile.PL 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FireHoseScores/Makefile.PL 2007-10-18 19:57:01 UTC (rev 200) @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. - +# $Id: $ WriteMakefile( 'NAME' => 'Slash::Tagbox::FireHoseScores', 'VERSION_FROM' => 'FireHoseScores.pm', # finds $VERSION Modified: slashjp/trunk/tagboxes/FireHoseScores/TAGBOX =================================================================== --- slashjp/trunk/tagboxes/FireHoseScores/TAGBOX 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/FireHoseScores/TAGBOX 2007-10-18 19:57:01 UTC (rev 200) @@ -1,4 +1,4 @@ - +# $Id: $ name=FireHoseScores description=Keep track of popularity of firehose entries (final) mysql_dump=mysql_dump.sql Modified: slashjp/trunk/tagboxes/Top/mysql_dump.sql =================================================================== --- slashjp/trunk/tagboxes/Top/mysql_dump.sql 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/tagboxes/Top/mysql_dump.sql 2007-10-18 19:57:01 UTC (rev 200) @@ -5,3 +5,5 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_top_minscore_stories', '2', 'Minimum score a tag must have to make it into the top tags for a story'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tagbox_top_minscore_urls', '2', 'Minimum score a tag must have to make it into the top tags for a URL'); +INSERT INTO tagbox_userkeyregexes VALUES ('Top', '^tag_clout$'); + Modified: slashjp/trunk/themes/slashcode/tasks/im_messages.pl =================================================================== --- slashjp/trunk/themes/slashcode/tasks/im_messages.pl 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/themes/slashcode/tasks/im_messages.pl 2007-10-18 19:57:01 UTC (rev 200) @@ -2,8 +2,8 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. +# $Id: $ - use strict; use Slash; Modified: slashjp/trunk/themes/slashcode/templates/autocomplete;misc;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/autocomplete;misc;default 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/themes/slashcode/templates/autocomplete;misc;default 2007-10-18 19:57:01 UTC (rev 200) @@ -18,4 +18,4 @@ __seclev__ 10000 __version__ - +$Id: $ Modified: slashjp/trunk/themes/slashcode/templates/d2prefs;misc;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/d2prefs;misc;default 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/themes/slashcode/templates/d2prefs;misc;default 2007-10-18 19:57:01 UTC (rev 200) @@ -82,4 +82,4 @@ __seclev__ 10000 __version__ - +$Id: $ Modified: slashjp/trunk/themes/slashcode/templates/dispCommentDetails;misc;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/dispCommentDetails;misc;default 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/themes/slashcode/templates/dispCommentDetails;misc;default 2007-10-18 19:57:01 UTC (rev 200) @@ -47,4 +47,4 @@ __seclev__ 10000 __version__ - +$Id: $ Modified: slashjp/trunk/themes/slashcode/templates/firehose_related;misc;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/firehose_related;misc;default 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/themes/slashcode/templates/firehose_related;misc;default 2007-10-18 19:57:01 UTC (rev 200) @@ -17,4 +17,4 @@ Firehose:[% fh_item.title %] by [% IF !is_anon %][% END %][% fh_user.nickname | strip_literal%][% IF !is_anon %] ([% fh_user.uid %])[% END %] __version__ - +$Id: $ Modified: slashjp/trunk/themes/slashcode/templates/userFireHose;users;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/userFireHose;users;default 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/themes/slashcode/templates/userFireHose;users;default 2007-10-18 19:57:01 UTC (rev 200) @@ -47,4 +47,4 @@ __seclev__ 500 __version__ - +$Id: $ Modified: slashjp/trunk/themes/slashcode/templates/userlogin_cover;misc;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/userlogin_cover;misc;default 2007-10-18 15:19:56 UTC (rev 199) +++ slashjp/trunk/themes/slashcode/templates/userlogin_cover;misc;default 2007-10-18 19:57:01 UTC (rev 200) @@ -29,4 +29,4 @@ __seclev__ 10000 __version__ - +$Id: $ From svnnotify → sourceforge.jp Fri Oct 19 05:14:59 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 05:14:59 +0900 Subject: [Slashdotjp-dev 694] [201] [svn-buildpackage] Tagging slash (2.5.0.119-17) Message-ID: <1192738499.450425.16558.nullmailer@users.sourceforge.jp> Revision: 201 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=201 Author: tach Date: 2007-10-19 05:14:59 +0900 (Fri, 19 Oct 2007) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.119-17) Added Paths: ----------- slashjp/tags/2.5.0.119-17/ -------------- next part -------------- Copied: slashjp/tags/2.5.0.119-17 (from rev 200, slashjp/trunk) From svnnotify → sourceforge.jp Fri Oct 19 05:17:23 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 05:17:23 +0900 Subject: [Slashdotjp-dev 695] [202] delete 2.5.0.119-17 tag: wrong tagging Message-ID: <1192738643.812767.17739.nullmailer@users.sourceforge.jp> Revision: 202 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=202 Author: tach Date: 2007-10-19 05:17:23 +0900 (Fri, 19 Oct 2007) Log Message: ----------- delete 2.5.0.119-17 tag: wrong tagging Removed Paths: ------------- slashjp/tags/2.5.0.119-17/ -------------- next part -------------- From svnnotify → sourceforge.jp Fri Oct 19 05:19:23 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 05:19:23 +0900 Subject: [Slashdotjp-dev 696] [203] [svn-buildpackage] Tagging slash (2.5.0.119-17) Message-ID: <1192738763.010273.19173.nullmailer@users.sourceforge.jp> Revision: 203 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=203 Author: tach Date: 2007-10-19 05:19:22 +0900 (Fri, 19 Oct 2007) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.119-17) Added Paths: ----------- slashjp/tags/2.5.0.119-17/ -------------- next part -------------- Copied: slashjp/tags/2.5.0.119-17 (from rev 192, slashjp/trunk) From svnnotify → sourceforge.jp Fri Oct 19 05:23:30 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 05:23:30 +0900 Subject: [Slashdotjp-dev 697] [204] new upstream release Message-ID: <1192739010.653098.21568.nullmailer@users.sourceforge.jp> Revision: 204 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=204 Author: tach Date: 2007-10-19 05:23:30 +0900 (Fri, 19 Oct 2007) Log Message: ----------- new upstream release Modified Paths: -------------- slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-18 20:19:22 UTC (rev 203) +++ slashjp/trunk/debian/changelog 2007-10-18 20:23:30 UTC (rev 204) @@ -1,3 +1,10 @@ +slash (2.5.0.180-1) unstable; urgency=low + + * New upstream cvs release + - Read upstream changelog + + -- Taku YASUI Fri, 19 Oct 2007 05:22:02 +0900 + slash (2.5.0.119-17) unstable; urgency=low * Merged from OTP From svnnotify → sourceforge.jp Fri Oct 19 05:26:00 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 05:26:00 +0900 Subject: [Slashdotjp-dev 698] [205] remove unnessesary upstream branch: 2.5.0.179 Message-ID: <1192739160.365288.23254.nullmailer@users.sourceforge.jp> Revision: 205 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=205 Author: tach Date: 2007-10-19 05:26:00 +0900 (Fri, 19 Oct 2007) Log Message: ----------- remove unnessesary upstream branch: 2.5.0.179 Removed Paths: ------------- slashjp/branches/upstream/2.5.0.179/ -------------- next part -------------- From svnnotify → sourceforge.jp Fri Oct 19 12:12:01 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 12:12:01 +0900 Subject: [Slashdotjp-dev 699] [206] add 180 orig and remove 165 orig Message-ID: <1192763521.877665.18359.nullmailer@users.sourceforge.jp> Revision: 206 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=206 Author: tach Date: 2007-10-19 12:11:56 +0900 (Fri, 19 Oct 2007) Log Message: ----------- add 180 orig and remove 165 orig Added Paths: ----------- slashjp/tarballs/slash_2.5.0.180.orig.tar.gz Removed Paths: ------------- slashjp/tarballs/slash_2.5.0.165.orig.tar.gz -------------- next part -------------- Deleted: slashjp/tarballs/slash_2.5.0.165.orig.tar.gz =================================================================== (Binary files differ) Added: slashjp/tarballs/slash_2.5.0.180.orig.tar.gz =================================================================== (Binary files differ) Property changes on: slashjp/tarballs/slash_2.5.0.180.orig.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svnnotify → sourceforge.jp Fri Oct 19 12:27:55 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 12:27:55 +0900 Subject: [Slashdotjp-dev 700] [207] fix interpreter path Message-ID: <1192764475.529015.26334.nullmailer@users.sourceforge.jp> Revision: 207 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=207 Author: tach Date: 2007-10-19 12:27:55 +0900 (Fri, 19 Oct 2007) Log Message: ----------- fix interpreter path Modified Paths: -------------- slashjp/trunk/plugins/TagDataView/fh_pophistory.pl -------------- next part -------------- Modified: slashjp/trunk/plugins/TagDataView/fh_pophistory.pl =================================================================== --- slashjp/trunk/plugins/TagDataView/fh_pophistory.pl 2007-10-19 03:11:56 UTC (rev 206) +++ slashjp/trunk/plugins/TagDataView/fh_pophistory.pl 2007-10-19 03:27:55 UTC (rev 207) @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl -w # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. From svnnotify → sourceforge.jp Fri Oct 19 12:32:29 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 12:32:29 +0900 Subject: [Slashdotjp-dev 701] [208] propset svn:executable to some util commands Message-ID: <1192764749.180928.29202.nullmailer@users.sourceforge.jp> Revision: 208 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=208 Author: tach Date: 2007-10-19 12:32:28 +0900 (Fri, 19 Oct 2007) Log Message: ----------- propset svn:executable to some util commands Property Changed: ---------------- slashjp/trunk/utils/convertDBto200406 slashjp/trunk/utils/convertDBto200406_render slashjp/trunk/utils/convertDBto200406_suggest slashjp/trunk/utils/sectioncollapse_convert.plx slashjp/trunk/utils/slash1toslash2 slashjp/trunk/utils/users_index_cleanup.plx -------------- next part -------------- Property changes on: slashjp/trunk/utils/convertDBto200406 ___________________________________________________________________ Name: svn:executable + * Property changes on: slashjp/trunk/utils/convertDBto200406_render ___________________________________________________________________ Name: svn:executable + * Property changes on: slashjp/trunk/utils/convertDBto200406_suggest ___________________________________________________________________ Name: svn:executable + * Property changes on: slashjp/trunk/utils/sectioncollapse_convert.plx ___________________________________________________________________ Name: svn:executable + * Property changes on: slashjp/trunk/utils/slash1toslash2 ___________________________________________________________________ Name: svn:executable + * Property changes on: slashjp/trunk/utils/users_index_cleanup.plx ___________________________________________________________________ Name: svn:executable + * From svnnotify → sourceforge.jp Fri Oct 19 12:38:39 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 19 Oct 2007 12:38:39 +0900 Subject: [Slashdotjp-dev 702] [209] propset svn:executable to some util commands Message-ID: <1192765119.361600.32524.nullmailer@users.sourceforge.jp> Revision: 209 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=209 Author: tach Date: 2007-10-19 12:38:39 +0900 (Fri, 19 Oct 2007) Log Message: ----------- propset svn:executable to some util commands Property Changed: ---------------- slashjp/trunk/plugins/ResKey/example.plx slashjp/trunk/utils/compareSecPrePost200406 -------------- next part -------------- Property changes on: slashjp/trunk/plugins/ResKey/example.plx ___________________________________________________________________ Name: svn:executable + * Property changes on: slashjp/trunk/utils/compareSecPrePost200406 ___________________________________________________________________ Name: svn:executable + * From svnnotify → sourceforge.jp Tue Oct 23 17:31:52 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 23 Oct 2007 17:31:52 +0900 Subject: [Slashdotjp-dev 703] [210] move Slash/LDAPDB/vars.sql contents to sql/mysql/default.sql Message-ID: <1193128312.358883.3987.nullmailer@users.sourceforge.jp> Revision: 210 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=210 Author: tach Date: 2007-10-23 17:31:51 +0900 (Tue, 23 Oct 2007) Log Message: ----------- move Slash/LDAPDB/vars.sql contents to sql/mysql/default.sql Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/sql/mysql/defaults.sql Removed Paths: ------------- slashjp/trunk/Slash/LDAPDB/vars.sql -------------- next part -------------- Deleted: slashjp/trunk/Slash/LDAPDB/vars.sql =================================================================== --- slashjp/trunk/Slash/LDAPDB/vars.sql 2007-10-19 03:38:39 UTC (rev 209) +++ slashjp/trunk/Slash/LDAPDB/vars.sql 2007-10-23 08:31:51 UTC (rev 210) @@ -1,7 +0,0 @@ -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_enable', '0', ''); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_server', 'localhost', ''); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_base_dn', '', ''); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_dn', '', ''); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_passwd', '', ''); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_attrib_prefix', '', ''); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_peer_attrib_prefix', '', ''); Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-19 03:38:39 UTC (rev 209) +++ slashjp/trunk/debian/changelog 2007-10-23 08:31:51 UTC (rev 210) @@ -1,9 +1,10 @@ -slash (2.5.0.180-1) unstable; urgency=low +slash (2.5.0.180-0.1) unstable; urgency=low * New upstream cvs release - Read upstream changelog + * move Slash/LDAPDB/vars.sql contents to sql/mysql/default.sql - -- Taku YASUI Fri, 19 Oct 2007 05:22:02 +0900 + -- Taku YASUI Fri, 19 Oct 2007 12:38:55 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2007-10-19 03:38:39 UTC (rev 209) +++ slashjp/trunk/sql/mysql/defaults.sql 2007-10-23 08:31:51 UTC (rev 210) @@ -941,6 +941,13 @@ INSERT INTO vars (name, value, description) VALUES ('lastlookmemory','3600','Amount of time the uid last looked-at will be remembered/displayed'); INSERT INTO vars (name, value, description) VALUES ('lastComments','0','Last time we checked comments for moderation points'); INSERT INTO vars (name, value, description) VALUES ('lastsrandsec','awards','Last Block used in the semi-random block'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_attrib_prefix','','attribute prefix for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_base_dn','','base dn for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_dn','','binddn for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_passwd','','bind password for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_enable','0','enable LDAP migration (1: enable, 0: disable)'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_peer_attrib_prefix', '', 'peer attribute prefix for LDAP migration'); +INSERT INTO vars (name, value, description) VALUES ('ldap_server','','LDAP server hostname for LDAP migration'); INSERT INTO vars (name, value, description) VALUES ('lenient_formkeys','0','0 - only ipid, 1 - ipid OR subnetid, in formkey validation check'); INSERT INTO vars (name, value, description) VALUES ('log_admin','1','This turns on/off entries to the accesslog. If you are a small site and want a true number for your stats turn this off.'); INSERT INTO vars (name, value, description) VALUES ('log_db_user','','The virtual user of the database that the code should write accesslog to. If you don\'t know what this is for, you should leave it blank.'); From svnnotify → sourceforge.jp Tue Oct 23 17:51:26 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 23 Oct 2007 17:51:26 +0900 Subject: [Slashdotjp-dev 704] [211] * separate original and update sql ( to apply update patch successfully) Message-ID: <1193129486.889750.14423.nullmailer@users.sourceforge.jp> Revision: 211 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=211 Author: tach Date: 2007-10-23 17:51:26 +0900 (Tue, 23 Oct 2007) Log Message: ----------- * separate original and update sql (to apply update patch successfully) Modified Paths: -------------- slashjp/trunk/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2007-10-23 08:31:51 UTC (rev 210) +++ slashjp/trunk/sql/mysql/defaults.sql 2007-10-23 08:51:26 UTC (rev 211) @@ -815,7 +815,7 @@ INSERT INTO vars (name, value, description) VALUES ('comments_wsfactor','1.0','Whitespace factor'); INSERT INTO vars (name, value, description) VALUES ('commentstatus','0','default comment code'); INSERT INTO vars (name, value, description) VALUES ('common_story_words', 'about above across after again against almost along already also although always among another anyone arise around aside asked available away became because become becomes been before began behind being better between both brought called came can\'t cannot certain certainly come could days didn\'t different does done down during each either else enough especially even ever every fact find following form found from further gave gets give given gives giving going gone hardly have having here himself however http important into it\'s itself just keep kept knew know known largely later least like look made mainly make many maybe might more most mostly much must nearly neither never next none noted nothing obtain obtained often once only other others ought over overall owing particularly past people perhaps please possible present probably quite rather read ready really right said same saying says seem seems seen several shall should show showed shown shows similar similarly since some something sometime sometimes somewhat soon such sure take taken tell than that that\'s their theirs them themselves then there therefore these they thing things think this those though through throughout thus time together told took toward turn under unless until upon used using usually various very want well were what what when where whether which while whole whom whose wide widely will will with within without would year years your', 'Words which are considered too common to be used in detecting "similar" stories'); -INSERT INTO vars (name, value, description) VALUES ('content_type_webpage','text/html; charset=UTF-8','The Content-Type header for webpages'); +INSERT INTO vars (name, value, description) VALUES ('content_type_webpage','text/html; charset=iso-8859-1','The Content-Type header for webpages'); INSERT INTO vars (name, value, description) VALUES ('cookiedomain','','Domain for cookie to be active (normally leave blank)'); INSERT INTO vars (name, value, description) VALUES ('cookiepath','/','Path on server for cookie to be active'); INSERT INTO vars (name, value, description) VALUES ('cookiesecure','1','Set the secure flag in cookies if SSL is on?'); @@ -871,7 +871,7 @@ INSERT INTO vars (name, value, description) VALUES ('do_expiry','1','Flag which controls whether we expire users.'); INSERT INTO vars (name, value, description) VALUES ('down_moderations','-6','number of how many comments you can post that get down moderated'); INSERT INTO vars (name, value, description) VALUES ('draconian_charrefs','0','Enable strictest-possible rules for disallowing HTML entities/character references?'); -INSERT INTO vars (name, value, description) VALUES ('draconian_charset','0','Convert high-bit characters to character references, which are then filtered by approveCharrefs or encode_html_amp (works only with Latin-1 for now)'); +INSERT INTO vars (name, value, description) VALUES ('draconian_charset','1','Convert high-bit characters to character references, which are then filtered by approveCharrefs or encode_html_amp (works only with Latin-1 for now)'); INSERT INTO vars (name, value, description) VALUES ('draconian_charset_convert','0','Convert some of high-bit chars to ASCII representations instead (see draconian_charset)'); INSERT INTO vars (name, value, description) VALUES ('email_domains_invalid', 'example.com', 'space separated list of domains that are not valid for email addresses'); INSERT INTO vars (name, value, description) VALUES ('enable_index_topic','','set this to the value in string param for index topic \(something like "topic_4"\)'); @@ -941,13 +941,6 @@ INSERT INTO vars (name, value, description) VALUES ('lastlookmemory','3600','Amount of time the uid last looked-at will be remembered/displayed'); INSERT INTO vars (name, value, description) VALUES ('lastComments','0','Last time we checked comments for moderation points'); INSERT INTO vars (name, value, description) VALUES ('lastsrandsec','awards','Last Block used in the semi-random block'); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_attrib_prefix','','attribute prefix for LDAP migration'); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_base_dn','','base dn for LDAP migration'); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_dn','','binddn for LDAP migration'); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_passwd','','bind password for LDAP migration'); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_enable','0','enable LDAP migration (1: enable, 0: disable)'); -INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_peer_attrib_prefix', '', 'peer attribute prefix for LDAP migration'); -INSERT INTO vars (name, value, description) VALUES ('ldap_server','','LDAP server hostname for LDAP migration'); INSERT INTO vars (name, value, description) VALUES ('lenient_formkeys','0','0 - only ipid, 1 - ipid OR subnetid, in formkey validation check'); INSERT INTO vars (name, value, description) VALUES ('log_admin','1','This turns on/off entries to the accesslog. If you are a small site and want a true number for your stats turn this off.'); INSERT INTO vars (name, value, description) VALUES ('log_db_user','','The virtual user of the database that the code should write accesslog to. If you don\'t know what this is for, you should leave it blank.'); @@ -955,8 +948,6 @@ INSERT INTO vars (name, value, description) VALUES ('login_nontemp_days', '365', 'Days before a nontemp login expires'); INSERT INTO vars (name, value, description) VALUES ('login_speed_limit', '20', 'How fast a user can create users, etc.'); INSERT INTO vars (name, value, description) VALUES ('login_temp_minutes', '10', 'Minutes before a temporary login expires'); -INSERT INTO vars (name, value, description) VALUES ('mail_charset_body','us-ascii','Character Encoding used for mail body sent by the system (s. Encode::Supported)'); -INSERT INTO vars (name, value, description) VALUES ('mail_charset_header','MIME-Header','Character Encoding used for mail header sent by the system (s. Encode::MIME::Header)'); INSERT INTO vars (name, value, description) VALUES ('mailfrom','admin → example.com','All mail addressed from the site looks like it is coming from here'); INSERT INTO vars (name, value, description) VALUES ('mailpass_max_hours','48','Mailing a password only allowed mailpass_max_num times per account per this many hours'); INSERT INTO vars (name, value, description) VALUES ('mailpass_max_num','2','Mailing a password only allowed this many times per account per mainpass_max_hours hours'); @@ -1023,7 +1014,7 @@ INSERT INTO vars (name, value, description) VALUES ('poll_cache','0','On home page, cache and display default poll for users (if false, is extra hits to database)'); INSERT INTO vars (name, value, description) VALUES ('poll_discussions','1','Allow discussions on polls'); INSERT INTO vars (name, value, description) VALUES ('poll_fwdfor','1','Loose proxy management for voting?'); -INSERT INTO vars (name, value, description) VALUES ('rdfencoding','UTF-8','Site encoding'); +INSERT INTO vars (name, value, description) VALUES ('rdfencoding','ISO-8859-1','Site encoding'); INSERT INTO vars (name, value, description) VALUES ('rdfimg','http://www.example.com/images/topics/topicslash.gif','site icon to be used by RSS subscribers'); INSERT INTO vars (name, value, description) VALUES ('rdfitemdesc','0','1 == include introtext in item description; 0 == don\'t. Any other number is substr() of introtext to use'); INSERT INTO vars (name, value, description) VALUES ('rdfitemdesc_html','0','1 == include HTML in item description; 0 == strip HTML (plain text only)'); @@ -1040,7 +1031,6 @@ INSERT INTO vars (name, value, description) VALUES ('returnto_passwd',CONCAT('changeme',RAND()),'Password used to sign MD5s for returnto URLs from remote sites'); INSERT INTO vars (name, value, description) VALUES ('rootdir','//www.example.com','Base URL of site; used for creating on-site links that need protocol-inspecific URL (so site can be used via HTTP and HTTPS at the same time)'); INSERT INTO vars (name, value, description) VALUES ('rss_allow_index', '0', 'Allow RSS feeds to be served from index.pl (1 = admins, 2 = subscribers, 3 = all logged-in users)'); -INSERT INTO vars (name, value, description) VALUES ('rss_entitize_nonascii', 1, 'Convert non-ASCII-printable characters into entities?'); INSERT INTO vars (name, value, description) VALUES ('rss_expire_days','7','Number of days till we blank the data from the database (the signatures still stick around though)'); INSERT INTO vars (name, value, description) VALUES ('rss_max_items_incoming','15','Max number of rss items shown in a slashbox, by default'); INSERT INTO vars (name, value, description) VALUES ('rss_max_items_outgoing','10','Max number of rss items emitted in an rss/rdf/atom feed'); @@ -1110,7 +1100,6 @@ INSERT INTO vars (name, value, description) VALUES ('totalhits','0','Total number of hits the site has had thus far'); INSERT INTO vars (name, value, description) VALUES ('url_checker_user_agent', '', 'user Agent to use for url checking task, empty string results in lwp user agent being used'); INSERT INTO vars (name, value, description) VALUES ('use_dept','1','use \"dept.\" field'); -INSERT INTO vars (name, value, description) VALUES ('use_dept_space2dash','1','replace whitespace to dash at \"dept.\" field'); INSERT INTO vars (name, value, description) VALUES ('use_prev_next_link','1','Boolean where to use next/prev links for articles'); INSERT INTO vars (name, value, description) VALUES ('use_prev_next_link_series','0','Boolean where to use next/prev links for articles in a series (topic)'); INSERT INTO vars (name, value, description) VALUES ('use_prev_next_link_section','0','Boolean where to use next/prev links for articles in a section'); @@ -1124,4 +1113,19 @@ INSERT INTO vars (name, value, description) VALUES ('users_speed_limit','20','How fast a user can change their prefs'); INSERT INTO vars (name, value, description) VALUES ('writestatus','dirty','Simple Boolean to determine if homepage needs rewriting'); INSERT INTO vars (name, value, description) VALUES ('xhtml','0','Boolean for whether we are using XHTML'); -INSERT INTO vars (name, value, description) VALUES ('tweak_japanese','0','Special tweak for Japanese.'); + +# add constants for OSDN Japan +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_attrib_prefix','','attribute prefix for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_base_dn','','base dn for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_dn','','binddn for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_passwd','','bind password for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_enable','0','enable LDAP migration (1: enable, 0: disable)'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_peer_attrib_prefix', '', 'peer attribute prefix for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('mail_charset_body','us-ascii','Character Encoding used for mail body sent by the system (s. Encode::Supported)'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('mail_charset_header','MIME-Header','Character Encoding used for mail header sent by the system (s. Encode::MIME::Header)'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('rss_entitize_nonascii', 1, 'Convert non-ASCII-printable characters into entities?'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('tweak_japanese','0','Special tweak for Japanese.'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('use_dept_space2dash','1','replace whitespace to dash at \"dept.\" field'); +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'; From svnnotify → sourceforge.jp Tue Oct 23 17:54:05 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 23 Oct 2007 17:54:05 +0900 Subject: [Slashdotjp-dev 705] [212] add enable/disable switch to agree privacy statement on create user Message-ID: <1193129645.207050.16622.nullmailer@users.sourceforge.jp> Revision: 212 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=212 Author: tach Date: 2007-10-23 17:54:04 +0900 (Tue, 23 Oct 2007) Log Message: ----------- add enable/disable switch to agree privacy statement on create user Modified Paths: -------------- slashjp/trunk/plugins/Login/login.pl slashjp/trunk/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/trunk/plugins/Login/login.pl =================================================================== --- slashjp/trunk/plugins/Login/login.pl 2007-10-23 08:51:26 UTC (rev 211) +++ slashjp/trunk/plugins/Login/login.pl 2007-10-23 08:54:04 UTC (rev 212) @@ -85,7 +85,7 @@ if (!$newnick) { push @note, getData('nick_invalid'); $error = 1; - } elsif (!$form->{agree_priv_cont}) { + } elsif ($constants->{use_privacy_agreement} && !$form->{agree_priv_cont}) { push @note, getData('not_agree_priv_cont'); $error = 1; } elsif (!$form->{email} || !emailValid($form->{email})) { Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2007-10-23 08:51:26 UTC (rev 211) +++ slashjp/trunk/sql/mysql/defaults.sql 2007-10-23 08:54:04 UTC (rev 212) @@ -1126,6 +1126,7 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('rss_entitize_nonascii', 1, 'Convert non-ASCII-printable characters into entities?'); INSERT IGNORE INTO vars (name, value, description) VALUES ('tweak_japanese','0','Special tweak for Japanese.'); INSERT IGNORE INTO vars (name, value, description) VALUES ('use_dept_space2dash','1','replace whitespace to dash at \"dept.\" field'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('use_privacy_agreement','0','Need to agree privacy statement on create user'); 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'; From svnnotify → sourceforge.jp Tue Oct 23 18:55:30 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Tue, 23 Oct 2007 18:55:30 +0900 Subject: [Slashdotjp-dev 706] [213] Add libdata-javascript-anon-perl to Depends: Message-ID: <1193133330.891127.25823.nullmailer@users.sourceforge.jp> Revision: 213 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=213 Author: tach Date: 2007-10-23 18:55:30 +0900 (Tue, 23 Oct 2007) Log Message: ----------- Add libdata-javascript-anon-perl to Depends: Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/debian/control -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-23 08:54:04 UTC (rev 212) +++ slashjp/trunk/debian/changelog 2007-10-23 09:55:30 UTC (rev 213) @@ -3,8 +3,11 @@ * New upstream cvs release - Read upstream changelog * move Slash/LDAPDB/vars.sql contents to sql/mysql/default.sql + * Add enable/disable switch to agree privacy statement on create user + * Add libdata-javascript-anon-perl to Depends: + - for Ajax plugin - -- Taku YASUI Fri, 19 Oct 2007 12:38:55 +0900 + -- Taku YASUI Tue, 23 Oct 2007 18:54:51 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/debian/control =================================================================== --- slashjp/trunk/debian/control 2007-10-23 08:54:04 UTC (rev 212) +++ slashjp/trunk/debian/control 2007-10-23 09:55:30 UTC (rev 213) @@ -8,7 +8,7 @@ Package: slash-common Architecture: any -Depends: libcompress-zlib-perl, libxml-parser-perl, libdbix-password-perl (>= 1.8-5), libnet-perl, libtimedate-perl, libapache-dbilogger-perl, libhtml-parser-perl, libhtml-format-perl, libxml-rss-perl, libimage-size-perl, libemail-valid-perl, libtemplate-perl, libmail-sendmail-perl, libsoap-lite-perl, liblingua-stem-perl, libhtml-template-perl, libmime-types-perl, libparallel-useragent-perl, libhtml-popuptreeselect-perl, libnet-ldap-perl, libjcode-pm-perl, libhtml-calendarmonth-perl, libgd-gd2-perl, libgd-text-perl, ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} +Depends: libcompress-zlib-perl, libxml-parser-perl, libdbix-password-perl (>= 1.8-5), libnet-perl, libtimedate-perl, libapache-dbilogger-perl, libhtml-parser-perl, libhtml-format-perl, libxml-rss-perl, libimage-size-perl, libemail-valid-perl, libtemplate-perl, libmail-sendmail-perl, libsoap-lite-perl, liblingua-stem-perl, libhtml-template-perl, libmime-types-perl, libparallel-useragent-perl, libhtml-popuptreeselect-perl, libnet-ldap-perl, libjcode-pm-perl, libhtml-calendarmonth-perl, libgd-gd2-perl, libgd-text-perl, libdata-javascript-anon-perl, ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} Description: The code that runs Slashdot - common files Slash -- Slashdot Like Automated Storytelling Homepage -- is an architecture to put together web sites. It comes with functionality for posting articles, From svnnotify → sourceforge.jp Wed Oct 24 14:35:00 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 14:35:00 +0900 Subject: [Slashdotjp-dev 707] [214] Fix: password notification email send fail Message-ID: <1193204100.840740.27408.nullmailer@users.sourceforge.jp> Revision: 214 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=214 Author: tach Date: 2007-10-24 14:35:00 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Fix: password notification email send fail Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Messages/Messages.pm -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-23 09:55:30 UTC (rev 213) +++ slashjp/trunk/debian/changelog 2007-10-24 05:35:00 UTC (rev 214) @@ -6,8 +6,9 @@ * Add enable/disable switch to agree privacy statement on create user * Add libdata-javascript-anon-perl to Depends: - for Ajax plugin + * Fix: password notification email send fail: plugins/Messages/Messages.pm - -- Taku YASUI Tue, 23 Oct 2007 18:54:51 +0900 + -- Taku YASUI Wed, 24 Oct 2007 14:33:39 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/plugins/Messages/Messages.pm =================================================================== --- slashjp/trunk/plugins/Messages/Messages.pm 2007-10-23 09:55:30 UTC (rev 213) +++ slashjp/trunk/plugins/Messages/Messages.pm 2007-10-24 05:35:00 UTC (rev 214) @@ -457,7 +457,7 @@ } # Email and Mobile messages are both Email modes, but use different recipients. - if ($msg->{user}{prefs}{$msg->{code}} == $self->getMessageDeliveryByName("Mobile")) { + if ($msg->{user}{prefs}{$msg->{code}} && $msg->{user}{prefs}{$msg->{code}} == $self->getMessageDeliveryByName("Mobile")) { $addr = $msg->{user}{mobile_text_address}; } else { $addr = $msg->{altto} || $msg->{user}{realemail}; @@ -1120,7 +1120,7 @@ my $slashdb = getCurrentDB(); my $name_q = $slashdb->sqlQuote($name); - my $code = $slashdb->sqlSelect("code", "message_deliverymodes", "name = $name_q"); + my $code = $slashdb->sqlSelect("code", "message_deliverymodes", "name = $name_q") || -1; return($code); } From svnnotify → sourceforge.jp Wed Oct 24 17:27:44 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 17:27:44 +0900 Subject: [Slashdotjp-dev 708] [215] Fix: remove filter failed Message-ID: <1193214464.359902.32102.nullmailer@users.sourceforge.jp> Revision: 215 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=215 Author: tach Date: 2007-10-24 17:27:43 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Fix: remove filter failed Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Admin/admin.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-24 05:35:00 UTC (rev 214) +++ slashjp/trunk/debian/changelog 2007-10-24 08:27:43 UTC (rev 215) @@ -7,8 +7,9 @@ * Add libdata-javascript-anon-perl to Depends: - for Ajax plugin * Fix: password notification email send fail: plugins/Messages/Messages.pm + * Fix: remove filter failed: plugins/Admin/admin.pl - -- Taku YASUI Wed, 24 Oct 2007 14:33:39 +0900 + -- Taku YASUI Wed, 24 Oct 2007 17:23:13 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2007-10-24 05:35:00 UTC (rev 214) +++ slashjp/trunk/plugins/Admin/admin.pl 2007-10-24 08:27:43 UTC (rev 215) @@ -1975,7 +1975,7 @@ } elsif ($form->{deletefilter}) { $slashdb->deleteContentFilter($form->{filter_id}); titlebar("100%", getTitle('updateFilter-delete-title')); - listFilters($formname); + listFilters(@_); return(); } From svnnotify → sourceforge.jp Wed Oct 24 18:25:55 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 18:25:55 +0900 Subject: [Slashdotjp-dev 709] [216] Typo fix Message-ID: <1193217955.487462.4916.nullmailer@users.sourceforge.jp> Revision: 216 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=216 Author: tach Date: 2007-10-24 18:25:55 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Typo fix Modified Paths: -------------- slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm =================================================================== --- slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-24 08:27:43 UTC (rev 215) +++ slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-24 09:25:55 UTC (rev 216) @@ -65,7 +65,7 @@ sub bind { my $self = shift; - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; return 1 if defined $self->{_bind_p}; $self->{_bind_p} = 1; my @args = (); @@ -86,7 +86,7 @@ my $matchname = shift; my $pass = shift; __debug(8, "LDAP::authUser: start auth for $matchname"); - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; my $userinfo = $self->getUser($matchname); if ($userinfo->{passwd} eq md5_hex($pass)) { @@ -103,7 +103,7 @@ my $val = shift; __debug(8, "LDAP::createUser called for user '$user'"); __debug(9, "LDAP::createUser called with ". Data::Dumper->Dump([$val], [qw($val)])); - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; $val->{matchname} = $user; unless ($self->getUser($val->{matchname})) { @@ -141,7 +141,7 @@ my $self = shift; my $uid = shift; __debug(8, "LDAP::deleteUser called for uid '$uid'"); - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; my $userent = $self->getUserByUid($uid); $userent && $self->deleteUser($userent->{matchname}); } @@ -150,7 +150,7 @@ my $self = shift; my $user = shift; __debug(8, "LDAP::deleteUser called for user '$user'"); - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; my $mesg = $self->_timeout(sub { $self->{_ldap}->delete("cn=${user},".$self->{base_dn}) }); $mesg->code && __debug(3, "LDAP Error when deleteUser: ". $mesg->error); !$mesg->code; @@ -162,7 +162,7 @@ my $val = shift; __debug(8, "LDAP::setUser called for user '$user'"); __debug(9, "LDAP::setUser called with ". Data::Dumper->Dump([$val], [qw($val)])); - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; my $changes = $self->_s2lop($val); return -1 unless @$changes; @@ -181,7 +181,7 @@ my $val = shift; __debug(8, "LDAP::setUserByUid called for uid '$uid'"); __debug(9, "LDAP::setUserByUid called with ". Data::Dumper->Dump([$val], [qw($val)])); - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; my $changes = $self->_s2lop($val); return -1 unless @$changes; @@ -193,7 +193,7 @@ sub getUser() { my $self = shift; my $user = shift; - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; my $entry = $self->_get_userent("(cn=$user)"); unless ($entry) { __debug(5, "LDAP::getUser: Can't find user cn=$user"); @@ -205,7 +205,7 @@ sub getUserByUid() { my $self = shift; my $uid = shift; - $self->_check_diabled and return undef; + $self->_check_disabled and return undef; my $entry = $self->_get_userent("($self->{attrib_prefix}UidNumber=$uid)"); unless ($entry) { __debug(5, "LDAP::getUser: Can't find user uid=$uid"); @@ -311,7 +311,7 @@ Slash::Utility::Environment::getCurrentStatic(); } -sub _check_diabled { +sub _check_disabled { my $self = shift; $self->{_disabled} and __debug(1, "Slash::LDAP has been disabled: ($self->{_disabled})"); Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-24 08:27:43 UTC (rev 215) +++ slashjp/trunk/debian/changelog 2007-10-24 09:25:55 UTC (rev 216) @@ -8,8 +8,9 @@ - for Ajax plugin * Fix: password notification email send fail: plugins/Messages/Messages.pm * Fix: remove filter failed: plugins/Admin/admin.pl + * Typo fix at Slash/LDAPDB/lib/Slash/LDAPDB.pm - -- Taku YASUI Wed, 24 Oct 2007 17:23:13 +0900 + -- Taku YASUI Wed, 24 Oct 2007 18:25:21 +0900 slash (2.5.0.119-17) unstable; urgency=low From svnnotify → sourceforge.jp Wed Oct 24 18:51:54 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 18:51:54 +0900 Subject: [Slashdotjp-dev 710] [217] Fix warning: Wide character in print at plugins/Admin/admin.pl Message-ID: <1193219514.238882.19128.nullmailer@users.sourceforge.jp> Revision: 217 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=217 Author: tach Date: 2007-10-24 18:51:53 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Fix warning: Wide character in print at plugins/Admin/admin.pl Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Admin/admin.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-24 09:25:55 UTC (rev 216) +++ slashjp/trunk/debian/changelog 2007-10-24 09:51:53 UTC (rev 217) @@ -9,8 +9,9 @@ * Fix: password notification email send fail: plugins/Messages/Messages.pm * Fix: remove filter failed: plugins/Admin/admin.pl * Typo fix at Slash/LDAPDB/lib/Slash/LDAPDB.pm + * Fix warning: Wide character in print at plugins/Admin/admin.pl - -- Taku YASUI Wed, 24 Oct 2007 18:25:21 +0900 + -- Taku YASUI Wed, 24 Oct 2007 18:50:39 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2007-10-24 09:25:55 UTC (rev 216) +++ slashjp/trunk/plugins/Admin/admin.pl 2007-10-24 09:51:53 UTC (rev 217) @@ -1776,6 +1776,7 @@ sub write_to_temp_file { my($data) = @_; my($fh, $file) = tempfile(); + binmode $fh, ':utf8'; print $fh $data; close $fh; return $file; From svnnotify → sourceforge.jp Wed Oct 24 19:18:42 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 19:18:42 +0900 Subject: [Slashdotjp-dev 711] [218] Fix warning: Use of uninitialized value in substitution iterator at Message-ID: <1193221122.491025.2094.nullmailer@users.sourceforge.jp> Revision: 218 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=218 Author: tach Date: 2007-10-24 19:18:42 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Fix warning: Use of uninitialized value in substitution iterator at fixparam() in Slash/Utility/Data/Data.pm Modified Paths: -------------- slashjp/trunk/Slash/Utility/Data/Data.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Data/Data.pm =================================================================== --- slashjp/trunk/Slash/Utility/Data/Data.pm 2007-10-24 09:51:53 UTC (rev 217) +++ slashjp/trunk/Slash/Utility/Data/Data.pm 2007-10-24 10:18:42 UTC (rev 218) @@ -2138,6 +2138,8 @@ sub fixparam { my($url) = @_; + no utf8; + Encode::is_utf8($url) and $url = Encode::encode_utf8($url); $url =~ s/([^$URI::unreserved ])/$URI::Escape::escapes{$1}/og; $url =~ s/ /+/g; return $url; Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-24 09:51:53 UTC (rev 217) +++ slashjp/trunk/debian/changelog 2007-10-24 10:18:42 UTC (rev 218) @@ -10,8 +10,10 @@ * Fix: remove filter failed: plugins/Admin/admin.pl * Typo fix at Slash/LDAPDB/lib/Slash/LDAPDB.pm * Fix warning: Wide character in print at plugins/Admin/admin.pl + * Fix warning: Use of uninitialized value in substitution iterator at + fixparam() in Slash/Utility/Data/Data.pm - -- Taku YASUI Wed, 24 Oct 2007 18:50:39 +0900 + -- Taku YASUI Wed, 24 Oct 2007 19:16:59 +0900 slash (2.5.0.119-17) unstable; urgency=low From svnnotify → sourceforge.jp Wed Oct 24 20:51:41 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 20:51:41 +0900 Subject: [Slashdotjp-dev 712] [219] remove tach branch Message-ID: <1193226701.669284.25830.nullmailer@users.sourceforge.jp> Revision: 219 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=219 Author: tach Date: 2007-10-24 20:51:41 +0900 (Wed, 24 Oct 2007) Log Message: ----------- remove tach branch Removed Paths: ------------- faq/branches/tach/ -------------- next part -------------- From svnnotify → sourceforge.jp Wed Oct 24 21:02:43 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 21:02:43 +0900 Subject: [Slashdotjp-dev 713] [221] Update slashdot.org FAQ: 2007-10-24 Message-ID: <1193227363.852302.487.nullmailer@users.sourceforge.jp> Revision: 221 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=221 Author: anoncvs_peerrating Date: 2007-10-24 21:02:43 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Update slashdot.org FAQ: 2007-10-24 Modified Paths: -------------- faq/branches/slashdot.org/faq/index.html -------------- next part -------------- Modified: faq/branches/slashdot.org/faq/index.html =================================================================== --- faq/branches/slashdot.org/faq/index.html 2007-10-24 11:53:14 UTC (rev 220) +++ faq/branches/slashdot.org/faq/index.html 2007-10-24 12:02:43 UTC (rev 221) @@ -257,8 +257,27 @@
-
+
+ + + + + +
+
+
+
From svnnotify → sourceforge.jp Wed Oct 24 21:10:43 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 21:10:43 +0900 Subject: [Slashdotjp-dev 714] [222] Update slashdot.org FAQ: 2007-10-24 Message-ID: <1193227843.379230.5901.nullmailer@users.sourceforge.jp> Revision: 222 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=222 Author: anoncvs_peerrating Date: 2007-10-24 21:10:43 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Update slashdot.org FAQ: 2007-10-24 Modified Paths: -------------- faq/branches/slashdot.org/faq/index.html -------------- next part -------------- Modified: faq/branches/slashdot.org/faq/index.html =================================================================== --- faq/branches/slashdot.org/faq/index.html 2007-10-24 12:02:43 UTC (rev 221) +++ faq/branches/slashdot.org/faq/index.html 2007-10-24 12:10:43 UTC (rev 222) @@ -257,27 +257,8 @@
-
- - - - - -
- +
-
-
From svnnotify → sourceforge.jp Wed Oct 24 21:14:48 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 21:14:48 +0900 Subject: [Slashdotjp-dev 715] [223] Update slashdot.org FAQ: 2007-10-24 Message-ID: <1193228088.608195.9200.nullmailer@users.sourceforge.jp> Revision: 223 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=223 Author: anoncvs_peerrating Date: 2007-10-24 21:14:48 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Update slashdot.org FAQ: 2007-10-24 Modified Paths: -------------- faq/branches/slashdot.org/faq/index.html -------------- next part -------------- Modified: faq/branches/slashdot.org/faq/index.html =================================================================== --- faq/branches/slashdot.org/faq/index.html 2007-10-24 12:10:43 UTC (rev 222) +++ faq/branches/slashdot.org/faq/index.html 2007-10-24 12:14:48 UTC (rev 223) @@ -257,8 +257,27 @@
-
+
+ + + + + +
+
+
+
From svnnotify → sourceforge.jp Wed Oct 24 21:28:20 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 21:28:20 +0900 Subject: [Slashdotjp-dev 716] [224] ignore index.shtml Message-ID: <1193228900.061405.19747.nullmailer@users.sourceforge.jp> Revision: 224 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=224 Author: tach Date: 2007-10-24 21:28:19 +0900 (Wed, 24 Oct 2007) Log Message: ----------- ignore index.shtml Property Changed: ---------------- faq/branches/slashdot.org/faq/ -------------- next part -------------- Property changes on: faq/branches/slashdot.org/faq ___________________________________________________________________ Name: svn:ignore + index.shtml From svnnotify → sourceforge.jp Wed Oct 24 21:38:54 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 21:38:54 +0900 Subject: [Slashdotjp-dev 717] [225] add svn:keyword property Message-ID: <1193229534.528216.29420.nullmailer@users.sourceforge.jp> Revision: 225 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=225 Author: tach Date: 2007-10-24 21:38:54 +0900 (Wed, 24 Oct 2007) Log Message: ----------- add svn:keyword property Property Changed: ---------------- faq/branches/slashdot.org/faq/UI.shtml faq/branches/slashdot.org/faq/accounts.shtml faq/branches/slashdot.org/faq/advertising.shtml faq/branches/slashdot.org/faq/badges.shtml faq/branches/slashdot.org/faq/com-mod.shtml faq/branches/slashdot.org/faq/editorial.shtml faq/branches/slashdot.org/faq/faq-meta.shtml faq/branches/slashdot.org/faq/feeds.shtml faq/branches/slashdot.org/faq/firehose.shtml faq/branches/slashdot.org/faq/friends.shtml faq/branches/slashdot.org/faq/interviews.shtml faq/branches/slashdot.org/faq/metamod.shtml faq/branches/slashdot.org/faq/slashmeta.shtml faq/branches/slashdot.org/faq/subscriptions.shtml faq/branches/slashdot.org/faq/suggestions.shtml faq/branches/slashdot.org/faq/tags.shtml faq/branches/slashdot.org/faq/tech.shtml -------------- next part -------------- Property changes on: faq/branches/slashdot.org/faq/UI.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/accounts.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/advertising.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/badges.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/com-mod.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/editorial.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/faq-meta.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/feeds.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/firehose.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/friends.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/interviews.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/metamod.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/slashmeta.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/subscriptions.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/suggestions.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/tags.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision Property changes on: faq/branches/slashdot.org/faq/tech.shtml ___________________________________________________________________ Name: svn:keyword + Author Date Id Revision From svnnotify → sourceforge.jp Wed Oct 24 21:47:22 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 21:47:22 +0900 Subject: [Slashdotjp-dev 718] [226] add svn:keywords property instead of svn:keyword ... Message-ID: <1193230042.702476.2447.nullmailer@users.sourceforge.jp> Revision: 226 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=226 Author: tach Date: 2007-10-24 21:47:22 +0900 (Wed, 24 Oct 2007) Log Message: ----------- add svn:keywords property instead of svn:keyword ... orz Modified Paths: -------------- faq/branches/slashdot.org/faq/UI.shtml faq/branches/slashdot.org/faq/accounts.shtml faq/branches/slashdot.org/faq/advertising.shtml faq/branches/slashdot.org/faq/badges.shtml faq/branches/slashdot.org/faq/com-mod.shtml faq/branches/slashdot.org/faq/editorial.shtml faq/branches/slashdot.org/faq/faq-meta.shtml faq/branches/slashdot.org/faq/feeds.shtml faq/branches/slashdot.org/faq/firehose.shtml faq/branches/slashdot.org/faq/friends.shtml faq/branches/slashdot.org/faq/interviews.shtml faq/branches/slashdot.org/faq/metamod.shtml faq/branches/slashdot.org/faq/slashmeta.shtml faq/branches/slashdot.org/faq/subscriptions.shtml faq/branches/slashdot.org/faq/suggestions.shtml faq/branches/slashdot.org/faq/tags.shtml faq/branches/slashdot.org/faq/tech.shtml Property Changed: ---------------- faq/branches/slashdot.org/faq/UI.shtml faq/branches/slashdot.org/faq/accounts.shtml faq/branches/slashdot.org/faq/advertising.shtml faq/branches/slashdot.org/faq/badges.shtml faq/branches/slashdot.org/faq/com-mod.shtml faq/branches/slashdot.org/faq/editorial.shtml faq/branches/slashdot.org/faq/faq-meta.shtml faq/branches/slashdot.org/faq/feeds.shtml faq/branches/slashdot.org/faq/firehose.shtml faq/branches/slashdot.org/faq/friends.shtml faq/branches/slashdot.org/faq/interviews.shtml faq/branches/slashdot.org/faq/metamod.shtml faq/branches/slashdot.org/faq/slashmeta.shtml faq/branches/slashdot.org/faq/subscriptions.shtml faq/branches/slashdot.org/faq/suggestions.shtml faq/branches/slashdot.org/faq/tags.shtml faq/branches/slashdot.org/faq/tech.shtml -------------- next part -------------- Modified: faq/branches/slashdot.org/faq/UI.shtml =================================================================== --- faq/branches/slashdot.org/faq/UI.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/UI.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - User Interface - + Property changes on: faq/branches/slashdot.org/faq/UI.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/accounts.shtml =================================================================== --- faq/branches/slashdot.org/faq/accounts.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/accounts.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Accounts - + Property changes on: faq/branches/slashdot.org/faq/accounts.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/advertising.shtml =================================================================== --- faq/branches/slashdot.org/faq/advertising.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/advertising.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Advertising - + Property changes on: faq/branches/slashdot.org/faq/advertising.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/badges.shtml =================================================================== --- faq/branches/slashdot.org/faq/badges.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/badges.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Badges How-To - + Property changes on: faq/branches/slashdot.org/faq/badges.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/com-mod.shtml =================================================================== --- faq/branches/slashdot.org/faq/com-mod.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/com-mod.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Comments and Moderation - + Property changes on: faq/branches/slashdot.org/faq/com-mod.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/editorial.shtml =================================================================== --- faq/branches/slashdot.org/faq/editorial.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/editorial.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Editorial - + Property changes on: faq/branches/slashdot.org/faq/editorial.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/faq-meta.shtml =================================================================== --- faq/branches/slashdot.org/faq/faq-meta.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/faq-meta.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Meta - + Property changes on: faq/branches/slashdot.org/faq/faq-meta.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/feeds.shtml =================================================================== --- faq/branches/slashdot.org/faq/feeds.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/feeds.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Feeds - + Property changes on: faq/branches/slashdot.org/faq/feeds.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/firehose.shtml =================================================================== --- faq/branches/slashdot.org/faq/firehose.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/firehose.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Firehose - + Property changes on: faq/branches/slashdot.org/faq/firehose.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/friends.shtml =================================================================== --- faq/branches/slashdot.org/faq/friends.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/friends.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Friends and Journals - + Property changes on: faq/branches/slashdot.org/faq/friends.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/interviews.shtml =================================================================== --- faq/branches/slashdot.org/faq/interviews.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/interviews.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Interviews - + Property changes on: faq/branches/slashdot.org/faq/interviews.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/metamod.shtml =================================================================== --- faq/branches/slashdot.org/faq/metamod.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/metamod.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Meta-moderation - + Property changes on: faq/branches/slashdot.org/faq/metamod.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/slashmeta.shtml =================================================================== --- faq/branches/slashdot.org/faq/slashmeta.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/slashmeta.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - About Slashdot - + Property changes on: faq/branches/slashdot.org/faq/slashmeta.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/subscriptions.shtml =================================================================== --- faq/branches/slashdot.org/faq/subscriptions.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/subscriptions.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Subscriptions - + Property changes on: faq/branches/slashdot.org/faq/subscriptions.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/suggestions.shtml =================================================================== --- faq/branches/slashdot.org/faq/suggestions.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/suggestions.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Suggestions and Requests - + Property changes on: faq/branches/slashdot.org/faq/suggestions.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/tags.shtml =================================================================== --- faq/branches/slashdot.org/faq/tags.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/tags.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -279,7 +279,7 @@
Property changes on: faq/branches/slashdot.org/faq/tags.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision Modified: faq/branches/slashdot.org/faq/tech.shtml =================================================================== --- faq/branches/slashdot.org/faq/tech.shtml 2007-10-24 12:38:54 UTC (rev 225) +++ faq/branches/slashdot.org/faq/tech.shtml 2007-10-24 12:47:22 UTC (rev 226) @@ -3,7 +3,7 @@ Slashdot FAQ - Tech - + Property changes on: faq/branches/slashdot.org/faq/tech.shtml ___________________________________________________________________ Name: svn:keyword - Author Date Id Revision Name: svn:keywords + Author Date Id Revision From svnnotify → sourceforge.jp Wed Oct 24 21:48:19 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 24 Oct 2007 21:48:19 +0900 Subject: [Slashdotjp-dev 719] [227] Update slashdot.org FAQ: 2007-10-24 Message-ID: <1193230099.206104.3529.nullmailer@users.sourceforge.jp> Revision: 227 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=227 Author: transit2svn Date: 2007-10-24 21:48:18 +0900 (Wed, 24 Oct 2007) Log Message: ----------- Update slashdot.org FAQ: 2007-10-24 Modified Paths: -------------- faq/branches/slashdot.org/faq/UI.shtml faq/branches/slashdot.org/faq/accounts.shtml faq/branches/slashdot.org/faq/advertising.shtml faq/branches/slashdot.org/faq/badges.shtml faq/branches/slashdot.org/faq/com-mod.shtml faq/branches/slashdot.org/faq/editorial.shtml faq/branches/slashdot.org/faq/faq-meta.shtml faq/branches/slashdot.org/faq/feeds.shtml faq/branches/slashdot.org/faq/firehose.shtml faq/branches/slashdot.org/faq/friends.shtml faq/branches/slashdot.org/faq/index.html faq/branches/slashdot.org/faq/interviews.shtml faq/branches/slashdot.org/faq/metamod.shtml faq/branches/slashdot.org/faq/slashmeta.shtml faq/branches/slashdot.org/faq/subscriptions.shtml faq/branches/slashdot.org/faq/suggestions.shtml faq/branches/slashdot.org/faq/tags.shtml faq/branches/slashdot.org/faq/tech.shtml -------------- next part -------------- Modified: faq/branches/slashdot.org/faq/UI.shtml =================================================================== --- faq/branches/slashdot.org/faq/UI.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/UI.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -378,9 +378,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/accounts.shtml =================================================================== --- faq/branches/slashdot.org/faq/accounts.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/accounts.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -442,9 +442,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/advertising.shtml =================================================================== --- faq/branches/slashdot.org/faq/advertising.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/advertising.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -341,9 +341,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/badges.shtml =================================================================== --- faq/branches/slashdot.org/faq/badges.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/badges.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -383,9 +383,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/com-mod.shtml =================================================================== --- faq/branches/slashdot.org/faq/com-mod.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/com-mod.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -804,9 +804,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/editorial.shtml =================================================================== --- faq/branches/slashdot.org/faq/editorial.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/editorial.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -523,9 +523,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/faq-meta.shtml =================================================================== --- faq/branches/slashdot.org/faq/faq-meta.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/faq-meta.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -337,9 +337,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/feeds.shtml =================================================================== --- faq/branches/slashdot.org/faq/feeds.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/feeds.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -376,9 +376,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/firehose.shtml =================================================================== --- faq/branches/slashdot.org/faq/firehose.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/firehose.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -435,9 +435,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/friends.shtml =================================================================== --- faq/branches/slashdot.org/faq/friends.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/friends.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -405,9 +405,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/index.html =================================================================== --- faq/branches/slashdot.org/faq/index.html 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/index.html 2007-10-24 12:48:18 UTC (rev 227) @@ -560,9 +560,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/interviews.shtml =================================================================== --- faq/branches/slashdot.org/faq/interviews.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/interviews.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -359,9 +359,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/metamod.shtml =================================================================== --- faq/branches/slashdot.org/faq/metamod.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/metamod.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -405,9 +405,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/slashmeta.shtml =================================================================== --- faq/branches/slashdot.org/faq/slashmeta.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/slashmeta.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -464,9 +464,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/subscriptions.shtml =================================================================== --- faq/branches/slashdot.org/faq/subscriptions.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/subscriptions.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -470,9 +470,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/suggestions.shtml =================================================================== --- faq/branches/slashdot.org/faq/suggestions.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/suggestions.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -459,9 +459,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/tags.shtml =================================================================== --- faq/branches/slashdot.org/faq/tags.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/tags.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -535,9 +535,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
Modified: faq/branches/slashdot.org/faq/tech.shtml =================================================================== --- faq/branches/slashdot.org/faq/tech.shtml 2007-10-24 12:47:22 UTC (rev 226) +++ faq/branches/slashdot.org/faq/tech.shtml 2007-10-24 12:48:18 UTC (rev 227) @@ -470,9 +470,8 @@
- Tout choses sont dites deja, mais comme personne n'ecoute, il faut -toujours recommencer. - -- A. Gide + When the going gets weird, the weird turn pro. + -- Hunter S. Thompson
From svnnotify → sourceforge.jp Thu Oct 25 18:27:40 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Thu, 25 Oct 2007 18:27:40 +0900 Subject: [Slashdotjp-dev 720] [228] fix typos Message-ID: <1193304460.464305.26806.nullmailer@users.sourceforge.jp> Revision: 228 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=228 Author: tach Date: 2007-10-25 18:27:40 +0900 (Thu, 25 Oct 2007) Log Message: ----------- fix typos Modified Paths: -------------- slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm =================================================================== --- slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-24 12:48:18 UTC (rev 227) +++ slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-25 09:27:40 UTC (rev 228) @@ -57,8 +57,8 @@ if (!$self->{_disabled} && !($self->{_ldap} = Net::LDAP->new($self->{host}, timeout => $self->{timeout}))){ - __debug(1, "LDAP: can't create DLAP object $@"); - $self->{_disabled} = "DLAP object create fail: $@"; + __debug(1, "LDAP: can't create LDAP object $@"); + $self->{_disabled} = "LDAP object create fail: $@"; } return $self; } @@ -166,7 +166,7 @@ my $changes = $self->_s2lop($val); return -1 unless @$changes; - __debug(9, "DLAP::serUser ".Data::Dumper->Dump([$changes], [qw($changes)])); + __debug(9, "LDAP::setUser ".Data::Dumper->Dump([$changes], [qw($changes)])); $self->bind; my $mesg = $self->_timeout(sub { $self->{_ldap}->modify("cn=$user,$self->{base_dn}", From svnnotify → sourceforge.jp Thu Oct 25 20:46:58 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Thu, 25 Oct 2007 20:46:58 +0900 Subject: [Slashdotjp-dev 721] [229] * Fix warning: Use of uninitialized value and hash key at Message-ID: <1193312818.876561.17632.nullmailer@users.sourceforge.jp> Revision: 229 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=229 Author: tach Date: 2007-10-25 20:46:58 +0900 (Thu, 25 Oct 2007) Log Message: ----------- * Fix warning: Use of uninitialized value and hash key at templateEdit() in plugins/Admin/admin.pl Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Admin/admin.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-25 09:27:40 UTC (rev 228) +++ slashjp/trunk/debian/changelog 2007-10-25 11:46:58 UTC (rev 229) @@ -12,8 +12,10 @@ * Fix warning: Wide character in print at plugins/Admin/admin.pl * Fix warning: Use of uninitialized value in substitution iterator at fixparam() in Slash/Utility/Data/Data.pm + * Fix warning: Use of uninitialized value and hash key at + templateEdit() in plugins/Admin/admin.pl - -- Taku YASUI Wed, 24 Oct 2007 19:16:59 +0900 + -- Taku YASUI Thu, 25 Oct 2007 20:45:36 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2007-10-25 09:27:40 UTC (rev 228) +++ slashjp/trunk/plugins/Admin/admin.pl 2007-10-25 11:46:58 UTC (rev 229) @@ -449,7 +449,7 @@ $templateref = $slashdb->getTemplate($tpid, '', 1) if $tpid; - $seclev_flag = 0 if $templateref->{seclev} > $user->{seclev}; + $seclev_flag = 0 if ($tpid && $templateref->{seclev} > $user->{seclev}); if ($form->{templatedelete}) { $templatedelete_flag = 1; @@ -460,7 +460,7 @@ my $getskin = $skin eq 'All' ? '' : $skin; unless ($form->{templateskin} || $form->{templatepage} || $form->{templatepageandskin} || $form->{templatesearch}) { - $form->{ $form->{templatelastselect} } = 1; + $form->{ $form->{templatelastselect} } = 1 if $form->{templatelastselect}; } if ($form->{templateskin}) { From svnnotify → sourceforge.jp Fri Oct 26 15:03:36 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 26 Oct 2007 15:03:36 +0900 Subject: [Slashdotjp-dev 722] [230] Allow to change LDAPDB DEBUG_LEVEL using vars "ldap_debug_level" Message-ID: <1193378616.158833.12257.nullmailer@users.sourceforge.jp> Revision: 230 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=230 Author: tach Date: 2007-10-26 15:03:35 +0900 (Fri, 26 Oct 2007) Log Message: ----------- Allow to change LDAPDB DEBUG_LEVEL using vars "ldap_debug_level" Modified Paths: -------------- slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm slashjp/trunk/debian/changelog slashjp/trunk/sql/mysql/defaults.sql -------------- next part -------------- Modified: slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm =================================================================== --- slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-25 11:46:58 UTC (rev 229) +++ slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-26 06:03:35 UTC (rev 230) @@ -55,6 +55,8 @@ @_ }; bless $self, $class; + $DEBUG_LEVEL = $constants->{ldap_debug_level} || $DEBUG_LEVEL; + if (!$self->{_disabled} && !($self->{_ldap} = Net::LDAP->new($self->{host}, timeout => $self->{timeout}))){ __debug(1, "LDAP: can't create LDAP object $@"); Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-25 11:46:58 UTC (rev 229) +++ slashjp/trunk/debian/changelog 2007-10-26 06:03:35 UTC (rev 230) @@ -14,8 +14,9 @@ fixparam() in Slash/Utility/Data/Data.pm * Fix warning: Use of uninitialized value and hash key at templateEdit() in plugins/Admin/admin.pl + * Allow to change LDAPDB DEBUG_LEVEL using vars "ldap_debug_level" - -- Taku YASUI Thu, 25 Oct 2007 20:45:36 +0900 + -- Taku YASUI Fri, 26 Oct 2007 15:01:29 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/sql/mysql/defaults.sql =================================================================== --- slashjp/trunk/sql/mysql/defaults.sql 2007-10-25 11:46:58 UTC (rev 229) +++ slashjp/trunk/sql/mysql/defaults.sql 2007-10-26 06:03:35 UTC (rev 230) @@ -1119,6 +1119,7 @@ INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_base_dn','','base dn for LDAP migration'); INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_dn','','binddn for LDAP migration'); INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_passwd','','bind password for LDAP migration'); +INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_debug_level','0','LDAPDB debug level (default: 5)'); INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_enable','0','enable LDAP migration (1: enable, 0: disable)'); INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_peer_attrib_prefix', '', 'peer attribute prefix for LDAP migration'); INSERT IGNORE INTO vars (name, value, description) VALUES ('mail_charset_body','us-ascii','Character Encoding used for mail body sent by the system (s. Encode::Supported)'); From svnnotify → sourceforge.jp Fri Oct 26 15:07:26 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Fri, 26 Oct 2007 15:07:26 +0900 Subject: [Slashdotjp-dev 723] [231] * Fix warning: Use of uninitialized value at Message-ID: <1193378846.426828.14519.nullmailer@users.sourceforge.jp> Revision: 231 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=231 Author: tach Date: 2007-10-26 15:07:26 +0900 (Fri, 26 Oct 2007) Log Message: ----------- * Fix warning: Use of uninitialized value at getDescForTopicsRendered() at plugins/Admin/admin.pl Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Admin/admin.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2007-10-26 06:03:35 UTC (rev 230) +++ slashjp/trunk/debian/changelog 2007-10-26 06:07:26 UTC (rev 231) @@ -15,8 +15,10 @@ * Fix warning: Use of uninitialized value and hash key at templateEdit() in plugins/Admin/admin.pl * Allow to change LDAPDB DEBUG_LEVEL using vars "ldap_debug_level" + * Fix warning: Use of uninitialized value at + getDescForTopicsRendered() at plugins/Admin/admin.pl - -- Taku YASUI Fri, 26 Oct 2007 15:01:29 +0900 + -- Taku YASUI Fri, 26 Oct 2007 15:06:24 +0900 slash (2.5.0.119-17) unstable; urgency=low Modified: slashjp/trunk/plugins/Admin/admin.pl =================================================================== --- slashjp/trunk/plugins/Admin/admin.pl 2007-10-26 06:03:35 UTC (rev 230) +++ slashjp/trunk/plugins/Admin/admin.pl 2007-10-26 06:07:26 UTC (rev 231) @@ -1708,7 +1708,7 @@ my $user = getCurrentUser(); my $tree = $slashdb->getTopicTree(); my $mainpage_nexus_tid = getCurrentStatic("mainpage_nexus_tid"); - my $primary_nexus_tid = $slashdb->getNexusFromSkid($primaryskid); + my $primary_nexus_tid = $primaryskid ? $slashdb->getNexusFromSkid($primaryskid) || 0; my @story_nexuses = grep { $tree->{$_}{nexus} } keys %$topics_rendered; my @sorted_nexuses = map { $_->[1] } From svnnotify → sourceforge.jp Wed Oct 31 14:42:27 2007 From: svnnotify → sourceforge.jp (svnnotify → sourceforge.jp) Date: Wed, 31 Oct 2007 14:42:27 +0900 Subject: [Slashdotjp-dev 724] [232] import from T_2_5_0_181 Message-ID: <1193809347.119983.16089.nullmailer@users.sourceforge.jp> Revision: 232 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=232 Author: tach Date: 2007-10-31 14:42:24 +0900 (Wed, 31 Oct 2007) Log Message: ----------- import from T_2_5_0_181 Modified Paths: -------------- slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm slashjp/branches/upstream/current/Slash/Slash.pm slashjp/branches/upstream/current/Slash/Utility/Display/Display.pm slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm slashjp/branches/upstream/current/plugins/Admin/admin.pl slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/admin.js slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/sectionprefs.js slashjp/branches/upstream/current/plugins/Ajax/templates/data;ajax;default slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default slashjp/branches/upstream/current/plugins/Blob/Blob.pm slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarklink;misc;default slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarktext;misc;default slashjp/branches/upstream/current/plugins/Console/templates/display;console;default slashjp/branches/upstream/current/plugins/FAQSlashdot/faq/UI.shtml slashjp/branches/upstream/current/plugins/FireHose/FireHose.pm slashjp/branches/upstream/current/plugins/FireHose/firehose.css slashjp/branches/upstream/current/plugins/FireHose/mysql_schema.sql slashjp/branches/upstream/current/plugins/FireHose/templates/data;firehose;default slashjp/branches/upstream/current/plugins/FireHose/templates/firehose_options;misc;default slashjp/branches/upstream/current/plugins/FireHose/templates/list;firehose;default slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default slashjp/branches/upstream/current/plugins/Journal/Journal.pm slashjp/branches/upstream/current/plugins/Messages/PLUGIN slashjp/branches/upstream/current/plugins/Messages/messages.pl slashjp/branches/upstream/current/plugins/Messages/templates/emailsponsor;messages;default slashjp/branches/upstream/current/plugins/Remarks/Remarks.pm slashjp/branches/upstream/current/plugins/Remarks/templates/display;remarks;default slashjp/branches/upstream/current/plugins/Submit/submit.pl slashjp/branches/upstream/current/plugins/Submit/templates/displayForm;submit;default slashjp/branches/upstream/current/plugins/Tags/Clout/Describe.pm slashjp/branches/upstream/current/plugins/Tags/Clout/Moderate.pm slashjp/branches/upstream/current/plugins/Tags/Clout/Vote.pm slashjp/branches/upstream/current/plugins/Tags/Clout.pm slashjp/branches/upstream/current/plugins/Tags/Tags.pm slashjp/branches/upstream/current/plugins/Tags/tags_updateclouts.pl slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivadmin;misc;default slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivtagbox;misc;default slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivadmin;misc;default slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivtagbox;misc;default slashjp/branches/upstream/current/sql/mysql/defaults.sql slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql slashjp/branches/upstream/current/sql/mysql/upgrades slashjp/branches/upstream/current/themes/slashcode/htdocs/comments.css slashjp/branches/upstream/current/themes/slashcode/htdocs/images/comments.js slashjp/branches/upstream/current/themes/slashcode/htdocs/images/comments2.js slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl slashjp/branches/upstream/current/themes/slashcode/templates/dispComment;misc;default slashjp/branches/upstream/current/themes/slashcode/templates/dispCommentDetails;misc;default slashjp/branches/upstream/current/themes/slashcode/templates/dispStory;misc;default slashjp/branches/upstream/current/themes/slashcode/templates/edit_comment;comments;default slashjp/branches/upstream/current/themes/slashcode/templates/ipid_display;misc;default slashjp/branches/upstream/current/themes/slashcode/templates/linkComment;misc;default slashjp/branches/upstream/current/themes/slashcode/templates/messages;users;default slashjp/branches/upstream/current/themes/slashcode/templates/printCommComments;misc;default slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default slashjp/branches/upstream/current/themes/slashcode/templates/userlogin_cover;misc;default -------------- next part -------------- Modified: slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/Slash/DB/MySQL/MySQL.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: MySQL.pm,v 1.987 2007/10/16 23:04:51 tvroom Exp $ +# $Id: MySQL.pm,v 1.989 2007/10/23 23:20:15 pudge Exp $ package Slash::DB::MySQL; use strict; @@ -20,7 +20,7 @@ use base 'Slash::DB::Utility'; use Slash::Constants ':messages'; -($VERSION) = ' $Revision: 1.987 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.989 $ ' =~ /\$Revision:\s+([^\s]+)/; # Fry: How can I live my life if I can't tell good from evil? @@ -277,6 +277,8 @@ 'd2_comment_order' => sub { $_[0]->sqlSelectMany('code, name', 'code_param', "type='d2_comment_order'") }, + 'mediatypes' + => sub { $_[0]->sqlSelectMany('code, name', 'string_param', "type='mediatypes'")} ); ######################################################## @@ -6030,7 +6032,7 @@ if ($cid && $one_cid_only) { $where .= "AND cid=$cid"; - } elsif ($user->{hardthresh}) { + } elsif ($user->{hardthresh} && !$options->{discussion2}) { my $threshold_q = $self->sqlQuote($user->{threshold}); $where .= "AND (comments.points >= $threshold_q"; $where .= " OR comments.uid=$user->{uid}" unless $user->{is_anon}; Modified: slashjp/branches/upstream/current/Slash/Slash.pm =================================================================== --- slashjp/branches/upstream/current/Slash/Slash.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/Slash/Slash.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Slash.pm,v 1.336 2007/10/16 22:31:22 pudge Exp $ +# $Id: Slash.pm,v 1.339 2007/10/25 02:12:17 pudge Exp $ package Slash; @@ -105,6 +105,7 @@ cache_read_only => $cache_read_only, one_cid_only => $options->{one_cid_only}, }; + $gcfu_opt->{discussion2} = $discussion2; if ($options->{force_read_from_master}) { $thisComment = $slashdb->getCommentsForUser($discussion->{id}, $cid, $gcfu_opt); } else { @@ -1209,7 +1210,7 @@ } else { my $pntcmt = @{$comments->{$comment->{pid}}{kids}} > $user->{commentspill}; $return .= $const->{commentbegin} . - linkComment($comment, $pntcmt, 1); + linkComment($comment, $pntcmt, { date => 1 }); $finish_list++; } $return .= $const->{fullcommentend} if ($user->{mode} eq 'flat'); @@ -1217,9 +1218,12 @@ if ($comment->{kids} && ($user->{mode} ne 'parents' || $pid)) { if (my $str = displayThread($sid, $cid, $lvl+1, $comments, $const)) { $return .= $const->{cagebegin} if $cagedkids; - $return .= $const->{indentbegin} if $indent; + if ($indent && $const->{indentbegin}) { + (my $indentbegin = $const->{indentbegin}) =~ s/^(<[^<>]+)>$/$1 id="commtree_$cid">/; + $return .= $indentbegin; + } $return .= $str; - $return .= "$const->{indentend}" if $indent; + $return .= $const->{indentend} if $indent; $return .= $const->{cageend} if $cagedkids; } # in flat or nested mode, all visible kids will @@ -1347,7 +1351,7 @@ vislenify($comment); # create $comment->{ipid_vis} and {subnetid_vis} if ($constants->{comments_hardcoded}) { $comment->{ipid_display} = <IPID: $comment->{ipid_vis}  SubnetID: +IPID: $comment->{ipid_vis}  SubnetID: $comment->{subnetid_vis} EOT } else { @@ -1978,7 +1982,7 @@ $time_to_display = timeCalc($comment->{date}); unless ($user->{noscores}) { - $score_to_display .= "(Score:"; + $score_to_display .= " (Score:"; $score_to_display .= length($comment->{points}) ? $comment->{points} : "?"; if ($reasons && $comment->{reason}) { $score_to_display .= ", $reasons->{$comment->{reason}}{name}"; @@ -1992,7 +1996,7 @@ cid => $comment->{cid}, subject => "#$comment->{cid}", subject_only => 1, - }, 1); + }, 1, { noextra => 1 }); $comment_link_to_display = qq| ($link)|; } else { $comment_link_to_display = " "; @@ -2159,9 +2163,9 @@ my $classattr = $discussion2 ? qq[ class="$class"] : ''; my $head = $discussion2 ? <$comment->{subject} +

$comment->{subject} EOT1 -

$comment->{subject}

+

$comment->{subject} EOT2 my $return = ''; @@ -2172,11 +2176,11 @@ EOT $return .= <{noshow}; -
+
$head $comment_links - $score_to_display + $score_to_display

by $user_nick_to_display$zoosphere_display Modified: slashjp/branches/upstream/current/Slash/Utility/Display/Display.pm =================================================================== --- slashjp/branches/upstream/current/Slash/Utility/Display/Display.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/Slash/Utility/Display/Display.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Display.pm,v 1.123 2007/10/04 19:41:22 pudge Exp $ +# $Id: Display.pm,v 1.124 2007/10/23 23:20:15 pudge Exp $ package Slash::Utility::Display; @@ -33,7 +33,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT); -($VERSION) = ' $Revision: 1.123 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.124 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( cleanSlashTags createMenu @@ -1081,11 +1081,9 @@ =cut sub linkComment { - my($linkdata, $printcomment, $date) = @_; + my($linkdata, $printcomment, $options) = @_; my $constants = getCurrentStatic(); my $form = getCurrentForm(); - return _hard_linkComment(@_) if $constants->{comments_hardcoded}; - my $user = getCurrentUser(); my $adminflag = $user->{seclev} >= 10000 ? 1 : 0; @@ -1095,17 +1093,21 @@ $linkdata->{$_} = undef unless exists $linkdata->{$_}; } - $linkdata->{pid} = $linkdata->{original_pid} || $linkdata->{pid}; + $linkdata->{pid} = $linkdata->{original_pid} || $linkdata->{pid}; + $linkdata->{comment} = $printcomment; - slashDisplay('linkComment', { - %$linkdata, # defaults - adminflag => $adminflag, - date => $date, - threshold => defined($linkdata->{threshold}) ? $linkdata->{threshold} : $user->{threshold}, - commentsort => $user->{commentsort}, - mode => $user->{mode}, - comment => $printcomment, - }, { Return => 1, Nocomm => 1 }); + if (!$options->{noextra}) { + %$linkdata = (%$linkdata, + adminflag => $adminflag, + date => $options->{date}, + threshold => defined($linkdata->{threshold}) ? $linkdata->{threshold} : $user->{threshold}, + commentsort => $user->{commentsort}, + mode => $user->{mode}, + ); + } + + return _hard_linkComment($linkdata) if $constants->{comments_hardcoded}; + slashDisplay('linkComment', $linkdata, { Return => 1, Nocomm => 1 }); } #======================================================================== @@ -1314,7 +1316,7 @@ ######################################################## # this sucks, but it is here for now sub _hard_linkComment { - my($linkdata, $printcomment, $date) = @_; + my($linkdata) = @_; my $user = getCurrentUser(); my $constants = getCurrentStatic(); my $form = getCurrentForm(); @@ -1323,16 +1325,16 @@ my $subject = $linkdata->{subject}; my $display = qq|{op}" if $linkdata->{op}; - $display .= "&threshold=" . (defined($linkdata->{threshold}) ? $linkdata->{threshold} : $user->{threshold}); - $display .= "&commentsort=$user->{commentsort}" if defined $user->{commentsort}; - $display .= "&mode=$user->{mode}" if defined $user->{mode}; + $display .= "&op=$linkdata->{op}" if defined($linkdata->{op}); + $display .= "&threshold=$linkdata->{threshold}" if defined($linkdata->{threshold}); + $display .= "&commentsort=$user->{commentsort}" if defined $linkdata->{commentsort}; + $display .= "&mode=$user->{mode}" if defined $linkdata->{mode}; $display .= "&no_d2=1" if $user->{state}{no_d2} || $linkdata->{no_d2}; $display .= "&startat=$linkdata->{startat}" if $linkdata->{startat}; $display .= "&tid=$user->{state}{tid}" if $constants->{tids_in_urls} && $user->{state}{tid}; - if ($printcomment) { + if ($linkdata->{comment}) { $display .= "&cid=$linkdata->{cid}"; } else { $display .= "&pid=" . ($linkdata->{original_pid} || $linkdata->{pid}); @@ -1346,7 +1348,7 @@ $display .= qq| (Score:$linkdata->{points})| if !$user->{noscores} && $linkdata->{points}; $display .= " " . timeCalc($linkdata->{date}) - if $date; + if $linkdata->{date}; } #$display .= "\n"; @@ -1726,4 +1728,4 @@ =head1 VERSION -$Id: Display.pm,v 1.123 2007/10/04 19:41:22 pudge Exp $ +$Id: Display.pm,v 1.124 2007/10/23 23:20:15 pudge Exp $ Modified: slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm =================================================================== --- slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/Slash/Utility/Environment/Environment.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Environment.pm,v 1.222 2007/10/17 06:31:24 pudge Exp $ +# $Id: Environment.pm,v 1.223 2007/10/24 21:19:34 jamiemccarthy Exp $ package Slash::Utility::Environment; @@ -33,7 +33,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT); -($VERSION) = ' $Revision: 1.222 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.223 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( dbAvailable @@ -3170,7 +3170,7 @@ quoted but rather inserted directly into an SQL request. For example, if passed "123" (a user id), will return "CAST('123' AS UNSIGNED)" (same value, quoted); if passed "200123456789abcd" (an encoded IP), -will return "CAST(CONV('200123456789abcd', 16, 10) AS UNSIGNED" which +will return "CAST(CONV('200123456789abcd', 16, 10) AS UNSIGNED)" which can be used as an assignment into or test against a BIGINT column. For speed, does not do error-checking against the value passed in. @@ -3500,4 +3500,4 @@ =head1 VERSION -$Id: Environment.pm,v 1.222 2007/10/17 06:31:24 pudge Exp $ +$Id: Environment.pm,v 1.223 2007/10/24 21:19:34 jamiemccarthy Exp $ Modified: slashjp/branches/upstream/current/plugins/Admin/admin.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Admin/admin.pl 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Admin/admin.pl 2007-10-31 05:42:24 UTC (rev 232) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: admin.pl,v 1.321 2007/10/17 06:13:44 pudge Exp $ +# $Id: admin.pl,v 1.323 2007/10/24 00:30:06 scc Exp $ use strict; use File::Temp 'tempfile'; @@ -1514,7 +1514,9 @@ } my $pending_file_count = 0; my $story_static_files = []; - if ($stoid) { + if ($stoid || $form->{sid}) { + my $story = $slashdb->getStory($form->{sid}); + $stoid ||= $story->{stoid}; $pending_file_count = $slashdb->numPendingFilesForStory($stoid); $story_static_files = $slashdb->getStaticFilesForStory($stoid); } slashDisplay('editStory', { @@ -1720,7 +1722,7 @@ [$val, $_] } @story_nexuses; - my $remove = qq{[x]}; + my $remove = qq{[x]}; my $desc; if (!@sorted_nexuses) { @@ -2113,28 +2115,53 @@ my($stoid) = @_; my $form = getCurrentForm(); my $slashdb = getCurrentDB(); + my $constants = getCurrentStatic(); + + my $saveblob = $constants->{admin_use_blob_for_upload}; + my $savefile = !$saveblob; + if ($form->{media_file}) { my $upload = $form->{query_apache}->upload; if ($upload) { my $fh = $upload->fh; use File::Path; - mkpath("/tmp/upload", 0, 0755) unless -e "/tmp/upload"; $form->{media_file} =~ s|^.*?([^/:\\]+)$|$1|; my $name = $form->{media_file}; my $suffix; ($suffix) = $name =~ /(\.\w+)$/; - use File::Temp qw(:mktemp); - my ($ofh, $tmpname) = mkstemps("/tmp/upload/fileXXXXXX", $suffix ); + my($ofh, $tmpname, $blobdata); + mkpath("/tmp/upload", 0, 0755) unless -e "/tmp/upload"; + + if ($savefile) { + use File::Temp qw(:mktemp); + ($ofh, $tmpname) = mkstemps("/tmp/upload/fileXXXXXX", $suffix ); + } while (<$fh>) { - print $ofh $_; + print $ofh $_ if $savefile; + $blobdata .= $_ if $saveblob; } - close $ofh; + if ($savefile) { + close $ofh; + } + my $action = $form->{media_action} eq "thumbnails" ? "thumbnails" : "upload"; my $file = { stoid => $stoid, - file => "$tmpname", - action => "upload", + action => $action, }; + if ($savefile) { + $file->{file} = "$tmpname"; + } + if ($saveblob) { + my $data; + my $blob = getObject("Slash::Blob"); + $file->{blobid} = $blob->create({ + data => $blobdata, + seclev => 0, + filename => $name + }); + + } $slashdb->addFileToQueue($file); } } Modified: slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default =================================================================== --- slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Admin/templates/editStory;admin;default 2007-10-31 05:42:24 UTC (rev 232) @@ -248,7 +248,7 @@ - + [% IF story_static_files && story_static_files.size %]
+ + + [% IF mfile.filetype == "image" %] - + [% END %] [% END %] @@ -28,4 +28,4 @@ __version__ -$Id: static_files;admin;default,v 1.1 2007/10/16 22:59:06 tvroom Exp $ +$Id: static_files;admin;default,v 1.2 2007/10/23 20:58:47 tvroom Exp $ Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/ajax.pl 2007-10-31 05:42:24 UTC (rev 232) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: ajax.pl,v 1.57 2007/10/16 17:22:23 entweichen Exp $ +# $Id: ajax.pl,v 1.58 2007/10/24 20:01:02 entweichen Exp $ use strict; use warnings; @@ -14,7 +14,7 @@ use Slash::Utility; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.57 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.58 $ ' =~ /\$Revision:\s+([^\s]+)/; ################################################################## sub main { @@ -524,8 +524,10 @@ my $user_edits_table = { d2_comment_q => $params{'d2_comment_q'} || undef, d2_comment_order => $params{'d2_comment_order'} || undef, - emaildisplay => $params{'emaildisplay'} || undef, nosigs => ($params{'nosigs'} ? 1 : 0), + noscores => ($params{'noscores'} ? 1 : 0), + domaintags => ($params{'domaintags'} != 2 ? $params{'domaintags'} : undef), + m2_with_comm_mod => ($params{'m2_with_mod_on_comm'} ? 1 : undef), }; $slashdb->setUser($params{uid}, $user_edits_table); Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/admin.js =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/admin.js 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/admin.js 2007-10-31 05:42:24 UTC (rev 232) @@ -1,4 +1,4 @@ -// $Id: admin.js,v 1.40 2007/08/13 18:30:19 tvroom Exp $ +// $Id: admin.js,v 1.41 2007/10/24 00:30:06 scc Exp $ function um_ajax(the_behaviors, the_events) { var params =[]; @@ -87,7 +87,7 @@ var tagshistid = "taghist-" + id; var popupid = "taghistory-" + id; var title = "History "; - var buttons = createPopupButtons("[?][X]"); + var buttons = createPopupButtons("[?][X]"); title = title + buttons; createPopup(getXYForId(tagshistid), title, popupid); ajax_update(params, "taghistory-" + id + "-contents"); @@ -123,7 +123,7 @@ var params = []; params['op'] = 'remarks_config'; var title = "Remarks Config "; - var buttons = createPopupButtons('[X]'); + var buttons = createPopupButtons('[X]'); title = title + buttons; createPopup(getXYForId('remarks_table'), title + buttons, 'remarksconfig'); ajax_update(params, 'remarksconfig-contents'); Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/common.js 2007-10-31 05:42:24 UTC (rev 232) @@ -1,5 +1,5 @@ // _*_ Mode: JavaScript; tab-width: 8; indent-tabs-mode: true _*_ -// $Id: common.js,v 1.146 2007/10/16 17:35:25 entweichen Exp $ +// $Id: common.js,v 1.147 2007/10/24 00:30:07 scc Exp $ var fh_play = 0; var fh_is_timed_out = 0; @@ -1226,7 +1226,7 @@ function vendorStoryPopup() { id = vendor_popup_id; var title = "Intel's Opinion Center"; - var buttons = createPopupButtons("[X]"); + var buttons = createPopupButtons("[X]"); title = title + buttons; var closepopup = function (e) { if (!e) var e = window.event; @@ -1251,7 +1251,7 @@ function vendorStoryPopup2() { id = vendor_popup_id; var title = "Intel's Opinion Center"; - var buttons = createPopupButtons("[X]"); + var buttons = createPopupButtons("[X]"); title = title + buttons; var closepopup = function (e) { if (!e) var e = window.event; Modified: slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/sectionprefs.js =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/sectionprefs.js 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Ajax/htdocs/images/sectionprefs.js 2007-10-31 05:42:24 UTC (rev 232) @@ -1,8 +1,8 @@ -// $Id: sectionprefs.js,v 1.6 2006/03/14 21:37:28 tvroom Exp $ +// $Id: sectionprefs.js,v 1.7 2007/10/24 00:30:07 scc Exp $ function configSectionPopup() { - var title = "Sectional Display Prefs "; - var buttons = createPopupButtons("[?]","[X]"); + var title = "Sectional Display Prefs "; + var buttons = createPopupButtons("[?]","[X]"); title = title + buttons; createPopup(getXYForId('links-sections-title'), title, "sectionprefs", "", "Loading..."); Modified: slashjp/branches/upstream/current/plugins/Ajax/templates/data;ajax;default =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/templates/data;ajax;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Ajax/templates/data;ajax;default 2007-10-31 05:42:24 UTC (rev 232) @@ -16,5 +16,5 @@ [% SWITCH value %] [% CASE 'set_section_prefs_success_msg' %] - Close + Close [% END %] Modified: slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default =================================================================== --- slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Ajax/templates/prefs_d2;ajax;default 2007-10-31 05:42:24 UTC (rev 232) @@ -20,6 +20,8 @@
[% mfile.sfid %][% mfile.name %][% constants.imagedir %]/articles/[% sid %][% trunc_name %][% mfile.width %][% mfile.height %] [% IF mfile.filetype == "image" %] @@ -288,4 +290,4 @@ __seclev__ 10000 __version__ -$Id: editStory;admin;default,v 1.77 2007/10/16 22:59:06 tvroom Exp $ +$Id: editStory;admin;default,v 1.78 2007/10/23 20:58:47 tvroom Exp $ Modified: slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default =================================================================== --- slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Admin/templates/static_files;admin;default 2007-10-31 05:42:24 UTC (rev 232) @@ -17,9 +17,9 @@ [% FOREACH mfile = story_static_files %] [% trunc_name = mfile.name %] [% trunc_name = trunc_name.replace('^\d+',"") %] -
[% mfile.sfid %][% mfile.name %][% constants.imagedir %]/articles/[% sid %][% trunc_name %]
[% mfile.sfid %][% mfile.name %][% constants.imagedir %]/articles/[% sid %][% trunc_name %][% mfile.width %][% mfile.height %]
+  

+ [% IF user.discussion2 && user.discussion2 == "slashdot" %]

@@ -36,31 +38,6 @@
[% END %] -

Email Display - (currently - [%- IF !user.fakeemail; " not displayed"; - ELSE; ": "; user.fakeemail | strip_literal; ""; - END %])
- [% IF !user.emaildisplay.defined; - IF user.fakeemail %] - (Your current email address was apparently set before - users' email addresses were forced to one of the below - choices. Please pick one and click Save.)
- [% END; - user.emaildisplay = 0; - END; - IF user.emaildisplay.defined; - emaildisplay.${user.emaildisplay} = constants.markup_checked_attribute; - END %] -

-
- Do not display an e-mail address.
- Show your email address with random SPAM-armoring applied.
- [% PROCESS formNote note='This changes weekly' %] - Show your real email address without cowering behind childish anonymity or obfuscation. -
-
- [% s_check = ''; IF user.nosigs; s_check = constants.markup_checked_attribute; @@ -68,6 +45,37 @@ [% PROCESS formNote note='Strip sig quotes from comments' %] + +

+ + [% n_check = ''; + IF user.noscores; + n_check = constants.markup_checked_attribute; + END %] + + [% PROCESS formNote note="Hides score: They still apply you just don't see them." %] + +  

+ + [% UNLESS user.domaintags.defined; user.domaintags = 2; END %] + [% domaintags.${user.domaintags} = constants.markup_checked_attribute -%] + + Display Link Domains? (shows the actual domain of any link in brackets)
+

+ Never show link domains
+ Show the links domain only in recommended situations
+ Always show link domains +
+ +

+ + [% IF user.is_admin && constants.m2 %] + [% s_m2c_check = ''; + IF user.m2_with_comm_mod; + s_m2c_check = constants.markup_checked_attribute; + END %] + + [% END %]

@@ -77,4 +85,4 @@ __seclev__ 500 __version__ -$Id: prefs_d2;ajax;default,v 1.5 2007/10/16 22:31:22 pudge Exp $ +$Id: prefs_d2;ajax;default,v 1.6 2007/10/24 20:01:48 entweichen Exp $ Modified: slashjp/branches/upstream/current/plugins/Blob/Blob.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Blob/Blob.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Blob/Blob.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Blob.pm,v 1.15 2005/10/11 19:15:50 jamiemccarthy Exp $ +# $Id: Blob.pm,v 1.17 2007/10/24 19:11:10 tvroom Exp $ package Slash::Blob; @@ -16,7 +16,7 @@ use base 'Exporter'; use base 'Slash::DB::Utility'; -($VERSION) = ' $Revision: 1.15 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.17 $ ' =~ /\$Revision:\s+([^\s]+)/; # When this plugin was first written, it used a hardcoded hash to # store MIME types. Now we use the MIME::Types module. But for @@ -176,6 +176,12 @@ return $self->sqlDelete($self->{_table}, "reference_count < 1"); } +sub get { + my($self, $sig) = @_; + my $sig_q = $self->sqlQuote($sig); + return $self->sqlSelectHashref($self->{_table}, "id = $sig_q"); +} + sub getFilesForStories { my($self) = @_; $self->sqlSelectAllHashrefArray('*', 'story_files', '', "ORDER BY stoid,description"); Modified: slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarklink;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarklink;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarklink;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -14,9 +14,9 @@ 10000 __template__ [% IF user.state.ssl %] - [% title || "Post to $constants.sitename" %] + [% title || "Post to $constants.sitename" %] [% ELSE %] - [% title || "Post to $constants.sitename" %] + [% title || "Post to $constants.sitename" %] [% END %] __version__ -$Id: bookmarklink;misc;default,v 1.3 2006/03/23 04:09:58 pudge Exp $ +$Id: bookmarklink;misc;default,v 1.4 2007/10/24 00:30:07 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarktext;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarktext;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Bookmark/templates/bookmarktext;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -24,9 +24,9 @@

<!-- Start [% constants.sitename %] It link --> -<a href="javascript:location.href='[% constants.absolutedir %]/bookmark.pl?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> +<a href="#" onclick="location.href='[% constants.absolutedir %]/bookmark.pl?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title); return false"> <img src="[% constants.absolutedir %]/favicon.ico" alt="[% constants.sitename %]" border="0" height="16" width="16"></a> &nbsp; -<a href="javascript:location.href='[% constants.absolutedir %]/bookmark.pl?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)">[% constants.sitename %] It! +<a href="#" onclick="location.href='[% constants.absolutedir %]/bookmark.pl?url='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title); return false">[% constants.sitename %] It! <!-- End [% constants.sitename %] It link -->


Modified: slashjp/branches/upstream/current/plugins/Console/templates/display;console;default =================================================================== --- slashjp/branches/upstream/current/plugins/Console/templates/display;console;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Console/templates/display;console;default 2007-10-31 05:42:24 UTC (rev 232) @@ -34,7 +34,7 @@ [% firehosebox %]
[% ELSE %] - Reload Bin + Reload Bin
[% END %] @@ -50,4 +50,4 @@ __seclev__ 10000 __version__ -$Id: display;console;default,v 1.11 2007/09/06 16:04:21 tvroom Exp $ +$Id: display;console;default,v 1.12 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/FAQSlashdot/faq/UI.shtml =================================================================== --- slashjp/branches/upstream/current/plugins/FAQSlashdot/faq/UI.shtml 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FAQSlashdot/faq/UI.shtml 2007-10-31 05:42:24 UTC (rev 232) @@ -3,7 +3,7 @@ Slashdot FAQ - User Interface - + @@ -19,13 +19,13 @@

The policy for Slashboxes is as follows:

  1. The remote site gives us permission.
  2. -
  3. The remote site provides an RDF file for us to parse (here is our rdf if you want an example).
  4. +
  5. The remote site provides an RSS feed URL.
  6. We decide that it belongs on Slashdot.
-

Currently the grand Slashbox poobah is CowboyNeal. Email him a URL to the RDF, as well as a technical contact, and we'll consider your addition to the roster.

+

Currently the Slashbox contact address is . Email us your feed URL, as well as a technical contact, and we'll consider your addition to the roster.

Answered by: CmdrTaco
- Last Modified: 6/14/00 + Last Modified: 10/23/2007

What is this little [?] I see in stories?

Modified: slashjp/branches/upstream/current/plugins/FireHose/FireHose.pm =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/FireHose.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/FireHose.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: FireHose.pm,v 1.176 2007/10/04 15:47:38 jamiemccarthy Exp $ +# $Id: FireHose.pm,v 1.179 2007/10/25 02:12:17 pudge Exp $ package Slash::FireHose; @@ -42,7 +42,7 @@ use base 'Slash::DB::MySQL'; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.176 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.179 $ ' =~ /\$Revision:\s+([^\s]+)/; sub createFireHose { my($self, $data) = @_; $data->{dept} ||= ""; @@ -53,6 +53,7 @@ $data->{editorpop} ||= 0; $data->{body_length} = $data->{bodytext} ? length($data->{bodytext}) : 0; $data->{word_count} = countWords($data->{introtext}) + countWords($data->{bodytext}); + $data->{mediatype} ||= "none"; my $text_data = {}; $text_data->{title} = delete $data->{title}; @@ -265,6 +266,7 @@ email => $submission->{email}, emaildomain => $submission->{emaildomain}, name => $submission->{name}, + mediatype => $submission->{mediatype} }; $data->{url_id} = $submission->{url_id} if $submission->{url_id}; my $firehose_id = $self->createFireHose($data); @@ -1805,7 +1807,8 @@ $mode = "full"; } } - + + # number of firehose items per page in the normal case if ($mode eq "full") { if ($user->{is_admin}) { $options->{limit} = $pagesize eq "large" ? 50 : 25; @@ -1820,25 +1823,23 @@ } } - if ($constants->{smalldevices_ua_regex}) { + # the non-normal cases: a small device (e.g., iPhone) or an embedded use (e.g., Google Gadget) + my $force_smaller = $form->{embed}; + if (!$force_smaller && $constants->{smalldevices_ua_regex}) { my $smalldev_re = qr($constants->{smalldevices_ua_regex}); if ($ENV{HTTP_USER_AGENT} && $ENV{HTTP_USER_AGENT} =~ $smalldev_re) { - $options->{smalldevices} = 1; - if ($mode eq "full") { - $options->{limit} = $pagesize eq "large" ? 15 : 10; - } else { - $options->{limit} = $pagesize eq "large" ? 20 : 15; - } + $force_smaller = 1; } } - if ($form->{gadget}) { - $options->{smalldevices} = 1; - if ($mode eq "full") { - $options->{limit} = $pagesize eq "large" ? 15 : 10; - } else { - $options->{limit} = $pagesize eq "large" ? 20 : 15; - } + # ...for which we'll have fewer items per page + if ($force_smaller) { + $options->{smalldevices} = 1; + if ($mode eq "full") { + $options->{limit} = $pagesize eq "large" ? 15 : 10; + } else { + $options->{limit} = $pagesize eq "large" ? 20 : 15; + } } if ($user->{is_admin} && $form->{setusermode}) { @@ -2064,7 +2065,7 @@ } } - if ($form->{gadget}) { + if ($form->{embed}) { $#{@$user_tags_top} = 2; } @@ -2392,4 +2393,4 @@ =head1 VERSION -$Id: FireHose.pm,v 1.176 2007/10/04 15:47:38 jamiemccarthy Exp $ +$Id: FireHose.pm,v 1.179 2007/10/25 02:12:17 pudge Exp $ Modified: slashjp/branches/upstream/current/plugins/FireHose/firehose.css =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/firehose.css 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/firehose.css 2007-10-31 05:42:24 UTC (rev 232) @@ -447,3 +447,4 @@ .briefarticle .storylinks .comments a:hover {background:transparent url('//images.slashdot.org/sic_icons.png') no-repeat scroll 0px -1498px; color: #fff !important} .briefarticle .storylinks .comments.nocomment, .briefarticle .storylinks .comments span {display: none} +.embed .paginate, .embed .firemenu, .embed + .copyright { display: none; } Modified: slashjp/branches/upstream/current/plugins/FireHose/mysql_schema.sql =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/mysql_schema.sql 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/mysql_schema.sql 2007-10-31 05:42:24 UTC (rev 232) @@ -1,5 +1,5 @@ # -# $Id: mysql_schema.sql,v 1.22 2007/09/04 07:16:37 pudge Exp $ +# $Id: mysql_schema.sql,v 1.23 2007/10/23 20:52:13 tvroom Exp $ # DROP TABLE IF EXISTS firehose; CREATE TABLE firehose ( @@ -35,6 +35,7 @@ body_length MEDIUMINT UNSIGNED DEFAULT 0 NOT NULL, word_count MEDIUMINT UNSIGNED DEFAULT 0 NOT NULL, srcname VARCHAR(32) NOT NULL DEFAULT '', + mediatype enum("text", "none", "video", "image", "audio") default "none" NOT NULL, PRIMARY KEY (id), UNIQUE globjid (globjid), KEY createtime (createtime), Modified: slashjp/branches/upstream/current/plugins/FireHose/templates/data;firehose;default =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/templates/data;firehose;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/templates/data;firehose;default 2007-10-31 05:42:24 UTC (rev 232) @@ -89,7 +89,7 @@ [% IF user.state.firehose_page == "user" %] This user's Firehose page contains no [% IF form.page %]additional [% END %]entries; [% ELSE %] - No matches were found. You may want to try [% IF new_color %][% END %]lowering your color threshold[% IF new_color %] to [% new_color %][% END %][% IF new_color %][% END %] or [% IF options.duration != -1 %][% END %]expanding your time window[% IF options.duration != -1 %][% END %] + No matches were found. You may want to try [% IF new_color %][% END %]lowering your color threshold[% IF new_color %] to [% new_color %][% END %][% IF new_color %][% END %] or [% IF options.duration != -1 %][% END %]expanding your time window[% IF options.duration != -1 %][% END %] [% END %]

@@ -98,4 +98,4 @@ [% END %] __version__ -$Id: data;firehose;default,v 1.22 2007/09/25 16:25:48 scc Exp $ +$Id: data;firehose;default,v 1.23 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/FireHose/templates/firehose_options;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/templates/firehose_options;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/templates/firehose_options;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -25,8 +25,8 @@ paused = user.firehose_pause; END; %] - Play - Pause + Play + Pause [% IF options.orderby == "popularity" || options.orderby == "editorpop" || options.orderby == "popularity2" %] Popularity @@ -49,4 +49,4 @@ [% END %] __version__ -$Id: firehose_options;misc;default,v 1.5 2007/08/15 03:08:50 tvroom Exp $ +$Id: firehose_options;misc;default,v 1.6 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/FireHose/templates/list;firehose;default =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/templates/list;firehose;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/templates/list;firehose;default 2007-10-31 05:42:24 UTC (rev 232) @@ -47,7 +47,7 @@
[% UNLESS user.noboxes %] - [% IF slashboxes && !(form.smalldevices || form.gadget || (constants.smalldevices_ua_regex && ua.match(constants.smalldevices_ua_regex))); + [% IF slashboxes && !(form.smalldevices || form.embed || (constants.smalldevices_ua_regex && ua.match(constants.smalldevices_ua_regex))); slashboxes %] [% END %] [% END %] @@ -196,4 +196,4 @@ __version__ -$Id: list;firehose;default,v 1.103 2007/10/11 22:14:06 pudge Exp $ +$Id: list;firehose;default,v 1.104 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivadmin;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -17,7 +17,7 @@ [% PROCESS ajax_reskey_tag reskey_label => 'admin_commands-reskey-' _ id, reskey_name => 'ajax_admin' %] - [History] + [History]
[% tags_admin_str %]
@@ -26,4 +26,4 @@ __seclev__ 10000 __version__ -$Id: tagsfirehosedivadmin;misc;default,v 1.2 2006/10/31 17:05:38 tvroom Exp $ +$Id: tagsfirehosedivadmin;misc;default,v 1.3 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/FireHose/templates/tagsfirehosedivtagbox;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -17,22 +17,22 @@
[% IF !form.skipvote && !options.nothumbs %] - + - - [% END %]
-  [% IF user.tags_canwrite_stories %][% ELSIF user.is_anon %][% ELSE %][% END %][+] +  [% IF user.tags_canwrite_stories %][% ELSIF user.is_anon %][% ELSE %][% END %][+] [% PROCESS firehose_tags_top id = id tags_top = tags_top item = item -%] [%- IF user.tags_canwrite_stories && (user.firehose_usermode || !user.is_admin) %] - , feedback + , feedback [% END %] [% IF user.is_admin && !user.firehose_usermode -%] - ( [% IF !item.note %]Note[% END %][% item.note | strip_literal %]) + ( [% IF !item.note %]Note[% END %][% item.note | strip_literal %]) [%- END -%]
@@ -49,7 +49,7 @@
[% IF user.is_admin && !user.firehose_usermode %]
- + [% END %]
@@ -59,4 +59,4 @@ __seclev__ 10000 __version__ -$Id: tagsfirehosedivtagbox;misc;default,v 1.35 2007/08/22 20:57:09 tvroom Exp $ +$Id: tagsfirehosedivtagbox;misc;default,v 1.36 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/Journal/Journal.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Journal/Journal.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Journal/Journal.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Journal.pm,v 1.66 2006/12/12 22:47:46 tvroom Exp $ +# $Id: Journal.pm,v 1.67 2007/10/26 03:05:27 pudge Exp $ package Slash::Journal; @@ -16,7 +16,7 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; -($VERSION) = ' $Revision: 1.66 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.67 $ ' =~ /\$Revision:\s+([^\s]+)/; # On a side note, I am not sure if I liked the way I named the methods either. # -Brian @@ -61,10 +61,14 @@ $self->sqlUpdate('journals', \%j1, "id=$id") if keys %j1; $self->sqlUpdate('journals_text', \%j2, "id=$id") if $j2{article}; if ($constants->{plugin}{FireHose}) { - my $journal_item = $self->get($id); - my $firehose = getObject("Slash::FireHose"); - if ($journal_item->{promotetype} eq "publicize" || $journal_item->{promotetype} eq "publish") { - $firehose->createUpdateItemFromJournal($id); + my $reskey = getObject('Slash::ResKey'); + my $rkey = $reskey->key('submit', { nostate => 1 }); + if ($rkey && $rkey->createuse) { + my $journal_item = $self->get($id); + my $firehose = getObject("Slash::FireHose"); + if ($journal_item->{promotetype} eq "publicize" || $journal_item->{promotetype} eq "publish") { + $firehose->createUpdateItemFromJournal($id); + } } } } @@ -210,11 +214,15 @@ my $slashdb = getCurrentDB(); $slashdb->setUser($uid, { journal_last_entry_date => $date }); if ($constants->{plugin}{FireHose}) { - my $firehose = getObject("Slash::FireHose"); - my $journal = getObject("Slash::Journal"); - my $j = $journal->get($id); - if ($j->{promotetype} eq "publicize" || $j->{promotetype} eq "publish") { - $firehose->createItemFromJournal($id); + my $reskey = getObject('Slash::ResKey'); + my $rkey = $reskey->key('submit', { nostate => 1 }); + if ($rkey && $rkey->createuse) { + my $firehose = getObject("Slash::FireHose"); + my $journal = getObject("Slash::Journal"); + my $j = $journal->get($id); + if ($j->{promotetype} eq "publicize" || $j->{promotetype} eq "publish") { + $firehose->createItemFromJournal($id); + } } } Modified: slashjp/branches/upstream/current/plugins/Messages/PLUGIN =================================================================== --- slashjp/branches/upstream/current/plugins/Messages/PLUGIN 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Messages/PLUGIN 2007-10-31 05:42:24 UTC (rev 232) @@ -1,4 +1,4 @@ -# $Id: PLUGIN,v 1.13 2007/06/19 18:00:35 entweichen Exp $ +# $Id: PLUGIN,v 1.14 2007/10/24 21:21:12 jamiemccarthy Exp $ name=Messages description="Messaging system" mysql_schema=mysql_schema @@ -14,6 +14,7 @@ template=templates/data;messages;default template=templates/display;messages;default template=templates/display_prefs;messages;default +template=templates/edit;messages;default template=templates/emailsponsor;messages;default template=templates/footer;messages;default template=templates/html_invalid;misc;default Modified: slashjp/branches/upstream/current/plugins/Messages/messages.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Messages/messages.pl 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Messages/messages.pl 2007-10-31 05:42:24 UTC (rev 232) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: messages.pl,v 1.32 2007/02/06 19:22:11 entweichen Exp $ +# $Id: messages.pl,v 1.33 2007/10/24 21:21:12 jamiemccarthy Exp $ # this program does some really cool stuff. # so i document it here. yay for me! @@ -16,7 +16,7 @@ use Time::HiRes; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.32 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.33 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $start_time = Time::HiRes::time; @@ -65,70 +65,8 @@ sub edit_message { my($messages, $constants, $user, $form, $error_message) = @_; - my $template = < -[% END %] - [% PROCESS titlebar width="100%" title="Send Message" %] - - -[% IF error_message %][% error_message %][% END %] - - - - -[% IF form.formkey %] - -[% END %] - - - - - - - - - - - - - - -
User:
Subject:
Comment -
(Use the Preview Button! Check those URLs! - Don't forget the http://!) -
- - - -
Allowed HTML: - <[% constants.approvedtags.join("> <") %]> - -
- - - -Important Stuff: -
  • Please try to keep posts on topic. -
  • Try to reply to other people's comments instead of starting new threads. -
  • Read other people's messages before posting your own to avoid simply duplicating - what has already been said. -
  • Use a clear subject that describes what your message is about. -
  • Offtopic, Inflammatory, Inappropriate, Illegal, or Offensive comments might be - moderated. (You can read everything, even moderated posts, by adjusting your - threshold on the User Preferences Page) - -

    Problems regarding accounts or comment posting should be sent to - [% constants.siteadmin_name %]. - - -EOT - header(getData('header')) or return; - # print edit screen - slashDisplay(\$template, {error_message => $error_message}); + slashDisplay('edit', { error_message => $error_message }); footer(); } Modified: slashjp/branches/upstream/current/plugins/Messages/templates/emailsponsor;messages;default =================================================================== --- slashjp/branches/upstream/current/plugins/Messages/templates/emailsponsor;messages;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Messages/templates/emailsponsor;messages;default 2007-10-31 05:42:24 UTC (rev 232) @@ -13,11 +13,8 @@ __instructions__ placeholder __template__ -Drink Slurm, in all four delectable varieties! Slurm Classic, -Royal Slurm, Super Slurm, and now New Slurm! -Slurm: It's so delicious, you'll eat it until you explode! __seclev__ 500 __version__ -$Id: emailsponsor;messages;default,v 1.3 2003/03/04 19:07:59 pudge Exp $ +$Id: emailsponsor;messages;default,v 1.4 2007/10/24 21:21:12 jamiemccarthy Exp $ Modified: slashjp/branches/upstream/current/plugins/Remarks/Remarks.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Remarks/Remarks.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Remarks/Remarks.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Remarks.pm,v 1.10 2006/07/18 23:08:55 pudge Exp $ +# $Id: Remarks.pm,v 1.11 2007/10/24 00:30:08 scc Exp $ package Slash::Remarks; @@ -34,7 +34,7 @@ use base 'Slash::DB::MySQL'; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.10 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.11 $ ' =~ /\$Revision:\s+([^\s]+)/; ######################################################## sub new { @@ -180,7 +180,7 @@ } $slashdb->setUser($user->{uid}, $data) if keys %$data; # this should be in a template -- pudge - return "Close"; + return "Close"; } 1; @@ -194,4 +194,4 @@ =head1 VERSION -$Id: Remarks.pm,v 1.10 2006/07/18 23:08:55 pudge Exp $ +$Id: Remarks.pm,v 1.11 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/Remarks/templates/display;remarks;default =================================================================== --- slashjp/branches/upstream/current/plugins/Remarks/templates/display;remarks;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Remarks/templates/display;remarks;default 2007-10-31 05:42:24 UTC (rev 232) @@ -27,7 +27,7 @@ - + [% i = 1; FOREACH remark = remarks_ref; i = i == 1 ? 2 : 1 %] @@ -51,4 +51,4 @@ __seclev__ 10000 __version__ -$Id: display;remarks;default,v 1.9 2006/03/29 23:04:55 pudge Exp $ +$Id: display;remarks;default,v 1.10 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/Submit/submit.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Submit/submit.pl 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Submit/submit.pl 2007-10-31 05:42:24 UTC (rev 232) @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: submit.pl,v 1.143 2007/06/07 19:45:55 tvroom Exp $ +# $Id: submit.pl,v 1.144 2007/10/23 20:56:46 tvroom Exp $ use strict; use Slash 2.003; # require Slash 2.3.x @@ -628,7 +628,8 @@ story => $form->{story}, subj => $form->{subj}, tid => $form->{tid}, - primaryskid => $form->{primaryskid} + primaryskid => $form->{primaryskid}, + mediatype => $form->{mediatype}, }; $submission->{url_id} = $url_id if $url_id; Modified: slashjp/branches/upstream/current/plugins/Submit/templates/displayForm;submit;default =================================================================== --- slashjp/branches/upstream/current/plugins/Submit/templates/displayForm;submit;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Submit/templates/displayForm;submit;default 2007-10-31 05:42:24 UTC (rev 232) @@ -86,7 +86,7 @@ [% PROCESS formNote note => "Where users can contact you" %] [% IF constants.plugin.FireHose %] [% PROCESS formLabel value => "Url" %] - + Url type [% Slash.createSelect('mediiatype', Slash.db.getDescriptions('mediatypes'), { default => form.mediatype || "none" , return => 1 }) %] [% PROCESS formNote note => "Main url of submission (optional but if provided must be unique) " %] [% END %] [% PROCESS formLabel value => "Subject" %] @@ -155,4 +155,4 @@ __seclev__ 10000 __version__ -$Id: displayForm;submit;default,v 1.38 2007/05/29 20:07:35 tvroom Exp $ +$Id: displayForm;submit;default,v 1.40 2007/10/23 20:56:46 tvroom Exp $ Modified: slashjp/branches/upstream/current/plugins/Tags/Clout/Describe.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/Clout/Describe.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/Clout/Describe.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,22 +1,30 @@ package Slash::Clout::Describe; +use strict; +use warnings; +use Slash::Utility; +use base 'Slash::Clout'; + use vars qw($VERSION); -($VERSION) = ' $Revision: 1.2 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.3 $ ' =~ /\$Revision:\s+([^\s]+)/; -# Hard-coded constants should be in the vars table. +sub init { + my($self) = @_; + $self->SUPER::init(@_); + # Hard-coded constants should be in the vars table. + # cumfrac is the cumulative fraction of how much weight is propagated + # for each matching tag. E.g. if $cumfrac is 0.5, the first match may + # propagate up to 50% of the weight, the second another 25%, the + # third another 12.5% etc. + $self->{cumfrac} = 0.5; + $self->{debug_uids} = { }; + $self->{debug} = 0; + 1; +} -# cumfrac is the cumulative fraction of how much weight is propagated -# for each matching tag. E.g. if $cumfrac is 0.5, the first match may -# propagate up to 50% of the weight, the second another 25%, the -# third another 12.5% etc. - -my $cumfrac = 0.5; -my $months_back = 4; -my $clid = 1; - sub getUserClout { - my($class, $user_stub) = @_; + my($self, $user_stub) = @_; my $clout = $user_stub->{karma} >= -3 ? log($user_stub->{karma}+10) : 0; @@ -31,15 +39,15 @@ } sub get_nextgen { - my($class, $g) = @_; - my $reader = getObject('Slash::DB', { db_type => 'reader' }); + my($self, $g) = @_; + my $tags_reader = getObject('Slash::Tags', { db_type => 'reader' }); # TODO: # - opposite tags. presumably a separate call that joins # sourcetag to newtag via tagnames AS sourcetn and # tagnames AS newtn and (sourcetn.tagname=CONCAT('!', newtn.tagname) # OR newtn.tagname=CONCAT('!', sourcetn.tagname)) # except that would be a double table scan I think, ugh - my $hr_ar = $reader->sqlSelectAllHashrefArray( + my $hr_ar = $tags_reader->sqlSelectAllHashrefArray( "sourcetag.uid AS sourcetag_uid, UNIX_TIMESTAMP(newtag.created_at)-UNIX_TIMESTAMP(sourcetag.created_at) AS timediff, @@ -59,11 +67,12 @@ "sourcetag.inactivated IS NULL AND sourcetag.globjid=globjs.globjid AND sourcetag.uid=sourcetpc.uid + AND sourcetpc.clid=$self->{clid} AND sourcetag.globjid=newtag.globjid AND sourcetag.tagnameid=newtag.tagnameid - AND sourcetag.tagnameid NOT IN ($nodid, $nixid) + AND sourcetag.tagnameid NOT IN ($self->{nodid}, $self->{nixid}) AND sourcetag.tagid != newtag.tagid - AND newtag.created_at >= DATE_SUB(NOW(), INTERVAL $months_back MONTH) + AND newtag.created_at >= DATE_SUB(NOW(), INTERVAL $self->{months_back} MONTH) AND newtag.uid=users_info.uid AND newtpc.uid IS NULL AND sourcetpc.gen=$g", @@ -72,38 +81,40 @@ } sub process_nextgen { - my($class, $hr_ar) = @_; + my($self, $hr_ar, $tags_peerclout) = @_; my %newtag_uid = ( map { $_->{newtag_uid}, 1 } @$hr_ar ); my @newtag_uid = sort { $a <=> $b } keys %newtag_uid; - my $insert_ar = [ ]; - my $i = 0; + my $insert_ar = [ ]; my $i = 0; for my $newtag_uid (@newtag_uid) { my @match = grep { $_->{newtag_uid} == $newtag_uid } @$hr_ar; my $match0 = $match[0]; my($clout, $created_at, $karma, $tokens) = ($match0->{clout}, $match0->{created_at_ut}, $match0->{karma}, $match0->{tokens}); - if ($debug_uids->{$newtag_uid}) { - slashdLog("$class starting uid=%d", $newtag_uid); + if ($self->{debug_uids}{$newtag_uid}) { + print STDERR ref($self) . sprintf(" starting uid=%d\n", $newtag_uid); + ++$self->{debug}; } - my $uid_mults = $class->get_mults(\@match); - my $weight = $class->get_total_weight($uid_mults, $clout, $created_at, $karma, $tokens); + my $uid_mults = $self->get_mults(\@match); + my $weight = $self->get_total_weight($tags_peerclout, $uid_mults, $clout, $created_at, $karma, $tokens); push @$insert_ar, { uid => $newtag_uid, clout => $weight, }; - if ($debug_uids->{$newtag_uid}) { - $debug = 1; - my $umd = Dumper($uid_mults); $umd =~ s/\s+/ /g; - slashdLog("$class uid=$newtag_uid weight=" - . $class->get_total_weight($uid_mults, $clout, $created_at, $karma, $tokens) - . " mults: $umd"); - $debug = 0; + if ($self->{debug}) { + use Data::Dumper; my $umd = Dumper($uid_mults); $umd =~ s/\s+/ /g; + print STDERR ref($self) . " uid=$newtag_uid weight=" + . $self->get_total_weight($tags_peerclout, $uid_mults, $clout, $created_at, $karma, $tokens) + . " mults: $umd\n"; } ++$i; - if ($i % 1000 == 0) { - slashdLog("$class process_nextgen processed $i (uid $newtag_uid, matched " . scalar(@match) . ")"); + if ($i % 100 == 0) { + print STDERR ref($self) . " process_nextgen processed $i (uid $newtag_uid, matched " . scalar(@match) . ")\n"; } + if ($self->{debug_uids}{$newtag_uid}) { + print STDERR ref($self) . sprintf(" done uid=%d\n", $newtag_uid); + --$self->{debug}; + } Time::HiRes::sleep(0.01); } @@ -111,10 +122,10 @@ } sub get_mults { - my($class, $match_ar) = @_; + my($self, $match_ar) = @_; my $uid_mults = { }; for my $hr (@$match_ar) { - my $mult = $class->get_mult($hr); + my $mult = $self->get_mult($hr); $uid_mults->{ $hr->{sourcetag_uid} } ||= [ ]; push @{$uid_mults->{ $hr->{sourcetag_uid} }}, $mult; } @@ -122,7 +133,7 @@ } sub get_mult { - my($class, $hr) = @_; + my($self, $hr) = @_; my $mult = 1.0; @@ -154,7 +165,8 @@ } # Tagging different types gets different mults. - my $type = $globjtypes->{ $hr->{gtid} }; + my $slashdb = getCurrentDB(); + my $type = $slashdb->getGlobjTypes()->{ $hr->{gtid} }; if ($type eq 'stories') { # full credit for matching tags on stories } elsif ($type eq 'comments') { @@ -169,13 +181,15 @@ sub get_total_weight { # uid_mults is a hashref where the key is the source uid and # the value is an arrayref of mults from that uid - my($class, $uid_mults, $clout, $created_at, $karma, $tokens) = @_; + my($self, $tags_peerclout, $uid_mults, $clout, $created_at, $karma, $tokens) = @_; return 0 if $clout == 0 || $tokens < -1000 || $karma < -10; my @total_mults = ( ); # Start by sorting source uids by decreasing weight. +my @nodef = grep { !defined $tags_peerclout->{$_} } keys %$uid_mults; $#nodef = 20 if $#nodef > 20; print STDERR "nodef: '@nodef', t_p:" . Dumper($tags_peerclout) if @nodef; +#print STDERR "uid_mults: " . Dumper($uid_mults); my @source_uids = sort { $tags_peerclout->{$b} <=> $tags_peerclout->{$a} } keys %$uid_mults; # If all source uids have weight 0, we know the answer quickly. @@ -190,20 +204,20 @@ # Get the mult for each of those for my $uid (@source_uids) { - my @balanced = $class->balance_weight_vectors(@{$uid_mults->{$uid}}); - push @total_mults, $tags_peerclout->{$uid} * $class->sum_weight_vectors(@balanced); - if ($debug) { - my @tm2 = map { sprintf("%.5g", @_) } @total_mults; - slashdLog("$class source_uid=$uid ($tags_peerclout->{$uid}) total_mults='@tm2'"); + my @balanced = $self->balance_weight_vectors(@{$uid_mults->{$uid}}); + push @total_mults, $tags_peerclout->{$uid} * $self->sum_weight_vectors(@balanced); + if ($self->{debug}) { + my @tm2 = map { sprintf("%.5g", $_) } @total_mults; + print STDERR ref($self) . " source_uid=$uid ($tags_peerclout->{$uid}) total_mults='@tm2'\n"; } } # Then (using the same decreasing-multipliers algorithm) get the # total of all those mults. - my @balanced = $class->balance_weight_vectors(@total_mults); - my $total = $class->sum_weight_vectors(@balanced); - if ($debug) { - slashdLog("$class total=$total"); + my @balanced = $self->balance_weight_vectors(@total_mults); + my $total = $self->sum_weight_vectors(@balanced); + if ($self->{debug}) { + print STDERR ref($self) . " total=$total\n"; } # If this user was created recently, less weight for them. @@ -245,11 +259,11 @@ } sub balance_weight_vectors { - my $class = shift @_; - my @w = sort { abs($b) <=> abs($a) || $b > $a } @_; + my($self, @w) = @_; + @w = sort { abs($b) <=> abs($a) || $b > $a } @w; my $w_pos_mag = 0; for my $w (@w) { $w_pos_mag += $w if $w > 0 }; my $w_neg_mag = 0; for my $w (@w) { $w_neg_mag -= $w if $w < 0 }; - return @_ if !$w_pos_mag && !$w_neg_mag; + return @w if !$w_pos_mag && !$w_neg_mag; my @ret; # Swinging more than 60-40% one way or the other reduces the @@ -263,57 +277,40 @@ @ret = map { $_ > 0 ? $_*$pos_reduc_factor : $_ } @_; } else { # No change. - @ret = @_; + @ret = @w; } - if ($debug) { + if ($self->{debug}) { my @w2 = map { sprintf("%5d", @_) } @w; $#w2 = 4 if $#w2 > 4; my @r2 = map { sprintf("%5d", @_) } @ret; $#r2 = 4 if $#r2 > 4; - slashdLog(sprintf("$class balance_weight_vectors pos=%.5g neg=%.5g from '%s' to '%s'", - $w_pos_mag, $w_neg_mag, join(' ', @w2), join(' ', @r2))); + print STDERR sprintf("%s balance_weight_vectors pos=%.5g neg=%.5g from '%s' to '%s'\n", + ref($self), $w_pos_mag, $w_neg_mag, join(' ', @w2), join(' ', @r2)); } return @ret; } sub sum_weight_vectors { - my $class = shift @_; - my @w = sort { abs($b) <=> abs($a) || $b > $a } @_; + my($self, @v) = @_; + my @w = sort { abs($b) <=> abs($a) || $b > $a } @v; $#w = 50 if $#w > 50; # beyond this point contributions are tiny my $weight = 0; my $cur_magnitude = 1; for my $w (@w) { - $cur_magnitude *= $cumfrac; + $cur_magnitude *= $self->{cumfrac}; $weight += $cur_magnitude * $w; } $weight = 0 if $weight < 0; - if ($debug) { - slashdLog("sum_weight_vectors weight='$weight' w='@w'"); + if ($self->{debug}) { + print STDERR ref($self) . " sum_weight_vectors weight='$weight' w='@w'\n"; } return $weight; } -sub insert_nextgen { - my($class, $g, $insert_ar) = @_; - my $slashdb = getCurrentDB(); - # XXX Should turn off autocommit for this loop - for my $hr (@$insert_ar) { - $hr->{gen} = $g; - $slashdb->sqlInsert('tags_peerclout', $hr); - } -} - -sub update_tags_peerclout { - my($class, $insert_ar) = @_; - for my $hr (@$insert_ar) { - $tags_peerclout->{ $hr->{uid} } = $hr->{clout}; - } -} - sub copy_peerclout_sql { - my($class) = @_; + my($self) = @_; my $slashdb = getCurrentDB(); $slashdb->sqlDo("SET AUTOCOMMIT=0"); - $slashdb->sqlDo("UPDATE users_clout SET clout=NULL WHERE clid='$clid'"); - $slashdb->sqlDo("INSERT INTO users_clout (clout_id, uid, clid, clout) SELECT NULL, uid, '$clid', clout FROM tags_peerclout WHERE clid='$clid'"); + $slashdb->sqlDo("UPDATE users_clout SET clout=NULL WHERE clid='$self->{clid}'"); + $slashdb->sqlDo("REPLACE INTO users_clout (clout_id, uid, clid, clout) SELECT NULL, uid, '$self->{clid}', clout FROM tags_peerclout WHERE clid='$self->{clid}'"); $slashdb->sqlDo("COMMIT"); $slashdb->sqlDo("SET AUTOCOMMIT=1"); } Modified: slashjp/branches/upstream/current/plugins/Tags/Clout/Moderate.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/Clout/Moderate.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/Clout/Moderate.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,13 +1,39 @@ package Slash::Clout::Moderate; +use strict; +use warnings; +use Slash::Utility; +use base 'Slash::Clout'; + use vars qw($VERSION); -($VERSION) = ' $Revision: 1.3 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.4 $ ' =~ /\$Revision:\s+([^\s]+)/; +sub init { + 1; +} + sub getUserClout { my($class, $user_stub) = @_; return 1; } +sub get_nextgen { + return [ ]; +} + +sub process_nextgen { + return [ ]; +} + +sub insert_nextgen { +} + +sub update_tags_peerclout { +} + +sub copy_peerclout_sql { +} + 1; Modified: slashjp/branches/upstream/current/plugins/Tags/Clout/Vote.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/Clout/Vote.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/Clout/Vote.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,15 +1,30 @@ package Slash::Clout::Vote; +use strict; +use warnings; +use Slash::Utility; +use base 'Slash::Clout'; + use vars qw($VERSION); -($VERSION) = ' $Revision: 1.2 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.4 $ ' =~ /\$Revision:\s+([^\s]+)/; -my $cumfrac = 0.45; -my $months_back = 4; -my $clid = 2; +sub init { + my($self) = @_; + $self->SUPER::init(@_); + # Hard-coded constants should be in the vars table. + # cumfrac is the cumulative fraction of how much weight is propagated + # for each matching tag. E.g. if $cumfrac is 0.5, the first match may + # propagate up to 50% of the weight, the second another 25%, the + # third another 12.5% etc. + $self->{cumfrac} = 0.45; + $self->{debug_uids} = { }; + $self->{debug} = 0; + 1; +} sub getUserClout { - my($class, $user_stub) = @_; + my($self, $user_stub) = @_; my $clout = $user_stub->{karma} >= -3 ? log($user_stub->{karma}+10)/50 : 0; @@ -23,12 +38,13 @@ } sub get_nextgen { - my($class, $g) = @_; + my($self, $g) = @_; # Populate the firehose_ogaspt table with the necessary data. my $constants = getCurrentStatic(); my $subscribe_future_secs = $constants->{subscribe_future_secs}; my $slashdb = getCurrentDB(); + my $globj_types = $slashdb->getGlobjTypes(); $slashdb->sqlDelete('firehose_ogaspt'); # First, the pub dates for submissions that made it into stories. $slashdb->sqlDo("INSERT INTO firehose_ogaspt @@ -37,9 +53,9 @@ WHERE stories.stoid=story_param.stoid AND in_trash='no' AND story_param.name='subid' - AND globjs.gtid='$globjtypes->{submissions}' + AND globjs.gtid='$globj_types->{submissions}' AND story_param.value=globjs.target_id - AND stories.time >= DATE_SUB(NOW(), INTERVAL $months_back MONTH) + AND stories.time >= DATE_SUB(NOW(), INTERVAL $self->{months_back} MONTH) GROUP BY globjid"); # Then, the same for journal entries that made it into stories. $slashdb->sqlDo("INSERT INTO firehose_ogaspt @@ -48,9 +64,9 @@ WHERE stories.stoid=story_param.stoid AND in_trash='no' AND story_param.name='journal_id' - AND globjs.gtid='$globjtypes->{journals}' + AND globjs.gtid='$globj_types->{journals}' AND story_param.value=globjs.target_id - AND stories.time >= DATE_SUB(NOW(), INTERVAL $months_back MONTH) + AND stories.time >= DATE_SUB(NOW(), INTERVAL $self->{months_back} MONTH) GROUP BY globjid"); # Those queries run in under a second each. But, wait a decent # amount of time for them to replicate. @@ -93,16 +109,20 @@ AND tagnames_similar.dest_tnid=newtag.tagnameid AND simil != 0 AND sourcetag.tagid != newtag.tagid - AND newtag.created_at >= DATE_SUB(NOW(), INTERVAL $months_back MONTH) + AND newtag.created_at >= DATE_SUB(NOW(), INTERVAL $self->{months_back} MONTH) AND newtag.uid=users_info.uid AND newtpc.uid IS NULL - AND sourcetpc.gen=$g", + AND sourcetpc.gen=$g + AND sourcetpc.clid=$self->{clid}", "ORDER BY newtag.tagid"); return $hr_ar; } sub process_nextgen { - my($class, $hr_ar) = @_; + my($self, $hr_ar, $tags_peerclout) = @_; + + $self->count_uid_nodnix($hr_ar); + my %newtag_uid = ( map { $_->{newtag_uid}, 1 } @$hr_ar ); my @newtag_uid = sort { $a <=> $b } keys %newtag_uid; my $user_nodnixes_min = 3; @@ -111,45 +131,49 @@ my $insert_ar = [ ]; my $i = 0; for my $newtag_uid (@newtag_uid) { - my $user_nodnixes_count = $nodc->{$newtag_uid} + $nixc->{$newtag_uid}; + ++$self->{debug} if $self->{debug_uids}{$newtag_uid}; + my $user_nodnixes_count = ($self->{nodc}{$newtag_uid} || 0) + ($self->{nixc}{$newtag_uid} || 0); my $user_nodnixes_mult = 0; if ($user_nodnixes_count >= $user_nodnixes_full) { $user_nodnixes_mult = 1; } elsif ($user_nodnixes_count >= $user_nodnixes_min) { - $user_nodnixes_mult = ($user_nodnixes_count+1-$user_nodnixes_min) - / ($user_nodnixes_full+1-$user_nodnixes_min); + $user_nodnixes_mult = ($user_nodnixes_count+1-$user_nodnixes_min) / + ($user_nodnixes_full+1-$user_nodnixes_min); } my $weight = 0; my(@match, $clout, $created_at, $karma, $tokens, $uid_mults); - if ($debug_uids->{$newtag_uid}) { - slashdLog("$class starting uid=%d user_nodnixes_mult=%.3f", $newtag_uid, $user_nodnixes_mult); + if ($self->{debug}) { + print STDERR ref($self) . sprintf(" starting uid=%d user_nodnixes_mult=%.3f\n", + $newtag_uid, $user_nodnixes_mult); } if ($user_nodnixes_mult > 0) { @match = grep { $_->{newtag_uid} == $newtag_uid } @$hr_ar; my $match0 = $match[0]; ($clout, $created_at, $karma, $tokens) = ($match0->{clout}, $match0->{created_at_ut}, $match0->{karma}, $match0->{tokens}); - $uid_mults = $class->get_mults(\@match); - $uid_mults->{'-1'} = $class->get_mult_timebeforepub(\@match); - $weight = $class->get_total_weight($uid_mults, $clout, $created_at, $karma, $tokens) + $uid_mults = $self->get_mults(\@match); + $uid_mults->{'-1'} = $self->get_mult_timebeforepub(\@match); + $weight = $self->get_total_weight($tags_peerclout, $uid_mults, + $clout, $created_at, $karma, $tokens, $newtag_uid) * $user_nodnixes_mult; } push @$insert_ar, { uid => $newtag_uid, clout => $weight, }; - if ($debug_uids->{$newtag_uid}) { - $debug = 1; - slashdLog(sprintf("$class uid=%d user_nodnixes_mult=%.3f weight=%.6f mults: %s", + if ($self->{debug}) { + use Data::Dumper; + print STDERR sprintf("%s uid=%d user_nodnixes_mult=%.3f weight=%.6f mults: %s\n", + ref($self), $newtag_uid, $user_nodnixes_mult, - $class->get_total_weight($uid_mults, $clout, $created_at, $karma, $tokens), - Dumper($uid_mults))); - $debug = 0; + $weight, + Dumper($uid_mults)); } ++$i; - if ($i % 1000 == 0) { - slashdLog("$class process_nextgen processed $i (uid $newtag_uid, matched " . scalar(@match) . ")"); + if ($i % 100 == 0) { + print STDERR scalar(localtime) . " " . ref($self) . " process_nextgen processed $i (uid $newtag_uid, matched " . scalar(@match) . ")\n"; } + --$self->{debug} if $self->{debug_uids}{$newtag_uid}; Time::HiRes::sleep(0.01); } @@ -157,13 +181,14 @@ } sub count_uid_nodnix { - my($class, $hr_ar) = @_; + my($self, $hr_ar) = @_; + $self->{nodc} = $self->{nixc} = { }; my %uid_needed = ( ); for my $hr (@$hr_ar) { my $uid = $hr->{sourcetag_uid}; - $uid_needed{$uid} = 1 if !exists $nodc->{$uid}; + $uid_needed{$uid} = 1 if !exists $self->{nodc}{$uid}; $uid = $hr->{newtag_uid}; - $uid_needed{$uid} = 1 if !exists $nodc->{$uid}; + $uid_needed{$uid} = 1 if !exists $self->{nodc}{$uid}; } return unless keys %uid_needed; my $reader = getObject('Slash::DB', { db_type => 'reader' }); @@ -175,29 +200,29 @@ my $nod_hr = $reader->sqlSelectAllKeyValue( 'uid, COUNT(*)', 'tags', - "tagnameid='$tagnameid->{nod}' AND uid IN ($uid_str) - AND created_at >= DATE_SUB(NOW(), INTERVAL $months_back MONTH)", + "tagnameid='$self->{nodid}' AND uid IN ($uid_str) + AND created_at >= DATE_SUB(NOW(), INTERVAL $self->{months_back} MONTH)", 'GROUP BY uid'); my $nix_hr = $reader->sqlSelectAllKeyValue( 'uid, COUNT(*)', 'tags', - "tagnameid='$tagnameid->{nix}' AND uid IN ($uid_str) - AND created_at >= DATE_SUB(NOW(), INTERVAL $months_back MONTH)", + "tagnameid='$self->{nixid}' AND uid IN ($uid_str) + AND created_at >= DATE_SUB(NOW(), INTERVAL $self->{months_back} MONTH)", 'GROUP BY uid'); for my $uid (@uid_chunk) { - $nodc->{$uid} = $nod_hr->{$uid} || 0; - $nixc->{$uid} = $nix_hr->{$uid} || 0; + $self->{nodc}{$uid} = $nod_hr->{$uid} || 0; + $self->{nixc}{$uid} = $nix_hr->{$uid} || 0; } sleep 1 if @uids_needed; } } sub get_mults { - my($class, $match_ar) = @_; + my($self, $match_ar) = @_; my $uid_mults = { }; for my $hr (@$match_ar) { - my $mult = $class->get_mult($hr); + my $mult = $self->get_mult($hr); $uid_mults->{ $hr->{sourcetag_uid} } ||= [ ]; push @{$uid_mults->{ $hr->{sourcetag_uid} }}, $mult; } @@ -205,15 +230,17 @@ } sub get_mult { - my($class, $hr) = @_; + my($self, $hr) = @_; my $mult = $hr->{simil}; + my $slashdb = getCurrentDB(); + my $globj_types = $slashdb->getGlobjTypes(); # If this tag-match is too old, it earns the new user less credit. my $older_tag = $hr->{sourcetag_created_at_ut}; $older_tag = $hr->{newtag_created_at_ut} if $hr->{newtag_created_at_ut} < $older_tag; my $tag_age = time - $older_tag; - my $max_days = $months_back * 30 + 1; + my $max_days = $self->{months_back} * 30 + 1; if ($tag_age < 7 * 86400) { # tags within the past week get full credit } elsif ($tag_age < 30 * 86400) { @@ -254,7 +281,7 @@ } # Tagging different types gets different mults. - my $type = $globjtypes->{ $hr->{gtid} }; + my $type = $globj_types->{ $hr->{gtid} }; if ($type eq 'comments') { # fair bit of credit for matching mods on comments # XXX may need to adjust this if it turns out that we're @@ -270,18 +297,18 @@ # rare choice (for either user) is considered more indicative. my($su, $nu) = ($hr->{sourcetag_uid}, $hr->{newtag_uid}); my($stn, $ntn) = ($hr->{sourcetag_tagnameid}, $hr->{newtag_tagnameid}); - my($nodid, $nixid) = ($stn == $tagnameid->{nod}, $stn == $tagnameid->{nix}); + my($nodid, $nixid) = ($stn == $self->{nodid}, $stn == $self->{nixid}); if ( ( $stn == $nodid || $stn == $nixid ) && ( $ntn == $nodid || $ntn == $nixid ) ) { my($su, $nu) = ($hr->{sourcetag_uid}, $hr->{newtag_uid}); - my $snod = $nodc->{$su}; - my $snix = $nixc->{$su}; - my $nnod = $nodc->{$nu}; - my $nnix = $nixc->{$nu}; + my $snod = $self->{nodc}{$su}; + my $snix = $self->{nixc}{$su}; + my $nnod = $self->{nodc}{$nu}; + my $nnix = $self->{nixc}{$nu}; my $sfrac = ($stn == $nodid ? $snix : $snod) / ($snod+$snix+1); my $nfrac = ($ntn == $nodid ? $nnix : $nnod) / ($nnod+$nnix+1); - if ($debug) { - slashdLog("$class get_mult su='$su' nu='$nu' sfrac='$sfrac' nfrac='$nfrac'"); + if ($self->{debug}) { + print STDERR ref($self) . " get_mult su='$su' nu='$nu' sfrac='$sfrac' nfrac='$nfrac'\n"; } $mult *= $sfrac * $nfrac; } @@ -290,15 +317,15 @@ } sub get_mult_timebeforepub { - my($class, $match_ar) = @_; + my($self, $match_ar) = @_; my $tbp_mults = [ ]; for my $hr (@$match_ar) { next unless $hr->{duration} == -1 && defined $hr->{timebeforepub}; my $nodnix; - if ($hr->{sourcetag_tagnameid} == $tagnameid->{nod}) { + if ($hr->{sourcetag_tagnameid} == $self->{nodid}) { $nodnix = 1; - } elsif ($hr->{sourcetag_tagnameid} == $tagnameid->{nix}) { + } elsif ($hr->{sourcetag_tagnameid} == $self->{nixid}) { $nodnix = -1; } else { next; @@ -324,7 +351,8 @@ sub get_total_weight { # uid_mults is a hashref where the key is the source uid and # the value is an arrayref of mults from that uid - my($class, $uid_mults, $clout, $created_at, $karma, $tokens) = @_; + my($self, $tags_peerclout, $uid_mults, + $clout, $created_at, $karma, $tokens, $new_uid) = @_; return 0 if $clout == 0 || $tokens < -1000 || $karma < -10; @@ -338,20 +366,22 @@ # correlations with other users' tags. if ($uid_mults->{'-1'}) { if (@{$uid_mults->{'-1'}}) { - my @balanced = $class->balance_weight_vectors(@{$uid_mults->{'-1'}}); + print STDERR "get_total_weight for $new_uid calling balance_weight_vectors -1\n" if $self->{debug}; + my @balanced = $self->balance_weight_vectors(@{$uid_mults->{'-1'}}); push @total_mults, $constants->{tags_tagpeerval_postingbonus} - * $class->sum_weight_vectors(@balanced); + * $self->sum_weight_vectors(@balanced); $any_weight = 1; } delete $uid_mults->{'-1'}; } # Start by sorting source uids by decreasing weight. - my @source_uids = sort { $tags_peerweight->{$b} <=> $tags_peerweight->{$a} } keys %$uid_mults; + my @nodef = grep { !defined $tags_peerclout->{$_} } keys %$uid_mults; $#nodef = 20 if $#nodef > 20; print STDERR "get_total_weight for $new_uid nodef: '@nodef'\n" if @nodef; + my @source_uids = sort { $tags_peerclout->{$b} <=> $tags_peerclout->{$a} } keys %$uid_mults; # If all source uids have weight 0, we know the answer quickly. for my $uid (@source_uids) { - if ($tags_peerweight->{$uid} > 0) { + if ($tags_peerclout->{$uid} > 0) { $any_weight = 1; last; } @@ -360,21 +390,21 @@ # Get the mult for each of those for my $uid (@source_uids) { - my @balanced = $class->balance_weight_vectors(@{$uid_mults->{$uid}}); - push @total_mults, $tags_peerweight->{$uid} * $class->sum_weight_vectors(@balanced); - if ($debug) { - my @t2 = map { sprintf("%.5g", @_) } @total_mults; - slashdLog("$class source_uid=$uid ($tags_peerweight->{$uid}) total_mults='@t2'"); + print STDERR "get_total_weight for $new_uid calling balance_weight_vectors $uid\n" if $self->{debug}; + my @balanced = $self->balance_weight_vectors(@{$uid_mults->{$uid}}); + push @total_mults, $tags_peerclout->{$uid} * $self->sum_weight_vectors(@balanced); + if ($self->{debug}) { + my @t2 = map { sprintf("%.6g", $_) } @total_mults; + print STDERR "get_total_weight for $new_uid source_uid=$uid (clout $tags_peerclout->{$uid}), total_mults='@t2' from balanced '@balanced'\n"; } } # Then (using the same decreasing-multipliers algorithm) get the # total of all those mults. - my @balanced = $class->balance_weight_vectors(@total_mults); - my $total = $class->sum_weight_vectors(@balanced); - if ($debug) { - slashdLog("$class total=$total"); - } + print STDERR "get_total_weight for $new_uid calling balance_weight_vectors total\n" if $self->{debug}; + my @balanced = $self->balance_weight_vectors(@total_mults); + my $total = $self->sum_weight_vectors(@balanced); + print STDERR ref($self) . " total=$total for uid $new_uid\n" if $self->{debug}; # If this user was created recently, less weight for them. my $daysold = (time - $created_at)/86400; @@ -415,11 +445,11 @@ } sub balance_weight_vectors { - my $class = shift @_; - my @w = sort { abs($b) <=> abs($a) || $b > $a } @_; + my($self, @w) = @_; + @w = sort { abs($b) <=> abs($a) || $b > $a } @w; my $w_pos_mag = 0; for my $w (@w) { $w_pos_mag += $w if $w > 0 }; my $w_neg_mag = 0; for my $w (@w) { $w_neg_mag -= $w if $w < 0 }; - return @_ if !$w_pos_mag && !$w_neg_mag; + return @w if !$w_pos_mag && !$w_neg_mag; my @ret; # Swinging more than 60-40% one way or the other reduces the @@ -427,63 +457,53 @@ my $total = $w_pos_mag+$w_neg_mag; if ($w_pos_mag > $total * 0.60) { my $neg_reduc_factor = $w_neg_mag*3/$w_pos_mag; - @ret = map { $_ < 0 ? $_*$neg_reduc_factor : $_ } @_; + @ret = map { $_ < 0 ? $_*$neg_reduc_factor : $_ } @w; } elsif ($w_neg_mag > $total * 0.60) { my $pos_reduc_factor = $w_pos_mag*3/$w_neg_mag; - @ret = map { $_ > 0 ? $_*$pos_reduc_factor : $_ } @_; + @ret = map { $_ > 0 ? $_*$pos_reduc_factor : $_ } @w; } else { # No change. - @ret = @_; + @ret = @w; } - if ($debug) { - my @w2 = map { sprintf("%5d", @_) } @w; $#w2 = 4 if $#w2 > 4; - my @r2 = map { sprintf("%5d", @_) } @ret; $#r2 = 4 if $#r2 > 4; - slashdLog(sprintf("$class balance_weight_vectors pos=%.5g neg=%.5g from '%s' to '%s'", - $w_pos_mag, $w_neg_mag, join(' ', @w2), join(' ', @r2))); + if ($self->{debug} || $w_pos_mag > 10_000 || $w_neg_mag > 10_000) { + my @w2 = @w; $#w2 = 4 if $#w2 > 4; + my @r2 = @ret; $#r2 = 4 if $#r2 > 4; + print STDERR sprintf("%s balance_weight_vectors posmag=%0.5g negmag=%0.5g from '%s' to '%s'\n", + ref($self), $w_pos_mag, $w_neg_mag, join(' ', @w2), join(' ', @r2)); } return @ret; } sub sum_weight_vectors { - my $class = shift @_; - my @w = sort { abs($b) <=> abs($a) || $b > $a } @_; + my($self, @v) = @_; + my @w = sort { abs($b) <=> abs($a) || $b > $a } @v; $#w = 50 if $#w > 50; # beyond this point contributions are tiny my $weight = 0; my $cur_magnitude = 1; for my $w (@w) { - $cur_magnitude *= $cumfrac; + $cur_magnitude *= $self->{cumfrac}; $weight += $cur_magnitude * $w; } $weight = 0 if $weight < 0; - if ($debug) { - slashdLog("$class sum_weight_vectors weight='$weight' w='@w'"); + if ($self->{debug}) { + print STDERR ref($self) . " sum_weight_vectors weight='$weight' w='@w'\n"; } return $weight; } -sub insert_nextgen { - my($class, $g, $insert_ar) = @_; - my $slashdb = getCurrentDB(); - # XXX Should turn off autocommit for this loop - for my $hr (@$insert_ar) { - $hr->{gen} = $g; - $slashdb->sqlInsert('tags_peerclout', $hr); - } -} - sub update_tags_peerclout { - my($class, $insert_ar) = @_; + my($self, $insert_ar, $tags_peerclout) = @_; for my $hr (@$insert_ar) { $tags_peerclout->{ $hr->{uid} } = $hr->{clout}; } } -sub copy_peerweight_sql { - my($class) = $_; +sub copy_peerclout_sql { + my($self) = @_; my $slashdb = getCurrentDB(); $slashdb->sqlDo("SET AUTOCOMMIT=0"); - $slashdb->sqlDo("UPDATE users_clout SET clout=NULL WHERE clid='$clid'"); - $slashdb->sqlDo("INSERT INTO users_clout (clout_id, uid, clid, clout) SELECT NULL, uid, '$clid', clout FROM tags_peerclout WHERE clid='$clid'"); + $slashdb->sqlDo("UPDATE users_clout SET clout=NULL WHERE clid='$self->{clid}'"); + $slashdb->sqlDo("REPLACE INTO users_clout (clout_id, uid, clid, clout) SELECT NULL, uid, '$self->{clid}', clout FROM tags_peerclout WHERE clid='$self->{clid}'"); $slashdb->sqlDo("COMMIT"); $slashdb->sqlDo("SET AUTOCOMMIT=1"); } Modified: slashjp/branches/upstream/current/plugins/Tags/Clout.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/Clout.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/Clout.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,20 +1,44 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Clout.pm,v 1.3 2007/10/04 20:28:16 jamiemccarthy Exp $ +# $Id: Clout.pm,v 1.4 2007/10/24 21:12:23 jamiemccarthy Exp $ package Slash::Clout; use strict; +use warnings; use Slash; -use Slash::Clout::Describe; -use Slash::Clout::Vote; -use Slash::Clout::Moderate; +use Slash::Utility; +use Slash::Tags; +#use Slash::Clout::Describe; +#use Slash::Clout::Vote; +#use Slash::Clout::Moderate; +use base 'Slash::DB::Utility'; +use base 'Slash::DB'; + use vars qw($VERSION); -($VERSION) = ' $Revision: 1.3 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.4 $ ' =~ /\$Revision:\s+([^\s]+)/; +sub init { + my($self) = @_; + + $self->{months_back} = 4; # default + my $slashdb = getCurrentDB(); + my $info = $slashdb->getCloutInfo(); + for my $clid (keys %$info) { + $self->{clid} = $clid if $info->{$clid}{class} eq ref($self); + } + warn "cannot find clid for $self" if !$self->{clid}; + + my $constants = getCurrentStatic(); + my $tags_reader = getObject('Slash::Tags', { db_type => 'reader' }); + $self->{nodid} = $tags_reader->getTagnameidCreate($constants->{tags_upvote_tagname} || 'nod'); + $self->{nixid} = $tags_reader->getTagnameidCreate($constants->{tags_downvote_tagname} || 'nix'); + 1; +} + #sub insert_nextgen { # my($g, $insert_ar) = @_; # my $slashdb = getCurrentDB(); Modified: slashjp/branches/upstream/current/plugins/Tags/Tags.pm =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/Tags.pm 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/Tags.pm 2007-10-31 05:42:24 UTC (rev 232) @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Tags.pm,v 1.84 2007/10/09 20:04:42 jamiemccarthy Exp $ +# $Id: Tags.pm,v 1.85 2007/10/24 21:12:23 jamiemccarthy Exp $ package Slash::Tags; @@ -17,7 +17,7 @@ use base 'Slash::DB::Utility'; use base 'Slash::DB::MySQL'; -($VERSION) = ' $Revision: 1.84 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.85 $ ' =~ /\$Revision:\s+([^\s]+)/; # FRY: And where would a giant nerd be? THE LIBRARY! @@ -26,8 +26,7 @@ my($class, $user) = @_; my $self = {}; - my $plugin = getCurrentStatic('plugin'); - return unless $plugin->{Tags}; + return undef unless $class->isInstalled(); bless($self, $class); $self->{virtual_user} = $user; @@ -36,6 +35,12 @@ return $self; } +sub isInstalled { + my($class) = @_; + my $constants = getCurrentStatic(); + return $constants->{plugin}{Tags} || 0; +} + ######################################################## # createTag's first argument is a hashref with four sets of @@ -617,7 +622,8 @@ # XXX this stub is good enough for now but we may # need the whole actual getUser() user at some # future time - $uid_clout_hr->{$uid} = $clout_info->{class}->getUserClout(\%user_stub); + my $clout = getObject($clout_info->{class}, { db_type => 'reader' }); + $uid_clout_hr->{$uid} = $clout->getUserClout(\%user_stub); } } Modified: slashjp/branches/upstream/current/plugins/Tags/tags_updateclouts.pl =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/tags_updateclouts.pl 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/tags_updateclouts.pl 2007-10-31 05:42:24 UTC (rev 232) @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# $Id: tags_updateclouts.pl,v 1.1 2007/09/26 21:25:51 jamiemccarthy Exp $ +# $Id: tags_updateclouts.pl,v 1.2 2007/10/24 21:12:23 jamiemccarthy Exp $ # # Slashd Task (c) OSTG 2004-2007 @@ -34,9 +34,12 @@ $globj_types = $slashdb->getGlobjTypes(); $clout_types = $slashdb->getCloutTypes(); $clout_info = $slashdb->getCloutInfo(); + my $total_inserts = 0; for my $clid (sort { $a <=> $b } grep { /^\d+$/ } keys %$clout_types) { my $class = $clout_info->{$clid}{class}; + my $clout = getObject($class); + next unless $clout; sleep 5; $tags_peerclout = $slashdb->sqlSelectAllKeyValue( 'uid, clout', @@ -49,21 +52,38 @@ while (1) { my $lastgen_count = $slashdb->sqlCount('tags_peerclout', "clid=$clid AND gen=$g"); + slashdLog("gen $g for $clout_types->{$clid}: $lastgen_count"); last unless $lastgen_count; - my $hr_ar = $class->get_nextgen($g); - slashdLog("$class gen $g produces " . scalar(@$hr_ar) . " rows"); - my $insert_ar = $class->process_nextgen($hr_ar); + my $hr_ar = $clout->get_nextgen($g); + slashdLog("$class gen $g produces " . scalar(defined($hr_ar) ? @$hr_ar : 0) . " rows"); + my $insert_ar = $clout->process_nextgen($hr_ar, $tags_peerclout); + slashdLog("$class gen $g insert_ar count: " . scalar(@$insert_ar)); + $total_inserts += scalar(@$insert_ar); ++$g; - for my $hr (@$insert_ar) { $hr->{clid} = $clid } - $class->insert_nextgen($g, $insert_ar); - $class->update_tags_peerclout($insert_ar); + my $total_rows = insert_nextgen($tags_peerclout, $clid, $g, $insert_ar); + slashdLog("$class inserted $total_rows rows"); sleep 5; } - $class->copy_peerclout_sql(); + $clout->copy_peerclout_sql(); } } + + return "$total_inserts inserts"; }; +sub insert_nextgen { + my($tags_peerclout, $clid, $gen, $insert_ar) = @_; + my $slashdb = getCurrentDB(); + my $rows = 0; + for my $hr (@$insert_ar) { + ($hr->{clid}, $hr->{gen}) = ($clid, $gen); +if (!$rows) { use Data::Dumper; my $hd = Dumper($hr); $hd =~ s/\s+/ /g; print STDERR "insert hr: $hd\n"; } + $rows += $slashdb->sqlInsert('tags_peerclout', $hr); + $tags_peerclout->{ $hr->{uid} } = $hr->{clout}; + } + return $rows; +} + 1; Modified: slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivadmin;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivadmin;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivadmin;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -17,7 +17,7 @@ [% PROCESS ajax_reskey_tag reskey_label => 'admin_commands-reskey-' _ sidenc, reskey_name => 'ajax_admin' %] -[History] +[History]
    [% tags_admin_str %]
    @@ -26,4 +26,4 @@ __seclev__ 10000 __version__ -$Id: tagsstorydivadmin;misc;default,v 1.9 2006/04/19 18:34:59 jamiemccarthy Exp $ +$Id: tagsstorydivadmin;misc;default,v 1.10 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivtagbox;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivtagbox;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/templates/tagsstorydivtagbox;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -17,13 +17,13 @@ [% IF user.tags_canread_stories %]
    -
     [% IF user.tags_canwrite_stories %][% ELSIF user.is_anon %][% ELSE %][% END %][+] +
     [% IF user.tags_canwrite_stories %][% ELSIF user.is_anon %][% ELSE %][% END %][+] [% IF tags_top.size %] [% FOR t = tags_top -%] [% t | strip_html %][% IF !loop.last() || story.is_future %], [% END -%] [%- END %] [%- END %] -[%- IF user.tags_canwrite_stories && story.is_future %]feedback[% END %] +[%- IF user.tags_canwrite_stories && story.is_future %]feedback[% END %] (tagging beta)
    @@ -54,4 +54,4 @@ __seclev__ 10000 __version__ -$Id: tagsstorydivtagbox;misc;default,v 1.9 2007/08/22 20:26:14 scc Exp $ +$Id: tagsstorydivtagbox;misc;default,v 1.10 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivadmin;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivadmin;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivadmin;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -17,7 +17,7 @@ [% PROCESS ajax_reskey_tag reskey_label => 'admin_commands-reskey-' _ id, reskey_name => 'ajax_admin' %] - [History] + [History]
    [% tags_admin_str %]
    @@ -26,4 +26,4 @@ __seclev__ 10000 __version__ -$Id: tagsurldivadmin;misc;default,v 1.1 2006/04/11 20:20:52 tvroom Exp $ +$Id: tagsurldivadmin;misc;default,v 1.2 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivtagbox;misc;default =================================================================== --- slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivtagbox;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/plugins/Tags/templates/tagsurldivtagbox;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -17,10 +17,10 @@
    -
     [% IF user.tags_canwrite_stories %][% ELSIF user.is_anon %][% ELSE %][% END %][+] +
     [% IF user.tags_canwrite_stories %][% ELSIF user.is_anon %][% ELSE %][% END %][+] [% IF tags_top.size %] [% FOR t = tags_top -%] - [% IF user.tags_canwrite_stories %][% END %][% t | strip_html %][% IF user.tags_canwrite_stories %][% END %][% IF !loop.last() %], [% END -%] + [% IF user.tags_canwrite_stories %][% END %][% t | strip_html %][% IF user.tags_canwrite_stories %][% END %][% IF !loop.last() %], [% END -%] [%- END %] [% END %] (tagging beta) @@ -32,7 +32,7 @@ [% IF tags_example.size %]
    Examples: [% FOR t = tags_example -%] - [% t | strip_html %][% IF !loop.last() %], [% END -%] + [% t | strip_html %][% IF !loop.last() %], [% END -%] [%- END %]
    [% END %] @@ -54,4 +54,4 @@ __seclev__ 10000 __version__ -$Id: tagsurldivtagbox;misc;default,v 1.1 2006/04/11 20:20:52 tvroom Exp $ +$Id: tagsurldivtagbox;misc;default,v 1.2 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/sql/mysql/defaults.sql =================================================================== --- slashjp/branches/upstream/current/sql/mysql/defaults.sql 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/sql/mysql/defaults.sql 2007-10-31 05:42:24 UTC (rev 232) @@ -3,7 +3,7 @@ #-------------------------------------------------------- # Server version 3.23.26-beta-log # -# $Id: defaults.sql,v 1.372 2007/10/17 06:13:44 pudge Exp $ +# $Id: defaults.sql,v 1.374 2007/10/25 07:13:04 pudge Exp $ # # @@ -737,6 +737,7 @@ INSERT INTO vars (name, value, description) VALUES ('admin_story_lookahead_default', 365*86400, 'In the admin.pl storylist, how many seconds to look into the future for all stories by default (but see skins_admin_story_lookahead_mainpage)'); INSERT INTO vars (name, value, description) VALUES ('admin_story_lookahead_infinite', '0', 'In the admin.pl storylist, always show all future stories no matter how far in the future?'); INSERT INTO vars (name, value, description) VALUES ('admin_story_lookahead_mainpage', 72*3600, 'In the admin.pl storylist, how many seconds to look into the future for stories on the mainpage'); +INSERT INTO vars (name, value, description) VALUES ('admin_use_blob_for_upload', '1', 'Use blobs for fileuploading - 1 for yes, 0 for no or file-based uploading'); INSERT INTO vars (name, value, description) VALUES ('admin_warn_primaryskid', '', 'Warn admin if a story is saved with the following primaryskids (skids delimited by |)'); INSERT INTO vars (name, value, description) VALUES ('admin_timeout','30','time in minutes before idle admin session ends'); INSERT INTO vars (name, value, description) VALUES ('adminmail','admin → example.com','All admin mail goes here'); @@ -829,7 +830,7 @@ INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_lastid', '0', 'accesslogid to start searching at'); INSERT INTO vars (name, value, description) VALUES ('cur_performance_stats_weeks', '8', 'number of weeks back to compare current stats to'); INSERT INTO vars (name, value, description) VALUES ('currentqid',1,'The Current Question on the homepage pollbooth'); -INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_180','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records'); +INSERT INTO vars (name, value, description) VALUES ('cvs_tag_currentcode','T_2_5_0_181','The current cvs tag that the code was updated to - this does not affect site behavior but may be useful for your records'); INSERT INTO vars (name, value, description) VALUES ('datadir','/usr/local/slash/www.example.com','What is the root of the install for Slash'); INSERT INTO vars (name, value, description) VALUES ('db_auto_increment_increment','1','If your master DB uses auto_increment_increment, i.e. multiple master replication, echo its value into this var'); INSERT INTO vars (name, value, description) VALUES ('dbsparklines_disp','0','Display dbsparklines in the currentAdminUsers box?'); Modified: slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql =================================================================== --- slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/sql/mysql/slashschema_create.sql 2007-10-31 05:42:24 UTC (rev 232) @@ -4,7 +4,7 @@ #-------------------------------------------------------- # Server version 3.23.26-beta # -# $Id: slashschema_create.sql,v 1.252 2007/10/17 06:13:44 pudge Exp $ +# $Id: slashschema_create.sql,v 1.254 2007/10/23 23:20:15 pudge Exp $ # # @@ -520,6 +520,7 @@ fhid mediumint(8) unsigned default NULL, file varchar(255) default NULL, action enum('upload','thumbnails') default NULL, + blobid VARCHAR(32) DEFAULT "" NOT NULL, PRIMARY KEY (fqid) ) ENGINE=InnoDB; @@ -1073,6 +1074,8 @@ stoid mediumint unsigned NOT NULL, filetype ENUM("file", "image", "audio") not null default "file", name varchar(255) default '' NOT NULL, + width smallint unsigned not null default 0, + height smallint unsigned not null default 0, PRIMARY KEY (sfid), INDEX stoid(stoid) ) ENGINE=InnoDB; @@ -1114,6 +1117,7 @@ del tinyint DEFAULT '0' NOT NULL, weight float DEFAULT '0' NOT NULL, signature varchar(32) NOT NULL, + mediatype enum("text", "none", "video", "image", "audio") default "none" NOT NULL, PRIMARY KEY (subid), UNIQUE signature (signature), KEY emaildomain (emaildomain), Modified: slashjp/branches/upstream/current/sql/mysql/upgrades =================================================================== --- slashjp/branches/upstream/current/sql/mysql/upgrades 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/sql/mysql/upgrades 2007-10-31 05:42:24 UTC (rev 232) @@ -10,7 +10,7 @@ # after X started at the same time that X was tagged. # -# $Id: upgrades,v 1.1261 2007/10/18 03:01:38 pudge Exp $ +# $Id: upgrades,v 1.1266 2007/10/26 03:05:27 pudge Exp $ # # BEGIN tf23's additions @@ -4877,8 +4877,6 @@ # 2007-09-26 UPDATE vars SET value = 'T_2_5_0_176' WHERE name = 'cvs_tag_currentcode'; -# PUDGE LAST UPDATED HERE - # For plugins/Tags UPDATE tagboxes SET clid=2 WHERE name='FirstMover'; @@ -4903,9 +4901,7 @@ # 2007-10-11 UPDATE vars SET value = 'T_2_5_0_179' WHERE name = 'cvs_tag_currentcode'; -# SLASHDOT LAST UPDATED HERE - # default prefs for new /. accounts INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','discussion2','slashdot'); INSERT INTO string_param (type, code, name) VALUES ('otherusersparam','d2_comment_q','5'); # medium @@ -4943,5 +4939,32 @@ # 2007-10-16 UPDATE vars SET value = 'T_2_5_0_180' WHERE name = 'cvs_tag_currentcode'; +# SLASHDOT LAST UPDATED HERE + +INSERT INTO string_param (type, code, name) VALUES ('mediatypes','none','None'); +INSERT INTO string_param (type, code, name) VALUES ('mediatypes','video','Video'); +INSERT INTO string_param (type, code, name) VALUES ('mediatypes','image','Image'); +INSERT INTO string_param (type, code, name) VALUES ('mediatypes','audio','Audio'); +INSERT INTO string_param (type, code, name) VALUES ('mediatypes','text','Text'); + +ALTER TABLE submissions ADD COLUMN mediatype enum("none", "text", "video","image","audio") default "none" NOT NULL; + +# For plugins/FireHose +ALTER TABLE firehose ADD COLUMN mediatype enum("none", "text", "video","image","audio") default "none" NOT NULL; + +ALTER TABLE file_queue ADD COLUMN blobid VARCHAR(32) DEFAULT "" NOT NULL; +ALTER TABLE story_static_files ADD COLUMN width smallint unsigned not null default 0; +ALTER TABLE story_static_files ADD COLUMN height smallint unsigned not null default 0; + +INSERT INTO vars (name, value, description) VALUES ('admin_use_blob_for_upload', '1', 'Use blobs for fileuploading - 1 for yes, 0 for no or file-based uploading'); + +UPDATE string_param SET name = '9' WHERE type = 'otherusersparam' AND code = 'd2_comment_q'; # large + + +# 2007-10-25 +UPDATE vars SET value = 'T_2_5_0_181' WHERE name = 'cvs_tag_currentcode'; + # SLASHCODE/USEPERL LAST UPDATED HERE +# PUDGE LAST UPDATED HERE + Modified: slashjp/branches/upstream/current/themes/slashcode/htdocs/comments.css =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/htdocs/comments.css 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/htdocs/comments.css 2007-10-31 05:42:24 UTC (rev 232) @@ -138,6 +138,16 @@ .hide { display: none } .show { display: inline } +.oldcomment { + opacity: .65; + filter: alpha(opacity=65); +} +.newcomment { +} +.currcomment { + opacity: .50; + filter: alpha(opacity=50); +} .comment > .hidden { display: none; Modified: slashjp/branches/upstream/current/themes/slashcode/htdocs/images/comments.js =================================================================== (Binary files differ) Modified: slashjp/branches/upstream/current/themes/slashcode/htdocs/images/comments2.js =================================================================== (Binary files differ) Modified: slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/tasks/process_file_queue.pl 2007-10-31 05:42:24 UTC (rev 232) @@ -2,11 +2,12 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: process_file_queue.pl,v 1.1 2007/10/16 22:59:52 tvroom Exp $ +# $Id: process_file_queue.pl,v 1.2 2007/10/23 20:58:05 tvroom Exp $ use File::Path; use File::Temp; use File::Copy; +use Image::Size; use Slash::Constants ':slashd'; use strict; @@ -28,6 +29,9 @@ $file_queue_cmds = $slashdb->getNextFileQueueCmds(); } $cmd = shift @$file_queue_cmds; + if ($cmd->{blobid}) { + $cmd->{file} = blobToFile($cmd->{blobid}); + } if($cmd) { handleFileCmd($cmd); } @@ -39,7 +43,36 @@ sub handleFileCmd { my($cmd) = @_; my $slashdb = getCurrentDB(); + if ($cmd->{action} eq "thumbnails") { + slashdLog("Creating Thumbnails"); + my $files = uploadFile($cmd); + $files ||= []; + slashdLog("after upload file"); + foreach (@$files) { + slashdLog("thumbing $_"); + my ($name, $path) = fileparse($_); + my ($namebase, $suffix) = $name =~ /^(\w+\-\d+)\.(\w+)$/; + my $thumb = $namebase . "-thumb." . $suffix; + my $thumbsm = $namebase . "-thumbsm." . $suffix; + slashdLog("About to create thumb $path$thumb"); + system("convert -size 100x100 $path$name $path$thumb"); + my $data = { + stoid => $cmd->{stoid}, + name => $thumb + }; + addStoryFile($data, $path); + + slashdLog("About to create thumbsms $path$thumbsm"); + system("convert -size 50x50 $path$name $path$thumbsm"); + $data = { + stoid => $cmd->{stoid}, + name => $thumbsm + }; + addStoryFile($data, $path); + } + } if ($cmd->{action} eq "upload") { + slashdLog("handling upload\n"); uploadFile($cmd); } $slashdb->deleteFileQueueCmd($cmd->{fqid}); @@ -78,37 +111,57 @@ return $file =~ /^\/tmp\/upload\/\w+(\.\w+)?$/ } +sub blobToFile { + my($blobid) = @_; + my $blob = getObject("Slash::Blob"); + my $blob_ref = $blob->get($blobid); + my($suffix) = $blob_ref->{filename} =~ /(\.\w+$)/; + $suffix = lc($suffix); + my ($ofh, $tmpname) = mkstemps("/tmp/upload/fileXXXXXX", $suffix ); + print $ofh $blob_ref->{data}; + close $ofh; + return $tmpname; +} + sub uploadFile { my($cmd) = @_; my @suffixlist = (); my $slashdb = getCurrentDB(); my $story = $slashdb->getStory($cmd->{stoid}); + my @files; + + my $file = $cmd->{file}; + if ($story->{sid}) { my $destpath = getStoryFileDir($story->{sid}); makeFileDir($destpath); my ($prefix) = $story->{sid} =~ /^\d\d\/\d\d\/\d\d\/(\d+)$/; - my ($name,$path,$suffix) = fileparse($cmd->{file}, → suffixlist); + my ($name,$path,$suffix) = fileparse($file, → suffixlist); ($suffix) = $name =~ /(\.\w+)$/; - if (verifyFileLocation($cmd->{file})) { - my $destfile = copyFileToLocation($cmd->{file}, $destpath, $prefix); + if (verifyFileLocation($file)) { + my $destfile = copyFileToLocation($file, $destpath, $prefix); + push @files, $destfile if $destfile; my $name = fileparse($destfile); my $data = { stoid => $cmd->{stoid}, name => $name }; - $slashdb->addStoryStaticFile($data); + addStoryFile($data, "$destpath/"); } + } if ($cmd->{fhid}) { my $destpath = getFireHoseFileDir($cmd->{fhid}); makeFileDir($destpath); my $numdir = sprintf("%09d",$cmd->{fhid}); my ($prefix) = $numdir =~ /\d\d\d\d\d\d(\d\d\d)/; - copyFileToLocation($cmd->{file}, $destpath, $prefix); + my $destfile = copyFileToLocation($cmd->{file}, $destpath, $prefix); + push @files, $destfile if $destfile; } + return \@files; } sub copyFileToLocation { @@ -139,4 +192,16 @@ return $ret_val; } +sub addStoryFile { + my($data, $path) = @_; + print "Add story file\n"; + my $slashdb = getCurrentDB(); + slashdLog("addStoryFile $path $data->{name}"); + if ($data->{name} =~ /\.(png|gif|jpg)$/i && $path) { + ($data->{width}, $data->{height}) = imgsize("$path$data->{name}"); + slashdLog("addStoryFile $data->{width} $data->{height}"); + } + $slashdb->addStoryStaticFile($data); +} + 1; Modified: slashjp/branches/upstream/current/themes/slashcode/templates/dispComment;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/dispComment;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/dispComment;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -27,14 +27,14 @@
    [% END; IF !options.noshow %] -
    +
    [% IF discussion2 %] -

    [% subject %]

    +

    [% subject %] [% ELSE %] -

    [% subject %]

    +

    [% subject %] [%- END %] - [% UNLESS user.noscores %](Score:[% IF points.length; points; ELSE; "?"; END %][% IF reasons && reason %], [% reasons.$reason.name %][% END %])[% END %] + [% UNLESS user.noscores %](Score:[% IF points.length; points; ELSE; "?"; END %][% IF reasons && reason %], [% reasons.$reason.name %][% END %])[% END %]

    by @@ -81,4 +81,4 @@ __seclev__ 10000 __version__ -$Id: dispComment;misc;default,v 1.61 2007/08/29 06:23:17 pudge Exp $ +$Id: dispComment;misc;default,v 1.64 2007/10/25 02:12:17 pudge Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/dispCommentDetails;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/dispCommentDetails;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/dispCommentDetails;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -26,7 +26,7 @@ cid => cid, subject => ('#' _ cid), subject_only => 1 - }, 1) %])[% END %] + }, 1, { noextra => 1 }) %])[% END %] [% has_homepage = homepage && homepage.length > 8; has_journal = journal_last_entry_date.search('[1-9]'); @@ -47,4 +47,4 @@ __seclev__ 10000 __version__ -$Id: dispCommentDetails;misc;default,v 1.2 2007/10/04 19:41:22 pudge Exp $ +$Id: dispCommentDetails;misc;default,v 1.3 2007/10/23 23:20:19 pudge Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/dispStory;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/dispStory;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/dispStory;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -151,7 +151,7 @@ [% title %] [% IF story.commentcount %][% IF thresh_commentcount && story.commentcount != thresh_commentcount %][% thresh_commentcount %] of [% END %][% story.commentcount %] comment[% IF story.commentcount > 1 %]s[% END %][% END %] [% IF user.is_admin %](edit)[% END %] [% IF expandable %] - [+] + [+] [% END %] [% IF getintro %]
    @@ -164,4 +164,4 @@ __seclev__ 10000 __version__ -$Id: dispStory;misc;default,v 1.66 2006/12/19 23:19:05 tvroom Exp $ +$Id: dispStory;misc;default,v 1.67 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/edit_comment;comments;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/edit_comment;comments;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/edit_comment;comments;default 2007-10-31 05:42:24 UTC (rev 232) @@ -237,7 +237,8 @@

    - Problems regarding accounts or comment posting should be sent to [% constants.siteadmin_name %]. + If you are having a problem with accounts or comment posting, + please yell for help.

    @@ -247,4 +248,4 @@ __seclev__ 1000 __version__ -$Id: edit_comment;comments;default,v 1.50 2007/10/04 19:41:22 pudge Exp $ +$Id: edit_comment;comments;default,v 1.51 2007/10/24 20:09:52 jamiemccarthy Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/ipid_display;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/ipid_display;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/ipid_display;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -12,7 +12,7 @@ __name__ ipid_display __template__ -
    IPID: +IPID: [% data.ipid_vis %]  SubnetID: @@ -23,4 +23,4 @@ __seclev__ 10000 __version__ -$Id: ipid_display;misc;default,v 1.4 2005/07/27 22:54:48 pudge Exp $ +$Id: ipid_display;misc;default,v 1.5 2007/10/23 23:20:19 pudge Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/linkComment;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/linkComment;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/linkComment;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -22,8 +22,8 @@ __name__ linkComment __template__ -If you find a problem, or have a reasonable suggestion - for new RSS feeds, please contact - [% constants.siteadmin_name %]. + for new RSS feeds, please + email us.

    Remarks (Last Updated [% Slash.timeCalc(Slash.db.getTime, '%Y-%m-%d %H:%M:%S %Z', 0) %]) [Config]Remarks (Last Updated [% Slash.timeCalc(Slash.db.getTime, '%Y-%m-%d %H:%M:%S %Z', 0) %]) [Config]
    @@ -130,11 +130,8 @@ [% realemail | strip_literal %]. If this is not correct, if you did not request this change, -please contact the site administrator immediately. +please email us immediately at [% constants.adminmail %]. - [% constants.siteadmin_name %] - [% constants.adminmail %] - [% CASE 'saveuseradmin_saveduser' %] Saved [% field %] [% id %] user settings @@ -198,4 +195,4 @@ __seclev__ 10000 __version__ -$Id: messages;users;default,v 1.40 2007/06/19 22:25:17 pudge Exp $ +$Id: messages;users;default,v 1.42 2007/10/24 20:16:10 jamiemccarthy Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/printCommComments;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/printCommComments;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/printCommComments;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -101,7 +101,17 @@ [% lcp %] [% IF discussion2 && !cid %] -

    +
    Check for more + [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] + | [% Slash.linkComment({ + sid => sid, + cid => cid, + op => 'reply', + subject => 'Reply', + subject_only => 1 + }); + END %] +
    [% END %] [% IF moderate_form %] @@ -145,4 +155,4 @@ __seclev__ 10000 __version__ -$Id: printCommComments;misc;default,v 1.61 2007/10/04 19:41:22 pudge Exp $ +$Id: printCommComments;misc;default,v 1.63 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/printCommentsMain;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -178,9 +178,9 @@ [% END %] [% IF discussion2 && !cid && !pid %] - More | + More | [% END; IF user.is_admin && user.d2prefs_debug %] - Prefs + Prefs [% ELSIF user.is_anon; PROCESS userlogin_cover return_url = gSkin.rootdir _ '/comments.pl?sid=' _ sid %] @@ -191,14 +191,13 @@ [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] | [% Slash.linkComment({ - sid => sid, - cid => cid, - op => 'reply', - subject => 'Reply', + sid => sid, + cid => cid, + op => 'reply', + subject => 'Reply', subject_only => 1 - }); - %] - [% END %] + }) %] + [% END %] / @@ -225,18 +224,18 @@
    - Full +  Full
    - Abbreviated +  Abbreviated
    - Hidden +  Hidden
  • @@ -264,9 +263,9 @@
    [% IF discussion2 && !cid && !pid %] - More | + More | [% END; IF user.is_admin && user.d2prefs_debug %] - Prefs + Prefs [% ELSIF user.is_anon; PROCESS userlogin_cover return_url = gSkin.rootdir _ '/comments.pl?sid=' _ sid %] @@ -276,13 +275,12 @@ [% END %] [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] | [% Slash.linkComment({ - sid => sid, - cid => cid, - op => 'reply', - subject => 'Reply', + sid => sid, + cid => cid, + op => 'reply', + subject => 'Reply', subject_only => 1 - }); - %] + }) %] [% END %]
    Loading ... Please wait.
    @@ -296,7 +294,7 @@ @@ -304,4 +302,4 @@ __seclev__ 10000 __version__ -$Id: printCommentsMain;misc;default,v 1.93 2007/10/16 17:43:39 entweichen Exp $ +$Id: printCommentsMain;misc;default,v 1.95 2007/10/24 00:30:08 scc Exp $ Modified: slashjp/branches/upstream/current/themes/slashcode/templates/userlogin_cover;misc;default =================================================================== --- slashjp/branches/upstream/current/themes/slashcode/templates/userlogin_cover;misc;default 2007-10-26 06:07:26 UTC (rev 231) +++ slashjp/branches/upstream/current/themes/slashcode/templates/userlogin_cover;misc;default 2007-10-31 05:42:24 UTC (rev 232) @@ -18,7 +18,7 @@
    [% IF discussion2 && !cid && !pid %] - More | + More | [% END; IF user.is_admin && user.d2prefs_debug %] - Prefs + Prefs [% ELSIF user.is_anon; PROCESS userlogin_cover return_url = gSkin.rootdir _ '/comments.pl?sid=' _ sid %] @@ -276,13 +275,12 @@ [% END %] [% UNLESS user.state.discussion_archived || user.state.discussion_future_nopost %] | [% Slash.linkComment({ - sid => sid, - cid => cid, - op => 'reply', - subject => 'Reply', + sid => sid, + cid => cid, + op => 'reply', + subject => 'Reply', subject_only => 1 - }); - %] + }) %] [% END %]
    Loading ... Please wait.
    @@ -296,7 +294,7 @@ Modified: slashjp/trunk/themes/slashcode/templates/userlogin_cover;misc;default =================================================================== --- slashjp/trunk/themes/slashcode/templates/userlogin_cover;misc;default 2007-10-31 05:43:45 UTC (rev 233) +++ slashjp/trunk/themes/slashcode/templates/userlogin_cover;misc;default 2007-10-31 05:54:43 UTC (rev 234) @@ -18,7 +18,7 @@