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
(23) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:32:46
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16303/plugins/serendipity_plugin_remoterss Modified Files: serendipity_plugin_remoterss.php Log Message: fixed minor xhtml issues Index: serendipity_plugin_remoterss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- serendipity_plugin_remoterss.php 20 Aug 2004 07:44:37 -0000 1.5 +++ serendipity_plugin_remoterss.php 20 Sep 2004 14:32:37 -0000 1.6 @@ -409,7 +409,7 @@ if (!empty($bulletimg)) { $content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> '; } - $content .= $item['title'] . "</a><br>\n"; + $content .= $item['title'] . "</a><br />\n"; $item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']); if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) { $content .= '<div class="serendipitySideBarDate">' |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:32:45
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16303 Modified Files: NEWS Log Message: fixed minor xhtml issues Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.227 retrieving revision 1.228 diff -u -d -r1.227 -r1.228 --- NEWS 20 Sep 2004 14:17:33 -0000 1.227 +++ NEWS 20 Sep 2004 14:32:37 -0000 1.228 @@ -6,6 +6,9 @@ Version 0.7-beta3 () ------------------------------------------------------------------------ + * Fixed wrong XHTML enties in remoterss and shoutbox plugin. Thanks + to Stephan van Beerschoten! (garvinhicking) + * Fixed bug #1030581: Category sidebar plugin now properly displays only categories of selected author (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:32:35
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16177/plugins/serendipity_plugin_shoutbox Modified Files: Tag: branch-smarty serendipity_plugin_shoutbox.php Log Message: fixed minor xhtml issues 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.1 retrieving revision 1.10.2.2 diff -u -d -r1.10.2.1 -r1.10.2.2 --- serendipity_plugin_shoutbox.php 14 Sep 2004 13:11:20 -0000 1.10.2.1 +++ serendipity_plugin_shoutbox.php 20 Sep 2004 14:32:26 -0000 1.10.2.2 @@ -156,7 +156,7 @@ <form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post"> <div> <input type="hidden" name="action" value="fillshoutbox" /> - <textarea name="serendipity[shouttext]" rows="4" style="width: 90%"></textarea> + <textarea name="serendipity[shouttext]" rows="4" cols="15" style="width: 90%"></textarea> <input name='submit' type='submit' value='<?php echo PLUGIN_SHOUTBOX_SUBMIT; ?>' /> </div> </form><br /> |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:32:35
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16177/plugins/serendipity_plugin_remoterss Modified Files: Tag: branch-smarty serendipity_plugin_remoterss.php Log Message: fixed minor xhtml issues Index: serendipity_plugin_remoterss.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- serendipity_plugin_remoterss.php 20 Aug 2004 07:44:37 -0000 1.5 +++ serendipity_plugin_remoterss.php 20 Sep 2004 14:32:26 -0000 1.5.2.1 @@ -409,7 +409,7 @@ if (!empty($bulletimg)) { $content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> '; } - $content .= $item['title'] . "</a><br>\n"; + $content .= $item['title'] . "</a><br />\n"; $item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']); if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) { $content .= '<div class="serendipitySideBarDate">' |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:32:35
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16177 Modified Files: Tag: branch-smarty NEWS Log Message: fixed minor xhtml issues Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.15 retrieving revision 1.214.2.16 diff -u -d -r1.214.2.15 -r1.214.2.16 --- NEWS 20 Sep 2004 14:20:21 -0000 1.214.2.15 +++ NEWS 20 Sep 2004 14:32:26 -0000 1.214.2.16 @@ -20,6 +20,9 @@ Version 0.7-beta3 () ------------------------------------------------------------------------ + * Fixed wrong XHTML enties in remoterss and shoutbox plugin. Thanks + to Stephan van Beerschoten! (garvinhicking) + * Fixed bug #1030581: Category sidebar plugin now properly displays only categories of selected author (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:23:47
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14611 Modified Files: serendipity_lang_pt.inc.php Log Message: updated brazil/portugues translation Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- serendipity_lang_pt.inc.php 8 Sep 2004 08:49:29 -0000 1.36 +++ serendipity_lang_pt.inc.php 20 Sep 2004 14:23:21 -0000 1.37 @@ -82,7 +82,7 @@ @define('ADD_COMMENT', 'Adicionar Comentários'); @define('NO_COMMENTS', 'Nenhum cmentários.'); @define('POSTED_BY', 'Enviado por'); -@define('ON', 'on'); +@define('ON', 'em'); @define('A_NEW_COMMENT_BLAHBLAH', 'Um novo comentário foi enviado para o seu Blog "%s", no artigo entitulada como "%s".'); @define('A_NEW_TRACKBACK_BLAHBLAH', 'Um novo trackback foi feito para o seu Blog "%s", no artigo entitulada como "%s".'); @define('NO_CATEGORY', 'Nenhuma categoria'); @@ -103,7 +103,7 @@ @define('GO', 'Vai!'); @define('NEWSIZE', 'Novo tamanho: '); @define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b><p>'); -@define('ORIGINAL_SIZE', 'Tamanaho original: <i>%sx%s</i> pixel'); +@define('ORIGINAL_SIZE', 'Tamanho original: <i>%sx%s</i> pixel'); @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aqui você pode ajustar o novo tamanho das imagens. Se pretende manter as proporções, preencha apenas um valor e pressione a tecla TAB que automaticamente será calculado o novo tamanho de modo que as proporções não fiquem bagunçadas:'); @define('QUICKJUMP_CALENDAR', 'Calendário de acesso rápido'); @define('QUICKSEARCH', 'Pesquisa rápida'); @@ -225,8 +225,8 @@ @define('SCALING_IMAGE', 'Redimensionando %s para %s x %s px'); @define('KEEP_PROPORTIONS', 'Manter proporções'); @define('REALLY_SCALE_IMAGE', 'Quer mesmo redimensionar a imagem? Não haverá volta!!'); -@define('TOGGLE_ALL', 'Toggle expand all'); -@define('TOGGLE_OPTION', 'Toggle option'); +@define('TOGGLE_ALL', 'Alternar para expandir tudo'); +@define('TOGGLE_OPTION', 'Opção para alternar'); @define('SUBSCRIBE_TO_THIS_ENTRY', 'Inscrever-se para este artigo'); @define('UNSUBSCRIBE_OK', "%s teve a inscrição cancelada para este artigo"); @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Novo comentário para o artigo inscrita"%s"'); @@ -269,17 +269,17 @@ @define('PREVIOUS_PAGE', 'página anterior'); @define('NEXT_PAGE', 'próxima página'); @define('ALL_CATEGORIES', 'Todas as categorias'); -@define('DO_MARKUP', 'Perform Markup Transformations'); -@define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text. Default is "Yes".'); +@define('DO_MARKUP', 'Executar trasnformações de marcação'); +@define('DO_MARKUP_DESCRIPTION', 'Aplicar transformações de marcação ao texto (sorrisos, atalhos de marcação via *, /, _, ...). Desabilitando isso preservará qualquer código HTML que exista no texto. O padrão é "Sim".'); @define('GENERAL_PLUGIN_DATEFORMAT', 'Formatação de data'); @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formato da data atual do artigo, usando a mesma formatação da função strftime() do PHP. (Padrão: "%s")'); @define('ERROR_TEMPLATE_FILE', 'Não foi possível abrir o arquivo de template, por favor atualize o serendipity!'); @define('ADVANCED_OPTIONS', 'Opções avançadas'); @define('EDIT_ENTRY', 'Editar artigo'); -@define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br /> %s<br />and reload this page.'); +@define('HTACCESS_ERROR', 'Para checar a intalação do servidor web, serendipity precisa ter poder criar o arquivo ".htaccess". Isso não foi possível devido a erros de permissões. Por favor, ajuste as permissões para isso: <br /> %s<br />e recarregue esta página.'); @define('SIDEBAR_PLUGINS', 'Plugins da barra lateral'); @define('EVENT_PLUGINS', 'Plugins de eventos'); -@define('SORT_ORDER', 'Sort order'); +@define('SORT_ORDER', 'Ordenação'); @define('SORT_ORDER_NAME', 'Nome do arquivo'); @define('SORT_ORDER_EXTENSION', 'Extensão do arquivo'); @define('SORT_ORDER_SIZE', 'Tamanho do arquivo'); @@ -291,8 +291,8 @@ @define('THUMBNAIL_SHORT', 'Miniatura'); @define('ORIGINAL_SHORT', 'Orig.'); @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevenir cache do HTTP'); -@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".'); -@define('APPLY_MARKUP_TO', 'Apply markup to %s'); +@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Se marcada como "verdadeiro" ("true") isso irá fazer com que o link para a sua fonte RSS não permita a clientes economia de banda por cache para requisições de fonte RSS. É sugerido marcar como "falso".'); +@define('APPLY_MARKUP_TO', 'Aplicar marcação para %s'); @define('CALENDAR_BEGINNING_OF_WEEK', 'Começo da semana'); @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity detectou que sua configuração está instalada com a versão %s, entretanto serendipity está instalado na versão %s, você precisa atualizar o serendipity! <a href="%s">Clique aqui</a>'); @define('SERENDIPITY_UPGRADER_WELCOME', 'Oi, e bem-vindo ao agente de atualização do Serendipity.'); @@ -311,7 +311,6 @@ @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'A sua instalação do Serendipity foi atualizada para a versão %s'); @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Você pode retornar ao seu blog clicando %saqui%s'); -/* TRANSLATE */ @define('MANAGE_USERS', 'Gerenciar usuários'); @define('EDIT_USERS', 'Editar usuários'); @define('CREATE_USERS', 'Criar usuários'); @@ -414,13 +413,13 @@ @define('INSTALL_CAT_DISPLAY', 'Aparência e opções'); @define('INSTALL_CAT_DISPLAY_DESC', 'Padroniza como o Serendipity é exibido'); @define('INSTALL_EXTERNALSTYLE', 'Folha de estilos externa'); -@define('INSTALL_EXTERNALSTYLE_DESC', 'Você pode definir um URI para uma folha de estilos aqui, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)'); +@define('INSTALL_EXTERNALSTYLE_DESC', 'Você pode definir um URI para uma folha de estilos aqui, adicionalmente para as configurações ajustáveis no painel de administração (digite \'none\' se você não precisa disso)'); @define('INSTALL_WYSIWYG', 'Usar editor WYSIWYG'); @define('INSTALL_WYSIWYG_DESC', 'Você quer usar o editor WYSIWYG? (Funciona no IE5+ e parcialmente no Mozilla 1.3+)'); @define('INSTALL_XHTML11', 'Forçar adequação ao XHTML 1.1'); @define('INSTALL_XHTML11_DESC', 'Quer forçar uma adequação ao padrão XHTML 1.1 (pode causar problemas de exibição nos navegadores de 4ª geração (4.x))'); @define('INSTALL_POPUP', 'Habilitar o uso de janelas popups'); -@define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?'); +@define('INSTALL_POPUP_DESC', 'Você quer que o weblog utilize janelas popups para comentários, trackbacks e etc?'); @define('INSTALL_EMBED', 'O serendipity está integrado?'); @define('INSTALL_EMBED_DESC', 'Se você quer empacotar o serendipity em um website, mude para verdadeiro para descartar quaisquer cabeçalhos e apenas imprimir o conteúdo. Você pode fazer uso da opção \'Arquivo inicial\' para usar uma classe mais abrangente onde você colocaria os cabeçalhos normais de sua página. Veja o arquivo README para mais informações!'); @define('INSTALL_BLOCKREF', 'Referências bloqueadas'); @@ -458,100 +457,99 @@ @define('USERCONF_ALLOWPUBLISH', 'Direitos: Publicação de artigos?'); @define('USERCONF_ALLOWPUBLISH_DESC', 'Este usuário está autorizado a publicar artigos?'); @define('SUCCESS', 'Sucesso'); -@define('POWERED_BY_SHOW_TEXT', 'Exibir "Serendipity" como texto'); // Translate -@define('POWERED_BY_SHOW_TEXT_DESC', 'Exibirá o "Serendipity Weblog" como texto'); // Translate -@define('POWERED_BY_SHOW_IMAGE', 'Exibir "Serendipity" como um logotipo'); // Translate -@define('POWERED_BY_SHOW_IMAGE_DESC', 'Exibe o logotipo do Serendipity'); // Translate +@define('POWERED_BY_SHOW_TEXT', 'Exibir "Serendipity" como texto'); +@define('POWERED_BY_SHOW_TEXT_DESC', 'Exibirá o "Serendipity Weblog" como texto'); +@define('POWERED_BY_SHOW_IMAGE', 'Exibir "Serendipity" como um logotipo'); +@define('POWERED_BY_SHOW_IMAGE_DESC', 'Exibe o logotipo do Serendipity'); -/* TRANSLATE */ -@define('SETTINGS_SAVED_AT', 'The new settings have been saved at %s'); -@define('PLUGIN_ITEM_DISPLAY', 'Where should the item be displayed?'); -@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('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 -@define('THIS_COMMENT_NEEDS_REVIEW', 'Warning: This comment needs approval before it will be displayed'); // Translate -@define('DELETE_COMMENT', 'Delete comment'); // Translate -@define('APPROVE_COMMENT', 'Approve comment'); // Translate -@define('REQUIRES_REVIEW', 'Requires review'); // Translate -@define('COMMENT_APPROVED', 'Comment #%s has successfully been approved'); // Translate -@define('COMMENT_DELETED', 'Comment #%s has successfully been deleted'); // Translate -@define('VIEW', 'View'); // Translate -@define('COMMENT_ALREADY_APPROVED', 'Comment #%s appears to already have been approved'); // Translate -@define('COMMENT_EDITED', 'The selected comment has been edited'); // Translate -@define('HIDE', 'Hide'); // Translate -@define('VIEW_EXTENDED_ENTRY', 'Continue reading "%s"'); // Translate -@define('TRACKBACK_SPECIFIC_ON_CLICK', 'This link is not meant to be clicked. It contains the trackback URI for this entry. You can use this URI to send ping- & trackbacks from your own blog to this entry. To copy the link, right click and select "Copy Shortcut" in Internet Explorer or "Copy Link Location" in Mozilla.'); // Translate -@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Warning: This trackback needs approval before it will be displayed'); // Translate -@define('DELETE_TRACKBACK', 'Delete trackback'); // Translate -@define('APPROVE_TRACKBACK', 'Approve trackback'); // Translate -@define('TRACKBACK_APPROVED', 'Trackback #%s has successfully been approved'); // Translate -@define('TRACKBACK_DELETED', 'Trackback #%s has successfully been deleted'); // Translate -@define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate -@define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login'); -@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!'); -@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?'); // Translate -@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate -@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate -@define('FILTERS', 'Filters'); // Translate -@define('FIND_ENTRIES', 'Find entries'); // Translate -@define('FIND_COMMENTS', 'Find comments'); // Translate -@define('FIND_MEDIA', 'Find media'); // Translate -@define('FILTER_DIRECTORY', 'Directory'); // Translate -@define('SORT_BY', 'Sort by'); // Translate -@define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate -@define('MEDIA', 'Media'); // Translate -@define('MEDIA_LIBRARY', 'Media library'); // Translate -@define('ADD_MEDIA', 'Add media'); // Translate -@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate -@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate -@define('SAVE_FILE_AS', 'Save the file as:'); // Translate -@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate -@define('MEDIA_RENAME', 'Rename this file'); // Translate -@define('IMAGE_RESIZE', 'Resize this image'); // Translate -@define('MEDIA_DELETE', 'Delete this file'); // Translate -@define('FILES_PER_PAGE', 'Files per page'); // Translate -@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate -@define('SELECT_FILE', 'Select file to insert'); // Translate -@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate -@define('CALENDAR_BOW_DESC', 'The day of the week that should be considered the beginning of the week. Default is Monday'); // Translate -@define('SUPERUSER', 'Blog Administration'); // Translate -@define('ALLOWS_YOU_BLAHBLAH', 'Provides a link in the sidebar to your blog administration'); // Translate -@define('CALENDAR', 'Calendar'); // Translate -@define('SUPERUSER_OPEN_ADMIN', 'Open administration'); // Translate -@define('SUPERUSER_OPEN_LOGIN', 'Open login screen'); // Translate -@define('INVERT_SELECTIONS', 'Invert Selections'); // Translate -@define('COMMENTS_DELETE_CONFIRM', 'Are you sure you wish to delete the selected comments?'); // Translate -@define('COMMENT_DELETE_CONFIRM', 'Are you sure you wish to delete comment #%d, written by %s?'); // Translate -@define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate -@define('VIEW_COMMENT', 'View comment'); // Translate -@define('VIEW_ENTRY', 'View entry'); // Translate -@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate -@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate -@define('TRACKBACK_SENDING', 'Sending trackback to URI %s...'); // Translate -@define('TRACKBACK_SENT', 'Trackback successful'); // Translate -@define('TRACKBACK_FAILED', 'Trackback failed: %s'); // Translate -@define('TRACKBACK_NOT_FOUND', 'No trackback-URI found.'); // Translate -@define('TRACKBACK_URI_MISMATCH', 'The autodiscovered trackback URI does not match our target URI.'); // Translate -@define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...'); // Translate -@define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate -@define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate -@define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate -@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate -@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate -@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate -@define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); // Translate -@define('NUMBER_FORMAT_DECIMALS', '2'); // Translate -@define('NUMBER_FORMAT_DECPOINT', '.'); // Translate -@define('NUMBER_FORMAT_THOUSANDS', ','); // Translate -@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); // Translate -@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?'); // Translate -@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "default": Use setting from global configuration (recommended).'); // Translate -@define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('SETTINGS_SAVED_AT', 'As novas configurações foram salvas em %s'); +@define('PLUGIN_ITEM_DISPLAY', 'Onde o item deve ser exibido?'); +@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'); +@define('THIS_COMMENT_NEEDS_REVIEW', 'Atenção: Esse comentário precisa de aprovação antes que seja exibido'); +@define('DELETE_COMMENT', 'Excluir comentário'); +@define('APPROVE_COMMENT', 'Aprovar comentário'); +@define('REQUIRES_REVIEW', 'Requer revisão'); +@define('COMMENT_APPROVED', 'Comentário #%s foi aprovado corretamente'); +@define('COMMENT_DELETED', 'Comentário #%s foi excluído corretamente'); +@define('VIEW', 'Exibir'); +@define('COMMENT_ALREADY_APPROVED', 'Comentário #%s parece já ter sido aprovado'); +@define('COMMENT_EDITED', 'O comentário selecionado foi editado'); +@define('HIDE', 'Ocultar'); +@define('VIEW_EXTENDED_ENTRY', 'Continuar lendo "%s"'); +@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Esse link não deve ser clicado. Ele contém a URI de trackback para este artigo. Você pode usar esse URI para enviar ping- & trackbacks do seu próprio weblog para esse artigo. Para copiar o link, clique com o botão direito e selecione "Copiar Atalho" no Internet Explorer ou "Copiar localização do link" no Mozilla.'); +@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Atenção: Esse trackback precisa de aprovação antes que seja exibido'); +@define('DELETE_TRACKBACK', 'Excluir trackback'); +@define('APPROVE_TRACKBACK', 'Aprovar trackback'); +@define('TRACKBACK_APPROVED', 'O trackback #%s foi aprovado corretamente'); +@define('TRACKBACK_DELETED', 'O trackback #%s foi excluído corretamente'); +@define('COMMENTS_MODERATE', 'Comentários & trackbacks para este artigo requerem moderação'); +@define('PLUGIN_SUPERUSER_HTTPS', 'Usar https para login'); +@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Permitir o link de login aponte para uma link https. seu servidor web precisa ter suporte a isso!'); +@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Tornar clicáveis os links externos?'); +@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"não": Links externos não marcados (Maiores saídas, Maiores referências, Comentários de usuários) não são exibidos como puro texto para evitar spam do google (recomendado). "sim": Links externos não marcados são exibidos como links. Podem ser sobrescritos pela configuração da barra lateral!'); +@define('PAGE_BROWSE_COMMENTS', 'Página %s de %s, totlizando %s comentários'); +@define('FILTERS', 'Filtros'); +@define('FIND_ENTRIES', 'Encontrar artigos'); +@define('FIND_COMMENTS', 'Encontrar comentários'); +@define('FIND_MEDIA', 'Encontrar mídia'); +@define('FILTER_DIRECTORY', 'Diretório'); +@define('SORT_BY', 'Ordenar por'); +@define('TRACKBACK_COULD_NOT_CONNECT', 'Nenhum trackback enviado: Não foi possível abrir conexão para %s na porta %d'); +@define('MEDIA', 'Mídia'); +@define('MEDIA_LIBRARY', 'Biblioteca de mídia'); +@define('ADD_MEDIA', 'Adicionar mídia'); +@define('ENTER_MEDIA_URL', 'Entre com a URL de um arquivo para buscá-lo:'); +@define('ENTER_MEDIA_UPLOAD', 'Selecione o arquivo que deseja transferir:'); +@define('SAVE_FILE_AS', 'Salvar arquivo como:'); +@define('STORE_IN_DIRECTORY', 'Guardar no seguinte diretório: '); +@define('MEDIA_RENAME', 'Renomear esse arquivo'); +@define('IMAGE_RESIZE', 'Redimensionar essa imagem'); +@define('MEDIA_DELETE', 'Excluir esse arquivo'); +@define('FILES_PER_PAGE', 'Arquivos por página'); +@define('CLICK_FILE_TO_INSERT', 'Clique no arquivo que deseja inserir:'); +@define('SELECT_FILE', 'Selecione arquivo para inserir'); +@define('MEDIA_FULLSIZE', 'Tamanho total'); +@define('CALENDAR_BOW_DESC', 'Dia da semana que deve ser considerado o início da semana. Padrão é segunda-feira'); +@define('SUPERUSER', 'Administração do weblog'); +@define('ALLOWS_YOU_BLAHBLAH', 'Provê um link para a administração do weblog na barra lateral '); +@define('CALENDAR', 'Calendário'); +@define('SUPERUSER_OPEN_ADMIN', 'Abrir administração'); +@define('SUPERUSER_OPEN_LOGIN', 'Abrir tela de login'); +@define('INVERT_SELECTIONS', 'Inverter Seleção'); +@define('COMMENTS_DELETE_CONFIRM', 'Tem certeza de que deseja excluir os comentários selecionados?'); +@define('COMMENT_DELETE_CONFIRM', 'Tem certeza de que deseja excluir o comentário #%d, escrito por %s?'); +@define('DELETE_SELECTED_COMMENTS', 'Excluir comentários selecionados'); +@define('VIEW_COMMENT', 'Exibir comentário'); +@define('VIEW_ENTRY', 'Exibir artigo'); +@define('DELETE_FILE', 'Excluir o campo entitulado <b>%s</b>'); +@define('ABOUT_TO_DELETE_FILE', 'Você está prestes a excluir <b>%s</b><br />Se estiver utilizando esse arquivo em algum dos seus artigos, vai resultar em links ou imagens perdidas<br />Deseja realmente prosseguir com a exclusão?<br /><br />'); +@define('TRACKBACK_SENDING', 'Enviando trackback para a URI %s...'); +@define('TRACKBACK_SENT', 'Trackback enviada com sucesso'); +@define('TRACKBACK_FAILED', 'Trackback falhou: %s'); +@define('TRACKBACK_NOT_FOUND', 'Nenhum URI de trackback foi encontrado.'); +@define('TRACKBACK_URI_MISMATCH', 'A URI de trackback descoberta não com é semelhante à URI alvo.'); +@define('TRACKBACK_CHECKING', 'Checando <u>%s</u> por possíveis trackbacks...'); +@define('TRACKBACK_NO_DATA', 'O alvo não contém dados'); +@define('TRACKBACK_SIZE', 'URI alvo excedeu o tamanho máximo de %s bytes para um arquivo.'); +@define('VIEWMODE_THREADED', 'Alternar para exibição por discussão'); +@define('COMMENTS_VIEWMODE_THREADED', 'Discussão'); +@define('COMMENTS_VIEWMODE_LINEAR', 'Sequencial'); +@define('DISPLAY_COMMENTS_AS', 'Exibir comentários como'); +@define('DATE_FORMAT_SHORT', '%d/%m/%Y %H:%M'); +@define('NUMBER_FORMAT_DECIMALS', '2'); +@define('NUMBER_FORMAT_DECPOINT', ','); +@define('NUMBER_FORMAT_THOUSANDS', '.'); +@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Categoria #%s excluída. Os artigos antigos foram movidos para a categoria #%s'); +@define('INSTALL_TOP_AS_LINKS', 'Exibir maiores saídas/referências como links?'); +@define('INSTALL_TOP_AS_LINKS_DESC', '"não": Saídas e Referências são exibidas como puro texto para prevenir spam do google. "sim": Saídas e Refrências são exibidas como links. "padrão": Usa o valor definido na configuração global (recomendado).'); +@define('ADD_MEDIA_BLAHBLAH', '<b>Adiciona um arquivo para o seu repositório de mídia:</b><p>Aqui você pode transferir arquivos de mídia, ou oriente-me para pegá-lo em algum lugar na web! Se não possuir uma imagem apropriada, <a href="http://images.google.com" target="_blank">procure no google</a> alguma imagem que tenha relação com o assunto, os resultados são geralmente úteis e divertidos :)<p><b>Selecione o método:</b><br>'); /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:23:30
|
Update of /cvsroot/php-blog/serendipity/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14595 Modified Files: Tag: branch-smarty serendipity_lang_pt.inc.php Log Message: updated brazil/portugues translation Index: serendipity_lang_pt.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -u -d -r1.36 -r1.36.2.1 --- serendipity_lang_pt.inc.php 8 Sep 2004 08:49:29 -0000 1.36 +++ serendipity_lang_pt.inc.php 20 Sep 2004 14:23:20 -0000 1.36.2.1 @@ -82,7 +82,7 @@ @define('ADD_COMMENT', 'Adicionar Comentários'); @define('NO_COMMENTS', 'Nenhum cmentários.'); @define('POSTED_BY', 'Enviado por'); -@define('ON', 'on'); +@define('ON', 'em'); @define('A_NEW_COMMENT_BLAHBLAH', 'Um novo comentário foi enviado para o seu Blog "%s", no artigo entitulada como "%s".'); @define('A_NEW_TRACKBACK_BLAHBLAH', 'Um novo trackback foi feito para o seu Blog "%s", no artigo entitulada como "%s".'); @define('NO_CATEGORY', 'Nenhuma categoria'); @@ -103,7 +103,7 @@ @define('GO', 'Vai!'); @define('NEWSIZE', 'Novo tamanho: '); @define('RESIZE_BLAHBLAH', '<b>Redimensionar %s</b><p>'); -@define('ORIGINAL_SIZE', 'Tamanaho original: <i>%sx%s</i> pixel'); +@define('ORIGINAL_SIZE', 'Tamanho original: <i>%sx%s</i> pixel'); @define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Aqui você pode ajustar o novo tamanho das imagens. Se pretende manter as proporções, preencha apenas um valor e pressione a tecla TAB que automaticamente será calculado o novo tamanho de modo que as proporções não fiquem bagunçadas:'); @define('QUICKJUMP_CALENDAR', 'Calendário de acesso rápido'); @define('QUICKSEARCH', 'Pesquisa rápida'); @@ -225,8 +225,8 @@ @define('SCALING_IMAGE', 'Redimensionando %s para %s x %s px'); @define('KEEP_PROPORTIONS', 'Manter proporções'); @define('REALLY_SCALE_IMAGE', 'Quer mesmo redimensionar a imagem? Não haverá volta!!'); -@define('TOGGLE_ALL', 'Toggle expand all'); -@define('TOGGLE_OPTION', 'Toggle option'); +@define('TOGGLE_ALL', 'Alternar para expandir tudo'); +@define('TOGGLE_OPTION', 'Opção para alternar'); @define('SUBSCRIBE_TO_THIS_ENTRY', 'Inscrever-se para este artigo'); @define('UNSUBSCRIBE_OK', "%s teve a inscrição cancelada para este artigo"); @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Novo comentário para o artigo inscrita"%s"'); @@ -269,17 +269,17 @@ @define('PREVIOUS_PAGE', 'página anterior'); @define('NEXT_PAGE', 'próxima página'); @define('ALL_CATEGORIES', 'Todas as categorias'); -@define('DO_MARKUP', 'Perform Markup Transformations'); -@define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text. Default is "Yes".'); +@define('DO_MARKUP', 'Executar trasnformações de marcação'); +@define('DO_MARKUP_DESCRIPTION', 'Aplicar transformações de marcação ao texto (sorrisos, atalhos de marcação via *, /, _, ...). Desabilitando isso preservará qualquer código HTML que exista no texto. O padrão é "Sim".'); @define('GENERAL_PLUGIN_DATEFORMAT', 'Formatação de data'); @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formato da data atual do artigo, usando a mesma formatação da função strftime() do PHP. (Padrão: "%s")'); @define('ERROR_TEMPLATE_FILE', 'Não foi possível abrir o arquivo de template, por favor atualize o serendipity!'); @define('ADVANCED_OPTIONS', 'Opções avançadas'); @define('EDIT_ENTRY', 'Editar artigo'); -@define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br /> %s<br />and reload this page.'); +@define('HTACCESS_ERROR', 'Para checar a intalação do servidor web, serendipity precisa ter poder criar o arquivo ".htaccess". Isso não foi possível devido a erros de permissões. Por favor, ajuste as permissões para isso: <br /> %s<br />e recarregue esta página.'); @define('SIDEBAR_PLUGINS', 'Plugins da barra lateral'); @define('EVENT_PLUGINS', 'Plugins de eventos'); -@define('SORT_ORDER', 'Sort order'); +@define('SORT_ORDER', 'Ordenação'); @define('SORT_ORDER_NAME', 'Nome do arquivo'); @define('SORT_ORDER_EXTENSION', 'Extensão do arquivo'); @define('SORT_ORDER_SIZE', 'Tamanho do arquivo'); @@ -291,8 +291,8 @@ @define('THUMBNAIL_SHORT', 'Miniatura'); @define('ORIGINAL_SHORT', 'Orig.'); @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevenir cache do HTTP'); -@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".'); -@define('APPLY_MARKUP_TO', 'Apply markup to %s'); +@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Se marcada como "verdadeiro" ("true") isso irá fazer com que o link para a sua fonte RSS não permita a clientes economia de banda por cache para requisições de fonte RSS. É sugerido marcar como "falso".'); +@define('APPLY_MARKUP_TO', 'Aplicar marcação para %s'); @define('CALENDAR_BEGINNING_OF_WEEK', 'Começo da semana'); @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity detectou que sua configuração está instalada com a versão %s, entretanto serendipity está instalado na versão %s, você precisa atualizar o serendipity! <a href="%s">Clique aqui</a>'); @define('SERENDIPITY_UPGRADER_WELCOME', 'Oi, e bem-vindo ao agente de atualização do Serendipity.'); @@ -311,7 +311,6 @@ @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'A sua instalação do Serendipity foi atualizada para a versão %s'); @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Você pode retornar ao seu blog clicando %saqui%s'); -/* TRANSLATE */ @define('MANAGE_USERS', 'Gerenciar usuários'); @define('EDIT_USERS', 'Editar usuários'); @define('CREATE_USERS', 'Criar usuários'); @@ -414,13 +413,13 @@ @define('INSTALL_CAT_DISPLAY', 'Aparência e opções'); @define('INSTALL_CAT_DISPLAY_DESC', 'Padroniza como o Serendipity é exibido'); @define('INSTALL_EXTERNALSTYLE', 'Folha de estilos externa'); -@define('INSTALL_EXTERNALSTYLE_DESC', 'Você pode definir um URI para uma folha de estilos aqui, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)'); +@define('INSTALL_EXTERNALSTYLE_DESC', 'Você pode definir um URI para uma folha de estilos aqui, adicionalmente para as configurações ajustáveis no painel de administração (digite \'none\' se você não precisa disso)'); @define('INSTALL_WYSIWYG', 'Usar editor WYSIWYG'); @define('INSTALL_WYSIWYG_DESC', 'Você quer usar o editor WYSIWYG? (Funciona no IE5+ e parcialmente no Mozilla 1.3+)'); @define('INSTALL_XHTML11', 'Forçar adequação ao XHTML 1.1'); @define('INSTALL_XHTML11_DESC', 'Quer forçar uma adequação ao padrão XHTML 1.1 (pode causar problemas de exibição nos navegadores de 4ª geração (4.x))'); @define('INSTALL_POPUP', 'Habilitar o uso de janelas popups'); -@define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?'); +@define('INSTALL_POPUP_DESC', 'Você quer que o weblog utilize janelas popups para comentários, trackbacks e etc?'); @define('INSTALL_EMBED', 'O serendipity está integrado?'); @define('INSTALL_EMBED_DESC', 'Se você quer empacotar o serendipity em um website, mude para verdadeiro para descartar quaisquer cabeçalhos e apenas imprimir o conteúdo. Você pode fazer uso da opção \'Arquivo inicial\' para usar uma classe mais abrangente onde você colocaria os cabeçalhos normais de sua página. Veja o arquivo README para mais informações!'); @define('INSTALL_BLOCKREF', 'Referências bloqueadas'); @@ -458,100 +457,99 @@ @define('USERCONF_ALLOWPUBLISH', 'Direitos: Publicação de artigos?'); @define('USERCONF_ALLOWPUBLISH_DESC', 'Este usuário está autorizado a publicar artigos?'); @define('SUCCESS', 'Sucesso'); -@define('POWERED_BY_SHOW_TEXT', 'Exibir "Serendipity" como texto'); // Translate -@define('POWERED_BY_SHOW_TEXT_DESC', 'Exibirá o "Serendipity Weblog" como texto'); // Translate -@define('POWERED_BY_SHOW_IMAGE', 'Exibir "Serendipity" como um logotipo'); // Translate -@define('POWERED_BY_SHOW_IMAGE_DESC', 'Exibe o logotipo do Serendipity'); // Translate +@define('POWERED_BY_SHOW_TEXT', 'Exibir "Serendipity" como texto'); +@define('POWERED_BY_SHOW_TEXT_DESC', 'Exibirá o "Serendipity Weblog" como texto'); +@define('POWERED_BY_SHOW_IMAGE', 'Exibir "Serendipity" como um logotipo'); +@define('POWERED_BY_SHOW_IMAGE_DESC', 'Exibe o logotipo do Serendipity'); -/* TRANSLATE */ -@define('SETTINGS_SAVED_AT', 'The new settings have been saved at %s'); -@define('PLUGIN_ITEM_DISPLAY', 'Where should the item be displayed?'); -@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('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 -@define('THIS_COMMENT_NEEDS_REVIEW', 'Warning: This comment needs approval before it will be displayed'); // Translate -@define('DELETE_COMMENT', 'Delete comment'); // Translate -@define('APPROVE_COMMENT', 'Approve comment'); // Translate -@define('REQUIRES_REVIEW', 'Requires review'); // Translate -@define('COMMENT_APPROVED', 'Comment #%s has successfully been approved'); // Translate -@define('COMMENT_DELETED', 'Comment #%s has successfully been deleted'); // Translate -@define('VIEW', 'View'); // Translate -@define('COMMENT_ALREADY_APPROVED', 'Comment #%s appears to already have been approved'); // Translate -@define('COMMENT_EDITED', 'The selected comment has been edited'); // Translate -@define('HIDE', 'Hide'); // Translate -@define('VIEW_EXTENDED_ENTRY', 'Continue reading "%s"'); // Translate -@define('TRACKBACK_SPECIFIC_ON_CLICK', 'This link is not meant to be clicked. It contains the trackback URI for this entry. You can use this URI to send ping- & trackbacks from your own blog to this entry. To copy the link, right click and select "Copy Shortcut" in Internet Explorer or "Copy Link Location" in Mozilla.'); // Translate -@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Warning: This trackback needs approval before it will be displayed'); // Translate -@define('DELETE_TRACKBACK', 'Delete trackback'); // Translate -@define('APPROVE_TRACKBACK', 'Approve trackback'); // Translate -@define('TRACKBACK_APPROVED', 'Trackback #%s has successfully been approved'); // Translate -@define('TRACKBACK_DELETED', 'Trackback #%s has successfully been deleted'); // Translate -@define('COMMENTS_MODERATE', 'Comments & trackbacks to this entry requires moderation'); // Re-translate -@define('PLUGIN_SUPERUSER_HTTPS', 'Use https for login'); -@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!'); -@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?'); // Translate -@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Unchecked external links (Top Exits, Top Referrers, User comments) are not shown/shown as plain text where applicable to prevent google spam (recommended). "yes": Unchecked external links are shown as hyperlinks. Can be overridden within sidebar plugin configuration!'); // Translate -@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate -@define('FILTERS', 'Filters'); // Translate -@define('FIND_ENTRIES', 'Find entries'); // Translate -@define('FIND_COMMENTS', 'Find comments'); // Translate -@define('FIND_MEDIA', 'Find media'); // Translate -@define('FILTER_DIRECTORY', 'Directory'); // Translate -@define('SORT_BY', 'Sort by'); // Translate -@define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate -@define('MEDIA', 'Media'); // Translate -@define('MEDIA_LIBRARY', 'Media library'); // Translate -@define('ADD_MEDIA', 'Add media'); // Translate -@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate -@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate -@define('SAVE_FILE_AS', 'Save the file as:'); // Translate -@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate -@define('MEDIA_RENAME', 'Rename this file'); // Translate -@define('IMAGE_RESIZE', 'Resize this image'); // Translate -@define('MEDIA_DELETE', 'Delete this file'); // Translate -@define('FILES_PER_PAGE', 'Files per page'); // Translate -@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate -@define('SELECT_FILE', 'Select file to insert'); // Translate -@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate -@define('CALENDAR_BOW_DESC', 'The day of the week that should be considered the beginning of the week. Default is Monday'); // Translate -@define('SUPERUSER', 'Blog Administration'); // Translate -@define('ALLOWS_YOU_BLAHBLAH', 'Provides a link in the sidebar to your blog administration'); // Translate -@define('CALENDAR', 'Calendar'); // Translate -@define('SUPERUSER_OPEN_ADMIN', 'Open administration'); // Translate -@define('SUPERUSER_OPEN_LOGIN', 'Open login screen'); // Translate -@define('INVERT_SELECTIONS', 'Invert Selections'); // Translate -@define('COMMENTS_DELETE_CONFIRM', 'Are you sure you wish to delete the selected comments?'); // Translate -@define('COMMENT_DELETE_CONFIRM', 'Are you sure you wish to delete comment #%d, written by %s?'); // Translate -@define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate -@define('VIEW_COMMENT', 'View comment'); // Translate -@define('VIEW_ENTRY', 'View entry'); // Translate -@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate -@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate -@define('TRACKBACK_SENDING', 'Sending trackback to URI %s...'); // Translate -@define('TRACKBACK_SENT', 'Trackback successful'); // Translate -@define('TRACKBACK_FAILED', 'Trackback failed: %s'); // Translate -@define('TRACKBACK_NOT_FOUND', 'No trackback-URI found.'); // Translate -@define('TRACKBACK_URI_MISMATCH', 'The autodiscovered trackback URI does not match our target URI.'); // Translate -@define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...'); // Translate -@define('TRACKBACK_NO_DATA', 'Target contained no data'); // Translate -@define('TRACKBACK_SIZE', 'Target URI exceeded maximum filesize of %s bytes.'); // Translate -@define('VIEWMODE_THREADED', 'Switch to threaded view'); // Translate -@define('COMMENTS_VIEWMODE_THREADED', 'Threaded'); // Translate -@define('COMMENTS_VIEWMODE_LINEAR', 'Linear'); // Translate -@define('DISPLAY_COMMENTS_AS', 'Display comments as'); // Translate -@define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M'); // Translate -@define('NUMBER_FORMAT_DECIMALS', '2'); // Translate -@define('NUMBER_FORMAT_DECPOINT', '.'); // Translate -@define('NUMBER_FORMAT_THOUSANDS', ','); // Translate -@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Category #%s deleted. Old articles moved to category #%s'); // Translate -@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?'); // Translate -@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "default": Use setting from global configuration (recommended).'); // Translate -@define('ADD_MEDIA_BLAHBLAH', '<b>Add a file to your media repository:</b><p>Here you can upload mediafiles, or tell me to fetch them from somewhere in the web! If you don\'t have an appropriate image, <a href="http://images.google.com" target="_blank">search for images on google</a> matching your thoughts, the results are often useful and funny :)<p><b>Select method:</b><br>'); // Translate +@define('SETTINGS_SAVED_AT', 'As novas configurações foram salvas em %s'); +@define('PLUGIN_ITEM_DISPLAY', 'Onde o item deve ser exibido?'); +@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'); +@define('THIS_COMMENT_NEEDS_REVIEW', 'Atenção: Esse comentário precisa de aprovação antes que seja exibido'); +@define('DELETE_COMMENT', 'Excluir comentário'); +@define('APPROVE_COMMENT', 'Aprovar comentário'); +@define('REQUIRES_REVIEW', 'Requer revisão'); +@define('COMMENT_APPROVED', 'Comentário #%s foi aprovado corretamente'); +@define('COMMENT_DELETED', 'Comentário #%s foi excluído corretamente'); +@define('VIEW', 'Exibir'); +@define('COMMENT_ALREADY_APPROVED', 'Comentário #%s parece já ter sido aprovado'); +@define('COMMENT_EDITED', 'O comentário selecionado foi editado'); +@define('HIDE', 'Ocultar'); +@define('VIEW_EXTENDED_ENTRY', 'Continuar lendo "%s"'); +@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Esse link não deve ser clicado. Ele contém a URI de trackback para este artigo. Você pode usar esse URI para enviar ping- & trackbacks do seu próprio weblog para esse artigo. Para copiar o link, clique com o botão direito e selecione "Copiar Atalho" no Internet Explorer ou "Copiar localização do link" no Mozilla.'); +@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Atenção: Esse trackback precisa de aprovação antes que seja exibido'); +@define('DELETE_TRACKBACK', 'Excluir trackback'); +@define('APPROVE_TRACKBACK', 'Aprovar trackback'); +@define('TRACKBACK_APPROVED', 'O trackback #%s foi aprovado corretamente'); +@define('TRACKBACK_DELETED', 'O trackback #%s foi excluído corretamente'); +@define('COMMENTS_MODERATE', 'Comentários & trackbacks para este artigo requerem moderação'); +@define('PLUGIN_SUPERUSER_HTTPS', 'Usar https para login'); +@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Permitir o link de login aponte para uma link https. seu servidor web precisa ter suporte a isso!'); +@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Tornar clicáveis os links externos?'); +@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"não": Links externos não marcados (Maiores saídas, Maiores referências, Comentários de usuários) não são exibidos como puro texto para evitar spam do google (recomendado). "sim": Links externos não marcados são exibidos como links. Podem ser sobrescritos pela configuração da barra lateral!'); +@define('PAGE_BROWSE_COMMENTS', 'Página %s de %s, totlizando %s comentários'); +@define('FILTERS', 'Filtros'); +@define('FIND_ENTRIES', 'Encontrar artigos'); +@define('FIND_COMMENTS', 'Encontrar comentários'); +@define('FIND_MEDIA', 'Encontrar mídia'); +@define('FILTER_DIRECTORY', 'Diretório'); +@define('SORT_BY', 'Ordenar por'); +@define('TRACKBACK_COULD_NOT_CONNECT', 'Nenhum trackback enviado: Não foi possível abrir conexão para %s na porta %d'); +@define('MEDIA', 'Mídia'); +@define('MEDIA_LIBRARY', 'Biblioteca de mídia'); +@define('ADD_MEDIA', 'Adicionar mídia'); +@define('ENTER_MEDIA_URL', 'Entre com a URL de um arquivo para buscá-lo:'); +@define('ENTER_MEDIA_UPLOAD', 'Selecione o arquivo que deseja transferir:'); +@define('SAVE_FILE_AS', 'Salvar arquivo como:'); +@define('STORE_IN_DIRECTORY', 'Guardar no seguinte diretório: '); +@define('MEDIA_RENAME', 'Renomear esse arquivo'); +@define('IMAGE_RESIZE', 'Redimensionar essa imagem'); +@define('MEDIA_DELETE', 'Excluir esse arquivo'); +@define('FILES_PER_PAGE', 'Arquivos por página'); +@define('CLICK_FILE_TO_INSERT', 'Clique no arquivo que deseja inserir:'); +@define('SELECT_FILE', 'Selecione arquivo para inserir'); +@define('MEDIA_FULLSIZE', 'Tamanho total'); +@define('CALENDAR_BOW_DESC', 'Dia da semana que deve ser considerado o início da semana. Padrão é segunda-feira'); +@define('SUPERUSER', 'Administração do weblog'); +@define('ALLOWS_YOU_BLAHBLAH', 'Provê um link para a administração do weblog na barra lateral '); +@define('CALENDAR', 'Calendário'); +@define('SUPERUSER_OPEN_ADMIN', 'Abrir administração'); +@define('SUPERUSER_OPEN_LOGIN', 'Abrir tela de login'); +@define('INVERT_SELECTIONS', 'Inverter Seleção'); +@define('COMMENTS_DELETE_CONFIRM', 'Tem certeza de que deseja excluir os comentários selecionados?'); +@define('COMMENT_DELETE_CONFIRM', 'Tem certeza de que deseja excluir o comentário #%d, escrito por %s?'); +@define('DELETE_SELECTED_COMMENTS', 'Excluir comentários selecionados'); +@define('VIEW_COMMENT', 'Exibir comentário'); +@define('VIEW_ENTRY', 'Exibir artigo'); +@define('DELETE_FILE', 'Excluir o campo entitulado <b>%s</b>'); +@define('ABOUT_TO_DELETE_FILE', 'Você está prestes a excluir <b>%s</b><br />Se estiver utilizando esse arquivo em algum dos seus artigos, vai resultar em links ou imagens perdidas<br />Deseja realmente prosseguir com a exclusão?<br /><br />'); +@define('TRACKBACK_SENDING', 'Enviando trackback para a URI %s...'); +@define('TRACKBACK_SENT', 'Trackback enviada com sucesso'); +@define('TRACKBACK_FAILED', 'Trackback falhou: %s'); +@define('TRACKBACK_NOT_FOUND', 'Nenhum URI de trackback foi encontrado.'); +@define('TRACKBACK_URI_MISMATCH', 'A URI de trackback descoberta não com é semelhante à URI alvo.'); +@define('TRACKBACK_CHECKING', 'Checando <u>%s</u> por possíveis trackbacks...'); +@define('TRACKBACK_NO_DATA', 'O alvo não contém dados'); +@define('TRACKBACK_SIZE', 'URI alvo excedeu o tamanho máximo de %s bytes para um arquivo.'); +@define('VIEWMODE_THREADED', 'Alternar para exibição por discussão'); +@define('COMMENTS_VIEWMODE_THREADED', 'Discussão'); +@define('COMMENTS_VIEWMODE_LINEAR', 'Sequencial'); +@define('DISPLAY_COMMENTS_AS', 'Exibir comentários como'); +@define('DATE_FORMAT_SHORT', '%d/%m/%Y %H:%M'); +@define('NUMBER_FORMAT_DECIMALS', '2'); +@define('NUMBER_FORMAT_DECPOINT', ','); +@define('NUMBER_FORMAT_THOUSANDS', '.'); +@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Categoria #%s excluída. Os artigos antigos foram movidos para a categoria #%s'); +@define('INSTALL_TOP_AS_LINKS', 'Exibir maiores saídas/referências como links?'); +@define('INSTALL_TOP_AS_LINKS_DESC', '"não": Saídas e Referências são exibidas como puro texto para prevenir spam do google. "sim": Saídas e Refrências são exibidas como links. "padrão": Usa o valor definido na configuração global (recomendado).'); +@define('ADD_MEDIA_BLAHBLAH', '<b>Adiciona um arquivo para o seu repositório de mídia:</b><p>Aqui você pode transferir arquivos de mídia, ou oriente-me para pegá-lo em algum lugar na web! Se não possuir uma imagem apropriada, <a href="http://images.google.com" target="_blank">procure no google</a> alguma imagem que tenha relação com o assunto, os resultados são geralmente úteis e divertidos :)<p><b>Selecione o método:</b><br>'); /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:20:38
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13875 Modified Files: Tag: branch-smarty NEWS serendipity_functions.inc.php Log Message: mfh Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.24 retrieving revision 1.419.2.25 diff -u -d -r1.419.2.24 -r1.419.2.25 --- serendipity_functions.inc.php 20 Sep 2004 14:00:38 -0000 1.419.2.24 +++ serendipity_functions.inc.php 20 Sep 2004 14:20:21 -0000 1.419.2.25 @@ -811,7 +811,7 @@ } if ($authorid != 'all' && is_numeric($authorid)) { - $where = " WHERE ((c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < " . $serendipity['serendipityUserlevel'] . ')'; + $where = " WHERE ((c.authorid = $authorid OR c.authorid = 0) " . (!empty($serendipity['serendipityUserlevel']) ? " OR a.userlevel < {$serendipity['serendipityUserlevel']}" : '') . ')'; } else { $where = ''; } Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.14 retrieving revision 1.214.2.15 diff -u -d -r1.214.2.14 -r1.214.2.15 --- NEWS 20 Sep 2004 14:00:38 -0000 1.214.2.14 +++ NEWS 20 Sep 2004 14:20:21 -0000 1.214.2.15 @@ -20,6 +20,9 @@ Version 0.7-beta3 () ------------------------------------------------------------------------ + * Fixed bug #1030581: Category sidebar plugin now properly displays + only categories of selected author (garvinhicking) + * Fixed XML RPC API to set categories when posting via BlogJet or other interfaces (garvinhicking) |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:17:44
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106 Modified Files: serendipity_functions.inc.php NEWS Log Message: bug #1030581: categories display fixed Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.226 retrieving revision 1.227 diff -u -d -r1.226 -r1.227 --- NEWS 20 Sep 2004 14:00:13 -0000 1.226 +++ NEWS 20 Sep 2004 14:17:33 -0000 1.227 @@ -6,6 +6,9 @@ Version 0.7-beta3 () ------------------------------------------------------------------------ + * Fixed bug #1030581: Category sidebar plugin now properly displays + only categories of selected author (garvinhicking) + * Fixed XML RPC API to set categories when posting via BlogJet or other interfaces (garvinhicking) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.429 retrieving revision 1.430 diff -u -d -r1.429 -r1.430 --- serendipity_functions.inc.php 20 Sep 2004 14:00:14 -0000 1.429 +++ serendipity_functions.inc.php 20 Sep 2004 14:17:33 -0000 1.430 @@ -859,7 +859,7 @@ } if ($authorid != 'all' && is_numeric($authorid)) { - $where = " WHERE ((c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < " . $serendipity['serendipityUserlevel'] . ')'; + $where = " WHERE ((c.authorid = $authorid OR c.authorid = 0) " . (!empty($serendipity['serendipityUserlevel']) ? " OR a.userlevel < {$serendipity['serendipityUserlevel']}" : '') . ')'; } else { $where = ''; } |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:00:49
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9206 Modified Files: Tag: branch-smarty NEWS serendipity_functions.inc.php serendipity_xmlrpc.php Log Message: MFH Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.13 retrieving revision 1.214.2.14 diff -u -d -r1.214.2.13 -r1.214.2.14 --- NEWS 20 Sep 2004 09:43:59 -0000 1.214.2.13 +++ NEWS 20 Sep 2004 14:00:38 -0000 1.214.2.14 @@ -20,6 +20,9 @@ Version 0.7-beta3 () ------------------------------------------------------------------------ + * Fixed XML RPC API to set categories when posting via BlogJet + or other interfaces (garvinhicking) + * Fixed invalid standard-SQL 'CURRENT_DATE' to use a real date string. Fixes Exit-Tracking with SQLite. (garvinhicking) Index: serendipity_xmlrpc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -d -r1.16 -r1.16.2.1 --- serendipity_xmlrpc.php 9 Aug 2004 19:57:34 -0000 1.16 +++ serendipity_xmlrpc.php 20 Sep 2004 14:00:39 -0000 1.16.2.1 @@ -1,10 +1,20 @@ <?php # $Id$ +$debug_xmlrpc = false; +if ($debug_xmlrpc) { + $fp = fopen('rpc.log', 'a'); + fwrite($fp, '[' . date('d.m.Y H:i') . ']' . print_r($HTTP_RAW_POST_DATA, true)); + fclose($fp); + ob_start(); +} + session_start(); require_once 'serendipity_config.inc.php'; require_once 'bundled-libs/XML/RPC/Server.php'; -$dispatches = array('blogger.getUsersBlogs' => +$dispatches = array( + /* BLOGGER API */ + 'blogger.getUsersBlogs' => array('function' => 'blogger_getUsersBlogs'), 'blogger.getUserInfo' => array('function' => 'blogger_getUserInfo'), @@ -18,6 +28,8 @@ array('function' => 'blogger_getRecentPosts'), 'blogger.getPost' => array('function' => 'blogger_getPost'), + + /* MT/metaWeblog API */ 'metaWeblog.newPost' => array('function' => 'metaWeblog_newPost'), 'metaWeblog.editPost' => @@ -26,6 +38,14 @@ array('function' => 'metaWeblog_getPost'), 'metaWeblog.deletePost' => array('function' => 'metaWeblog_deletePost'), + 'metaWeblog.setPostCategories' => + array('function' => 'metaWeblog_setPostCategories'), + 'metaWeblog.getPostCategories' => + array('function' => 'metaWeblog_getPostCategories'), + 'metaWeblog.newMediaObject' => + array('function' => 'metaWeblog_newMediaObject'), + 'metaWeblog.getRecentPosts' => + array('function' => 'mt_getRecentPostTitles'), 'mt.getRecentPostTitles' => array('function' => 'mt_getRecentPostTitles'), 'mt.getCategoryList' => @@ -34,14 +54,10 @@ array('function' => 'metaWeblog_getPostCategories'), 'mt.setPostCategories' => array('function' => 'metaWeblog_setPostCategories'), - 'metaWeblog.setPostCategories' => - array('function' => 'metaWeblog_setPostCategories'), - 'metaWeblog.getPostCategories' => - array('function' => 'metaWeblog_getPostCategories'), - 'metaWeblog.newMediaObject' => - array('function' => 'metaWeblog_newMediaObject'), 'mt.supportedTextFilters' => - array('function' => 'mt_supportedTextFilters')); + array('function' => 'mt_supportedTextFilters'), + 'mt.publishPost' => + array('function' => 'metaWeblog_publishPost')); function blogger_getUsersBlogs($message) { global $serendipity; @@ -50,7 +66,7 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $blog1 = new XML_RPC_Value( @@ -69,7 +85,7 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $userdata = new XML_RPC_Value( @@ -91,7 +107,7 @@ $password = $val->getval(); $val = $message->params[4]; $numposts = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $entries = serendipity_fetchEntries('', false, $numposts); @@ -117,27 +133,13 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } - $entry = serendipity_fetchEntry('id', $postid); - $tmp = array( - 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), - 'postid' => new XML_RPC_Value($postid, 'string'), - 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), - 'description' => new XML_RPC_Value($entry['body'], 'string'), - 'content' => new XML_RPC_Value($entry['extended'], 'string'), - 'mt_excerpt' => new XML_RPC_Value('', 'string'), - 'mt_allow_comments' => new XML_RPC_Value(1, 'int'), - 'mt_allow_pings' => new XML_RPC_Value(1, 'int'), - 'mt_convert_breaks' => new XML_RPC_Value('', 'string'), - 'mt_keywords' => new XML_RPC_Value('', 'string'), - 'title' => new XML_RPC_Value($entry['title'],'string'), - 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), - 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string')); - $entry = new XML_RPC_Value($tmp, 'struct'); - return new XML_RPC_Response($entry); + $entry = serendipity_fetchEntry('id', $postid); + $entry = new XML_RPC_Value(blogger_setEntry($entry), 'struct'); + return new XML_RPC_Response($entry); } function mt_getCategoryList($message) { @@ -147,7 +149,7 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $cats = serendipity_fetchCategories($serendipity['authorid']); @@ -156,10 +158,13 @@ $xml_entries_vals[] = new XML_RPC_Value( array( 'categoryId' => new XML_RPC_Value($cat['categoryid'], 'string'), - 'categoryName' => new XML_RPC_Value($cat['category_name'], 'string')), 'struct'); + 'categoryName' => new XML_RPC_Value($cat['category_name'], 'string') + ), + 'struct' + ); } $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array'); - return new XML_RPC_Response($xml_entries); + return new XML_RPC_Response($xml_entries); } function mt_getRecentPostTitles($message) { @@ -169,19 +174,21 @@ $password = $val->getval(); $val = $message->params[3]; $numposts = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $entries = serendipity_fetchEntries('', false, $numposts); $xml_entries_vals = array(); - foreach ( $entries as $entry ) { + foreach ($entries as $entry) { $xml_entries_vals[] = new XML_RPC_Value( array( - 'postid' => new XML_RPC_Value($entry['id'], 'string'), - 'title' => new XML_RPC_Value($entry['title'], 'string'), - 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), - 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), - 'postid' => new XML_RPC_Value($entry['id'], 'string')), 'struct'); + 'postid' => new XML_RPC_Value($entry['id'], 'string'), + 'title' => new XML_RPC_Value($entry['title'], 'string'), + 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), + 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), + 'postid' => new XML_RPC_Value($entry['id'], 'string') + ), + 'struct'); } $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array'); return new XML_RPC_Response($xml_entries); @@ -189,7 +196,7 @@ function mt_supportedTextFilters($message) { # we support no text filters currently - return new XML_RPC_Response( new XML_RPC_Value(array(), 'array')); + return new XML_RPC_Response(new XML_RPC_Value(array(), 'array')); } function blogger_newPost($message) { @@ -198,7 +205,7 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; @@ -206,7 +213,7 @@ $entry['allow_comments'] = $serendipity['allowCommentsDefault']; $entry['moderate_comments'] = $serendipity['moderateCommentsDefault']; $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id, 'string')); + return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); } function blogger_editPost($message) { @@ -216,14 +223,14 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; $entry['body'] = $val->getval(); $entry['author'] = $username; $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id, 'string')); + return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); } function blogger_deletePost($message) { @@ -233,14 +240,36 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; $entry['body'] = $val->getval(); $entry['author'] = $username; $id = serendipity_deleteEntry($entry['id']); - return new XML_RPC_Response( new XML_RPC_Value(1, 'boolean')); + return new XML_RPC_Response(new XML_RPC_Value(1, 'boolean')); +} + +function universal_fetchCategories($post_categories) { + global $serendipity; + + $categories = array(); + if (is_array($post_categories)) { + foreach($post_categories AS $cat_id => $cat_obj) { + if (is_object($cat_obj)) { + $cat_name = $cat_obj->getval(); + $cat = serendipity_fetchCategories(null, $cat_name); + if (isset($cat[0]['categoryid'])) { + $categories[$cat[0]['categoryid']] = $cat[0]['categoryid']; + } + } elseif (is_array($cat_obj) && isset($cat_obj['categoryId'])) { + $cat_id = $cat_obj['categoryId']->getval(); + $categories[$cat_id] = $cat_id; + } + } + } + + return $categories; } function metaWeblog_newPost($message) { @@ -249,46 +278,80 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + $val = $message->params[3]; $post_array = $val->getval(); $val = $message->params[4]; $publish = $val->getval(); - $entry['title'] = $post_array['title']; - $entry['body'] = $post_array['description']; - $entry['extended'] = $post_array['mt_text_more']; - $entry['isdraft'] = ($publish == 0)?'true':'false'; - $entry['allow_comments'] = $serendipity['allowCommentsDefault']; + + $entry['categories'] = universal_fetchCategories($post_array['categories']); + $entry['title'] = $post_array['title']; + $entry['body'] = $post_array['description']; + $entry['extended'] = $post_array['mt_text_more']; + $entry['isdraft'] = ($publish == 0) ? 'true' : 'false'; + $entry['allow_comments'] = $serendipity['allowCommentsDefault']; $entry['moderate_comments'] = $serendipity['moderateCommentsDefault']; + $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id, 'string')); + + return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); +} + +function metaWeblog_publishPost($message) { + global $serendipity; + + $val = $message->params[0]; + $postid = $val->getval(); + $val = $message->params[1]; + $username = $val->getval(); + $val = $message->params[2]; + $password = $val->getval(); + + if (!serendipity_authenticate_author($username, $password)) { + return new XML_RPC_Response('', 4, 'Authentication Failed'); + } + + $entry['isdraft'] = 'false'; + $entry['id'] = $postid; + + $id = serendipity_updertEntry($entry); + return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean')); } function metaWeblog_editPost($message) { + global $serendipity; + $val = $message->params[0]; $postid = $val->getval(); $val = $message->params[1]; $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + $val = $message->params[3]; $post_array = $val->getval(); $val = $message->params[4]; $publish = $val->getval(); - $entry['title'] = $post_array['title']; - $entry['body'] = $post_array['description']; - $entry['extended'] = $post_array['mt_text_more']; - $entry['author'] = $username; - $entry['authorid'] = $serendipity['authorid']; - $entry['id'] = $postid; - $entry['isdraft'] = ($publish == 0)?'true':'false'; + + $entry['categories'] = universal_fetchCategories($post_array['categories']); + $entry['title'] = $post_array['title']; + $entry['body'] = $post_array['description']; + $entry['extended'] = $post_array['mt_text_more']; + $entry['isdraft'] = ($publish == 0) ? 'true' : 'false'; + $entry['author'] = $username; + $entry['authorid'] = $serendipity['authorid']; + $entry['id'] = $postid; + $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id)); + return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean')); } function metaWeblog_getPost($message) { @@ -299,44 +362,31 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + $entry = serendipity_fetchEntry('id', $postid); + $entry = new XML_RPC_Value(metaWeblog_setEntry($entry), 'struct'); - $tmp = array( - 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), - 'postid' => new XML_RPC_Value($postid, 'string'), - 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), - 'description' => new XML_RPC_Value($entry['body'], 'string'), - 'mt_text_more' => new XML_RPC_Value($entry['extended'], 'string'), - 'mt_excerpt' => new XML_RPC_Value('', 'string'), - 'mt_allow_comments' => new XML_RPC_Value(1, 'int'), - 'mt_allow_pings' => new XML_RPC_Value(1, 'int'), - 'mt_convert_breaks' => new XML_RPC_Value('', 'string'), - 'mt_keywords' => new XML_RPC_Value('', 'string'), - 'title' => new XML_RPC_Value($entry['title'],'string'), - 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), - 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string')); - $entry = new XML_RPC_Value($tmp, 'struct'); - return new XML_RPC_Response($entry); + return new XML_RPC_Response($entry); } -function metaweblog_deletePost($message) { +function metaWeblog_deletePost($message) { $val = $message->params[1]; $entry['id'] = $val->getval(); $val = $message->params[2]; $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; $entry['body'] = $val->getval(); $entry['author'] = $username; $id = serendipity_deleteEntry($entry['id']); - return new XML_RPC_Response( new XML_RPC_Value(1, 'boolean')); + return new XML_RPC_Response(new XML_RPC_Value(1, 'boolean')); } function metaWeblog_setPostCategories($message) { @@ -347,29 +397,44 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - $val = $message->params[3]; - $categories = $val->getval(); - $category_ids = array(); - foreach ($categories as $cat) { - $val = $cat['categoryId']; - $category_ids[] = $val->getval(); - } - if(!serendipity_authenticate_author($username, $password)) { + $categories = $message->params[3]; + + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + + $category_ids = universal_fetchCategories($categories->getval(), true); serendipity_updateEntryCategories($postid, $category_ids); - return new XML_RPC_Response( new XML_RPC_Value(1, 'boolean')); + return new XML_RPC_Response(new XML_RPC_Value(1, 'boolean')); } function metaWeblog_getPostCategories($message) { + $val = $message->params[0]; + $postid = $val->getval(); $val = $message->params[1]; $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } - return new XML_RPC_Response( new XML_RPC_Value(array(), 'array')); + + $entry = serendipity_fetchEntry('id', (int)$postid); + + $categories = array(); + if (is_array($entry['categories'])) { + foreach($entry['categories'] AS $i => $cat) { + $categories[] = new XML_RPC_Value( + array( + 'categoryId' => new XML_RPC_Value($cat['categoryid'], 'string'), + 'categoryName' => new XML_RPC_Value($cat['category_name'], 'string') + ), + 'struct' + ); + } + } + + return new XML_RPC_Response(new XML_RPC_Value($categories, 'array')); } function metaWeblog_newMediaObject($message) { @@ -382,7 +447,7 @@ $password = $val->getval(); $val = $message->params[3]; $struct = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } @@ -390,9 +455,48 @@ fwrite($fp, $struct['bits']); fclose($fp); $path = $serendipity['baseURL'] . $serendipity['uploadPath'] . $struct['name']; - return new XML_RPC_Response( new XML_RPC_Value(array('url' => new XML_RPC_Value($path, 'string')), 'struct')); + return new XML_RPC_Response(new XML_RPC_Value(array('url' => new XML_RPC_Value($path, 'string')), 'struct')); +} + +function blogger_setEntry(&$entry) { + $tmp = array( + 'content' => new XML_RPC_Value($entry['extended'], 'string'), + ); + return universal_setEntry($entry, $tmp); +} + +function metaWeblog_setEntry(&$entry) { + $tmp = array( + 'mt_text_more' => new XML_RPC_Value($entry['extended'], 'string'), + ); + return universal_setEntry($entry, $tmp); +} + +function universal_setEntry(&$entry, &$tmp) { + $tmp = array( + 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), + 'postid' => new XML_RPC_Value($postid, 'string'), + 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), + 'description' => new XML_RPC_Value($entry['body'], 'string'), + 'mt_excerpt' => new XML_RPC_Value('', 'string'), + 'mt_allow_comments' => new XML_RPC_Value(1, 'int'), + 'mt_allow_pings' => new XML_RPC_Value(1, 'int'), + 'mt_convert_breaks' => new XML_RPC_Value('', 'string'), + 'mt_keywords' => new XML_RPC_Value('', 'string'), + 'title' => new XML_RPC_Value($entry['title'],'string'), + 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), + 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), + ); + + return array_merge($entry, $tmp); } $server = new XML_RPC_Server($dispatches,1); +if ($debug_xmlrpc) { + $fp = fopen('rpc.log', 'a'); + fwrite($fp, ob_get_contents() . "\n---------------------------------------\n"); + fclose($fp); + ob_end_flush(); +} /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.23 retrieving revision 1.419.2.24 diff -u -d -r1.419.2.23 -r1.419.2.24 --- serendipity_functions.inc.php 20 Sep 2004 09:43:59 -0000 1.419.2.23 +++ serendipity_functions.inc.php 20 Sep 2004 14:00:38 -0000 1.419.2.24 @@ -799,7 +799,7 @@ /** * Fetches a users categories **/ -function serendipity_fetchCategories($authorid = null) { +function serendipity_fetchCategories($authorid = null, $name = '') { global $serendipity; if (!isset($authorid) || $authorid === null) { @@ -811,11 +811,21 @@ } if ($authorid != 'all' && is_numeric($authorid)) { - $where = " WHERE (c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < ".$serendipity['serendipityUserlevel']; + $where = " WHERE ((c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < " . $serendipity['serendipityUserlevel'] . ')'; } else { $where = ''; } + if (!empty($name)) { + if ($where == '') { + $where = ' WHERE '; + } else { + $where = ' AND '; + } + + $where .= " c.category_name = '" . serendipity_db_escape_string($name) . "'"; + } + $querystring = "SELECT c.*, a.username @@ -1574,7 +1584,7 @@ $query .= " VALUES ('$id', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$status')"; serendipity_db_query($query); - $cid = serendipity_db_insert_id(); + $cid = serendipity_db_insert_id('comments', 'id'); $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks, e.moderate_comments FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a @@ -2401,17 +2411,18 @@ if (!$_SESSION['serendipityRightPublish']) { $entry['isdraft'] = 'true'; } - if(!isset($entry['allow_comments'])){ - $entry['allow_comments']='false'; - } - if(!isset($entry['moderate_comments'])){ - $entry['moderate_comments']='false'; - } + + if(!isset($entry['allow_comments'])){ + $entry['allow_comments']='false'; + } + if(!isset($entry['moderate_comments'])){ + $entry['moderate_comments']='false'; + } $res = serendipity_db_insert('entries', $entry); if ($res) { - $entry['id'] = serendipity_db_insert_id(); + $entry['id'] = serendipity_db_insert_id('entries', 'id'); if (is_array($categories)) { foreach ($categories as $cat) { if (is_numeric($cat)) @@ -2440,9 +2451,11 @@ unset($entry['isdraft']); } - serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entrycat WHERE entryid={$entry['id']}"); - foreach ($categories as $cat) { - serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entrycat (entryid, categoryid) VALUES ({$entry['id']}, {$cat})"); + if (is_array($categories)) { + serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entrycat WHERE entryid={$entry['id']}"); + foreach ($categories as $cat) { + serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entrycat (entryid, categoryid) VALUES ({$entry['id']}, {$cat})"); + } } $res = serendipity_db_update('entries', array('id' => $entry['id']), $entry); @@ -3257,8 +3270,14 @@ $query = "DELETE FROM $serendipity[dbPrefix]entrycat WHERE entryid = " . (int)$postid; serendipity_db_query($query); - $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES (" . (int)$categories[0] . ", " . (int)$postid . ")"; - serendipity_db_query($query); + if (!is_array($categories)) { + $categories = array(0 => $categories); + } + + foreach($categories AS $idx => $cat) { + $query = "INSERT INTO $serendipity[dbPrefix]entrycat (categoryid, entryid) VALUES (" . (int)$cat . ", " . (int)$postid . ")"; + serendipity_db_query($query); + } } /* |
|
From: Garvin H. <gar...@us...> - 2004-09-20 14:00:24
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8968 Modified Files: NEWS serendipity_xmlrpc.php serendipity_functions.inc.php Log Message: Fix some XML-RPC errors so that blogJet and Zempt work with categories. Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.225 retrieving revision 1.226 diff -u -d -r1.225 -r1.226 --- NEWS 17 Sep 2004 09:45:39 -0000 1.225 +++ NEWS 20 Sep 2004 14:00:13 -0000 1.226 @@ -6,6 +6,9 @@ Version 0.7-beta3 () ------------------------------------------------------------------------ + * Fixed XML RPC API to set categories when posting via BlogJet + or other interfaces (garvinhicking) + * Fixed invalid standard-SQL 'CURRENT_DATE' to use a real date string. Fixes Exit-Tracking with SQLite. (garvinhicking) Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.428 retrieving revision 1.429 diff -u -d -r1.428 -r1.429 --- serendipity_functions.inc.php 17 Sep 2004 09:45:39 -0000 1.428 +++ serendipity_functions.inc.php 20 Sep 2004 14:00:14 -0000 1.429 @@ -847,7 +847,7 @@ /** * Fetches a users categories **/ -function serendipity_fetchCategories($authorid = null) { +function serendipity_fetchCategories($authorid = null, $name = '') { global $serendipity; if (!isset($authorid) || $authorid === null) { @@ -859,11 +859,21 @@ } if ($authorid != 'all' && is_numeric($authorid)) { - $where = " WHERE (c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < ".$serendipity['serendipityUserlevel']; + $where = " WHERE ((c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < " . $serendipity['serendipityUserlevel'] . ')'; } else { $where = ''; } + if (!empty($name)) { + if ($where == '') { + $where = ' WHERE '; + } else { + $where = ' AND '; + } + + $where .= " c.category_name = '" . serendipity_db_escape_string($name) . "'"; + } + $querystring = "SELECT c.*, a.username @@ -2641,9 +2651,11 @@ unset($entry['isdraft']); } - serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entrycat WHERE entryid={$entry['id']}"); - foreach ($categories as $cat) { - serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entrycat (entryid, categoryid) VALUES ({$entry['id']}, {$cat})"); + if (is_array($categories)) { + serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entrycat WHERE entryid={$entry['id']}"); + foreach ($categories as $cat) { + serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entrycat (entryid, categoryid) VALUES ({$entry['id']}, {$cat})"); + } } $res = serendipity_db_update('entries', array('id' => $entry['id']), $entry); @@ -3458,8 +3470,14 @@ $query = "DELETE FROM $serendipity[dbPrefix]entrycat WHERE entryid = " . (int)$postid; serendipity_db_query($query); - $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES (" . (int)$categories[0] . ", " . (int)$postid . ")"; - serendipity_db_query($query); + if (!is_array($categories)) { + $categories = array(0 => $categories); + } + + foreach($categories AS $idx => $cat) { + $query = "INSERT INTO $serendipity[dbPrefix]entrycat (categoryid, entryid) VALUES (" . (int)$cat . ", " . (int)$postid . ")"; + serendipity_db_query($query); + } } /* Index: serendipity_xmlrpc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_xmlrpc.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- serendipity_xmlrpc.php 9 Aug 2004 19:57:34 -0000 1.16 +++ serendipity_xmlrpc.php 20 Sep 2004 14:00:14 -0000 1.17 @@ -1,10 +1,20 @@ <?php # $Id$ +$debug_xmlrpc = false; +if ($debug_xmlrpc) { + $fp = fopen('rpc.log', 'a'); + fwrite($fp, '[' . date('d.m.Y H:i') . ']' . print_r($HTTP_RAW_POST_DATA, true)); + fclose($fp); + ob_start(); +} + session_start(); require_once 'serendipity_config.inc.php'; require_once 'bundled-libs/XML/RPC/Server.php'; -$dispatches = array('blogger.getUsersBlogs' => +$dispatches = array( + /* BLOGGER API */ + 'blogger.getUsersBlogs' => array('function' => 'blogger_getUsersBlogs'), 'blogger.getUserInfo' => array('function' => 'blogger_getUserInfo'), @@ -18,6 +28,8 @@ array('function' => 'blogger_getRecentPosts'), 'blogger.getPost' => array('function' => 'blogger_getPost'), + + /* MT/metaWeblog API */ 'metaWeblog.newPost' => array('function' => 'metaWeblog_newPost'), 'metaWeblog.editPost' => @@ -26,6 +38,14 @@ array('function' => 'metaWeblog_getPost'), 'metaWeblog.deletePost' => array('function' => 'metaWeblog_deletePost'), + 'metaWeblog.setPostCategories' => + array('function' => 'metaWeblog_setPostCategories'), + 'metaWeblog.getPostCategories' => + array('function' => 'metaWeblog_getPostCategories'), + 'metaWeblog.newMediaObject' => + array('function' => 'metaWeblog_newMediaObject'), + 'metaWeblog.getRecentPosts' => + array('function' => 'mt_getRecentPostTitles'), 'mt.getRecentPostTitles' => array('function' => 'mt_getRecentPostTitles'), 'mt.getCategoryList' => @@ -34,14 +54,10 @@ array('function' => 'metaWeblog_getPostCategories'), 'mt.setPostCategories' => array('function' => 'metaWeblog_setPostCategories'), - 'metaWeblog.setPostCategories' => - array('function' => 'metaWeblog_setPostCategories'), - 'metaWeblog.getPostCategories' => - array('function' => 'metaWeblog_getPostCategories'), - 'metaWeblog.newMediaObject' => - array('function' => 'metaWeblog_newMediaObject'), 'mt.supportedTextFilters' => - array('function' => 'mt_supportedTextFilters')); + array('function' => 'mt_supportedTextFilters'), + 'mt.publishPost' => + array('function' => 'metaWeblog_publishPost')); function blogger_getUsersBlogs($message) { global $serendipity; @@ -50,7 +66,7 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $blog1 = new XML_RPC_Value( @@ -69,7 +85,7 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $userdata = new XML_RPC_Value( @@ -91,7 +107,7 @@ $password = $val->getval(); $val = $message->params[4]; $numposts = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $entries = serendipity_fetchEntries('', false, $numposts); @@ -117,27 +133,13 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } - $entry = serendipity_fetchEntry('id', $postid); - $tmp = array( - 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), - 'postid' => new XML_RPC_Value($postid, 'string'), - 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), - 'description' => new XML_RPC_Value($entry['body'], 'string'), - 'content' => new XML_RPC_Value($entry['extended'], 'string'), - 'mt_excerpt' => new XML_RPC_Value('', 'string'), - 'mt_allow_comments' => new XML_RPC_Value(1, 'int'), - 'mt_allow_pings' => new XML_RPC_Value(1, 'int'), - 'mt_convert_breaks' => new XML_RPC_Value('', 'string'), - 'mt_keywords' => new XML_RPC_Value('', 'string'), - 'title' => new XML_RPC_Value($entry['title'],'string'), - 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), - 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string')); - $entry = new XML_RPC_Value($tmp, 'struct'); - return new XML_RPC_Response($entry); + $entry = serendipity_fetchEntry('id', $postid); + $entry = new XML_RPC_Value(blogger_setEntry($entry), 'struct'); + return new XML_RPC_Response($entry); } function mt_getCategoryList($message) { @@ -147,7 +149,7 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $cats = serendipity_fetchCategories($serendipity['authorid']); @@ -156,10 +158,13 @@ $xml_entries_vals[] = new XML_RPC_Value( array( 'categoryId' => new XML_RPC_Value($cat['categoryid'], 'string'), - 'categoryName' => new XML_RPC_Value($cat['category_name'], 'string')), 'struct'); + 'categoryName' => new XML_RPC_Value($cat['category_name'], 'string') + ), + 'struct' + ); } $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array'); - return new XML_RPC_Response($xml_entries); + return new XML_RPC_Response($xml_entries); } function mt_getRecentPostTitles($message) { @@ -169,19 +174,21 @@ $password = $val->getval(); $val = $message->params[3]; $numposts = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $entries = serendipity_fetchEntries('', false, $numposts); $xml_entries_vals = array(); - foreach ( $entries as $entry ) { + foreach ($entries as $entry) { $xml_entries_vals[] = new XML_RPC_Value( array( - 'postid' => new XML_RPC_Value($entry['id'], 'string'), - 'title' => new XML_RPC_Value($entry['title'], 'string'), - 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), - 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), - 'postid' => new XML_RPC_Value($entry['id'], 'string')), 'struct'); + 'postid' => new XML_RPC_Value($entry['id'], 'string'), + 'title' => new XML_RPC_Value($entry['title'], 'string'), + 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), + 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), + 'postid' => new XML_RPC_Value($entry['id'], 'string') + ), + 'struct'); } $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array'); return new XML_RPC_Response($xml_entries); @@ -189,7 +196,7 @@ function mt_supportedTextFilters($message) { # we support no text filters currently - return new XML_RPC_Response( new XML_RPC_Value(array(), 'array')); + return new XML_RPC_Response(new XML_RPC_Value(array(), 'array')); } function blogger_newPost($message) { @@ -198,7 +205,7 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; @@ -206,7 +213,7 @@ $entry['allow_comments'] = $serendipity['allowCommentsDefault']; $entry['moderate_comments'] = $serendipity['moderateCommentsDefault']; $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id, 'string')); + return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); } function blogger_editPost($message) { @@ -216,14 +223,14 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; $entry['body'] = $val->getval(); $entry['author'] = $username; $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id, 'string')); + return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); } function blogger_deletePost($message) { @@ -233,14 +240,36 @@ $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; $entry['body'] = $val->getval(); $entry['author'] = $username; $id = serendipity_deleteEntry($entry['id']); - return new XML_RPC_Response( new XML_RPC_Value(1, 'boolean')); + return new XML_RPC_Response(new XML_RPC_Value(1, 'boolean')); +} + +function universal_fetchCategories($post_categories) { + global $serendipity; + + $categories = array(); + if (is_array($post_categories)) { + foreach($post_categories AS $cat_id => $cat_obj) { + if (is_object($cat_obj)) { + $cat_name = $cat_obj->getval(); + $cat = serendipity_fetchCategories(null, $cat_name); + if (isset($cat[0]['categoryid'])) { + $categories[$cat[0]['categoryid']] = $cat[0]['categoryid']; + } + } elseif (is_array($cat_obj) && isset($cat_obj['categoryId'])) { + $cat_id = $cat_obj['categoryId']->getval(); + $categories[$cat_id] = $cat_id; + } + } + } + + return $categories; } function metaWeblog_newPost($message) { @@ -249,46 +278,80 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + $val = $message->params[3]; $post_array = $val->getval(); $val = $message->params[4]; $publish = $val->getval(); - $entry['title'] = $post_array['title']; - $entry['body'] = $post_array['description']; - $entry['extended'] = $post_array['mt_text_more']; - $entry['isdraft'] = ($publish == 0)?'true':'false'; - $entry['allow_comments'] = $serendipity['allowCommentsDefault']; + + $entry['categories'] = universal_fetchCategories($post_array['categories']); + $entry['title'] = $post_array['title']; + $entry['body'] = $post_array['description']; + $entry['extended'] = $post_array['mt_text_more']; + $entry['isdraft'] = ($publish == 0) ? 'true' : 'false'; + $entry['allow_comments'] = $serendipity['allowCommentsDefault']; $entry['moderate_comments'] = $serendipity['moderateCommentsDefault']; + $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id, 'string')); + + return new XML_RPC_Response(new XML_RPC_Value($id, 'string')); +} + +function metaWeblog_publishPost($message) { + global $serendipity; + + $val = $message->params[0]; + $postid = $val->getval(); + $val = $message->params[1]; + $username = $val->getval(); + $val = $message->params[2]; + $password = $val->getval(); + + if (!serendipity_authenticate_author($username, $password)) { + return new XML_RPC_Response('', 4, 'Authentication Failed'); + } + + $entry['isdraft'] = 'false'; + $entry['id'] = $postid; + + $id = serendipity_updertEntry($entry); + return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean')); } function metaWeblog_editPost($message) { + global $serendipity; + $val = $message->params[0]; $postid = $val->getval(); $val = $message->params[1]; $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + $val = $message->params[3]; $post_array = $val->getval(); $val = $message->params[4]; $publish = $val->getval(); - $entry['title'] = $post_array['title']; - $entry['body'] = $post_array['description']; - $entry['extended'] = $post_array['mt_text_more']; - $entry['author'] = $username; - $entry['authorid'] = $serendipity['authorid']; - $entry['id'] = $postid; - $entry['isdraft'] = ($publish == 0)?'true':'false'; + + $entry['categories'] = universal_fetchCategories($post_array['categories']); + $entry['title'] = $post_array['title']; + $entry['body'] = $post_array['description']; + $entry['extended'] = $post_array['mt_text_more']; + $entry['isdraft'] = ($publish == 0) ? 'true' : 'false'; + $entry['author'] = $username; + $entry['authorid'] = $serendipity['authorid']; + $entry['id'] = $postid; + $id = serendipity_updertEntry($entry); - return new XML_RPC_Response( new XML_RPC_Value($id)); + return new XML_RPC_Response(new XML_RPC_Value($id ? true : false, 'boolean')); } function metaWeblog_getPost($message) { @@ -299,44 +362,31 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + $entry = serendipity_fetchEntry('id', $postid); + $entry = new XML_RPC_Value(metaWeblog_setEntry($entry), 'struct'); - $tmp = array( - 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), - 'postid' => new XML_RPC_Value($postid, 'string'), - 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), - 'description' => new XML_RPC_Value($entry['body'], 'string'), - 'mt_text_more' => new XML_RPC_Value($entry['extended'], 'string'), - 'mt_excerpt' => new XML_RPC_Value('', 'string'), - 'mt_allow_comments' => new XML_RPC_Value(1, 'int'), - 'mt_allow_pings' => new XML_RPC_Value(1, 'int'), - 'mt_convert_breaks' => new XML_RPC_Value('', 'string'), - 'mt_keywords' => new XML_RPC_Value('', 'string'), - 'title' => new XML_RPC_Value($entry['title'],'string'), - 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), - 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string')); - $entry = new XML_RPC_Value($tmp, 'struct'); - return new XML_RPC_Response($entry); + return new XML_RPC_Response($entry); } -function metaweblog_deletePost($message) { +function metaWeblog_deletePost($message) { $val = $message->params[1]; $entry['id'] = $val->getval(); $val = $message->params[2]; $username = $val->getval(); $val = $message->params[3]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } $val = $message->params[4]; $entry['body'] = $val->getval(); $entry['author'] = $username; $id = serendipity_deleteEntry($entry['id']); - return new XML_RPC_Response( new XML_RPC_Value(1, 'boolean')); + return new XML_RPC_Response(new XML_RPC_Value(1, 'boolean')); } function metaWeblog_setPostCategories($message) { @@ -347,29 +397,44 @@ $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - $val = $message->params[3]; - $categories = $val->getval(); - $category_ids = array(); - foreach ($categories as $cat) { - $val = $cat['categoryId']; - $category_ids[] = $val->getval(); - } - if(!serendipity_authenticate_author($username, $password)) { + $categories = $message->params[3]; + + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } + + $category_ids = universal_fetchCategories($categories->getval(), true); serendipity_updateEntryCategories($postid, $category_ids); - return new XML_RPC_Response( new XML_RPC_Value(1, 'boolean')); + return new XML_RPC_Response(new XML_RPC_Value(1, 'boolean')); } function metaWeblog_getPostCategories($message) { + $val = $message->params[0]; + $postid = $val->getval(); $val = $message->params[1]; $username = $val->getval(); $val = $message->params[2]; $password = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } - return new XML_RPC_Response( new XML_RPC_Value(array(), 'array')); + + $entry = serendipity_fetchEntry('id', (int)$postid); + + $categories = array(); + if (is_array($entry['categories'])) { + foreach($entry['categories'] AS $i => $cat) { + $categories[] = new XML_RPC_Value( + array( + 'categoryId' => new XML_RPC_Value($cat['categoryid'], 'string'), + 'categoryName' => new XML_RPC_Value($cat['category_name'], 'string') + ), + 'struct' + ); + } + } + + return new XML_RPC_Response(new XML_RPC_Value($categories, 'array')); } function metaWeblog_newMediaObject($message) { @@ -382,7 +447,7 @@ $password = $val->getval(); $val = $message->params[3]; $struct = $val->getval(); - if(!serendipity_authenticate_author($username, $password)) { + if (!serendipity_authenticate_author($username, $password)) { return new XML_RPC_Response('', 4, 'Authentication Failed'); } @@ -390,9 +455,48 @@ fwrite($fp, $struct['bits']); fclose($fp); $path = $serendipity['baseURL'] . $serendipity['uploadPath'] . $struct['name']; - return new XML_RPC_Response( new XML_RPC_Value(array('url' => new XML_RPC_Value($path, 'string')), 'struct')); + return new XML_RPC_Response(new XML_RPC_Value(array('url' => new XML_RPC_Value($path, 'string')), 'struct')); +} + +function blogger_setEntry(&$entry) { + $tmp = array( + 'content' => new XML_RPC_Value($entry['extended'], 'string'), + ); + return universal_setEntry($entry, $tmp); +} + +function metaWeblog_setEntry(&$entry) { + $tmp = array( + 'mt_text_more' => new XML_RPC_Value($entry['extended'], 'string'), + ); + return universal_setEntry($entry, $tmp); +} + +function universal_setEntry(&$entry, &$tmp) { + $tmp = array( + 'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'), + 'postid' => new XML_RPC_Value($postid, 'string'), + 'userid' => new XML_RPC_Value($entry['authorid'], 'string'), + 'description' => new XML_RPC_Value($entry['body'], 'string'), + 'mt_excerpt' => new XML_RPC_Value('', 'string'), + 'mt_allow_comments' => new XML_RPC_Value(1, 'int'), + 'mt_allow_pings' => new XML_RPC_Value(1, 'int'), + 'mt_convert_breaks' => new XML_RPC_Value('', 'string'), + 'mt_keywords' => new XML_RPC_Value('', 'string'), + 'title' => new XML_RPC_Value($entry['title'],'string'), + 'permalink' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), + 'link' => new XML_RPC_Value($serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? '/' . $serendipity['indexFile'] . '?' : '') . '/'.PATH_ARCHIVES.'/' . $postid . '_.html', 'string'), + ); + + return array_merge($entry, $tmp); } $server = new XML_RPC_Server($dispatches,1); +if ($debug_xmlrpc) { + $fp = fopen('rpc.log', 'a'); + fwrite($fp, ob_get_contents() . "\n---------------------------------------\n"); + fclose($fp); + ob_end_flush(); +} /* vim: set sts=4 ts=4 expandtab : */ -?> +?> \ No newline at end of file |
|
From: Tom S. <tom...@us...> - 2004-09-20 10:42:45
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29289 Modified Files: Tag: branch-smarty serendipity_config.inc.php Log Message: - It's called -alpha1 Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.7 retrieving revision 1.93.2.8 diff -u -d -r1.93.2.7 -r1.93.2.8 --- serendipity_config.inc.php 20 Sep 2004 10:27:08 -0000 1.93.2.7 +++ serendipity_config.inc.php 20 Sep 2004 10:42:36 -0000 1.93.2.8 @@ -15,7 +15,7 @@ include_once(S9Y_INCLUDE_PATH . 'compat.php'); -$serendipity['version'] = '0.8-CVS-1'; +$serendipity['version'] = '0.8-alpha1'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme $serendipity['production'] = 1; $serendipity['rewrite'] = 'none'; |
|
From: Garvin H. <gar...@us...> - 2004-09-20 10:27:20
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25775 Modified Files: Tag: branch-smarty serendipity_admin_upgrader.inc.php serendipity_config.inc.php Log Message: * new version for branch (0.8-CVS-1, that's what we agreed upon, right? If not, please change ;) * fix foreach-error when no sql files where found Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.6 retrieving revision 1.93.2.7 diff -u -d -r1.93.2.6 -r1.93.2.7 --- serendipity_config.inc.php 19 Sep 2004 20:06:35 -0000 1.93.2.6 +++ serendipity_config.inc.php 20 Sep 2004 10:27:08 -0000 1.93.2.7 @@ -15,7 +15,7 @@ include_once(S9Y_INCLUDE_PATH . 'compat.php'); -$serendipity['version'] = '0.7-beta3'; +$serendipity['version'] = '0.8-CVS-1'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme $serendipity['production'] = 1; $serendipity['rewrite'] = 'none'; Index: serendipity_admin_upgrader.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -u -d -r1.21.2.1 -r1.21.2.2 --- serendipity_admin_upgrader.inc.php 16 Sep 2004 18:07:44 -0000 1.21.2.1 +++ serendipity_admin_upgrader.inc.php 20 Sep 2004 10:27:08 -0000 1.21.2.2 @@ -48,11 +48,13 @@ } $sqlfiles = array(); -foreach ( $tmpFiles as $version => $db ) { - if ( array_key_exists($serendipity['dbType'], $db) === false ) { - $sqlfiles[$version] = $db['mysql']; - } else { - $sqlfiles[$version] = $db[$serendipity['dbType']]; +if (is_array($tmpFiles)) { + foreach ($tmpFiles as $version => $db) { + if (array_key_exists($serendipity['dbType'], $db) === false ) { + $sqlfiles[$version] = $db['mysql']; + } else { + $sqlfiles[$version] = $db[$serendipity['dbType']]; + } } } |
|
From: Garvin H. <gar...@us...> - 2004-09-20 09:44:10
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18087 Modified Files: Tag: branch-smarty NEWS serendipity_functions.inc.php Log Message: don't send more than one trackback to a link Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.22 retrieving revision 1.419.2.23 diff -u -d -r1.419.2.22 -r1.419.2.23 --- serendipity_functions.inc.php 19 Sep 2004 21:30:43 -0000 1.419.2.22 +++ serendipity_functions.inc.php 20 Sep 2004 09:43:59 -0000 1.419.2.23 @@ -2309,22 +2309,29 @@ $names = $matches[1]; $tmpid = serendipity_db_escape_string($id); - + $checked_locations = array(); for ($i = 0, $j = count($locations); $i < $j; ++$i) { - if($locations[$i][0] == '/') { + if ($locations[$i][0] == '/') { $locations[$i] = 'http' . (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $locations[$i]; } + if (!empty($checked_locations[$locations[$i]])) { + // If the same link in an entry has been trackbacked already, don't try another time. + continue; + } + $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references - WHERE entry_id = '". (int)$tmpid ."' - AND link = '" . serendipity_db_escape_string($locations[$i]) . "'"; + WHERE entry_id = '". (int)$tmpid ."' + AND link = '" . serendipity_db_escape_string($locations[$i]) . "'"; $row = serendipity_db_query($query, true, 'num'); if ($row[0] > 0) { continue; } + if (!isset($serendipity['noautodiscovery']) || !$serendipity['noautodiscovery']) { serendipity_reference_autodiscover($locations[$i], $url, $author, $title, serendipity_trackback_excerpt($text)); + $checked_locations[$locations[$i]] = true; // Store trackbacked link so that no further trackbacks will be sent to the same link } } serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid'"); @@ -3433,8 +3440,8 @@ function serendipity_smarty_hookPlugin($params, &$smarty) { global $serendipity; - static $hookable = array('frontend_header', - 'entries_footer', + static $hookable = array('frontend_header', + 'entries_footer', 'frontend_comment'); if ( !isset($params['hook']) ) { Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.12 retrieving revision 1.214.2.13 diff -u -d -r1.214.2.12 -r1.214.2.13 --- NEWS 20 Sep 2004 09:23:33 -0000 1.214.2.12 +++ NEWS 20 Sep 2004 09:43:59 -0000 1.214.2.13 @@ -3,6 +3,9 @@ Version 0.8 () ------------------------------------------------------------------------ + * Fixed bug #1031059 - Trackbacks to a link will not be sent more + than once (garvinhicking) + * Added "Ping-o-Matic!" to weblogping plugin (garvinhicking) * RSS Feed export will not contain rewritten URLs using event |
|
From: Garvin H. <gar...@us...> - 2004-09-20 09:23:43
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14163/plugins/serendipity_event_weblogping Modified Files: Tag: branch-smarty serendipity_event_weblogping.php Log Message: added ping-o-matic Index: serendipity_event_weblogping.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -d -r1.9 -r1.9.2.1 --- serendipity_event_weblogping.php 22 Jun 2004 13:45:47 -0000 1.9 +++ serendipity_event_weblogping.php 20 Sep 2004 09:23:34 -0000 1.9.2.1 @@ -45,6 +45,14 @@ $this->services = array( array( + 'name' => 'Ping-o-Matic', + 'host' => 'rpc.pingomatic.com', + 'path' => '/', + 'extended' => true, + 'supersedes' => array('blo.gs', 'blogrolling.com', 'technorati.com', 'weblogs.com', 'Yahoo!') + ), + + array( 'name' => 'blo.gs', 'host' => 'ping.blo.gs', 'path' => '/', |
|
From: Garvin H. <gar...@us...> - 2004-09-20 09:23:42
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14163 Modified Files: Tag: branch-smarty NEWS Log Message: added ping-o-matic Index: NEWS =================================================================== RCS file: /cvsroot/php-blog/serendipity/NEWS,v retrieving revision 1.214.2.11 retrieving revision 1.214.2.12 diff -u -d -r1.214.2.11 -r1.214.2.12 --- NEWS 17 Sep 2004 09:44:55 -0000 1.214.2.11 +++ NEWS 20 Sep 2004 09:23:33 -0000 1.214.2.12 @@ -3,6 +3,8 @@ Version 0.8 () ------------------------------------------------------------------------ + * Added "Ping-o-Matic!" to weblogping plugin (garvinhicking) + * RSS Feed export will not contain rewritten URLs using event plugins (garvinhicking) |
|
From: Tom S. <tom...@us...> - 2004-09-19 21:30:53
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10225/templates/default Modified Files: Tag: branch-smarty entries.tpl Added Files: Tag: branch-smarty entries_summary.tpl Log Message: - Move the entry summary to its own template - Simplify logic when selecting between short or normal entry display mode. They are essentially the same, they just use a different template. Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -d -r1.1.2.7 -r1.1.2.8 --- entries.tpl 19 Sep 2004 20:06:36 -0000 1.1.2.7 +++ entries.tpl 19 Sep 2004 21:30:44 -0000 1.1.2.8 @@ -1,20 +1,4 @@ <!-- ENTRIES START --> - -{if $is_short_mode} - - <div class='serendipity_date'>{$CONST.TOPICS_OF} {$short_timestamp|formatTime:DATE_FORMAT_ENTRY}</div> - - <div class="serendipity_entry"> - {section name=date loop=$bydate} - {section name=x loop=$bydate[date]} - <a href="{$byedate[date][x].entryLink}">{$bydate[date][x].title}</a> - <br /> - {/section} - {/section} - </div> - -{else} - {section name=date loop=$bydate} <div class="serendipity_Entry_Date"> <h3 class="serendipity_date">{$dateref[date]|formatTime:DATE_FORMAT_ENTRY}</h3> @@ -178,7 +162,4 @@ {serendipity_hookPlugin hook="entries_footer"} </div> - -{/if} - <!-- ENTRIES END --> --- NEW FILE: entries_summary.tpl --- <div class='serendipity_date'>{$CONST.TOPICS_OF} {$bydate[0][0].timestamp|formatTime:"%B, %Y"}</div> <div class="serendipity_entry"> {section name=date loop=$bydate} {section name=x loop=$bydate[date]} <a href="{$bydate[date][x].entryLink}">{$bydate[date][x].title}</a> <br /> {/section} {/section} </div> |
|
From: Tom S. <tom...@us...> - 2004-09-19 21:30:52
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10225 Modified Files: Tag: branch-smarty serendipity_functions.inc.php Log Message: - Move the entry summary to its own template - Simplify logic when selecting between short or normal entry display mode. They are essentially the same, they just use a different template. Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.21 retrieving revision 1.419.2.22 diff -u -d -r1.419.2.21 -r1.419.2.22 --- serendipity_functions.inc.php 19 Sep 2004 20:06:35 -0000 1.419.2.21 +++ serendipity_functions.inc.php 19 Sep 2004 21:30:43 -0000 1.419.2.22 @@ -1118,145 +1118,114 @@ $dateref[$datekey] = $entries[$x]['timestamp']; } - if (!isset($serendipity['short_archives']) || !$serendipity['short_archives']) { - foreach($bydate AS $date => $ents) { - foreach($ents AS $x => $_entry) { - $entry = &$bydate[$date][$x]; - serendipity_plugin_api::hook_event('frontend_display', $entry); + foreach($bydate AS $date => $ents) { + foreach($ents AS $x => $_entry) { + $entry = &$bydate[$date][$x]; + serendipity_plugin_api::hook_event('frontend_display', $entry); - $entry['entryLink'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); - $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL'); - $entry['title'] = htmlspecialchars($entry['title']); - $entry['commURL'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); + $entry['entryLink'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); + $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL'); + $entry['title'] = htmlspecialchars($entry['title']); + $entry['commURL'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); - if (strlen($entry['extended'])) { - $entry['has_extended'] = true; - } + if (strlen($entry['extended'])) { + $entry['has_extended'] = true; + } - if (isset($entry['exflag']) && $entry['exflag'] && $extended) { - $entry['is_extended'] = true; - } + if (isset($entry['exflag']) && $entry['exflag'] && $extended) { + $entry['is_extended'] = true; + } - if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0)) { - $entry['has_comments'] = true; - $entry['label_comments'] = $entry['comments'] == 1 ? COMMENT : COMMENTS; - } + if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0)) { + $entry['has_comments'] = true; + $entry['label_comments'] = $entry['comments'] == 1 ? COMMENT : COMMENTS; + } - if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0)) { - $entry['has_trackbacks'] = true; - $entry['label_trackbacks'] = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS; - } + if (!isset($serendipity['GET']['id']) && (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0)) { + $entry['has_trackbacks'] = true; + $entry['label_trackbacks'] = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS; + } - if ($_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $entry['authorid'])) { - $entry['is_entry_owner'] = true; - } + if ($_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $entry['authorid'])) { + $entry['is_entry_owner'] = true; + } - $eventData = array_merge(array('display_dat' => ''), $entry); - serendipity_plugin_api::hook_event('frontend_display:html:per_entry', $eventData); - $entry['plugin_display_dat'] = $eventData['display_dat']; + $eventData = array_merge(array('display_dat' => ''), $entry); + serendipity_plugin_api::hook_event('frontend_display:html:per_entry', $eventData); + $entry['plugin_display_dat'] = $eventData['display_dat']; - if ($preview) { - ob_start(); - serendipity_plugin_api::hook_event('backend_preview', $entry); - $entry['backend_preview'] = ob_get_contents(); - ob_end_clean(); - } + if ($preview) { + ob_start(); + serendipity_plugin_api::hook_event('backend_preview', $entry); + $entry['backend_preview'] = ob_get_contents(); + ob_end_clean(); + } - if (isset($serendipity['GET']['id'])) { - $comm_url = serendipity_archiveURL( - $entry['id'], - $entry['title'], - 'baseURL', - false - ); + /* IF WE ARE DISPLAYING A FULL ENTRY */ + if (isset($serendipity['GET']['id'])) { + $comm_url = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); - serendipity_printTrackbacks( - serendipity_fetchTrackbacks( - $entry['id'] - ) - ); + serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id'])); - ob_start(); // TODO: Remove recursion and output buffering - serendipity_printComments( - serendipity_fetchComments( - $entry['id'] - ), - (isset($entry['allow_comments']) ? $entry['allow_comments'] : true), - true, - $viewmode - ); + ob_start(); // TODO: Remove recursion and output buffering + serendipity_printComments(serendipity_fetchComments($entry['id']),(isset($entry['allow_comments']) ? $entry['allow_comments'] : true), true, $viewmode); - if (!empty($serendipity['POST']['preview'])) { - serendipity_printComments( - array( + if (!empty($serendipity['POST']['preview'])) { + serendipity_printComments( + array( array( - 'email' => $serendipity['POST']['email'], - 'username' => $serendipity['POST']['name'], - 'body' => $serendipity['POST']['comment'], - 'url' => $serendipity['POST']['url'], - 'parent_id' => $serendipity['POST']['replyTo'], - 'timestamp' => time() + 'email' => $serendipity['POST']['email'], + 'username' => $serendipity['POST']['name'], + 'body' => $serendipity['POST']['comment'], + 'url' => $serendipity['POST']['url'], + 'parent_id' => $serendipity['POST']['replyTo'], + 'timestamp' => time() ) - ), - false, - false, - $serendipity['POST']['replyTo'] - ); - } - $serendipity['smarty']->assign('comments_list', ob_get_contents()); - ob_end_clean(); - serendipity_smarty_fetch('COMMENTS', 'comments.tpl'); + ), + false, + false, + $serendipity['POST']['replyTo'] + ); + } - if ($serendipity['GET']['cview'] == VIEWMODE_LINEAR) { - $serendipity['smarty']->assign('is_cview_linear', true); - } else { - $serendipity['smarty']->assign('is_cview_linear', false); - } + $serendipity['smarty']->assign('comments_list', ob_get_contents()); + ob_end_clean(); + serendipity_smarty_fetch('COMMENTS', 'comments.tpl'); - $serendipity['smarty']->assign( - array( + if ($serendipity['GET']['cview'] == VIEWMODE_LINEAR) { + $serendipity['smarty']->assign('is_cview_linear', true); + } else { + $serendipity['smarty']->assign('is_cview_linear', false); + } + + $serendipity['smarty']->assign( + array( 'is_cview_linear' => ($serendipity['GET']['cview'] == VIEWMODE_LINEAR ? true : false), 'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false), 'is_comment_added' => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true' ? true: false), 'is_comment_closed' => (!serendipity_db_bool($entry['allow_comments']) ? true : false) - ) - ); - - serendipity_displayCommentForm( - $entry['id'], - $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url, - true, - $serendipity['POST'], - true, - serendipity_db_bool($entry['moderate_comments']) - ); - } - } // end for-loop (entries) - } // end for-loop (dates) + ) + ); - if (!isset($serendipity['GET']['id']) && - (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) && - (count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) { - serendipity_printEntryFooter(); - } else { - serendipity_printEntryFooter(true); - } - } else { // else short mode - foreach($bydate AS $date => $ents) { - foreach($ents AS $x => $_entry) { - $entry = &$bydate[$date][$x]; - $entry['entryLink'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath'); - } - } + serendipity_displayCommentForm( + $entry['id'], + $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?url=' . $comm_url, + true, + $serendipity['POST'], + true, + serendipity_db_bool($entry['moderate_comments']) + ); + } /* END FULL ENTRY LOGIC */ + } // end for-loop (entries) + } // end for-loop (dates) - $s = &$serendipity['GET']['range']; - $serendipity['smarty']->assign( - array( - 'is_short_mode' => true, - 'short_timestamp' => mktime(0, 0, 0, substr($s, 4, 2), 1, substr($s, 0, 4)) - ) - ); - } // end else short mode + if (!isset($serendipity['GET']['id']) && + (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) && + (count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) { + serendipity_printEntryFooter(); + } else { + serendipity_printEntryFooter(true); + } $serendipity['smarty']->assign( array( @@ -1265,7 +1234,11 @@ ) ); - serendipity_smarty_fetch('ENTRIES', 'entries.tpl', true); + if (isset($serendipity['short_archives']) && $serendipity['short_archives']) { + serendipity_smarty_fetch('ENTRIES', 'entries_summary.tpl', true); + } else { + serendipity_smarty_fetch('ENTRIES', 'entries.tpl', true); + } } // end function serendipity_printEntries |
|
From: Tom S. <tom...@us...> - 2004-09-19 21:07:25
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5518 Modified Files: Tag: branch-smarty commentform.tpl Log Message: - Remove space Index: commentform.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/commentform.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 --- commentform.tpl 19 Sep 2004 20:06:36 -0000 1.1.2.2 +++ commentform.tpl 19 Sep 2004 21:07:16 -0000 1.1.2.3 @@ -38,7 +38,7 @@ <input id="checkbox_remember" type="checkbox" name="serendipity[remember]" {$commentform_remember} /><label for="checkbox_remember">{$CONST.REMEMBER_INFO}</label> {if $is_allowSubscriptions} <br /> - <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" {$commentform_subscribe} /><label for="checkbox_subscribe"> {$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label> + <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" {$commentform_subscribe} /><label for="checkbox_subscribe">{$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label> {/if} </td> </tr> |
|
From: Tom S. <tom...@us...> - 2004-09-19 20:06:46
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24787 Modified Files: Tag: branch-smarty serendipity_config.inc.php serendipity_functions.inc.php serendipity_genpage.inc.php Log Message: - Allow Smarty to hook certain event - Rename the sidebar function to serendipity_printSidebar Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.20 retrieving revision 1.419.2.21 diff -u -d -r1.419.2.20 -r1.419.2.21 --- serendipity_functions.inc.php 19 Sep 2004 00:31:25 -0000 1.419.2.20 +++ serendipity_functions.inc.php 19 Sep 2004 20:06:35 -0000 1.419.2.21 @@ -213,11 +213,6 @@ $comments = serendipity_fetchComments($id); } - ob_start(); - serendipity_plugin_api::hook_event('frontend_comment', $nullParam); - $data['frontend_comment'] = ob_get_contents(); - ob_end_clean(); - $serendipity['smarty']->assign( array( 'commentform_url' => $url, @@ -229,7 +224,6 @@ 'commentform_replyTo' => serendipity_generateCommentList($id, $comments, ((isset($data['replyTo']) && ($data['replyTo'])) ? $data['replyTo'] : 0)), 'commentform_subscribe' => isset($data['subscribe']) ? 'checked="checked"' : '', 'commentform_data' => isset($data['comment']) ? $data['comment'] : '', - 'plugin_frontend_comment' => $data['frontend_comment'], 'is_commentform_showToolbar' => $showToolbar, 'is_allowSubscriptions' => $serendipity['allowSubscriptions'], 'is_moderate_comments' => $moderate_comments @@ -1082,11 +1076,6 @@ $serendipity['smarty']->assign('footer_next_page', $serendipity['baseURL'] . $serendipity['indexFile'] . '?serendipity[page]=' . ($serendipity['GET']['page'] + 1) . $add_query); } } - - ob_start(); - serendipity_plugin_api::hook_event('entries_footer', $serendipity); - $serendipity['smarty']->assign('plugin_entries_footer', ob_get_contents()); - ob_end_clean(); } /** @@ -3469,9 +3458,36 @@ } } -function serendipity_printSidebar($params, &$smarty) { +function serendipity_smarty_hookPlugin($params, &$smarty) { + global $serendipity; + static $hookable = array('frontend_header', + 'entries_footer', + 'frontend_comment'); + + if ( !isset($params['hook']) ) { + $smarty->trigger_error(__FUNCTION__ .": missing 'hook' parameter"); + return; + } + if ( !in_array($params['hook'], $hookable) ) { + $smarty->trigger_error(__FUNCTION__ .": illegal hook '". $params['hook'] ."'"); + return; + } + + if ( !isset($params['data']) ) { + $params['data'] = &$serendipity; + } + if ( !isset($params['adddata']) ) { + $params['add'] = null; + } + + serendipity_plugin_api::hook_event($params['hook'], $params['data'], $params['add']); +} + + +function serendipity_smarty_printSidebar($params, &$smarty) { if ( !isset($params['side']) ) { $smarty->trigger_error(__FUNCTION__ .": missing 'side' parameter"); + return; } echo serendipity_plugin_api::generate_plugins($params['side']); } Index: serendipity_genpage.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v retrieving revision 1.33.2.7 retrieving revision 1.33.2.8 diff -u -d -r1.33.2.7 -r1.33.2.8 --- serendipity_genpage.inc.php 19 Sep 2004 00:31:25 -0000 1.33.2.7 +++ serendipity_genpage.inc.php 19 Sep 2004 20:06:36 -0000 1.33.2.8 @@ -38,12 +38,6 @@ ) ); -ob_start(); -serendipity_plugin_api::hook_event('frontend_header', $serendipity); -$serendipity['smarty']->assign('plugin_frontend_header', ob_get_contents()); -ob_end_clean(); - - if ($serendipity['smarty_raw_mode']) { include_once(serendipity_getTemplateFile('layout.php', 'serendipityPath')); } else { Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.5 retrieving revision 1.93.2.6 diff -u -d -r1.93.2.5 -r1.93.2.6 --- serendipity_config.inc.php 19 Sep 2004 00:31:25 -0000 1.93.2.5 +++ serendipity_config.inc.php 19 Sep 2004 20:06:35 -0000 1.93.2.6 @@ -244,8 +244,8 @@ $serendipity['smarty']->register_modifier('emptyPrefix', 'serendipity_emptyPrefix'); $serendipity['smarty']->register_modifier('printf', 'serendipity_printf'); $serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime'); -$serendipity['smarty']->register_function('serendipity_sidebar', 'serendipity_printSidebar'); - +$serendipity['smarty']->register_function('serendipity_printSidebar', 'serendipity_smarty_printSidebar'); +$serendipity['smarty']->register_function('serendipity_hookPlugin', 'serendipity_smarty_hookPlugin'); /* vim: set sts=4 ts=4 expandtab : */ ?> |
|
From: Tom S. <tom...@us...> - 2004-09-19 20:06:46
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24787/templates/default Modified Files: Tag: branch-smarty commentform.tpl entries.tpl index.tpl Log Message: - Allow Smarty to hook certain event - Rename the sidebar function to serendipity_printSidebar Index: entries.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -d -r1.1.2.6 -r1.1.2.7 --- entries.tpl 10 Sep 2004 22:20:26 -0000 1.1.2.6 +++ entries.tpl 19 Sep 2004 20:06:36 -0000 1.1.2.7 @@ -176,7 +176,7 @@ <a href="{$footer_next_page}">» {$CONST.NEXT_PAGE}</a> {/if} - {$plugin_entries_footer} + {serendipity_hookPlugin hook="entries_footer"} </div> {/if} Index: commentform.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/commentform.tpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- commentform.tpl 9 Sep 2004 15:00:45 -0000 1.1.2.1 +++ commentform.tpl 19 Sep 2004 20:06:36 -0000 1.1.2.2 @@ -27,7 +27,7 @@ <td class="serendipity_commentsLabel">{$CONST.COMMENT}</td> <td class="serendipity_commentsValue"> <textarea rows="10" cols="40" name="serendipity[comment]">{$commentform_data}</textarea><br /> - {$plugin_frontend_comment} + {serendipity_hookPlugin hook="frontend_comment"} </td> </tr> Index: index.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/index.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 --- index.tpl 19 Sep 2004 00:31:25 -0000 1.1.2.2 +++ index.tpl 19 Sep 2004 20:06:36 -0000 1.1.2.3 @@ -19,12 +19,12 @@ <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&entry_id={$entry_id}" /> {/if} -{$plugin_frontend_header} +{serendipity_hookPlugin hook="frontend_header"} </head> <body> {else} -{$plugin_frontend_header} +{serendipity_hookPlugin hook="frontend_header"} {/if} {if $is_raw_mode != true} @@ -39,9 +39,9 @@ <table id="mainpane"> <tr> - <td id="serendipityLeftSideBar" valign="top">{serendipity_sidebar side="left"}</td> + <td id="serendipityLeftSideBar" valign="top">{serendipity_printSidebar side="left"}</td> <td id="content" valign="top">{$CONTENT}</td> - <td id="serendipityRightSideBar" valign="top">{serendipity_sidebar side="right"}</td> + <td id="serendipityRightSideBar" valign="top">{serendipity_printSidebar side="right"}</td> </tr> </table> {/if} |
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23834 Modified Files: Tag: branch-smarty index.php serendipity_config.inc.php serendipity_functions.inc.php serendipity_genpage.inc.php serendipity_plugin_api.php Log Message: - Turn sidebars into smarty templates TODO: Add some {if} logic to index.tpl so we don't display the sidebar when there are no plugins in it - Add process time to index.php, for benchmark during development Index: serendipity_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v retrieving revision 1.93.2.4 retrieving revision 1.93.2.5 diff -u -d -r1.93.2.4 -r1.93.2.5 --- serendipity_config.inc.php 10 Sep 2004 15:48:28 -0000 1.93.2.4 +++ serendipity_config.inc.php 19 Sep 2004 00:31:25 -0000 1.93.2.5 @@ -15,7 +15,7 @@ include_once(S9Y_INCLUDE_PATH . 'compat.php'); -$serendipity['version'] = '0.7-beta1'; +$serendipity['version'] = '0.7-beta3'; $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme $serendipity['production'] = 1; $serendipity['rewrite'] = 'none'; @@ -244,6 +244,8 @@ $serendipity['smarty']->register_modifier('emptyPrefix', 'serendipity_emptyPrefix'); $serendipity['smarty']->register_modifier('printf', 'serendipity_printf'); $serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime'); +$serendipity['smarty']->register_function('serendipity_sidebar', 'serendipity_printSidebar'); + /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_plugin_api.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -d -r1.23 -r1.23.2.1 --- serendipity_plugin_api.php 17 Jun 2004 20:57:10 -0000 1.23 +++ serendipity_plugin_api.php 19 Sep 2004 00:31:25 -0000 1.23.2.1 @@ -295,39 +295,34 @@ return serendipity_db_query($sql); } - function generate_plugins($side, $tagname = 'div') + function generate_plugins($side) { + global $serendipity; $plugins = serendipity_plugin_api::enum_plugins($side); if (!is_array($plugins)) { return; } - - echo "<$tagname id=\"serendipity" . ucfirst($side) . "SideBar\">\n"; + + $pluginData = array(); foreach ($plugins as $plugin_data) { $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']); + $class = get_class($plugin); $title = ''; + /* TODO: make generate_content NOT echo its output */ ob_start(); - if ($plugin->generate_content($title) !== false) { - $content = ob_get_contents(); - $class = get_class($plugin); - ob_end_clean(); + $plugin->generate_content($title); + $content = ob_get_contents(); + ob_end_clean(); - echo " <div class=\"$plugin->wrap_class sidebar_wrap_$class\">\n"; - if (!empty($title)) { - echo " <h3 class=\"$plugin->title_class sidebar_title_$class\">$title</h3>\n"; - } - echo " <div class=\"$plugin->content_class sidebar_content_$class\">\n"; - echo " $content\n"; - echo " </div>\n"; - echo " </div>\n"; - } else { - ob_end_clean(); - } + $pluginData[] = array('side' => $side, + 'class' => get_class($plugin), + 'title' => $title, + 'content' => $content); } - - echo "</$tagname>\n"; + $serendipity['smarty']->assign('plugindata', $pluginData); + return serendipity_smarty_fetch('sidebar_'. $side, 'sidebar.tpl', true); } function get_plugin_title(&$plugin, $default_title = '') Index: serendipity_genpage.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v retrieving revision 1.33.2.6 retrieving revision 1.33.2.7 diff -u -d -r1.33.2.6 -r1.33.2.7 --- serendipity_genpage.inc.php 10 Sep 2004 22:20:25 -0000 1.33.2.6 +++ serendipity_genpage.inc.php 19 Sep 2004 00:31:25 -0000 1.33.2.7 @@ -34,7 +34,7 @@ 'serendipityHTTPPath' => $serendipity['serendipityHTTPPath'], 'serendipityBaseURL' => $serendipity['baseURL'], 'serendipityRewritePrefix' => $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '', - 'serendipityIndexFile' => $serendipity['indexFile'] + 'serendipityIndexFile' => $serendipity['indexFile'], ) ); Index: index.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/index.php,v retrieving revision 1.49.2.2 retrieving revision 1.49.2.3 diff -u -d -r1.49.2.2 -r1.49.2.3 --- index.php 14 Sep 2004 13:11:16 -0000 1.49.2.2 +++ index.php 19 Sep 2004 00:31:24 -0000 1.49.2.3 @@ -1,5 +1,14 @@ <?php # $Id$ +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. header('HTTP/1.0 200\r\n'); @@ -218,5 +227,7 @@ $serendipity['smarty_file'] = '404.tpl'; } $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath')); + +echo '<center style="color: red; font-size: large">Process complete in '. (microtime_float()-$time_start) .' ms</center>'; /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?> Index: serendipity_functions.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v retrieving revision 1.419.2.19 retrieving revision 1.419.2.20 diff -u -d -r1.419.2.19 -r1.419.2.20 --- serendipity_functions.inc.php 17 Sep 2004 09:44:55 -0000 1.419.2.19 +++ serendipity_functions.inc.php 19 Sep 2004 00:31:25 -0000 1.419.2.20 @@ -3453,6 +3453,8 @@ $output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode'])); $serendipity['smarty']->assign($block, $output); + + return $output; } function serendipity_emptyPrefix($string, $prefix = ': ') { @@ -3467,6 +3469,13 @@ } } +function serendipity_printSidebar($params, &$smarty) { + if ( !isset($params['side']) ) { + $smarty->trigger_error(__FUNCTION__ .": missing 'side' parameter"); + } + echo serendipity_plugin_api::generate_plugins($params['side']); +} + function serendipity_smarty_formatTime($timestamp, $format) { if (defined($format)) { return serendipity_formatTime(constant($format), $timestamp); |
|
From: Tom S. <tom...@us...> - 2004-09-19 00:31:35
|
Update of /cvsroot/php-blog/serendipity/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23834/templates/default Modified Files: Tag: branch-smarty index.tpl smarty_layout.php Added Files: Tag: branch-smarty sidebar.tpl Log Message: - Turn sidebars into smarty templates TODO: Add some {if} logic to index.tpl so we don't display the sidebar when there are no plugins in it - Add process time to index.php, for benchmark during development Index: smarty_layout.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/smarty_layout.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 --- smarty_layout.php 9 Sep 2004 18:50:13 -0000 1.1.2.2 +++ smarty_layout.php 19 Sep 2004 00:31:25 -0000 1.1.2.3 @@ -4,18 +4,6 @@ include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php'); include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php'); -if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) { - ob_start(); - serendipity_plugin_api::generate_plugins('left', 'td'); - $serendipity['smarty']->assign('left_sidebar', ob_get_contents()); - ob_end_clean(); - - ob_start(); - serendipity_plugin_api::generate_plugins('right', 'td'); - $serendipity['smarty']->assign('right_sidebar', ob_get_contents()); - ob_end_clean(); -} - if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) { $serendipity['GET']['range'] = date('Ymd'); } --- NEW FILE: sidebar.tpl --- {foreach from=$plugindata item=item} <div class="serendipitySideBarItem"> <h3 class="serendipitySideBarTitle {$item.class}">{$item.title}</h3> <div class="serendipitySideBarContent">{$item.content}</div> </div> {/foreach} Index: index.tpl =================================================================== RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/index.tpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- index.tpl 9 Sep 2004 15:00:45 -0000 1.1.2.1 +++ index.tpl 19 Sep 2004 00:31:25 -0000 1.1.2.2 @@ -39,11 +39,9 @@ <table id="mainpane"> <tr> - {$left_sidebar} - + <td id="serendipityLeftSideBar" valign="top">{serendipity_sidebar side="left"}</td> <td id="content" valign="top">{$CONTENT}</td> - - {$right_sidebar} + <td id="serendipityRightSideBar" valign="top">{serendipity_sidebar side="right"}</td> </tr> </table> {/if} @@ -53,4 +51,4 @@ {if $is_embedded != true} </body> </html> -{/if} \ No newline at end of file +{/if} |
|
From: Tom S. <tom...@us...> - 2004-09-18 19:47:15
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042/plugins/serendipity_event_spamblock Modified Files: Tag: branch-smarty serendipity_event_spamblock.php Log Message: MFH Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -d -r1.4.2.1 -r1.4.2.2 --- serendipity_event_spamblock.php 17 Sep 2004 12:06:58 -0000 1.4.2.1 +++ serendipity_event_spamblock.php 18 Sep 2004 19:47:06 -0000 1.4.2.2 @@ -4,18 +4,18 @@ default: @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam Protector'); @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam'); - @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'SPAM Prevention detected invalid message. Comment not added.'); - @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'SPAM Prevention asks you to not mass-post comments to this blog. Comment not added.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'Spam Prevention: Invalid message.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'Spam Prevention: You cannot post a comment so soon after submitting another one.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'Spam Prevention: The IP of the computer you are posting from, is listed as an open relay.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'This blog is in "Emergency Comment Blockage Mode", please come back another time'); @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Do not allow duplicate comments'); @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Do not allow users to submit a comment which contains the same body as an already submitted comment'); @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', 'Emergency comment shutdown'); @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC', 'Temporarily disable comments for all entries. Useful if your blog is under spam attack.'); - @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_NOTICE', 'This blog is in "Emergency Comment Blockage Mode", please come back another time'); @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP block interval'); @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Only allow an IP to submit a comment every n minutes. Useful to prevent comment floods.'); @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Block comments from RBL-listed hosts'); - @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Be careful with this feature. Avoid to choose an RBL that includes dialup-hosts.'); - @define('PLUGIN_EVENT_SPAMBLOCK_RBL_NOTICE', 'SPAM Prevention detected that your host is listed as open relay. Comment not added.'); + @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Blocks comments based on provided RPL lists. Avoid lists with dynamic hosts.'); break; } @@ -63,7 +63,7 @@ $propbag->add('type', 'string'); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_RBL); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_RBL_DESC); - $propbag->add('default', 'bl.spamcop.net, sbl-xbl.spamhaus.org'); + $propbag->add('default', 'sbl-xbl.spamhaus.org, bl.spamcop.net'); break; default: @@ -89,7 +89,7 @@ if ( $this->get_config('killswitch', false) === true ) { $eventData = array('allow_comments' => false); - $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_NOTICE; + $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH; return false; } @@ -116,26 +116,28 @@ } // Check for IP listed in RBL - // Partly based on work done bei James Seward (ja...@ja...) + // Partly based on work done by James Seward (ja...@ja...) if ( $this->get_config('rbl') != '' ) { - $rbls = explode(',', $this->get_config('rbl')); - // $remote = '81.70.69.193'; - $remote = $_SERVER['REMOTE_ADDR']; - if (preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/", $remote, $matches)) { - foreach ($rbls as $rbl) { - $rblhost = $matches[4] . "." . $matches[3] . "." . $matches[2] . "." . $matches[1] . "." . trim($rbl); - $resolved = gethostbyname($rblhost); - if ($resolved != $rblhost) { - $eventData = array('allow_comments' => false); - $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_RBL_NOTICE; - return false; - } - } - } - } - } - return true; - break; + $remoteIP = $_SERVER['REMOTE_ADDR']; + # $remoteIP = '81.70.69.193'; + + $rbls = explode(',', $this->get_config('rbl')); + if (preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/", $remoteIP, $res)) { + array_shift($res); + $reverseIP = implode('.', array_reverse($res)); + foreach ($rbls as $rbl) { + $rblhost = $reverseIP .'.'. trim($rbl); + if (gethostbyname($rblhost) != $rblhost) { + $eventData = array('allow_comments' => false); + $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL; + return false; + } + } + } + } + } + return true; + break; default: return false; |
|
From: Tom S. <tom...@us...> - 2004-09-18 19:47:01
|
Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1819 Modified Files: serendipity_event_spamblock.php Log Message: - Fix tabs/indentation - Use spamhaus.org as primary RBL - Change names of constants and fix wording/typos - Use alternative method of imploding the IP Index: serendipity_event_spamblock.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- serendipity_event_spamblock.php 17 Sep 2004 11:59:29 -0000 1.5 +++ serendipity_event_spamblock.php 18 Sep 2004 19:46:52 -0000 1.6 @@ -4,18 +4,18 @@ default: @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam Protector'); @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam'); - @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'SPAM Prevention detected invalid message. Comment not added.'); - @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'SPAM Prevention asks you to not mass-post comments to this blog. Comment not added.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'Spam Prevention: Invalid message.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'Spam Prevention: You cannot post a comment so soon after submitting another one.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'Spam Prevention: The IP of the computer you are posting from, is listed as an open relay.'); + @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'This blog is in "Emergency Comment Blockage Mode", please come back another time'); @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', 'Do not allow duplicate comments'); @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Do not allow users to submit a comment which contains the same body as an already submitted comment'); @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', 'Emergency comment shutdown'); @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC', 'Temporarily disable comments for all entries. Useful if your blog is under spam attack.'); - @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_NOTICE', 'This blog is in "Emergency Comment Blockage Mode", please come back another time'); @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP block interval'); @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD_DESC', 'Only allow an IP to submit a comment every n minutes. Useful to prevent comment floods.'); @define('PLUGIN_EVENT_SPAMBLOCK_RBL', 'Block comments from RBL-listed hosts'); - @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Be careful with this feature. Avoid to choose an RBL that includes dialup-hosts.'); - @define('PLUGIN_EVENT_SPAMBLOCK_RBL_NOTICE', 'SPAM Prevention detected that your host is listed as open relay. Comment not added.'); + @define('PLUGIN_EVENT_SPAMBLOCK_RBL_DESC', 'Blocks comments based on provided RPL lists. Avoid lists with dynamic hosts.'); break; } @@ -63,7 +63,7 @@ $propbag->add('type', 'string'); $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_RBL); $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_RBL_DESC); - $propbag->add('default', 'bl.spamcop.net, sbl-xbl.spamhaus.org'); + $propbag->add('default', 'sbl-xbl.spamhaus.org, bl.spamcop.net'); break; default: @@ -89,7 +89,7 @@ if ( $this->get_config('killswitch', false) === true ) { $eventData = array('allow_comments' => false); - $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_NOTICE; + $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH; return false; } @@ -116,26 +116,28 @@ } // Check for IP listed in RBL - // Partly based on work done bei James Seward (ja...@ja...) + // Partly based on work done by James Seward (ja...@ja...) if ( $this->get_config('rbl') != '' ) { - $rbls = explode(',', $this->get_config('rbl')); - // $remote = '81.70.69.193'; - $remote = $_SERVER['REMOTE_ADDR']; - if (preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/", $remote, $matches)) { - foreach ($rbls as $rbl) { - $rblhost = $matches[4] . "." . $matches[3] . "." . $matches[2] . "." . $matches[1] . "." . trim($rbl); - $resolved = gethostbyname($rblhost); - if ($resolved != $rblhost) { - $eventData = array('allow_comments' => false); - $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_RBL_NOTICE; - return false; - } - } - } - } - } - return true; - break; + $remoteIP = $_SERVER['REMOTE_ADDR']; + # $remoteIP = '81.70.69.193'; + + $rbls = explode(',', $this->get_config('rbl')); + if (preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/", $remoteIP, $res)) { + array_shift($res); + $reverseIP = implode('.', array_reverse($res)); + foreach ($rbls as $rbl) { + $rblhost = $reverseIP .'.'. trim($rbl); + if (gethostbyname($rblhost) != $rblhost) { + $eventData = array('allow_comments' => false); + $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL; + return false; + } + } + } + } + } + return true; + break; default: return false; |
