You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(179) |
Apr
(56) |
May
(53) |
Jun
(65) |
Jul
(70) |
Aug
(89) |
Sep
(50) |
Oct
(38) |
Nov
(12) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(57) |
Feb
(226) |
Mar
(172) |
Apr
(194) |
May
(120) |
Jun
(162) |
Jul
(297) |
Aug
(156) |
Sep
(312) |
Oct
(180) |
Nov
(358) |
Dec
(362) |
| 2005 |
Jan
(275) |
Feb
(224) |
Mar
(202) |
Apr
(157) |
May
(133) |
Jun
(115) |
Jul
(211) |
Aug
(257) |
Sep
(135) |
Oct
(116) |
Nov
(106) |
Dec
(81) |
| 2006 |
Jan
(74) |
Feb
(94) |
Mar
(59) |
Apr
(125) |
May
(50) |
Jun
(71) |
Jul
(45) |
Aug
(80) |
Sep
(3) |
Oct
(44) |
Nov
(50) |
Dec
(38) |
| 2007 |
Jan
(46) |
Feb
(33) |
Mar
(24) |
Apr
(28) |
May
(19) |
Jun
(37) |
Jul
(66) |
Aug
(73) |
Sep
(87) |
Oct
(33) |
Nov
(39) |
Dec
(37) |
| 2008 |
Jan
(20) |
Feb
(54) |
Mar
(47) |
Apr
(68) |
May
(10) |
Jun
(13) |
Jul
(13) |
Aug
(25) |
Sep
(11) |
Oct
(22) |
Nov
(22) |
Dec
(34) |
| 2009 |
Jan
(34) |
Feb
(35) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(18) |
Jul
(28) |
Aug
(22) |
Sep
(9) |
Oct
(12) |
Nov
(6) |
Dec
(32) |
| 2010 |
Jan
(11) |
Feb
(7) |
Mar
(9) |
Apr
(3) |
May
(16) |
Jun
(1) |
Jul
(2) |
Aug
(25) |
Sep
(9) |
Oct
(8) |
Nov
(4) |
Dec
(8) |
| 2011 |
Jan
(17) |
Feb
(1) |
Mar
(6) |
Apr
(7) |
May
(5) |
Jun
(2) |
Jul
(12) |
Aug
(3) |
Sep
(18) |
Oct
(3) |
Nov
(2) |
Dec
|
| 2012 |
Jan
(92) |
Feb
(74) |
Mar
(64) |
Apr
(55) |
May
(44) |
Jun
(91) |
Jul
(35) |
Aug
(42) |
Sep
(32) |
Oct
(56) |
Nov
(42) |
Dec
(81) |
| 2013 |
Jan
(117) |
Feb
(130) |
Mar
(33) |
Apr
(36) |
May
(155) |
Jun
(241) |
Jul
(113) |
Aug
(70) |
Sep
(50) |
Oct
(55) |
Nov
(34) |
Dec
(36) |
| 2014 |
Jan
(94) |
Feb
(67) |
Mar
(177) |
Apr
(67) |
May
(147) |
Jun
(137) |
Jul
(58) |
Aug
(56) |
Sep
(62) |
Oct
(35) |
Nov
(118) |
Dec
(53) |
| 2015 |
Jan
(204) |
Feb
(165) |
Mar
(275) |
Apr
(42) |
May
(58) |
Jun
(91) |
Jul
(81) |
Aug
(62) |
Sep
(23) |
Oct
(63) |
Nov
(29) |
Dec
(110) |
| 2016 |
Jan
(82) |
Feb
(55) |
Mar
(48) |
Apr
(92) |
May
(77) |
Jun
(41) |
Jul
(27) |
Aug
(41) |
Sep
(101) |
Oct
(84) |
Nov
(12) |
Dec
(18) |
| 2017 |
Jan
(44) |
Feb
(40) |
Mar
(23) |
Apr
(79) |
May
(27) |
Jun
(12) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(9) |
Nov
(4) |
Dec
(9) |
| 2018 |
Jan
(5) |
Feb
(23) |
Mar
(150) |
Apr
(114) |
May
(63) |
Jun
(25) |
Jul
(23) |
Aug
(54) |
Sep
(43) |
Oct
(10) |
Nov
(9) |
Dec
(1) |
| 2019 |
Jan
(1) |
Feb
(27) |
Mar
(27) |
Apr
(64) |
May
(21) |
Jun
(17) |
Jul
(12) |
Aug
(81) |
Sep
(15) |
Oct
(25) |
Nov
(15) |
Dec
(13) |
| 2020 |
Jan
(5) |
Feb
(4) |
Mar
(95) |
Apr
(59) |
May
(53) |
Jun
(22) |
Jul
(3) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(3) |
Dec
(1) |
| 2021 |
Jan
(20) |
Feb
(32) |
Mar
(34) |
Apr
(22) |
May
(58) |
Jun
(43) |
Jul
(35) |
Aug
(2) |
Sep
(14) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(6) |
Mar
(4) |
Apr
|
May
(5) |
Jun
(4) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(3) |
Nov
(38) |
Dec
(15) |
| 2023 |
Jan
(26) |
Feb
(12) |
Mar
(3) |
Apr
(9) |
May
(2) |
Jun
(5) |
Jul
(8) |
Aug
|
Sep
(39) |
Oct
(11) |
Nov
(3) |
Dec
(3) |
| 2024 |
Jan
(19) |
Feb
(20) |
Mar
(15) |
Apr
(12) |
May
(2) |
Jun
(12) |
Jul
(4) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(72) |
Feb
(80) |
Mar
(92) |
Apr
(35) |
May
(19) |
Jun
(26) |
Jul
(30) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Garvin H. <gar...@us...> - 2004-11-16 16:16:48
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25927/templates/default Modified Files: Tag: branch-smarty comments.tpl entries.tpl style.css Log Message: * Implement CSS classes to identify yourself for entries/comments Index: comments.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/comments.tpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- comments.tpl 3 Nov 2004 13:04:35 -0000 1.1.2.3 +++ comments.tpl 16 Nov 2004 16:16:05 -0000 1.1.2.4 @@ -1,6 +1,6 @@ {foreach from=$comments item=comment} <a id="c{$comment.id}"></a> - <div class="serendipity_comment" style="padding-left: {$comment.depth*20}px"> + <div class="serendipity_comment serendipity_comment_author_{$comment.username|@makeFilename} {if $entry.username == $comment.username}serendipity_comment_author_self{/if}" style="padding-left: {$comment.depth*20}px"> <div class="serendipity_commentBody">{$comment.body}</div> <div class="serendipity_comment_source"> <a href="#c{$comment.id}" title="Link to comment #{$comment.trace}">#{$comment.trace}</a> Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -u -d -r1.1.2.22 -r1.1.2.23 --- entries.tpl 16 Nov 2004 15:23:44 -0000 1.1.2.22 +++ entries.tpl 16 Nov 2004 16:16:05 -0000 1.1.2.23 @@ -12,7 +12,7 @@ {foreach from=$dategroup.entries item="entry"} <h4 class="serendipity_title"><a href="{$entry.link}">{$entry.title}</a></h4> - <div class="serendipity_entry"> + <div class="serendipity_entry serendipity_entry_author_{$entry.username|@makeFilename} {if $entry.is_entry_owner}serendipity_entry_author_self{/if}"> {if $entry.categories} <span class="serendipity_entryIcon"> {foreach from=$entry.categories item="category"} Index: style.css =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -u -d -r1.36 -r1.36.2.1 --- style.css 6 Sep 2004 15:28:13 -0000 1.36 +++ style.css 16 Nov 2004 16:16:05 -0000 1.36.2.1 @@ -402,3 +402,10 @@ .serendipity_msg_notice { color: green; } + +.serendipity_entry_author_self { +} + +.serendipity_comment_author_self .serendipity_comment_source { + background-color: #EEEEFF; +} \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-11-16 16:16:47
|
Update of /cvsroot/php-blog/serendipity/templates/idea In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25927/templates/idea Modified Files: Tag: branch-smarty style.css Log Message: * Implement CSS classes to identify yourself for entries/comments Index: style.css =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/idea/style.css,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- style.css 31 Aug 2004 22:56:23 -0000 1.6 +++ style.css 16 Nov 2004 16:16:05 -0000 1.6.2.1 @@ -380,3 +380,11 @@ .serendipity_msg_notice { color: green; } + +.serendipity_entry_author_self { +} + +.serendipity_comment_author_self { + border-left: double #669999 thick; + color: #669999; +} \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-11-16 16:16:45
|
Update of /cvsroot/php-blog/serendipity/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25927/docs Modified Files: Tag: branch-smarty NEWS Log Message: * Implement CSS classes to identify yourself for entries/comments Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -d -r1.1.2.13 -r1.1.2.14 --- NEWS 15 Nov 2004 21:06:47 -0000 1.1.2.13 +++ NEWS 16 Nov 2004 16:16:03 -0000 1.1.2.14 @@ -3,6 +3,16 @@ Version 0.8 () ------------------------------------------------------------------------ + * New CSS classes for distinction of authors within entries/comments: + .serendipity_entry_(author|comment)_USERNAME, applied to each + entry container, where USERNAME is replaced with the name of the + author. + .serendipity_entry_author_self, applied to the entry container if + the currently logged in user is the author of an entry + .serendipity_comment_author_self, applied if the commenting user- + name matches the owner of the entry. + (garvinhicking) + * Rewrote importer to use import modules and class framework (tomsommer) |
|
From: Garvin H. <gar...@us...> - 2004-11-16 16:16:23
|
Update of /cvsroot/php-blog/serendipity/templates/mt3-squash In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25927/templates/mt3-squash Modified Files: Tag: branch-smarty style.css Log Message: * Implement CSS classes to identify yourself for entries/comments Index: style.css =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/mt3-squash/style.css,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- style.css 2 Sep 2004 17:42:00 -0000 1.5 +++ style.css 16 Nov 2004 16:16:13 -0000 1.5.2.1 @@ -160,7 +160,7 @@ margin-bottom: 25px; line-height: normal; padding: 3px; - + } img.serendipity_entryIcon { @@ -220,14 +220,14 @@ a { text-decoration: underline; - - + + } a { text-decoration: underline; - - + + } a:link { @@ -404,3 +404,10 @@ margin-right: auto; text-align: center; } + +.serendipity_entry_author_self { +} + +.serendipity_comment_author_self { + background-color: #f5f5f5; +} |
|
From: Garvin H. <gar...@us...> - 2004-11-16 16:16:23
|
Update of /cvsroot/php-blog/serendipity/templates/newspaper In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25927/templates/newspaper Modified Files: Tag: branch-smarty style.css Log Message: * Implement CSS classes to identify yourself for entries/comments Index: style.css =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/style.css,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -d -r1.13 -r1.13.2.1 --- style.css 7 Aug 2004 16:33:54 -0000 1.13 +++ style.css 16 Nov 2004 16:16:14 -0000 1.13.2.1 @@ -342,3 +342,10 @@ .serendipity_msg_notice { color: green; } + +.serendipity_entry_author_self { +} + +.serendipity_comment_author_self { + background-color: #efefef; +} |
|
From: Garvin H. <gar...@us...> - 2004-11-16 16:16:22
|
Update of /cvsroot/php-blog/serendipity/templates/mt3-independence In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25927/templates/mt3-independence Modified Files: Tag: branch-smarty style.css Log Message: * Implement CSS classes to identify yourself for entries/comments Index: style.css =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/mt3-independence/style.css,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -d -r1.8.2.1 -r1.8.2.2 --- style.css 14 Sep 2004 16:35:34 -0000 1.8.2.1 +++ style.css 16 Nov 2004 16:16:12 -0000 1.8.2.2 @@ -155,7 +155,7 @@ margin-bottom: 25px; line-height: normal; padding: 3px; - + } img.serendipity_entryIcon { @@ -211,8 +211,8 @@ a { text-decoration: underline; - - + + } a:link { @@ -254,7 +254,7 @@ font-size: x-small; text-align: left; font-weight: bold; - + text-transform: uppercase; padding: 3px; letter-spacing: .25em; @@ -417,4 +417,11 @@ font-size: small; } +.serendipity_entry_author_self { +} + +.serendipity_comment_author_self { + border-right: 1px dashed #B22222; +} + /* vim: set sts=4 ts=4 expandtab : */ |
|
From: Garvin H. <gar...@us...> - 2004-11-16 15:24:21
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650 Modified Files: Tag: branch-smarty serendipity_config.inc.php Log Message: * fixed entryproperties caching (cough, cough) * fixed recent entries plugin (variable garbage) * fixed some E_NOTICE errors to be nicer to PHP's error reporting Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.19 retrieving revision 1.93.2.20 diff -u -d -r1.93.2.19 -r1.93.2.20 --- serendipity_config.inc.php 16 Nov 2004 13:21:42 -0000 1.93.2.19 +++ serendipity_config.inc.php 16 Nov 2004 15:23:41 -0000 1.93.2.20 @@ -17,7 +17,7 @@ $serendipity['version'] = '0.8-alpha3'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme -$serendipity['production'] = 1; +$serendipity['production'] = true; // Setting this to 'false' will enable debugging output $serendipity['rewrite'] = 'none'; $serendipity['messagestack'] = array(); @@ -234,7 +234,7 @@ define('SMARTY_DIR', S9Y_INCLUDE_PATH . 'bundled-libs/Smarty/libs/'); require_once SMARTY_DIR . 'Smarty.class.php'; $serendipity['smarty'] = new Smarty; -if ( !$serendipity['production'] ) { +if (!$serendipity['production']) { $serendipity['smarty']->force_compile = true; $serendipity['smarty']->debugging = true; } |
|
From: Garvin H. <gar...@us...> - 2004-11-16 15:23:57
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/plugins/serendipity_plugin_shoutbox Modified Files: Tag: branch-smarty serendipity_plugin_shoutbox.php Log Message: * fixed entryproperties caching (cough, cough) * fixed recent entries plugin (variable garbage) * fixed some E_NOTICE errors to be nicer to PHP's error reporting Index: serendipity_plugin_shoutbox.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v retrieving revision 1.10.2.4 retrieving revision 1.10.2.5 diff -u -d -r1.10.2.4 -r1.10.2.5 --- serendipity_plugin_shoutbox.php 12 Nov 2004 15:43:32 -0000 1.10.2.4 +++ serendipity_plugin_shoutbox.php 16 Nov 2004 15:23:43 -0000 1.10.2.5 @@ -99,7 +99,7 @@ $dateformat = $this->get_config('dateformat'); //Put new shout into the database if necessary - if ($_REQUEST['action'] == 'fillshoutbox' && $_REQUEST['serendipity']['shouttext'] != '') { + if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'fillshoutbox' && $_REQUEST['serendipity']['shouttext'] != '') { // Create table, if not yet existant if ($this->get_config('version') != '1.0') { @@ -130,7 +130,7 @@ serendipity_db_escape_string($_REQUEST['serendipity']['shouttext'])); serendipity_db_query($sql); } - if ( $serendipity['GET']['action'] == 'shoutboxdelete' + if (!empty($serendipity['GET']['action']) && $serendipity['GET']['action'] == 'shoutboxdelete' && $_SESSION['serendipityAuthedUser'] === true) { $sql = sprintf("DELETE from %sshoutbox WHERE id = %d |
|
From: Garvin H. <gar...@us...> - 2004-11-16 15:23:57
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/templates/default Modified Files: Tag: branch-smarty entries.tpl plugin_calendar.tpl Log Message: * fixed entryproperties caching (cough, cough) * fixed recent entries plugin (variable garbage) * fixed some E_NOTICE errors to be nicer to PHP's error reporting Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -u -d -r1.1.2.21 -r1.1.2.22 --- entries.tpl 15 Nov 2004 09:41:48 -0000 1.1.2.21 +++ entries.tpl 16 Nov 2004 15:23:44 -0000 1.1.2.22 @@ -78,27 +78,27 @@ --> {$entry.plugin_display_dat} - {if $CONST.DATA_UNSUBSCRIBED} - <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@sprintf:$CONST.UNSUBSCRIBE_OK}</div><br /> - {/if} + {if $is_single_entry and not $use_popups and not $is_preview} + {if $CONST.DATA_UNSUBSCRIBED} + <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@sprintf:$CONST.UNSUBSCRIBE_OK}</div><br /> + {/if} - {if $CONST.DATA_TRACKBACK_DELETED} - <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|@sprintf:$CONST.TRACKBACK_DELETED}</div><br /> - {/if} + {if $CONST.DATA_TRACKBACK_DELETED} + <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|@sprintf:$CONST.TRACKBACK_DELETED}</div><br /> + {/if} - {if $CONST.DATA_TRACKBACK_APPROVED} - <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|@sprintf:$CONST.TRACKBACK_APPROVED}</div><br /> - {/if} + {if $CONST.DATA_TRACKBACK_APPROVED} + <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|@sprintf:$CONST.TRACKBACK_APPROVED}</div><br /> + {/if} - {if $CONST.DATA_COMMENT_DELETED} - <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|@sprintf:$CONST.COMMENT_DELETED}</div><br /> - {/if} + {if $CONST.DATA_COMMENT_DELETED} + <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|@sprintf:$CONST.COMMENT_DELETED}</div><br /> + {/if} - {if $CONST.DATA_COMMENT_APPROVED} - <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</div><br /> - {/if} + {if $CONST.DATA_COMMENT_APPROVED} + <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</div><br /> + {/if} - {if $is_single_entry and not $use_popups and not $is_preview} <div class="serendipity_comments"> <br /> <a id="trackbacks"></a> Index: plugin_calendar.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/plugin_calendar.tpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- plugin_calendar.tpl 12 Nov 2004 15:43:33 -0000 1.1.2.2 +++ plugin_calendar.tpl 16 Nov 2004 15:23:44 -0000 1.1.2.3 @@ -26,7 +26,7 @@ {foreach from=$plugin_calendar_weeks item="week"} <tr class="serendipity_calendar"> {foreach from=$week.days item="day"} - <td class="serendipity_calendarDay {$day.classes}">{if $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:" "}{if $day.properties.Active}</a>{/if}</td> + <td class="serendipity_calendarDay {$day.classes}">{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:" "}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td> {/foreach} </tr> {/foreach} |
|
From: Garvin H. <gar...@us...> - 2004-11-16 15:23:57
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/plugins/serendipity_plugin_recententries Modified Files: Tag: branch-smarty serendipity_plugin_recententries.php Log Message: * fixed entryproperties caching (cough, cough) * fixed recent entries plugin (variable garbage) * fixed some E_NOTICE errors to be nicer to PHP's error reporting Index: serendipity_plugin_recententries.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -u -d -r1.9.2.4 -r1.9.2.5 --- serendipity_plugin_recententries.php 15 Nov 2004 10:33:46 -0000 1.9.2.4 +++ serendipity_plugin_recententries.php 16 Nov 2004 15:23:43 -0000 1.9.2.5 @@ -131,7 +131,7 @@ $sql_number = $number; - switch($number_from_switch) { + switch($number_from_sw) { case 'skip': $sql_number = serendipity_db_limit_sql(serendipity_db_limit($serendipity['fetchLimit'], $sql_number)); break; @@ -141,7 +141,6 @@ $dateformat = '%A, %B %e %Y'; } - if ($number_from > 0) $entries_query = "SELECT id, title, timestamp |
|
From: Garvin H. <gar...@us...> - 2004-11-16 15:23:57
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/include Modified Files: Tag: branch-smarty functions_smarty.inc.php Log Message: * fixed entryproperties caching (cough, cough) * fixed recent entries plugin (variable garbage) * fixed some E_NOTICE errors to be nicer to PHP's error reporting Index: functions_smarty.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_smarty.inc.php,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- functions_smarty.inc.php 12 Nov 2004 15:43:23 -0000 1.1.2.4 +++ functions_smarty.inc.php 16 Nov 2004 15:23:42 -0000 1.1.2.5 @@ -121,7 +121,7 @@ 'is_single_entry' => (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])), 'blogTitle' => htmlspecialchars($serendipity['blogTitle']), - 'blogSubTitle' => htmlspecialchars($serendipity['blogSubTitle']), + 'blogSubTitle' => (!empty($serendipity['blogSubTitle']) ? htmlspecialchars($serendipity['blogSubTitle']) : ''), 'blogDescription' => htmlspecialchars($serendipity['blogDescription']), 'serendipityHTTPPath' => $serendipity['serendipityHTTPPath'], |
|
From: Garvin H. <gar...@us...> - 2004-11-16 15:23:57
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/plugins/serendipity_event_karma Modified Files: Tag: branch-smarty serendipity_event_karma.php Log Message: * fixed entryproperties caching (cough, cough) * fixed recent entries plugin (variable garbage) * fixed some E_NOTICE errors to be nicer to PHP's error reporting Index: serendipity_event_karma.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v retrieving revision 1.14.2.9 retrieving revision 1.14.2.10 diff -u -d -r1.14.2.9 -r1.14.2.10 --- serendipity_event_karma.php 29 Oct 2004 11:37:36 -0000 1.14.2.9 +++ serendipity_event_karma.php 16 Nov 2004 15:23:42 -0000 1.14.2.10 @@ -605,6 +605,10 @@ $points = (!empty($rows[$entryid]['points']) ? $rows[$entryid]['points'] : 0); $visits = (!empty($rows[$entryid]['visits']) ? $rows[$entryid]['visits'] : 0); + if (!isset($eventData[$i]['add_footer'])) { + $eventData[$i]['add_footer'] = ''; + } + if (isset($karma[$entryid])) { $eventData[$i]['add_footer'] .= sprintf($karma_current, $karma[$entryid], $points, $votes, $visits, $url); } elseif ($eventData[$i]['timestamp'] < ($now - $max_karmatime)) { |
|
From: Garvin H. <gar...@us...> - 2004-11-16 15:23:57
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/plugins/serendipity_event_entryproperties Modified Files: Tag: branch-smarty serendipity_event_entryproperties.php Log Message: * fixed entryproperties caching (cough, cough) * fixed recent entries plugin (variable garbage) * fixed some E_NOTICE errors to be nicer to PHP's error reporting Index: serendipity_event_entryproperties.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/Attic/serendipity_event_entryproperties.php,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -d -r1.1.2.8 -r1.1.2.9 --- serendipity_event_entryproperties.php 16 Nov 2004 14:55:19 -0000 1.1.2.8 +++ serendipity_event_entryproperties.php 16 Nov 2004 15:23:42 -0000 1.1.2.9 @@ -258,9 +258,9 @@ $conds[] = 'ep_sticky.value IS NULL AS orderkey,'; } - if ($iscache && (!isset($addData['noCache']) || !$addData['noCache'])) { - $conds[] = 'ep_cache_extended,'; - $conds[] = 'ep_cache_body,'; + if ($is_cache && (!isset($addData['noCache']) || !$addData['noCache'])) { + $conds[] = 'ep_cache_extended.value AS ep_cache_extended,'; + $conds[] = 'ep_cache_body.value AS ep_cache_body,'; } if (count($conds) < 1) { |
|
From: Garvin H. <gar...@us...> - 2004-11-16 14:56:15
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4426/plugins/serendipity_event_trackexits Modified Files: Tag: branch-smarty serendipity_event_trackexits.php Log Message: * Performance improvements for Plugin API (only fetch authorids of plugins once) * Make TrackExits plugin cacheable like the markup plugins * Remove obsolete legacy code Index: serendipity_event_trackexits.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -u -d -r1.11.2.3 -r1.11.2.4 --- serendipity_event_trackexits.php 29 Oct 2004 11:02:39 -0000 1.11.2.3 +++ serendipity_event_trackexits.php 16 Nov 2004 14:55:20 -0000 1.11.2.4 @@ -106,6 +106,10 @@ } foreach ($this->markup_elements as $temp) { + if (isset($eventData['is_cached']) && $eventData['is_cached'] && ($temp['element'] == 'body' || $temp['element'] == 'extended')) { + continue; + } + if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) { $element = $temp['element']; |
|
From: Garvin H. <gar...@us...> - 2004-11-16 14:55:59
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4426/plugins/serendipity_event_entryproperties Modified Files: Tag: branch-smarty serendipity_event_entryproperties.php Log Message: * Performance improvements for Plugin API (only fetch authorids of plugins once) * Make TrackExits plugin cacheable like the markup plugins * Remove obsolete legacy code Index: serendipity_event_entryproperties.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/Attic/serendipity_event_entryproperties.php,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -d -r1.1.2.7 -r1.1.2.8 --- serendipity_event_entryproperties.php 8 Nov 2004 09:25:32 -0000 1.1.2.7 +++ serendipity_event_entryproperties.php 16 Nov 2004 14:55:19 -0000 1.1.2.8 @@ -148,7 +148,6 @@ $page = (isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1); $from = ($page-1)*$per_fetch; $to = ($page)*$per_fetch; - printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO, $from, $to); $entries = serendipity_fetchEntries( null, |
|
From: Garvin H. <gar...@us...> - 2004-11-16 14:55:59
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4426 Modified Files: Tag: branch-smarty index.php rss.php Log Message: * Performance improvements for Plugin API (only fetch authorids of plugins once) * Make TrackExits plugin cacheable like the markup plugins * Remove obsolete legacy code Index: rss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/rss.php,v retrieving revision 1.28.2.7 retrieving revision 1.28.2.8 diff -u -d -r1.28.2.7 -r1.28.2.8 --- rss.php 12 Nov 2004 15:43:22 -0000 1.28.2.7 +++ rss.php 16 Nov 2004 14:55:18 -0000 1.28.2.8 @@ -89,7 +89,7 @@ // load each plugin to make some introspection foreach ($plugins as $plugin_data) { if (preg_match('|@serendipity_syndication_plugin|', $plugin_data['name'])) { - $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']); + $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']); $additional_fields = $plugin->generate_rss_fields($title, $description, $entries); $fullFeed = $plugin->get_config('fullfeed', false); break; Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.49.2.12 retrieving revision 1.49.2.13 diff -u -d -r1.49.2.12 -r1.49.2.13 --- index.php 12 Nov 2004 15:43:21 -0000 1.49.2.12 +++ index.php 16 Nov 2004 14:55:17 -0000 1.49.2.13 @@ -1,13 +1,17 @@ <?php # $Id$ -#apd_set_pprof_trace(); +$global_debug = true; -function microtime_float() { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); -} +if ($global_debug) { + #apd_set_pprof_trace(); -$time_start = microtime_float(); + function microtime_float() { + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); + } + + $time_start = microtime_float(); +} // We need to set this to return a 200 since we use .htaccess ErrorDocument // rules to handle archives. @@ -229,8 +233,10 @@ } $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath')); -/* TODO: Remove (hide) this debug */ -echo '<div id="s9y_debug" style="text-align: center; color: red; font-size: 10pt; font-weight: bold; padding: 10px">Page generated in '. round(microtime_float()-$time_start,6) .' seconds, '. sizeof(get_included_files()) .' files included</div>'; +if ($global_debug) { + /* TODO: Remove (hide) this debug */ + echo '<div id="s9y_debug" style="text-align: center; color: red; font-size: 10pt; font-weight: bold; padding: 10px">Page generated in '. round(microtime_float()-$time_start,6) .' seconds, '. sizeof(get_included_files()) .' files included</div>'; +} /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Garvin H. <gar...@us...> - 2004-11-16 14:55:59
|
Update of /cvsroot/php-blog/serendipity/include/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4426/include/db Modified Files: Tag: branch-smarty mysql.inc.php Log Message: * Performance improvements for Plugin API (only fetch authorids of plugins once) * Make TrackExits plugin cacheable like the markup plugins * Remove obsolete legacy code Index: mysql.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/db/Attic/mysql.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- mysql.inc.php 6 Nov 2004 11:22:50 -0000 1.1.2.1 +++ mysql.inc.php 16 Nov 2004 14:55:19 -0000 1.1.2.2 @@ -18,10 +18,10 @@ // highlight_string(var_export($sql, 1)); $c = mysql_query($sql, $serendipity['dbConn']); + if (mysql_error($serendipity['dbConn']) != '') { return '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']); } - if (!$c) { if (!$serendipity['production']) { print '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']); |
|
From: Garvin H. <gar...@us...> - 2004-11-16 14:55:58
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4426/include Modified Files: Tag: branch-smarty functions.inc.php plugin_api.inc.php Log Message: * Performance improvements for Plugin API (only fetch authorids of plugins once) * Make TrackExits plugin cacheable like the markup plugins * Remove obsolete legacy code Index: plugin_api.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/plugin_api.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- plugin_api.inc.php 6 Nov 2004 11:22:49 -0000 1.1.2.1 +++ plugin_api.inc.php 16 Nov 2004 14:55:18 -0000 1.1.2.2 @@ -77,7 +77,7 @@ serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order, placement, authorid) values ('$key', $nextidx, '$default_placement', '$authorid')"); /* Check for multiple dependencies */ - $plugin =& serendipity_plugin_api::load_plugin($key); + $plugin =& serendipity_plugin_api::load_plugin($key, $authorid); $plugin->install(); $bag = new serendipity_property_bag; $plugin->introspect($bag); @@ -268,7 +268,7 @@ } /* Creates an instance of a named plugin */ - function &load_plugin($instance_id) + function &load_plugin($instance_id, $authorid = null) { global $serendipity; @@ -296,10 +296,13 @@ } $p =& new $class_name($instance_id); - - $sql = "SELECT authorid from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'"; - $owner = serendipity_db_query($sql, true); - $p->serendipity_owner = $owner[0]; + if (!is_null($authorid)) { + $p->serendipity_owner = $authorid; + } else { + $sql = "SELECT authorid from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'"; + $owner = serendipity_db_query($sql, true); + $p->serendipity_owner = $owner[0]; + } return $p; } @@ -348,7 +351,7 @@ $pluginData = array(); foreach ($plugins as $plugin_data) { - $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']); + $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']); $class = get_class($plugin); $title = ''; @@ -404,7 +407,7 @@ function &get_event_plugins($getInstance = false) { static $event_plugins; - if ( isset($event_plugins) && is_array($event_plugins) ) { + if (isset($event_plugins) && is_array($event_plugins)) { return $event_plugins; } @@ -416,11 +419,13 @@ $event_plugins = array(); foreach ($plugins as $plugin_data) { - if ($event_plugins[$plugin_data['name']]['p'] = &serendipity_plugin_api::load_plugin($plugin_data['name'])) { + if ($event_plugins[$plugin_data['name']]['p'] = &serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid'])) { /* query for its name, description and configuration data */ $event_plugins[$plugin_data['name']]['b'] = new serendipity_property_bag; $event_plugins[$plugin_data['name']]['p']->introspect($event_plugins[$plugin_data['name']]['b']); $event_plugins[$plugin_data['name']]['t'] = serendipity_plugin_api::get_plugin_title($event_plugins[$plugin_data['name']]['p']); + } else { + unset($event_plugins[$plugin_data['name']]); // Unset failed plugins } } Index: functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions.inc.php,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- functions.inc.php 12 Nov 2004 15:43:23 -0000 1.1.2.3 +++ functions.inc.php 16 Nov 2004 14:55:18 -0000 1.1.2.4 @@ -261,15 +261,6 @@ 'y'); - // For pretty urls we want to have a '+' as word separator. But GUIDs need to stay used to using '_' to not break bc. - // (For performance reasons this changes the static array instead of using a second str_replace call only for the ' ' case, - // and to avoid a costy call to array_merge() - if ($compat !== true) { - $to[0] = '-'; - } else { - $to[0] = '_'; - } - // Replace international chars not detected by every locale $str = str_replace($from, $to, $str); |
|
From: Garvin H. <gar...@us...> - 2004-11-16 14:55:58
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4426/include/admin Modified Files: Tag: branch-smarty plugins.inc.php Log Message: * Performance improvements for Plugin API (only fetch authorids of plugins once) * Make TrackExits plugin cacheable like the markup plugins * Remove obsolete legacy code Index: plugins.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/Attic/plugins.inc.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- plugins.inc.php 12 Nov 2004 15:43:24 -0000 1.1.2.2 +++ plugins.inc.php 16 Nov 2004 14:55:19 -0000 1.1.2.3 @@ -55,7 +55,7 @@ $sort_idx = 0; foreach ($plugins as $plugin_data) { - $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']); + $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']); $key = urlencode($plugin_data['name']); /* query for its name, description and configuration data */ |
|
From: Garvin H. <gar...@us...> - 2004-11-16 13:21:52
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18176 Modified Files: Tag: branch-smarty serendipity_config.inc.php Log Message: make 0.8 work in shared setup Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.18 retrieving revision 1.93.2.19 diff -u -d -r1.93.2.18 -r1.93.2.19 --- serendipity_config.inc.php 15 Nov 2004 10:21:48 -0000 1.93.2.18 +++ serendipity_config.inc.php 16 Nov 2004 13:21:42 -0000 1.93.2.19 @@ -231,7 +231,7 @@ serendipity_plugin_api::hook_event('frontend_configure', $serendipity); -define('SMARTY_DIR', $serendipity['serendipityPath'] . 'bundled-libs/Smarty/libs/'); +define('SMARTY_DIR', S9Y_INCLUDE_PATH . 'bundled-libs/Smarty/libs/'); require_once SMARTY_DIR . 'Smarty.class.php'; $serendipity['smarty'] = new Smarty; if ( !$serendipity['production'] ) { |
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30846/lang Modified Files: Tag: branch-smarty serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php serendipity_lang_da.inc.php serendipity_lang_de.inc.php serendipity_lang_en.inc.php serendipity_lang_es.inc.php serendipity_lang_fr.inc.php serendipity_lang_it.inc.php serendipity_lang_nl.inc.php serendipity_lang_no.inc.php serendipity_lang_pt.inc.php serendipity_lang_tw.inc.php Log Message: * fix language strings * generic import fix for 'draft' setting Index: serendipity_lang_cs.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v retrieving revision 1.61.2.11 retrieving revision 1.61.2.12 diff -u -d -r1.61.2.11 -r1.61.2.12 --- serendipity_lang_cs.inc.php 15 Nov 2004 21:06:49 -0000 1.61.2.11 +++ serendipity_lang_cs.inc.php 16 Nov 2004 11:38:58 -0000 1.61.2.12 @@ -471,6 +471,8 @@ @define('PLUGIN_ITEM_DISPLAY_BOTH', 'V obojím'); /* TRANSLATE */ +@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); +@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.'); @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate @@ -587,7 +589,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -599,8 +603,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_no.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v retrieving revision 1.2.2.11 retrieving revision 1.2.2.12 diff -u -d -r1.2.2.11 -r1.2.2.12 --- serendipity_lang_no.inc.php 15 Nov 2004 21:06:51 -0000 1.2.2.11 +++ serendipity_lang_no.inc.php 16 Nov 2004 11:38:59 -0000 1.2.2.12 @@ -462,6 +462,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Kun udvidet artikkel'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Kun i oversikten'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Hele tiden'); +@define('RSS_IMPORT_DESC', 'RSS-import vil hente en RSS-feed og sette inn alle artiklene i denne i ditt arkiv. Du kan velge om du vil importere disse med UTKAST eller PUBLISER status. Kategorier i den fremmede feeden skal inneholde nøyaktig det samme navnet som de navn du har tastet inn i Serendipity. Via det andre feltet kan du velge hvilken kategori du vil plassere artikler som ikke matcher kategorier i den importerete feeden.'); +@define('RSS_IMPORT_CATEGORY', 'Bruk denne kategorien for kategoriløse artikler'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Det oppstod en ukjent feil, filen ble ikke lastet opp. Kanskje er din filstørrelse større end den maksimale størrelse tillatt av ditt serveroppsett. Spør din webtilbyder eller rediger din php.ini fil for å tillate uploads av større filer.'); @define('COMMENTS_WILL_BE_MODERATED', 'Kommentarer på denne artikkelen vil først bli vist når de er blitt godkjendt.'); @define('YOU_HAVE_THESE_OPTIONS', 'Du har følgende muligheter:'); @@ -582,7 +584,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -594,7 +598,7 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate -?> +?> \ No newline at end of file Index: serendipity_lang_nl.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v retrieving revision 1.36.2.11 retrieving revision 1.36.2.12 diff -u -d -r1.36.2.11 -r1.36.2.12 --- serendipity_lang_nl.inc.php 15 Nov 2004 21:06:51 -0000 1.36.2.11 +++ serendipity_lang_nl.inc.php 16 Nov 2004 11:38:58 -0000 1.36.2.12 @@ -470,6 +470,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only'); // Translate @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only'); // Translate @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times'); //Translate +@define('RSS_IMPORT_DESC', 'The RSS import opent een RSS feed en voegt alle artikelen toe in de verzameling. Je kan kiezen of je deez wilt importeren als proef als gelijk wilt publiceren. Categorieën in de geïmporteerde feed moeten exact dezelfde naam hebben als in Serendipity. Via de het andere invulveld kun je de categorie kiezen die er anders aan toegekend moet worden.'); +@define('RSS_IMPORT_CATEGORY', 'Gebruik deze categorie voor niet matchende geëmporteerde artikel'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Er is een ongedefiniëerde fout opgetreden. Het bestand is niet geupload. Mogelijk is de bestandsgrootte groter dan het maximum toegestaan door de server. Vraag je ISP of bewerk je php.ini bestand om groter bestand uploads toe te laten.'); @define('COMMENTS_WILL_BE_MODERATED', 'Reacties zullen eerst worden gemoderreerd voordat het getoond wordt.'); @define('YOU_HAVE_THESE_OPTIONS', 'De volgende opties zijn mogelijk:'); @@ -592,7 +594,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -604,8 +608,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v retrieving revision 1.79.2.12 retrieving revision 1.79.2.13 diff -u -d -r1.79.2.12 -r1.79.2.13 --- serendipity_lang_en.inc.php 15 Nov 2004 21:06:51 -0000 1.79.2.12 +++ serendipity_lang_en.inc.php 16 Nov 2004 11:38:58 -0000 1.79.2.13 @@ -185,6 +185,21 @@ @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Entries successfully inserted!'); @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Entries were not successfully inserted!'); @define('VIEW_FEED_EXPORT', 'View feed export'); +@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); +@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.'); +@define('MT_DATA_FILE', 'Movable Type data file'); +@define('FORCE', 'Force'); +@define('WORDPRESS_DATA', 'WordPress data'); +@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); +@define('CREATE_AUTHOR', 'Create author \'%s\'.'); +@define('CREATE_CATEGORY', 'Create category \'%s\'.'); +@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); +@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); +@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); +@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); +@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); +@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); +@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); @define('YES', 'Yes'); @define('NO', 'No'); @define('USE_DEFAULT', 'Default'); @@ -466,6 +481,9 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times'); +@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); +@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); + @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); @define('THIS_COMMENT_NEEDS_REVIEW', 'Warning: This comment needs approval before it will be displayed'); @@ -570,19 +588,20 @@ @define('STICKY_POSTINGS', 'Sticky Postings'); @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); - -@define('IMPORT_ENTRIES', 'Import entries'); // Translate -@define('EXPORT_ENTRIES', 'Export entries'); // Translate -@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate -@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate -@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate -@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate -@define('IMPORT_NOW', 'Import now!'); // Translate -@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate -@define('IMPORT_FAILED', 'Import failed'); // Translate -@define('IMPORT_DONE', 'Import successfully completed'); // Translate -@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate -@define('EXPORT_FEED', 'Export full RSS feed'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); +@define('EXPORT_ENTRIES', 'Export entries'); +@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); +@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); +@define('IMPORT_SELECT', 'Please select the software you wish to import from'); +@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); +@define('IMPORT_NOW', 'Import now!'); +@define('IMPORT_STARTING', 'Starting import procedure...'); +@define('IMPORT_FAILED', 'Import failed'); +@define('IMPORT_DONE', 'Import successfully completed'); +@define('IMPORT_WEBLOG_APP', 'Weblog application'); +@define('EXPORT_FEED', 'Export full RSS feed'); +@define('STATUS', 'Status after import'); +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_tw.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/Attic/serendipity_lang_tw.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- serendipity_lang_tw.inc.php 15 Nov 2004 10:55:31 -0000 1.1.2.1 +++ serendipity_lang_tw.inc.php 16 Nov 2004 11:38:59 -0000 1.1.2.2 @@ -185,8 +185,6 @@ @define('ENTRIES_SUCCESSFULLY_INSERTED', '§¹¦¨¼W¤J¤å³¹!'); @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', '¨S¦³§¹¦¨¼W¤J¤å³¹!'); @define('VIEW_FEED_EXPORT', 'ÂsÄý¿é¥X'); -@define('IMPORT', '¿é¤J'); -@define('EXPORT', '¿é¥X'); @define('MAX_COMPAT_OLD_BLOG', '¬°¤F¯à°÷©M±zªºÂ¤é°O¦³³Ì¤jªº¬Û®e©Ê, ½Ð...'); @define('IMPORT_AGAIN_FORCE', 'µM«á¦b¸Õ¤@¦¸. ©ÎªÌ±z¥i¥H¤Ä¿ï \'±j¨î\' Äæ¦ì, ¥¦·|±j¨î±N±zªº¤å³¹¿é¤J¨ì²{¦³ªº¬[ºc.'); @define('MT_DATA_FILE', 'Movable Type ¸ê®ÆÀÉ'); @@ -483,8 +481,6 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', '¥u¦b°Æ¤º®eÅã¥Ü'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', '¥u¦b·§Æ[¤ºÅã¥Ü'); @define('PLUGIN_ITEM_DISPLAY_BOTH', '¥Ã»·Åã¥Ü'); -@define('RSS_IMPORT_DESC', 'RSS ªº¿é¤J¥\¯à¥i¥HÅý±zÂ^¨ú RSS feed ©M¿é¤J©Ò¦³ªº¤å³¹. ±z¥i¥H¿ï¾Ü¥Î¯ó½Z©Î¤½¶}ªº¤è¦¡¿é¤J. ¥~¨Ó feed ªºÃþ§O¦WºÙ¥²¶·¸ò±zªº Serendipity Ãþ§O¦WºÙ¬Û¦P. ¦pªGÃþ§O¦WºÙ¤£¬Û¦P, ±z¥i¥H¥Î¨ä¥LÄæ¦ì¿ï¾Ü±zn³sµ²¤å³¹ªºÃþ§O.'); -@define('RSS_IMPORT_CATEGORY', '¥Î³oÓÃþ§Oµ¹¤£¬Û¦Pªº¿é¤J¤å³¹'); @define('COMMENTS_WILL_BE_MODERATED', 'µo§Gªº°jÅT±N»ÝnºÞ²zûªº¼f®Ö.'); @define('YOU_HAVE_THESE_OPTIONS', '±z¦³¥H¤U¿ï¾Ü:'); @@ -585,11 +581,28 @@ @define('ALREADY_INSTALLED', '¤w¸g¦w¸Ë'); @define('SELECT_A_PLUGIN_TO_ADD', '½Ð¿ï¾Ün¦w¸Ëªº¥~±¾'); @define('QUICKSAVE', '§Ö³tÀx¦s'); +@define('RSS_IMPORT_DESC', 'RSS ªº¿é¤J¥\¯à¥i¥HÅý±zÂ^¨ú RSS feed ©M¿é¤J©Ò¦³ªº¤å³¹. ±z¥i¥H¿ï¾Ü¥Î¯ó½Z©Î¤½¶}ªº¤è¦¡¿é¤J. ¥~¨Ó feed ªºÃþ§O¦WºÙ¥²¶·¸ò±zªº Serendipity Ãþ§O¦WºÙ¬Û¦P. ¦pªGÃþ§O¦WºÙ¤£¬Û¦P, ±z¥i¥H¥Î¨ä¥LÄæ¦ì¿ï¾Ü±zn³sµ²¤å³¹ªºÃþ§O.'); +@define('RSS_IMPORT_CATEGORY', '¥Î³oÓÃþ§Oµ¹¤£¬Û¦Pªº¿é¤J¤å³¹'); + @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate +@define('EXPORT_ENTRIES', 'Export entries'); // Translate +@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate +@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate +@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate +@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate +@define('IMPORT_NOW', 'Import now!'); // Translate +@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate +@define('IMPORT_FAILED', 'Import failed'); // Translate +@define('IMPORT_DONE', 'Import successfully completed'); // Translate +@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate +@define('EXPORT_FEED', 'Export full RSS feed'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file Index: serendipity_lang_bg.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v retrieving revision 1.15.2.11 retrieving revision 1.15.2.12 diff -u -d -r1.15.2.11 -r1.15.2.12 --- serendipity_lang_bg.inc.php 15 Nov 2004 21:06:49 -0000 1.15.2.11 +++ serendipity_lang_bg.inc.php 16 Nov 2004 11:38:58 -0000 1.15.2.12 @@ -494,6 +494,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only'); // Translate @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only'); // Translate @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times'); // Translate +@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); // Translate +@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); // Translate @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate @define('THIS_COMMENT_NEEDS_REVIEW', 'Warning: This comment needs approval before it will be displayed'); // Translate @@ -569,7 +571,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -581,8 +585,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.36.2.12 retrieving revision 1.36.2.13 diff -u -d -r1.36.2.12 -r1.36.2.13 --- serendipity_lang_pt.inc.php 15 Nov 2004 21:06:52 -0000 1.36.2.12 +++ serendipity_lang_pt.inc.php 16 Nov 2004 11:38:59 -0000 1.36.2.13 @@ -464,6 +464,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Apenas artigo extendido'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Página de visão geral apenas'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Todas as vezes'); +@define('RSS_IMPORT_DESC', 'A importação de RSS irá buscar uma fonte RSS e inserir na sua base de artigos, todas as entradas contidas nele. Você pode escolher se quer importar os itens no estado de RASCUNHO ou PUBLICADO. Categorias no RSS externo precisam ter exatamente o mesmo nome que você informou no Serendipity. Através do outra caixa de texto, você pode escolher a categoria para a qual que você deseja ter os artigos de categorias desconhecidas associados.'); +@define('RSS_IMPORT_CATEGORY', 'Utilize essa categoria para artigos que não encontrem uma categoria no Serendipity'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Ocorreu um erro desconhecido, o arquivo não foi transferido. Talvez o tamanho do arquivo seja maior que o permitido pelo seu servidor. Verifique com o seu servidor de internet, ou edite o php.ini para permitir transferência de arquivos de maior tamanho.'); @define('COMMENTS_WILL_BE_MODERATED', 'Comentários enviados estarão sujeitos a moderação antes de serem exibidos.'); @define('YOU_HAVE_THESE_OPTIONS', 'Você possui as seguintes opções disponíveis'); @@ -588,7 +590,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -600,8 +604,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_it.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -d -r1.1.2.11 -r1.1.2.12 --- serendipity_lang_it.inc.php 15 Nov 2004 21:06:51 -0000 1.1.2.11 +++ serendipity_lang_it.inc.php 16 Nov 2004 11:38:58 -0000 1.1.2.12 @@ -466,6 +466,9 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Solo notizia estesa'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Solo pagina riassuntiva'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Sempre'); +@define('RSS_IMPORT_DESC', 'L\'importazione di RSS scarica un feed RSS e inserisce tutte le notizie nel tuo database degli articoli. Puoi scegliere se importare le notizie come BOZZA o come PUBBLICATA. Le categorie nel file importato devono avere lo stesso nome che è configurato in Serendipity. Con l\'altro campo di inserimento puoi scegliere in quale categoria mettere gli articoli che non corrispondono a nessuna categoria.'); +@define('RSS_IMPORT_CATEGORY', 'Usa questa categoria per le notizie importate non corrispondenti'); + @define('COMMENTS_WILL_BE_MODERATED', 'I commenti sottoposti sono soggetti a moderazione prima di essere mostrati.'); @define('YOU_HAVE_THESE_OPTIONS', 'Sono disponibili le seguenti opzioni:'); @define('THIS_COMMENT_NEEDS_REVIEW', 'Attenzione: Questo commento deve essere approvato prima di essere mostrato'); @@ -583,7 +586,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -595,8 +600,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_da.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v retrieving revision 1.79.2.12 retrieving revision 1.79.2.13 diff -u -d -r1.79.2.12 -r1.79.2.13 --- serendipity_lang_da.inc.php 15 Nov 2004 21:06:50 -0000 1.79.2.12 +++ serendipity_lang_da.inc.php 16 Nov 2004 11:38:58 -0000 1.79.2.13 @@ -463,6 +463,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Kun udvidet artikel'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Kun i oversigten'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Hele tiden'); +@define('RSS_IMPORT_DESC', 'RSS import vil hente et RSS feed og indsætte alle artiklerne i denne i dit arkiv. Du kan vælge om du vil importere disse med UDKAST eller UDGIVET status. Kategorier i det fremmede feed skal indeholde det præcist samme navn som de navne du har indtastet i Serendipity. Via det andet felt kan du vælge hvilken kategori du vil placere artikler i, der ikke matcher kategorier i det importerede feed.'); +@define('RSS_IMPORT_CATEGORY', 'Brug denne kategori for kategoriløse artikler'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Der skete en ukendt fejl, filen blev ikke uploaded. Måske er din filstørrelse større end den maximale størrelse tilladt af din serveropsætning. Spørg din webudbyder eller rediger din php.ini fil for at tillade uploads af større filer.'); @define('COMMENTS_WILL_BE_MODERATED', 'Kommentarer på denne artikel vil først blive vist såfremt de bliver godkendt.'); @define('YOU_HAVE_THESE_OPTIONS', 'Du har følgende muligheder:'); @@ -582,7 +584,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -594,8 +598,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_fr.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v retrieving revision 1.58.2.13 retrieving revision 1.58.2.14 diff -u -d -r1.58.2.13 -r1.58.2.14 --- serendipity_lang_fr.inc.php 15 Nov 2004 21:06:51 -0000 1.58.2.13 +++ serendipity_lang_fr.inc.php 16 Nov 2004 11:38:58 -0000 1.58.2.14 @@ -472,6 +472,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Dans la vue détaillée seulement'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Page d\'accueil seulement'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Sur la page d\'accueil et la vue détaillée'); +@define('RSS_IMPORT_DESC', 'L\'import de fil RSS télécharge tous les billets du fil et les insère dans votre liste de billets. Vous pouvez choisir si vous voulez importer les billets en tant que brouillons ou directement en publications. Les noms des catégories contenues dans le fil n\'ont pas besoin de correspondre exactement à celles que vous avez dans votre installation de Serendipity. En utilisant l\'autre champ de saisie, vous pouvez choisir la catégorie dans laquelle vous voulez insérer les billets dont la catégorie qui ne correspondent à aucune des vôtres.'); +@define('RSS_IMPORT_CATEGORY', 'Utiliser cette catégorie pour les billets à catégorie inconnue'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Erreur: impossible d\'uploader le fichier. Peut-être que la taille du fichier est plus grande que ce que votre serveur autorise. Vérifiez avec votre administrateur système ou éditez votre fichier php.ini pour autoriser le téléchargement de fichiers plus volumineux.'); @define('COMMENTS_WILL_BE_MODERATED', 'Les commentaires postés doivent être approuvés avant d\'être affichés dans le blog.'); @define('YOU_HAVE_THESE_OPTIONS', 'Vous avez les possibilités suivantes:'); @@ -590,7 +592,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -602,8 +606,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_cz.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v retrieving revision 1.61.2.10 retrieving revision 1.61.2.11 diff -u -d -r1.61.2.10 -r1.61.2.11 --- serendipity_lang_cz.inc.php 15 Nov 2004 21:06:50 -0000 1.61.2.10 +++ serendipity_lang_cz.inc.php 16 Nov 2004 11:38:58 -0000 1.61.2.11 @@ -468,6 +468,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Pouze v roz¹íøené èásti'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Pouze v popisu'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'V obojím'); +@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); +@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.'); @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate @@ -585,7 +587,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -597,8 +601,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v retrieving revision 1.77.2.12 retrieving revision 1.77.2.13 diff -u -d -r1.77.2.12 -r1.77.2.13 --- serendipity_lang_es.inc.php 15 Nov 2004 21:06:51 -0000 1.77.2.12 +++ serendipity_lang_es.inc.php 16 Nov 2004 11:38:58 -0000 1.77.2.13 @@ -461,11 +461,14 @@ @define('POWERED_BY_SHOW_TEXT_DESC', 'Mostrará "Serendipity Weblog" como texto'); @define('POWERED_BY_SHOW_IMAGE', 'Mostrar "Serendipity" con una imagen'); @define('POWERED_BY_SHOW_IMAGE_DESC', 'Mostrará el logotipo de Serendipity'); +/* TRANSLATE */ @define('SETTINGS_SAVED_AT', 'La nueva configuración se ha guardado en la hora %s'); @define('PLUGIN_ITEM_DISPLAY', '¿Dónde debería mostrarse el elemento?'); @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Sólo en la entrada extendida'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Sólo en la página general'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Siempre'); +@define('RSS_IMPORT_DESC', 'La importación RSS cogerá un fichero RSS e insertará todas las entradas que contiene para que formen parte de tu blog. Puedes escoger si quieres importar los elementos como PUBLICADOS o como BORRADOR. Las categorías en el fichero externo deben tener el mismo nombre que las categorías de Serendipity. Puedes escoger también la categoría que quieres que tengan las entradas que no coincidan con una categoría de Serendipity.'); +@define('RSS_IMPORT_CATEGORY', 'Usa esta categoría para las entradas importadas que no coincidan'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Ocurrió un error desconocido, fichero no importado. Quizás el tamaño del fichero es mayor que el tamaño máximo permitido por tu instalación. Verifica con tu ISP o edita tu fichero php.ini para permitir que suba ficheros de tamaño más grande.'); @define('COMMENTS_WILL_BE_MODERATED', 'Los comentarios enviados será sometidos a moderación antes de poder ser mostrados.'); @define('YOU_HAVE_THESE_OPTIONS', 'Tienes disponibles las siguientes opciones:'); @@ -592,7 +595,9 @@ @define('INSTALL_OFFSET', 'Server time Offset'); // Translate @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate -@define('IMPORT_ENTRIES', 'Import entries'); // Translate +@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate +@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('IMPORT_ENTRIES', 'Import data'); // Translate @define('EXPORT_ENTRIES', 'Export entries'); // Translate @define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate @define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate @@ -604,8 +609,8 @@ @define('IMPORT_DONE', 'Import successfully completed'); // Translate @define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate @define('EXPORT_FEED', 'Export full RSS feed'); // Translate -@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate -@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate +@define('STATUS', 'Status after import'); // Translate +@define('IMPORT_GENERIC_RSS', 'Generic RSS import'); // Translate /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v retrieving revision 1.98.2.13 retrieving revision 1.98.2.14 diff -u -d -r1.98.2.13 -r1.98.2.14 --- serendipity_lang_de.inc.php 15 Nov 2004 21:06:50 -0000 1.98.2.13 +++ serendipity_lang_de.inc.php 16 Nov 2004 11:38:58 -0000 1.98.2.14 @@ -465,6 +465,8 @@ @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Nur Artikel-Detailansicht'); @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Nur Artikelübersicht'); @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Überall'); +@define('RSS_IMPORT_DESC', 'Der RSS-Import liest einen RSS-Feed ein und fügt alle dort vorhandenen Artikel in die Artikeldatenbank ein. Ein importierter Artikel kann als VERÖFFENTLICHUNG oder ENTWURF eingefügt werden. Die Kategorien im importierten Feed müssen exakt denselben Namen enthalten wie die Namen ihrer Kategorien im Serendipity-Blog. Über das Dropdown-Menü kann gewählt werden, wie die Artikel kategorisiert werden sollen, wenn keine oder eine ungültige Angabe über die Kategorie im Feed enthalten ist.'); +@define('RSS_IMPORT_CATEGORY', 'Diese Kategorie für nicht zugeordnete importierte Einträge verwenden'); @define('ERROR_UNKNOWN_NOUPLOAD', 'Ein Fehler trat beim Dateiupload auf. Vielleicht ist die Datei größer als durch die Server-Konfiguration zugelassen. Bitte mit Ihrem ISP absprechen oder die php.ini datei bearbeiten um größere Uploads zuzulassen.'); @define('COMMENTS_WILL_BE_MODERATED', 'Kommentare werden erst nach redaktioneller Prüfung freigeschaltet.'); @define('YOU_HAVE_THESE_OPTIONS', 'Folgende Möglichkeiten stehen zur Verfügung:'); @@ -584,20 +586,22 @@ @define('INSTALL_OFFSET', 'Server Zeitunterschied'); @define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers und der eigenen Zeitzone'); @define('STICKY_POSTINGS', 'Dauerhafte Einträge'); -@define('IMPORT_ENTRIES', 'Import entries'); // Translate -@define('EXPORT_ENTRIES', 'Export entries'); // Translate -@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate -@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate -@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate -@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate -@define('IMPORT_NOW', 'Import now!'); // Translate -@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate -@define('IMPORT_FAILED', 'Import failed'); // Translate -@define('IMPORT_DONE', 'Import successfully completed'); // Translate -@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate -@define('EXPORT_FEED', 'Export full RSS feed'); // Translate @define('INSTALL_FETCHLIMIT', 'Anzahl der Artikel auf der Startseite'); @define('INSTALL_FETCHLIMIT_DESC', 'Wieviele Artikel sollen auf jeder Seite des Blogs angezeigt werden'); +@define('IMPORT_ENTRIES', 'Daten importieren'); +@define('EXPORT_ENTRIES', 'Einträge exportieren'); +@define('IMPORT_WELCOME', 'Willkommen im Serendipity Import-Bereich'); +@define('IMPORT_WHAT_CAN', 'Hier können Daten von anderen Weblog-Installationen importiert werde'); +@define('IMPORT_SELECT', 'Bitte die Art der Software auswählen, von der die Daten importiert werden sollen'); +@define('IMPORT_PLEASE_ENTER', 'Bitte die folgenden Daten eintrage'); +@define('IMPORT_NOW', 'Jetzt importieren!'); +@define('IMPORT_STARTING', 'Starte Import-Vorgang...'); +@define('IMPORT_FAILED', 'Import fehlgeschlagen'); +@define('IMPORT_DONE', 'Import erfolgreich abgeschlossen'); +@define('IMPORT_WEBLOG_APP', 'Weblog-Software'); +@define('EXPORT_FEED', 'Vollständigen RSS-Feed exportieren'); +@define('STATUS', 'Status nach dem Importieren'); +@define('IMPORT_GENERIC_RSS', 'Allgemeiner RSS-Import'); /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-11-16 11:39:09
|
Update of /cvsroot/php-blog/serendipity/include/admin/importers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30846/include/admin/importers Modified Files: Tag: branch-smarty generic.inc.php movabletype.inc.php wordpress.inc.php Log Message: * fix language strings * generic import fix for 'draft' setting Index: generic.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/Attic/generic.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- generic.inc.php 15 Nov 2004 21:06:49 -0000 1.1.2.1 +++ generic.inc.php 16 Nov 2004 11:39:00 -0000 1.1.2.2 @@ -2,37 +2,33 @@ require_once 'bundled-libs/Onyx/RSS.php'; - -@define('STATUS', 'Status after import'); -@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); -@define('RSS_IMPORT_CATEGORY', 'Use this default category for entries without a matching category'); - - class Serendipity_Import_Generic extends Serendipity_Import { - var $info = array('software' => 'Generic RSS import'); + var $info = array('software' => IMPORT_GENERIC_RSS); var $data = array(); var $inputFields = array(); function Serendipity_Import_Generic($data) { $this->data = $data; - $this->inputFields = array(array('text' => (RSS .' '. URL), - 'type' => 'input', - 'name' => 'url'), - array('text' => STATUS, - 'type' => 'list', - 'name' => 'type', - 'value' => 'publish', - 'default' => array('draft' => DRAFT, - 'publish' => PUBLISH)), - array('text' => RSS_IMPORT_CATEGORY, - 'type' => 'list', - 'name' => 'category', - 'value' => 0, - 'default' => $this->_fuckCategoryList()), - array('text' => RSS_IMPORT_BODYONLY, - 'type' => 'bool', - 'name' => 'bodyonly', - 'value' => 'false')); + $this->inputFields = array(array('text' => RSS . ' ' . URL, + 'type' => 'input', + 'name' => 'url'), + + array('text' => STATUS, + 'type' => 'list', + 'name' => 'type', + 'value' => 'publish', + 'default' => array('draft' => DRAFT, 'publish' => PUBLISH)), + + array('text' => RSS_IMPORT_CATEGORY, + 'type' => 'list', + 'name' => 'category', + 'value' => 0, + 'default' => $this->_getCategoryList()), + + array('text' => RSS_IMPORT_BODYONLY, + 'type' => 'bool', + 'name' => 'bodyonly', + 'value' => 'false')); } function validateData() { @@ -43,10 +39,10 @@ return $this->inputFields; } - function _fuckCategoryList() { + function _getCategoryList() { $res = serendipity_fetchCategories('all'); $ret = array(0 => NO_CATEGORY); - foreach ( $res as $v ) { + foreach ($res as $v) { $ret[$v['categoryid']] = $v['category_name']; } return $ret; @@ -57,7 +53,6 @@ $entry = array(); $bodyonly = serendipity_get_bool($this->data['bodyonly']); - $bodyonly = false; if ($item['description']) { $entry['body'] = utf8_decode($item['description']); @@ -88,7 +83,7 @@ $entry['timestamp'] = time(); } - if ($serendipity['POST']['type'] == 'draft') { + if ($this->data['type'] == 'draft') { $entry['isdraft'] = 'true'; } else { $entry['isdraft'] = 'false'; @@ -134,4 +129,4 @@ return 'Serendipity_Import_Generic'; /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: wordpress.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/Attic/wordpress.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- wordpress.inc.php 15 Nov 2004 21:06:49 -0000 1.1.2.1 +++ wordpress.inc.php 16 Nov 2004 11:39:00 -0000 1.1.2.2 @@ -1,22 +1,9 @@ <?php # $Id$ /***************************************************************** - * WordPress Importer, by Even * + * WordPress Importer, by Evan Nemerson * *****************************************************************/ -@define('WORDPRESS_DATA', 'WordPress data'); -@define('CREATE_AUTHOR', 'Create author \'%s\'.'); -@define('CREATE_CATEGORY', 'Create category \'%s\'.'); -@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); -@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); -@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); -@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); -@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); -@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); -@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); - - - class Serendipity_Import_WordPress extends Serendipity_Import { var $info = array('software' => 'WordPress'); var $data = array(); @@ -28,15 +15,19 @@ $this->inputFields = array(array('text' => INSTALL_DBHOST, 'type' => 'input', 'name' => 'host'), + array('text' => INSTALL_DBUSER, 'type' => 'input', 'name' => 'user'), + array('text' => INSTALL_DBPASS, 'type' => 'protected', 'name' => 'pass'), + array('text' => INSTALL_DBNAME, 'type' => 'input', 'name' => 'name'), + array('text' => INSTALL_DBPREFIX, 'type' => 'input', 'name' => 'prefix')); @@ -199,13 +190,13 @@ $comment = array('entry_id ' => $entry['entryid'], 'parent_id' => 0, 'timestamp' => strtotime($a['comment_date']), - 'author' => $a['comment_author'], - 'email' => $a['comment_author_email'], - 'url' => $a['comment_author_url'], - 'ip' => $a['comment_author_IP'], - 'status' => 'approved', - 'body' => $a['comment_content'], - 'type' => 'NORMAL'); + 'author' => $a['comment_author'], + 'email' => $a['comment_author_email'], + 'url' => $a['comment_author_url'], + 'ip' => $a['comment_author_IP'], + 'status' => 'approved', + 'body' => $a['comment_content'], + 'type' => 'NORMAL'); serendipity_db_insert('comments', $comment); serendipity_approveComment($cid, $id, true); @@ -221,4 +212,4 @@ return 'Serendipity_Import_WordPress'; /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: movabletype.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/Attic/movabletype.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- movabletype.inc.php 15 Nov 2004 21:06:49 -0000 1.1.2.1 +++ movabletype.inc.php 16 Nov 2004 11:39:00 -0000 1.1.2.2 @@ -1,13 +1,9 @@ <?php # $Id$ /***************************************************************** - * MovableType Importer, by Even * + * MovableType Importer, by Evan Nemerson * *****************************************************************/ -@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); -@define('MT_DATA_FILE', 'Movable Type data file'); -@define('FORCE', 'Force'); - class Serendipity_Import_MovableType extends Serendipity_Import { var $info = array('software' => 'MovableType'); var $data = array(); @@ -15,12 +11,13 @@ function Serendipity_Import_MovableType($data) { $this->data = $data; - $this->inputFields = array(array('text' => MT_DATA_FILE, - 'type' => 'file', - 'name' => 'mt_dat'), - array('text' => FORCE, - 'type' => 'bool', - 'name' => 'mt_force', + $this->inputFields = array(array('text' => MT_DATA_FILE, + 'type' => 'file', + 'name' => 'mt_dat'), + + array('text' => FORCE, + 'type' => 'bool', + 'name' => 'mt_force', 'default' => 'true')); } @@ -32,16 +29,15 @@ return $this->inputFields; } - function import() { global $serendipity; - $force = ($this->data['force'] == 'true'); + $force = ($this->data['force'] == 'true'); $contents = file_get_contents($serendipity['FILES']['tmp_name']['mt_dat']); - $authors = array(); + $authors = array(); $categories = serendipity_fetchCategories(); - $tasks = array(); + $tasks = array(); $entries = array(); $n = 0; |
|
From: Tom S. <tom...@us...> - 2004-11-15 21:11:51
|
Update of /cvsroot/php-blog/serendipity/include/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28603 Modified Files: Tag: branch-smarty import.inc.php Log Message: - Secure the loading of the import module Index: import.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/admin/Attic/import.inc.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- import.inc.php 15 Nov 2004 21:06:49 -0000 1.1.2.1 +++ import.inc.php 15 Nov 2004 21:11:41 -0000 1.1.2.2 @@ -14,11 +14,8 @@ if ( isset($serendipity['GET']['importFrom']) ) { - /* Include the importer - - HIGH PRIORITY TODO: Must validate $serendipity['GET']['importFrom'] - */ - $class = @require_once(S9Y_INCLUDE_PATH . 'include/admin/importers/'. $serendipity['GET']['importFrom'] .'.inc.php'); + /* Include the importer */ + $class = @require_once(S9Y_INCLUDE_PATH . 'include/admin/importers/'. basename($serendipity['GET']['importFrom']) .'.inc.php'); if ( !class_exists($class) ) { die('FAILURE: Unable to require import module, possible syntax error?'); } |
|
From: Tom S. <tom...@us...> - 2004-11-15 21:07:47
|
Update of /cvsroot/php-blog/serendipity/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27345/include Modified Files: Tag: branch-smarty functions_installer.inc.php Log Message: - Draft for new import framework. It's working, but might need some changes to make it a little more pretty Note: Please review your importer methods, like validateData() etc. - Split importer and exporter up into two menuitems - Don't let serendipity_guessInput() parse data, it should just act on the data given - Add 'file' type to serendipity_guessInput(), implementing <input type="file"> Index: functions_installer.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_installer.inc.php,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- functions_installer.inc.php 15 Nov 2004 10:31:48 -0000 1.1.2.3 +++ functions_installer.inc.php 15 Nov 2004 21:06:48 -0000 1.1.2.4 @@ -141,7 +141,7 @@ } function serendipity_parseTemplate($n, $raw = false, $prepend_var = null, $get_defaults = true) { - global $serendipity; + global $serendipity; if (is_array($prepend_var)) { $config = $configRaw = &$prepend_var; @@ -156,13 +156,13 @@ $maxt = count($t); for ($x=0; $x<$maxt; $x++) { - $l = $t[$x]; + $l = $t[$x]; $l = trim($l); if ($l != '') { - switch ($l[0]) { + switch ($l[0]) { - // New Configure section + // New Configure section case '/': if ($l[1] == '/') { $current = @constant(trim(substr($l, 2))); @@ -176,7 +176,7 @@ // A configure option case '$': - // Grep out the name, type and default + // Grep out the name, type and default preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match); // Make vars containing the elements in the | list @@ -184,18 +184,27 @@ // Only show directives which are destined for this user. On installation, show everyting. if (IS_installed === false || $serendipity['serendipityUserlevel'] >= $permission) { - $cdef = ($get_defaults ? serendipity_query_default($name, $distdefault, $usertemplate, $type) : ''); - $config['categories'][$current][] = $configRaw[] = array( - 'longname' => @constant($constant), - 'name' => $name, - 'type' => $type, - 'default' => $cdef, - 'distdefault' => serendipity_replaceEmbeddedConfigvars($distdefault), - 'desc' => serendipity_replaceEmbeddedConfigVars(@constant(trim($match[3]))), - 'valid_for' => $permission, - 'flags' => explode(',', $flags) - ); - } + $cdef = ($get_defaults ? serendipity_query_default($name, $distdefault, $usertemplate, $type) : ''); + $distDefault = serendipity_replaceEmbeddedConfigvars($distdefault); + + /* Expand 'list' type, to a normal assocaitive array */ + if ( $type == 'list' && preg_match_all("/([^\=]+)\=\>([^\,]+)\,?/i", $distDefault, $res)) { + $distDefault = array(); + foreach ( $res[1] as $k => $v ) { + $distDefault[$res[1][$k]] = $res[2][$k]; + } + } + $config['categories'][$current][] = $configRaw[] = array( + 'longname' => @constant($constant), + 'name' => $name, + 'type' => $type, + 'default' => $cdef, + 'distdefault' => $distDefault, + 'desc' => serendipity_replaceEmbeddedConfigVars(@constant(trim($match[3]))), + 'valid_for' => $permission, + 'flags' => explode(',', $flags) + ); + } break; } } @@ -217,7 +226,7 @@ } function serendipity_guessInput($type, $name, $value='', $default='') { -global $serendipity; + global $serendipity; if ($name == 'rewrite' && $default == $value && isset($serendipity['rewrite_default']) && $serendipity['rewrite_default'] != '') { $value = $serendipity['rewrite_default']; @@ -235,17 +244,20 @@ case 'protected' : echo '<input type="password" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />'; break; + case 'list' : - preg_match_all("/([^\=]+)\=\>([^\,]+)\,?/i", $default, $res); echo '<select name="'. $name .'">'; - for ($x=0; $x<sizeof($res[1]); $x++) { + foreach ((array)$default as $k=>$v) { printf('<option value="%s"%s>%s</option>'. "\n", - $res[1][$x], - (($res[1][$x] == $value) ? ' selected="selected"' : ''), - $res[2][$x]); + $k, + (($k == $value) ? ' selected="selected"' : ''), + $v); } echo '</select>'; break; + case 'file' : + echo '<input type="file" size="30" name="' . $name . '" />'; + break; default : echo '<input type="text" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />'; break; @@ -359,7 +371,7 @@ <?php } if ( sizeof($t['categories']) > 1 ) { ?> <div align="right"> - <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" /> <?php echo TOGGLE_ALL; ?></a></a><br /> + <a style="border:0; text-decoration: none" href="#" onClick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" /> <?php echo TOGGLE_ALL; ?></a></a><br /> </div> <?php } @@ -373,7 +385,7 @@ ?> <tr> <th align="left" colspan="2" style="padding-left: 15px;"> - <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" /> <?php echo $key; ?></a></th> + <a style="border:0; text-decoration: none" href="#" onClick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" /> <?php echo $key; ?></a></th> </tr> <?php } ?> <tr> @@ -824,4 +836,4 @@ return preg_replace('@/include$@', '', dirname($file)) . '/'; } -?> \ No newline at end of file +?> |
|
From: Tom S. <tom...@us...> - 2004-11-15 21:07:46
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27345 Modified Files: Tag: branch-smarty serendipity_admin.php Log Message: - Draft for new import framework. It's working, but might need some changes to make it a little more pretty Note: Please review your importer methods, like validateData() etc. - Split importer and exporter up into two menuitems - Don't let serendipity_guessInput() parse data, it should just act on the data given - Add 'file' type to serendipity_guessInput(), implementing <input type="file"> Index: serendipity_admin.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v retrieving revision 1.41.2.3 retrieving revision 1.41.2.4 diff -u -d -r1.41.2.3 -r1.41.2.4 --- serendipity_admin.php 6 Nov 2004 11:22:45 -0000 1.41.2.3 +++ serendipity_admin.php 15 Nov 2004 21:06:46 -0000 1.41.2.4 @@ -28,7 +28,7 @@ ?> </head> -<body class="s9y_wrap" id="serendipity_admin_page" onload="if (self.Spawnnugget) { Spawnnugget(); }"> +<body class="s9y_wrap" id="serendipity_admin_page" onLoad="if (self.Spawnnugget) { Spawnnugget(); }"> <div id="serendipity_banner"> <?php if ( IS_installed === true && IS_up2date === true ) { ?> <h1><?php echo (isset($serendipity['blogTitle']) ? $serendipity['blogTitle'] : ''); ?></h1> @@ -78,7 +78,8 @@ <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?> • <a href="?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a><br /> <?php } ?> - • <a href="?serendipity[adminModule]=interop"><?php echo IMPORT_EXPORT_ENTRIES; ?></a><br /> + • <a href="?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a><br /> + • <a href="?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a><br /> <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?> </div> </div> @@ -120,8 +121,12 @@ include S9Y_INCLUDE_PATH . 'include/admin/users.inc.php'; break; - case 'interop': - include S9Y_INCLUDE_PATH . 'include/admin/interop.inc.php'; + case 'export': + include S9Y_INCLUDE_PATH . 'include/admin/export.inc.php'; + break; + + case 'import': + include S9Y_INCLUDE_PATH . 'include/admin/import.inc.php'; break; case 'logout': |
