php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_pt.inc.php,1.3,1.4

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22711

Modified Files:
	serendipity_lang_pt.inc.php 
Log Message:
Update from Netto, thanks :)


Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_lang_pt.inc.php	5 Jul 2004 08:36:12 -0000	1.3
+++ serendipity_lang_pt.inc.php	7 Jul 2004 18:04:32 -0000	1.4
@@ -13,10 +13,10 @@
 
 @define('LANG_CHARSET', 'ISO-8859-1');
 @define('DATE_LOCALES', 'portuguese brazilian, pt, pt_BR');
-@define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
+@define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y');
 @define('WYSIWYG_LANG', 'pt_BR');
 
-@define('SERENDIPITY_ADMIN_SUITE', 'Suíte de Administração do Serendipity');
+@define('SERENDIPITY_ADMIN_SUITE', 'Painel de Administração do Serendipity');
 @define('HAVE_TO_BE_LOGGED_ON', 'Você deve entrar no sistema para ver esta página:');
 @define('WRONG_USERNAME_OR_PASSWORD', 'Você deve ter fornecido nome de usuário ou senha inválidos');
 @define('APPEARANCE', 'Aparência');
@@ -65,7 +65,7 @@
 @define('DOWN', 'Abaixo');
 @define('ENTRIES', 'Artigos:');
 @define('NEW_ENTRY', 'Novo artigo');
-@define('AUTHOR_SUITE', 'Suíte de autoria');
+@define('AUTHOR_SUITE', 'Painel de autoria');
 @define('EDIT_ENTRIES', 'Editar artigos');
 @define('DELETE_ENTRIES', 'Excluir artigos');
 @define('CATEGORIES', 'Categorias');
@@ -76,7 +76,7 @@
 @define('CREATE_THUMBS', 'Reconstruir Miniaturas');
 @define('MANAGE_IMAGES', 'Gerenciar imagens');
 @define('ADMIN_INTERFACE', 'Painel de administração');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Suíte de Autoria do Serendipity');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Painel de Autoria do Serendipity');
 @define('NAME', 'Nome');
 @define('EMAIL', 'E-mail');
 @define('HOMEPAGE', 'Página pessoal');
@@ -346,168 +346,170 @@
 @define('IMAGE_NAME', 'Salvar a imagem usando o nome de arquivo (vazio: usar nome original do arquivo): ');
 
 /* TRANSLATE */
-  @define('MANAGE_USERS', 'Manage users');
-@define('EDIT_USERS', 'Edit users');
-@define('CREATE_USERS', 'Create users');
-@define('CREATE_NEW_USER', 'Create new user');
-@define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
-@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
-@define('CREATED_USER', 'A new user %s has been created');
-@define('MODIFIED_USER', 'The properties of user %s have been changed');
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
-@define('USER_LEVEL', 'Userlevel');
-@define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
-@define('DELETED_USER', 'User #%d %s deleted.');
-@define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
-@define('FILTER', 'Filter');
-@define('ENTRIES_PER_PAGE', 'entries per page');
-@define('XML_IMAGE_TO_DISPLAY', 'XML Button');
-@define('XML_IMAGE_TO_DISPLAY_DESC','Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.');
+  @define('MANAGE_USERS', 'Gerenciar usuários');
+@define('EDIT_USERS', 'Editar usuários');
+@define('CREATE_USERS', 'Criar usuários');
+@define('CREATE_NEW_USER', 'Criar novo usuário');
+@define('CREATE_NOT_AUTHORIZED', 'Você não pode modificar usuários que tenham o mesmo nível que o seu');
+@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Você não pode criar usuários com um nível maior que o seu');
+@define('CREATED_USER', 'Um novo usuário %s foi criado');
+@define('MODIFIED_USER', 'As propriedades do usuário %s foram alteradas');
+@define('USER_SELF_INFO', 'identificado como %s, nível %s');
+@define('USER_LEVEL', 'Nível do usuário');
+@define('DELETE_USER', 'Você está prestes a excluir o usuário #%d %s. Tem certeza disso? Isso fará com que os artigos escritos por ele não sejam mais exibidos.');
+@define('DELETED_USER', 'Usuário #%d %s excluído.');
+@define('LIMIT_TO_NUMBER', 'Quantos itens devem ser exibidos?');
+@define('FILTER', 'Filtro');
+@define('ENTRIES_PER_PAGE', 'artigos por página');
+@define('XML_IMAGE_TO_DISPLAY', 'Botão XML');
+@define('XML_IMAGE_TO_DISPLAY_DESC','Links para XML Feeds serão exibidos por esta imagem. Deixe em branco para padrão, digite \'none\' para desabilitar.');
 
-@define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.');
-@define('ALL_DIRECTORIES', 'all directories');
-@define('MANAGE_DIRECTORIES', 'Manage directories');
-@define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.');
-@define('NEW_DIRECTORY', 'Create a new directory');
-@define('PARENT_DIRECTORY', 'Parent directory');
-@define('DELETE_DIRECTORY', 'Delete this directory');
-@define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('STORE_IN_DIRECTORY', 'Store inside this directory: ');
-@define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
-@define('FORCE_DELETE', 'Force deletion of files not inside the media database');
-@define('CHECKING_DIRECTORY', 'Checking files in directory %s');
-@define('DELETING_DIRECTORY', 'Deleting directory %s...');
-@define('DELETING_FILE', 'Deleting file %s...');
-@define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
-@define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.');
-@define('DIRECTORY_DELETE_SUCCESS', 'Directory %s successfully deleted.');
-@define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.');
-@define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.');
-@define('FOUND_FILE', 'Found new/modified file: %s.');
-@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
-@define('PARENT_CATEGORY', 'Parent category');
-@define('REPLY', 'Reply');
-@define('IN_REPLY_TO', 'In reply to');
-@define('TOP_LEVEL', 'Top level');
+@define('DIRECTORIES_AVAILABLE', 'Na lista de subdiretórios disponíveis você pode clicar em qualquer nome de diretório para criar um novo diretório dentro daquela estrutura.');
+@define('ALL_DIRECTORIES', 'todos os diretórios');
+@define('MANAGE_DIRECTORIES', 'Gerenciar diretórios');
+@define('DIRECTORY_CREATED', 'Diretório <strong>%s</strong> foi criado.');
+@define('NEW_DIRECTORY', 'Criar novo diretório');
+@define('PARENT_DIRECTORY', 'Diretório superior');
+@define('DELETE_DIRECTORY', 'Excluir ese diretório');
+@define('CONFIRM_DELETE_DIRECTORY', 'Tem certeza que quer excluir todo o conteúdo do diretório %s?');
+@define('STORE_IN_DIRECTORY', 'Guardar nesse diretório: ');
+@define('ERROR_NO_DIRECTORY', 'Erro: Diretório %s não existe');
+@define('FORCE_DELETE', 'Forçar exclusão de arquivos que não estão no banco de dados da mídias ("media")');
+@define('CHECKING_DIRECTORY', 'Verificando arquivos no diretório %s');
+@define('DELETING_DIRECTORY', 'Excluindo diretório %s...');
+@define('DELETING_FILE', 'Excluindo arquivo %s...');
+@define('ERROR_DIRECTORY_NOT_EMPTY', 'Não foi possível remover um diretório que não esteja vazio. Marque a opção "forçar exclusão" se deseja remover seus arquivos também, e envie o comando novamente. Os arquivos existenntes são:');
+@define('DIRECTORY_DELETE_FAILED', 'A exclusão do diretório %s falhou. Verifique permissões ou as mensagem acima.');
+@define('DIRECTORY_DELETE_SUCCESS', 'Diretório %s excluído corretamente.');
+@define('SKIPPING_FILE_EXTENSION', 'Ignorando arquivo: Faltando extensão em %s.');
+@define('SKIPPING_FILE_UNREADABLE', 'Ignorando arquivo: %s ilegível.');
+@define('FOUND_FILE', 'Encontrado arquivo novo/modificado: %s.');
+@define('ALREADY_SUBCATEGORY', '%s já é uma subcategoria de %s.');
+@define('PARENT_CATEGORY', 'Categoria superior');
+@define('REPLY', 'Resposta');
+@define('IN_REPLY_TO', 'Em reposta à');
+@define('TOP_LEVEL', 'Nível máximo');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
-@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s comments');
-@define('PERMISSIONS', 'Permissions');
+@define('SYNDICATION_PLUGIN_GENERIC_COMMENTFEED', '%s comentários');
+@define('PERMISSIONS', 'Permissões');
 
 /* DATABASE SETTINGS */
-@define('INSTALL_CAT_DB', 'Database settings');
-@define('INSTALL_CAT_DB_DESC', 'Here you can enter all your database information. Serendipity needs this to be able to function');
-@define('INSTALL_DBTYPE', 'Database type');
-@define('INSTALL_DBTYPE_DESC', 'Database type');
-@define('INSTALL_DBHOST', 'Database host');
-@define('INSTALL_DBHOST_DESC', 'The hostname for your database');
-@define('INSTALL_DBUSER', 'Database user');
-@define('INSTALL_DBUSER_DESC', 'The username used to connect to your database');
-@define('INSTALL_DBPASS', 'Database password');
-@define('INSTALL_DBPASS_DESC', 'The password matching the above username');
-@define('INSTALL_DBNAME', 'Database name');
-@define('INSTALL_DBNAME_DESC', 'The name of your datbase');
-@define('INSTALL_DBPREFIX', 'Database table prefix');
-@define('INSTALL_DBPREFIX_DESC', 'Prefix for the table names, i.e. serendipity_');
+@define('INSTALL_CAT_DB', 'Configurações de banco de dados');
+@define('INSTALL_CAT_DB_DESC', 'Aqui você pode inserir todas as informações do seu banco de dados. O Serendipity precisa dessas informações para funcionar.');
+@define('INSTALL_DBTYPE', 'Tipo de banco de dados');
+@define('INSTALL_DBTYPE_DESC', 'Tipo de banco de dados');
+@define('INSTALL_DBHOST', 'Servidor de banco de dados');
+@define('INSTALL_DBHOST_DESC', 'Endereço/Nome do seu servidor de banco de dados');
+@define('INSTALL_DBUSER', 'Usuário de banco de dados');
+@define('INSTALL_DBUSER_DESC', 'O nome de usuário que conecta ao banco');
+@define('INSTALL_DBPASS', 'Senha do banco de dados');
+@define('INSTALL_DBPASS_DESC', 'A senha correspondente ao usuário acima');
+@define('INSTALL_DBNAME', 'Nome do banco de dados');
+@define('INSTALL_DBNAME_DESC', 'O nome do banco de dados');
+@define('INSTALL_DBPREFIX', 'Prefixo para as tabelas do banco de dados');
+@define('INSTALL_DBPREFIX_DESC', 'Prefixo utilizado para nomear as tabelas, ex.: serendipity_');
 
 /* PATHS */
-@define('INSTALL_CAT_PATHS', 'Paths');
-@define('INSTALL_CAT_PATHS_DESC', 'Various paths to different essential folders and files. Don\'t forget trailing slashes for directories!');
-@define('INSTALL_FULLPATH', 'Full path');
-@define('INSTALL_FULLPATH_DESC', 'The full and absolute path to your serendipity installation');
-@define('INSTALL_UPLOADPATH', 'Upload path');
-@define('INSTALL_UPLOADPATH_DESC', 'All uploads will go here, relative to the \'Full path\' - typically \'uploads/\'');
-@define('INSTALL_RELPATH', 'Relative path');
-@define('INSTALL_RELPATH_DESC', 'Path to serendipity for your browser, typically \'/serendipity/\'');
-@define('INSTALL_RELTEMPLPATH', 'Relative template path');
-@define('INSTALL_RELTEMPLPATH_DESC', 'The path to the folder containing your templates - Relative to the \'relative path\'');
-@define('INSTALL_RELUPLOADPATH', 'Relative upload path');
-@define('INSTALL_RELUPLOADPATH_DESC', 'Path to your uploads for browsers - Relative to the \'relative path\'');
-@define('INSTALL_URL', 'URL to blog');
-@define('INSTALL_URL_DESC', 'Base URL to your serendipity installation');
-@define('INSTALL_INDEXFILE', 'Index file');
-@define('INSTALL_INDEXFILE_DESC', 'The name of your serendipity index file');
+@define('INSTALL_CAT_PATHS', 'Caminhos');
+@define('INSTALL_CAT_PATHS_DESC', 'Os vários caminhos para pastas e arquivos essênciais. Não se esqueça de terminar com barras para os diretórios');
+@define('INSTALL_FULLPATH', 'Caminho completo');
+@define('INSTALL_FULLPATH_DESC', 'O caminho completo e absoluto para a sua instalação do serendipity');
+@define('INSTALL_UPLOADPATH', 'Caminho para o Upload');
+@define('INSTALL_UPLOADPATH_DESC', 'Todos os arquivos transferidos irão parar aí, relativo ao \'Caminho completo\' - geralmente \'uploads/\'');
+@define('INSTALL_RELPATH', 'Caminho relativo');
+@define('INSTALL_RELPATH_DESC', 'Caminho para o serendipity em seu navegador, geralmente \'/serendipity/\'');
+@define('INSTALL_RELTEMPLPATH', 'Caminho relativo do template');
+@define('INSTALL_RELTEMPLPATH_DESC', 'Caminho para o diretório onde estão os seus templates - Relativo ao \'caminho relativo\'');
+@define('INSTALL_RELUPLOADPATH', 'Caminho relativo do Upload');
+@define('INSTALL_RELUPLOADPATH_DESC', 'Caminho para o \'uploads\' em seu navegador - Relativo ao \'caminho relativo\'');
+@define('INSTALL_URL', 'URL do blog');
+@define('INSTALL_URL_DESC', 'URL base para a instalação do serendipity');
+@define('INSTALL_INDEXFILE', 'Arquivo inicial');
+@define('INSTALL_INDEXFILE_DESC', 'Nome do arquivo inicial do serendipity');
 
 /* Generel settings */
-@define('INSTALL_CAT_SETTINGS', 'General settings');
-@define('INSTALL_CAT_SETTINGS_DESC', 'Customize how Serendipity behaves');
-@define('INSTALL_USERNAME', 'Admin username');
-@define('INSTALL_USERNAME_DESC', 'Username for admin login');
-@define('INSTALL_PASSWORD', 'Admin password');
-@define('INSTALL_PASSWORD_DESC', 'Password for admin login');
-@define('INSTALL_EMAIL', 'Admin email');
-@define('INSTALL_EMAIL_DESC', 'Email for the blog administrator');
-@define('INSTALL_SENDMAIL', 'Send mails to admin?');
-@define('INSTALL_SENDMAIL_DESC', 'Do you want to receive emails when comments are posted to your entries?');
-@define('INSTALL_SUBSCRIBE', 'Allow users to subscribe to entries?');
-@define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry');
-@define('INSTALL_BLOGNAME', 'Blog name');
-@define('INSTALL_BLOGNAME_DESC', 'The title of your blog');
-@define('INSTALL_BLOGDESC', 'Blog description');
-@define('INSTALL_BLOGDESC_DESC', 'Description of your blog');
-@define('INSTALL_LANG', 'Language');
-@define('INSTALL_LANG_DESC', 'Select the language for your blog');
+@define('INSTALL_CAT_SETTINGS', 'Configurações gerais');
+@define('INSTALL_CAT_SETTINGS_DESC', 'Padroniza como o Serendipity deve se comportar');
+@define('INSTALL_USERNAME', 'Usuário do administrador');
+@define('INSTALL_USERNAME_DESC', 'Nome de usuário para o login do administrador');
+@define('INSTALL_PASSWORD', 'Senha do administrador');
+@define('INSTALL_PASSWORD_DESC', 'Senha para o login do administrador');
+@define('INSTALL_EMAIL', 'E-mail do administrador');
+@define('INSTALL_EMAIL_DESC', 'E-mail do administrador do blog');
+@define('INSTALL_SENDMAIL', 'Enviar e-mails ao administrador?');
+@define('INSTALL_SENDMAIL_DESC', 'Você deseja receber notificações via e-mail quando novos comentários forem incluídos em seus artigos?');
+@define('INSTALL_SUBSCRIBE', 'Permitir que usuários se inscrevam nos artigos?');
+@define('INSTALL_SUBSCRIBE_DESC', 'Permitir que usuários se inscrevam nos artigos e com isso, recebam notificações via e-mail quando novos comentários forem adicionados?');
+@define('INSTALL_BLOGNAME', 'Nome do Blog');
+@define('INSTALL_BLOGNAME_DESC', 'Título do seu Blog');
+@define('INSTALL_BLOGDESC', 'Descrição do Blog');
+@define('INSTALL_BLOGDESC_DESC', 'Descrição');
+@define('INSTALL_LANG', 'Idioma');
+@define('INSTALL_LANG_DESC', 'Selecione o idioma para o seu blog');
 
 /* Appearance and options */
-@define('INSTALL_CAT_DISPLAY', 'Appearance and options');
-@define('INSTALL_CAT_DISPLAY_DESC', 'Customize how Serendipity looks and feels');
-@define('INSTALL_EXTERNALSTYLE', 'External Stylesheet');
-@define('INSTALL_EXTERNALSTYLE_DESC', 'You can define a stylesheet URI here, aditionally to the settings adjustable in the admin interface (enter \'none\' if you don\'t need this)');
-@define('INSTALL_WYSIWYG', 'Use WYSIWYG editor');
-@define('INSTALL_WYSIWYG_DESC', 'Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)');
-@define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
-@define('INSTALL_XHTML11_DESC', 'Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)');
-@define('INSTALL_POPUP', 'Enable use of popup windows');
+@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_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_EMBED', 'Is serendipity embedded?');
-@define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
-@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
-@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
-@define('INSTALL_BLOCKREF', 'Blocked Referers');
-@define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!');
-@define('INSTALL_REWRITE', 'URL Rewriting');
-@define('INSTALL_REWRITE_DESC', 'Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected');
+@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');
+@define('INSTALL_BLOCKREF_DESC', 'Existem servidores especiais que você não gostaria de listar na sua lista de referências? Separe a lista dos servidores com \';\' e note que o servidor será bloqueado por uma busca parcial em sua string!');
+@define('INSTALL_REWRITE', 'Rescrita de URL');
+@define('INSTALL_REWRITE_DESC', 'Selecione as regras que você gostaria de usar na geração de URLs. A habilitação da rescrita de URL criará URLS bem formatadas para o seu blog e o deixará melhor indexável para bots como o do google. O servidor web precisa dar suporte ou ao mod_rewrite ou ao "AllowOverride All" para o diretório do seu serendipity. A configuração padrão é auto detectada');
 
 /* Imageconversion Settings */
-@define('INSTALL_CAT_IMAGECONV', 'Imageconversion Settings');
-@define('INSTALL_CAT_IMAGECONV_DESC', 'Enter general information about how serendipity should handle Images');
-@define('INSTALL_IMAGEMAGICK', 'Use Imagemagick');
-@define('INSTALL_IMAGEMAGICK_DESC', 'Do you have image magick installed and want to use it to resize images?');
-@define('INSTALL_IMAGEMAGICKPATH', 'Path to convert binary');
-@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full path & name of your image magick convert binary');
-@define('INSTALL_THUMBSUFFIX', 'Thumbnail suffix');
-@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails will be named with the following format: original.[suffix].ext');
-@define('INSTALL_THUMBWIDTH', 'Thumbnail dimensions');
-@define('INSTALL_THUMBWIDTH_DESC', 'Static maximum width of auto-generated thumbnails');
+@define('INSTALL_CAT_IMAGECONV', 'Configurações da conversão de imagens');
+@define('INSTALL_CAT_IMAGECONV_DESC', 'Informações gerais sobre como o serendipity deve lidar com imagens');
+@define('INSTALL_IMAGEMAGICK', 'Usar Imagemagick');
+@define('INSTALL_IMAGEMAGICK_DESC', 'Você tem o \'image magick\' instalado e quer utilizá-lo para redimensionar imagens?');
+@define('INSTALL_IMAGEMAGICKPATH', 'Caminho para o executável do conversor');
+@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Caminho completo e nome do executável do image magick');
+@define('INSTALL_THUMBSUFFIX', 'Sufixo das miniaturas');
+@define('INSTALL_THUMBSUFFIX_DESC', 'As miniaturas serão nomeadas com o seguinte formato: original.[sufixo].ext');
+@define('INSTALL_THUMBWIDTH', 'Dimensão das miniaturas ');
+@define('INSTALL_THUMBWIDTH_DESC', 'Largura máxima estática das miniaturas geradas automaticamente');
 
 /* Personal details */
-@define('USERCONF_CAT_PERSONAL', 'Your personal details');
-@define('USERCONF_CAT_PERSONAL_DESC', 'Change your personal details');
-@define('USERCONF_USERNAME', 'Your username');
-@define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
-@define('USERCONF_PASSWORD', 'Your password');
-@define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
-@define('USERCONF_USERLEVEL', 'Permissionlevel');
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
-@define('USERCONF_EMAIL', 'Your e-mail address');
-@define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
-@define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
-@define('USERCONF_SENDCOMMENTS_DESC', 'Do you want to receive emails when comments are posted to your entries?');
-@define('USERCONF_SENDTRACKBACKS', 'Send trackback announcements?');
-@define('USERCONF_SENDTRACKBACKS_DESC', 'Do you want to receive emails when trackbacks are posted to your entries?');
-@define('USERCONF_ALLOWPUBLISH', 'Rights: Publishing entries?');
-@define('USERCONF_ALLOWPUBLISH_DESC', 'Is this user allowed to publish entries?');
-@define('TRACKBACK_SENDING', 'Sending trackback to URI %s...');
-@define('TRACKBACK_SENT', 'done: %s');
-@define('TRACKBACK_NOT_FOUND', 'No Trackback sent: No trackback-URI found.');
-@define('TRACKBACK_URI_MISMATCH', 'No Trackback sent: The autodiscovered trackback URI does not match our target URI.');
-@define('TRACKBACK_CHECKING', 'Checking <u>%s</u> for possible trackbacks...');
-@define('TRACKBACK_SIZE', 'No Trackback sent: Target URI exceeded filesize of %s bytes.');
-@define('TRACKBACK_NO_DATA', 'No Trackback sent: Target contained no data');
-@define('SUCCESS', 'Success');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
+@define('USERCONF_CAT_PERSONAL', 'Detalhes pessoais');
+@define('USERCONF_CAT_PERSONAL_DESC', 'Altere os seus detalhes pessoais');
+@define('USERCONF_USERNAME', 'Seu nome de usuário');
+@define('USERCONF_USERNAME_DESC', 'O nome de usuário que você usa para se identificar no blog');
+@define('USERCONF_PASSWORD', 'Sua senha');
+@define('USERCONF_PASSWORD_DESC', 'A senha que você quer usar para se identificar no blog');
+@define('USERCONF_USERLEVEL', 'Nível de permissões');
+@define('USERCONF_USERLEVEL_DESC', 'Nível do usuário. Deve ser um dos seguintes: [USERLEVEL_ADMIN] - Administrador, [USERLEVEL_CHIEF] - Editor Chefe, [USERLEVEL_EDITOR] - Editor normal.');
+@define('USERCONF_EMAIL', 'Seu endereço de e-mail');
+@define('USERCONF_EMAIL_DESC', 'Seu endereço de e-mail pessoal');
+@define('USERCONF_SENDCOMMENTS', 'Enviar notificação dos comentários?');
+@define('USERCONF_SENDCOMMENTS_DESC', 'Quer receber e-mails quando comentários forem enviados para os seus artigos?');
+@define('USERCONF_SENDTRACKBACKS', 'Enviar notificação de trackbacks?');
+@define('USERCONF_SENDTRACKBACKS_DESC', 'Quer receber e-mails quando trackbacks forem enviados para os seus artigos?');
+@define('USERCONF_ALLOWPUBLISH', 'Direitos: Publicação de artigos?');
+@define('USERCONF_ALLOWPUBLISH_DESC', 'Este usuário está autorizado a publicar artigos?');
+@define('TRACKBACK_SENDING', 'Enviar trackback para a URI %s...');
+@define('TRACKBACK_SENT', 'pronto: %s');
+@define('TRACKBACK_NOT_FOUND', 'Nenhum Trackback enviado: Nenhum URI de trackback encontrado.');
+@define('TRACKBACK_URI_MISMATCH', 'Nenhum Trackback enviado: O URI do trackback descoberto não é mesmo do nosso URI de destino.');
+@define('TRACKBACK_CHECKING', 'Verificando <u>%s</u> para possíveis trackbacks...');
+@define('TRACKBACK_SIZE', 'Nenhum Trackback enviado: URI de destino excedeu o tamanho do arquivo de %s bytes.');
+@define('TRACKBACK_NO_DATA', 'Nenhum Trackback enviado: Destino não contém dados');
+@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
+
+
+
+
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.14,1.15

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32415

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
maybe this helps kris already?


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_functions_images.inc.php	6 Jul 2004 21:15:12 -0000	1.14
+++ serendipity_functions_images.inc.php	7 Jul 2004 16:13:07 -0000	1.15
@@ -205,7 +205,7 @@
         );
         $r = array(0, 0);
     } else {
-        if (!isset($fdim['mime'])) {
+        if (empty($fdim['mime'])) {
             $fdim['mime'] = serendipity_guessMime($suf);
         }
 
@@ -436,7 +436,7 @@
 
         $fdim   = getimagesize($ffull);
 
-        if (!isset($fdim['mime'])) {
+        if (empty($fdim['mime'])) {
             $fdim['mime'] = serendipity_guessMime($f[1]);
         }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.10,1.11

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26550

Modified Files:
	serendipity_event_karma.php 
Log Message:
remove unneccesary linebreaks which may get converted by the nl2br markup
plugin


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_event_karma.php	30 Jun 2004 08:40:01 -0000	1.10
+++ serendipity_event_karma.php	7 Jul 2004 15:44:52 -0000	1.11
@@ -490,23 +490,17 @@
                             $link_4 = '<a class="serendipity_karmaVoting_link4" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=-1&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_4) . '">-</a>';
                             $link_5 = '<a class="serendipity_karmaVoting_link5" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=-2&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_5) . '">--</a>';
 
-                            $karma_voting = '
-                            <br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>
-                                ' . PLUGIN_KARMA_VOTETEXT . ' ' . $link_1 . ' | ' . $link_2 . ' | ' . $link_3 . ' | ' . $link_4 . ' | ' . $link_5 . '<br />
-                                ' . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '
-                            </div>';
+                            $karma_voting = '<br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>'
+                                  . PLUGIN_KARMA_VOTETEXT . ' ' . $link_1 . ' | ' . $link_2 . ' | ' . $link_3 . ' | ' . $link_4 . ' | ' . $link_5 . '<br />'
+                                  . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
 
-                            $karma_current = '
-                            <br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>
-                                <div class="serendipity_karmaSuccess">' . PLUGIN_KARMA_VOTED . '</div>
-                                ' . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '
-                            </div>';
+                            $karma_current = '<br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>'
+                                . '<div class="serendipity_karmaSuccess">' . PLUGIN_KARMA_VOTED . '</div>'
+                                . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
 
-                            $karma_timeout = '
-                            <br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>
-                                <div>' . sprintf(PLUGIN_KARMA_CLOSED, $karmatime) . '</div>
-                                ' . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '
-                            </div>';
+                            $karma_timeout = '<br /><div class="serendipity_karmaVoting"><a id="karma_vote%1$s"></a>'
+                                . '<div>' . sprintf(PLUGIN_KARMA_CLOSED, $karmatime) . '</div>'
+                                . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
 
                             if ($addData['extended']) {
                                 $entryid = serendipity_db_escape_string($eventData[0]['id']);

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.13,1.14

[Matthias L. <di...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1977

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
Two little tidbits

1. CaSe CoNfLiCt
   _guessMime vs. _guessMIME

2. replaced preg_match with an equivalent strpos


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_functions_images.inc.php	8 Jun 2004 14:49:27 -0000	1.13
+++ serendipity_functions_images.inc.php	6 Jul 2004 21:15:12 -0000	1.14
@@ -266,7 +266,7 @@
     $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total);
 
     foreach ($serendipity['imageList'] as $k => $file) {
-        $is_image = (preg_match('@^image/@i', $file['mime']) ? true : false);
+        $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
 
         if ($is_image) {
             $update   = false;
@@ -314,7 +314,7 @@
     return $i;
 }
 
-function serendipity_guessMIME($extension) {
+function serendipity_guessMime($extension) {
     $mime = '';
     switch (strtolower($extension)) {
         case 'pdf':
@@ -671,7 +671,7 @@
             ++$x; $preview = '';
             $i      = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
             $imgsrc = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
-            $is_image = (preg_match('@^image/@i', $file['mime']) ? true : false);
+            $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
 
             if (file_exists($imgsrc)) {
                 $preview .= '<img src="' . $imgsrc . '" border="0" alt="'. $file['name'] . '" />';

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.319,1.320

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8298

Modified Files:
	serendipity_functions.inc.php 
Log Message:
change other occurences of archives links to '+' as well, to remain
compatible with auto-trackbacks.
Old-style URLs stay valid if used as link, of course.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- serendipity_functions.inc.php	6 Jul 2004 00:16:26 -0000	1.319
+++ serendipity_functions.inc.php	6 Jul 2004 07:43:59 -0000	1.320
@@ -1201,7 +1201,7 @@
                          rdf:about="<?php echo $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : ''); ?>feeds/ei_<?php echo $entry['id']; ?>.rdf"
                          trackback:ping="<?php echo $serendipity['baseURL']; ?>comment.php?type=trackback&amp;entry_id=<?php echo $entry['id']; ?>"
                          dc:title="<?php echo htmlspecialchars($entry['title']); ?>"
-                         dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title']); ?>" />
+                         dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false); ?>" />
                 </rdf:RDF>
                 -->
         <?php
@@ -1481,9 +1481,9 @@
 ?>
 
             </div>
-            <?php 
+            <?php
                 if ( $comment['id'] ) {
-                    serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $i . '.'); 
+                    serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $i . '.');
                 }
             ?>
         </div>
@@ -1612,7 +1612,7 @@
 function serendipity_mailSubscribers($entry_id, $poster, $posterMail, $title, $fromEmail = 'no...@ex...') {
     global $serendipity;
 
-    $entryURI = serendipity_archiveURL($entry_id, $title);
+    $entryURI = serendipity_archiveURL($entry_id, $title, 'baseURL', false);
     $subject =  '[' . $serendipity['blogTitle'] . '] ' . sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
 
     $pgsql_insert = '';
@@ -1681,7 +1681,7 @@
         $fromName = ANONYMOUS;
     }
 
-    $entryURI = serendipity_archiveURL($id, $title);
+    $entryURI = serendipity_archiveURL($id, $title, 'baseURL', false);
 
     if ($type == 'TRACKBACK') {
         $subject =  '[' . $serendipity['blogTitle'] . '] ' . NEW_TRACKBACK_TO . ' ' . $title;
@@ -2262,7 +2262,7 @@
     array_shift($matches);
 
     // Make trackback URL
-    $url = serendipity_archiveURL($id, $title);
+    $url = serendipity_archiveURL($id, $title, 'baseURL', false);
 
     // Add URL references
     $locations = $matches[0];

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.318,1.319

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7061

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed toggling $allow_comments not working in popupwindow


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- serendipity_functions.inc.php	5 Jul 2004 21:34:22 -0000	1.318
+++ serendipity_functions.inc.php	6 Jul 2004 00:16:26 -0000	1.319
@@ -1497,8 +1497,8 @@
     }
 
     if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
-        if (!isset($comment)) {
-            $comment = array('entry_id' => $serendipity['GET']['id']);
+        if (!isset($comment['entry_id'])) {
+            $comment = array('entry_id' => (isset($serendipity['GET']['id']) ? $serendipity['GET']['id'] : $serendipity['GET']['entry_id']));
         }
 
         if (serendipity_db_bool($allow_comments)) {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.317,1.318

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9574

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Make bloody sure there is a $comment['id'] before looking for parents

This fixes a nasty endless-loop bug when previewing comments


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- serendipity_functions.inc.php	5 Jul 2004 20:38:53 -0000	1.317
+++ serendipity_functions.inc.php	5 Jul 2004 21:34:22 -0000	1.318
@@ -222,7 +222,7 @@
 <?php
 }
 
-function serendipity_displayCommentForm($id, $url = '?', $comments = NULL) {
+function serendipity_displayCommentForm($id, $url = '', $comments = NULL) {
     global $serendipity;
 
     if ( $comments == NULL ) {
@@ -1481,7 +1481,11 @@
 ?>
 
             </div>
-            <?php serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $i . '.'); ?>
+            <?php 
+                if ( $comment['id'] ) {
+                    serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $i . '.'); 
+                }
+            ?>
         </div>
         <br />
 <?php

[php-blog-cvs] serendipity comment.php,1.37,1.38 serendipity_functions.inc.php,1.316,1.317

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31483

Modified Files:
	comment.php serendipity_functions.inc.php 
Log Message:
It's not serendipity_deleteComment()'s job to redirect...


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -d -r1.316 -r1.317
--- serendipity_functions.inc.php	5 Jul 2004 20:20:12 -0000	1.316
+++ serendipity_functions.inc.php	5 Jul 2004 20:38:53 -0000	1.317
@@ -1314,7 +1314,6 @@
 
         $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = $entry_id $admin";
         serendipity_db_query($query);
-        header('Location: '. $_SERVER['HTTP_REFERER']);
     } else {
         die('What are you up to? You need to be an admin to delete comments');
     }

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- comment.php	5 Jul 2004 09:59:55 -0000	1.37
+++ comment.php	5 Jul 2004 20:38:53 -0000	1.38
@@ -8,6 +8,7 @@
 
 if (isset($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type'])) {
     serendipity_deleteComment($serendipity['GET']['delete'], $serendipity['GET']['entry'], $serendipity['GET']['type']);
+    header('Location: '. $_SERVER['HTTP_REFERER']); die();
 }
 
 if (isset($serendipity['GET']['switch'], $serendipity['GET']['entry'])) {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.315,1.316

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28334

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Pimp up the theme selector, could use some CSS - but this will have to do for now


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- serendipity_functions.inc.php	5 Jul 2004 12:57:16 -0000	1.315
+++ serendipity_functions.inc.php	5 Jul 2004 20:20:12 -0000	1.316
@@ -167,6 +167,13 @@
 function serendipity_printTemplates($themelist) {
     global $serendipity;
 ?>
+<script language="JavaScript" type="text/javascript">
+    function setRadio(id) {
+        if (document.getElementById(id)) {
+            document.getElementById(id).checked = true;
+        }
+    }
+</script>
 <div>
     <form method="post" action="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php?serendipity[adminModule]=templates&amp;serendipity[adminAction]=save">
     <table width="100%" class="prettyTable">
@@ -186,19 +193,19 @@
         }
 ?>
         <tr>
-            <td colspan="3"><strong><?php echo $info['name']; ?></strong></td>
+            <td colspan="3" onmousedown="setRadio('serendipity_theme_<?php echo $theme; ?>');"><strong><?php echo $info['name']; ?></strong></td>
         </tr>
 
         <tr>
-            <td width="100"><?php echo $preview; ?></td>
+            <td width="100" onmousedown="setRadio('serendipity_theme_<?php echo $theme; ?>');"><?php echo $preview; ?></td>
 
-            <td valign="top">
+            <td valign="top" onmousedown="setRadio('serendipity_theme_<?php echo $theme; ?>');">
                 <?php echo AUTHOR; ?>      : <?php echo $info['author'];?><br />
                 <?php echo LAST_UPDATED; ?>: <?php echo $info['date'];  ?>
             </td>
 
-            <td valign="middle">
-                <div><input type="radio" name="serendipity[theme]" value="<?php echo $theme; ?>" <?php echo $is_active; ?> /></div>
+            <td valign="middle" onmousedown="setRadio('serendipity_theme_<?php echo $theme; ?>');">
+                <div><input type="radio" name="serendipity[theme]" value="<?php echo $theme; ?>" id="serendipity_theme_<?php echo $theme; ?>" <?php echo $is_active; ?> /></div>
             </td>
         </tr>
 <?php

[php-blog-cvs] serendipity NEWS,1.166,1.167 serendipity_admin_installer.inc.php,1.68,1.69

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21350

Modified Files:
	NEWS serendipity_admin_installer.inc.php 
Log Message:
Fixed bug causing the .htaccess file to never get updated when changing rewrite method


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- serendipity_admin_installer.inc.php	16 Jun 2004 18:56:44 -0000	1.68
+++ serendipity_admin_installer.inc.php	5 Jul 2004 19:41:53 -0000	1.69
@@ -81,13 +81,14 @@
 
         }
 
+        $oldRewrite = $serendipity['rewrite']; // We save the rewrite method, because we run a check after $serendipity has been updated
         $res = serendipity_updateConfiguration();
         if (is_array($res)) {
             echo DIAGNOSTIC_ERROR;
             echo '<span style="color: #FF0000">- ' . implode('<br />', $res) . '</span><br /><br />';
         } else {
             /* If we have new rewrite rules, then install them */
-            if (isset($_POST['rewrite']) && $serendipity['serendipityUserLevel'] >= USERLEVEL_ADMIN && $serendipity['rewrite'] != $_POST['rewrite']) {
+            if (isset($_POST['rewrite']) && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN && $oldRewrite != $_POST['rewrite']) {
                 printf(ATTEMPT_WRITE_FILE, '.htaccess');
                 $res = serendipity_installFiles();
                 if (is_array($res)) {

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- NEWS	5 Jul 2004 08:25:49 -0000	1.166
+++ NEWS	5 Jul 2004 19:41:53 -0000	1.167
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed bug causing the .htaccess file to never get updated when 
+      changing rewrite method (tomsommer)
+
     * Track Exits plugin: Now only uses the link id for link referal.
       Reduces URI length and makes random exit.php calling useless for
       spammers, as no URL is tracked, which the author didn't refer to

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.314,1.315

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10788

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed broken entries counting when browsing a category


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- serendipity_functions.inc.php	5 Jul 2004 09:59:55 -0000	1.314
+++ serendipity_functions.inc.php	5 Jul 2004 12:57:16 -0000	1.315
@@ -410,7 +410,7 @@
                                AND e.isdraft     = 'false'
                                AND e.id          = ec.entryid
                                AND c.categoryid  = ec.categoryid
-                               AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid)) . ")";
+                               AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
         }
     }
 
@@ -1031,19 +1031,22 @@
 
     $querystring  = "SELECT count(id)
                        FROM {$serendipity['dbPrefix']}entries e,
-                         {$serendipity['dbPrefix']}entrycat ec
-                       WHERE isdraft = 'false'
-                         AND e.id = ec.entryid";
+                         {$serendipity['dbPrefix']}entrycat ec,
+                         {$serendipity['dbPrefix']}category c
+                       WHERE e.isdraft = 'false'
+                         AND e.id = ec.entryid AND ec.categoryid = c.categoryid ";
     if (isset($serendipity['GET']['category'])) {
         $_categoryid = explode('_', $serendipity['GET']['category']);
         $categoryid  = serendipity_db_escape_string($_categoryid[0]);
 
         if (is_numeric($categoryid)) {
-            $querystring .= " e.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
+            $querystring .= " AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
         }
     }
 
     $query        = serendipity_db_query($querystring);
+    echo '<!-- querystring: ' . $querystring . ' ' . print_r($query, true) . ' -->';
+
     $totalEntries = $query[0][0];
     $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
 

[php-blog-cvs] serendipity/plugins/serendipity_plugin_recententries serendipity_plugin_recententries.php,1.7,1.8

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13336/plugins/serendipity_plugin_recententries

Modified Files:
	serendipity_plugin_recententries.php 
Log Message:
pretty url with word separation


Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_plugin_recententries.php	22 Jun 2004 13:45:49 -0000	1.7
+++ serendipity_plugin_recententries.php	5 Jul 2004 10:00:56 -0000	1.8
@@ -80,7 +80,8 @@
                 $entryLink = serendipity_archiveURL(
                                $entry['id'],
                                $entry['title'],
-                               'serendipityHTTPPath'
+                               'serendipityHTTPPath',
+                               false
                             );
 
                 echo '<a href="' . $entryLink . '" title="' . htmlspecialchars($entry['title']) . '">' . $entry['title'] . '</a><br />'

[php-blog-cvs] serendipity comment.php,1.36,1.37 serendipity_functions.inc.php,1.313,1.314

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12973

Modified Files:
	comment.php serendipity_functions.inc.php 
Log Message:
Now the '+' separator style is only used for article overview URL generation
and URL detail link generation, as well as the two entry plugins. Every
other occurence uses the old '_' way to stay backwards compatible.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- serendipity_functions.inc.php	5 Jul 2004 09:31:27 -0000	1.313
+++ serendipity_functions.inc.php	5 Jul 2004 09:59:55 -0000	1.314
@@ -924,6 +924,8 @@
 **/
 function serendipity_makeFilename($str, $compat = true) {
     static $from = array(
+                     ' ',
+
                      'Ä',
                      'ä',
 
@@ -955,11 +957,11 @@
                      'ù',
                      'û',
 
-                     'ý',
-
-                     ' ');
+                     'ý');
 
     static $to   = array(
+                     '_',
+
                      'AE',
                      'ae',
 
@@ -991,9 +993,16 @@
                      'u',
                      'u',
 
-                     'y',
+                     'y');
 
-                     '_');
+    // For pretty urls we want to have a '+' as word separator. But GUIDs need to stay used to using '_' to not break bc.
+    // (For performance reasons this changes the static array instead of using a second str_replace call only for the ' ' case,
+    // and to avoid a costy call to array_merge()
+    if ($compat !== true) {
+        $to[0] = '+';
+    } else {
+        $to[0] = '_';
+    }
 
     $str = str_replace($from, $to, $str);
     return preg_replace('#[^' . PAT_FILENAME . ']#i', '', $str);
@@ -1097,7 +1106,7 @@
 
 <?php
             foreach ($ents as $x => $entry) {
-                $entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
+                $entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', false);
                 serendipity_plugin_api::hook_event('frontend_display', $entry);
 
                 $html_extended = '';
@@ -1273,7 +1282,7 @@
 <?php
         foreach ($bydate as $date => $ents) {
             foreach ($ents as $x => $entry) {
-                echo '<a href="' . serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath') . '">' . $entry['title'] . '</a>' . "\n";
+                echo '<a href="' . serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', false) . '">' . $entry['title'] . '</a>' . "\n";
                 echo '<br />' . "\n";
             }
         }

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- comment.php	17 Jun 2004 20:13:48 -0000	1.36
+++ comment.php	5 Jul 2004 09:59:55 -0000	1.37
@@ -102,11 +102,7 @@
             $tbu = $serendipity['baseURL'] . 'comment.php?type=trackback&amp;entry_id=' . $serendipity['GET']['entry_id'];
             $query = 'SELECT title FROM ' . $serendipity['dbPrefix'] . 'entries WHERE id = ' . $serendipity['GET']['entry_id'];
             $entry = serendipity_db_query($query);
-            $entry =  $serendipity['baseURL']
-                   . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '')
-                   . 'archives/'
-                   . $serendipity['GET']['entry_id']
-                   . '_' . serendipity_makeFilename($entry[0]['title']) . '.html';
+            $entry = serendipity_archiveURL($serendipity['GET']['entry_id'], $entry[0]['title'], 'baseURL', false); $serendipity['baseURL'];
 ?>
     <div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?></div><br />
     <dl>

[php-blog-cvs] serendipity/plugins/serendipity_plugin_history serendipity_plugin_history.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12973/plugins/serendipity_plugin_history

Modified Files:
	serendipity_plugin_history.php 
Log Message:
Now the '+' separator style is only used for article overview URL generation
and URL detail link generation, as well as the two entry plugins. Every
other occurence uses the old '_' way to stay backwards compatible.


Index: serendipity_plugin_history.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history/serendipity_plugin_history.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_plugin_history.php	25 Jun 2004 08:34:19 -0000	1.2
+++ serendipity_plugin_history.php	5 Jul 2004 09:59:56 -0000	1.3
@@ -155,7 +155,9 @@
         for($x=0; $x < $e_c; $x++) {
             $url = serendipity_archiveURL($e[$x]['id'],
                                           $e[$x]['title'],
-                                          'serendipityHTTPPath');
+                                          'serendipityHTTPPath',
+                                          false
+            );
             $date = ($displaydate=='0') ? '' : strftime($dateformat);
             echo $date . "<a href='$url'>{$e[$x]['title']}</a> " .
                  strip_tags($e[$x]['body']) . '<br />';

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments serendipity_plugin_comments.php,1.19,1.20

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12973/plugins/serendipity_plugin_comments

Modified Files:
	serendipity_plugin_comments.php 
Log Message:
Now the '+' separator style is only used for article overview URL generation
and URL detail link generation, as well as the two entry plugins. Every
other occurence uses the old '_' way to stay backwards compatible.


Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_plugin_comments.php	22 Jun 2004 13:45:47 -0000	1.19
+++ serendipity_plugin_comments.php	5 Jul 2004 09:59:56 -0000	1.20
@@ -147,7 +147,7 @@
                   PLUGIN_COMMENTS_ABOUT,
 
                   $user,
-                  ' <a class="highlight" href="' . serendipity_archiveURL($row['entry_id'], $row['subject']) .'#c' . $row['comment_id'] . '" title="' . htmlspecialchars($row['subject']) . '">'
+                  ' <a class="highlight" href="' . serendipity_archiveURL($row['entry_id'], $row['subject'], 'baseURL', false) .'#c' . $row['comment_id'] . '" title="' . htmlspecialchars($row['subject']) . '">'
                       . htmlspecialchars($row['subject'])
                       . '</a><br />' . "\n"
                       . htmlspecialchars(strftime($dateformat, $row['stamp'])) . '<br />' . "\n"

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.312,1.313

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7386

Modified Files:
	serendipity_functions.inc.php 
Log Message:
back out previous commit. Replacing '_' with '+' also changed permanent
URIs, and those shouldn't. Will make a better solution later.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- serendipity_functions.inc.php	5 Jul 2004 08:25:49 -0000	1.312
+++ serendipity_functions.inc.php	5 Jul 2004 09:31:27 -0000	1.313
@@ -922,7 +922,7 @@
 /**
 *  Creates a filename that consists of [a-zA-z0-9_] (with some custom adjustments (space -> _, ä -> ae and such)
 **/
-function serendipity_makeFilename($str) {
+function serendipity_makeFilename($str, $compat = true) {
     static $from = array(
                      'Ä',
                      'ä',
@@ -993,7 +993,7 @@
 
                      'y',
 
-                     '+');
+                     '_');
 
     $str = str_replace($from, $to, $str);
     return preg_replace('#[^' . PAT_FILENAME . ']#i', '', $str);
@@ -2210,10 +2210,10 @@
 /**
  * return a fully qualified URL
  */
-function serendipity_archiveURL($id, $title, $key = 'baseURL') {
+function serendipity_archiveURL($id, $title, $key = 'baseURL', $compat = true) {
 global $serendipity;
 
-    return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $id . '_' . serendipity_makeFilename($title) . '.html';
+    return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $id . '_' . serendipity_makeFilename($title, $compat) . '.html';
 }
 
 /**

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.29,1.30 serendipity_lang_cz.inc.php,1.29,1.30 serendipity_lang_da.inc.php,1.45,1.46 serendipity_lang_de.inc.php,1.57,1.58 serendipity_lang_en.inc.php,1.47,1.48 serendipity_lang_es.inc.php,1.45,1.46 serendipity_lang_fr.inc.php,1.25,1.26 serendipity_lang_nl.inc.php,1.3,1.4 serendipity_lang_pt.inc.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30345

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_pt.inc.php 
Log Message:
German Translations. Adjusted position of 'Translate' strings. Inserted new
missing 'INSTALL_AS_TOP_LINKS' constant for all languages.


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_cs.inc.php	1 Jul 2004 18:35:18 -0000	1.29
+++ serendipity_lang_cs.inc.php	5 Jul 2004 08:36:12 -0000	1.30
@@ -517,14 +517,14 @@
 @define('TRACKBACK_SIZE', 'Nebyla odeslána odezva: Cílové URI pøekroèilo velikost souboru %s bajtù.');
 @define('TRACKBACK_NO_DATA', 'Nebyla odeslána odezva: Cíl neobsahuje data');
 @define('SUCCESS', 'Úspìch');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
-
-
-
 
+/* TRANSLATE */
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_da.inc.php	1 Jul 2004 18:35:18 -0000	1.45
+++ serendipity_lang_da.inc.php	5 Jul 2004 08:36:12 -0000	1.46
@@ -442,6 +442,8 @@
 @define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
 @define('INSTALL_EMBED', 'Is serendipity embedded?');
 @define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 @define('INSTALL_BLOCKREF', 'Blocked Referers');
 @define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!');
 @define('INSTALL_REWRITE', 'URL Rewriting');
@@ -516,14 +518,10 @@
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', ',');
 @define('NUMBER_FORMAT_THOUSANDS', '.');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
-
-
-
-
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_fr.inc.php	1 Jul 2004 18:35:18 -0000	1.25
+++ serendipity_lang_fr.inc.php	5 Jul 2004 08:36:12 -0000	1.26
@@ -505,14 +505,12 @@
 @define('TRACKBACK_SIZE', 'No Trackback sent: Target URI exceeded filesize of %s bytes.');
 @define('TRACKBACK_NO_DATA', 'No Trackback sent: Target contained no data');
 @define('SUCCESS', 'Success');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
-
-
-
-
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_cz.inc.php	1 Jul 2004 18:35:18 -0000	1.29
+++ serendipity_lang_cz.inc.php	5 Jul 2004 08:36:12 -0000	1.30
@@ -517,14 +517,14 @@
 @define('TRACKBACK_SIZE', 'Nebyla odeslána odezva: Cílové URI pøekroèilo velikost souboru %s bajtù.');
 @define('TRACKBACK_NO_DATA', 'Nebyla odeslána odezva: Cíl neobsahuje data');
 @define('SUCCESS', 'Úspìch');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
-
-
-
 
+/* TRANSLATE */
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_lang_nl.inc.php	1 Jul 2004 18:35:18 -0000	1.3
+++ serendipity_lang_nl.inc.php	5 Jul 2004 08:36:12 -0000	1.4
@@ -462,6 +462,8 @@
 @define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
 @define('INSTALL_EMBED', 'Is serendipity embedded?');
 @define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 @define('INSTALL_BLOCKREF', 'Blocked Referers');
 @define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!');
 @define('INSTALL_REWRITE', 'URL Rewriting');
@@ -504,14 +506,10 @@
 @define('TRACKBACK_SIZE', 'No Trackback sent: Target URI exceeded filesize of %s bytes.');
 @define('TRACKBACK_NO_DATA', 'No Trackback sent: Target contained no data');
 @define('SUCCESS', 'Success');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
-
-
-
-
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_lang_en.inc.php	5 Jul 2004 06:28:15 -0000	1.47
+++ serendipity_lang_en.inc.php	5 Jul 2004 08:36:12 -0000	1.48
@@ -511,8 +511,5 @@
 @define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
 @define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
 
-
-
-
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_es.inc.php	1 Jul 2004 18:35:18 -0000	1.45
+++ serendipity_lang_es.inc.php	5 Jul 2004 08:36:12 -0000	1.46
@@ -450,6 +450,8 @@
 @define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
 @define('INSTALL_EMBED', 'Is serendipity embedded?');
 @define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 @define('INSTALL_BLOCKREF', 'Blocked Referers');
 @define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!');
 @define('INSTALL_REWRITE', 'URL Rewriting');
@@ -499,10 +501,10 @@
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', '.');
 @define('NUMBER_FORMAT_THOUSANDS', ',');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
 
 
 

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- serendipity_lang_de.inc.php	5 Jul 2004 06:28:15 -0000	1.57
+++ serendipity_lang_de.inc.php	5 Jul 2004 08:36:12 -0000	1.58
@@ -504,14 +504,10 @@
 @define('TRACKBACK_SIZE', 'Kein Trackbackt: Ziel-URI überschreitet maximale Größe von %s bytes.');
 @define('TRACKBACK_NO_DATA', 'No Trackback sent: Target contained no data');
 @define('SUCCESS', 'Erfolgreich beendet');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
-
-
-
-
+@define('POWERED_BY_SHOW_TEXT', 'Zeige "Serendipity" als text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Zeigt den Text "Serendipity Weblog" an');
+@define('POWERED_BY_SHOW_IMAGE', 'Zeige "Serendipity" als Logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Stellt das Serendipity-Logo dar');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_lang_pt.inc.php	1 Jul 2004 18:35:18 -0000	1.2
+++ serendipity_lang_pt.inc.php	5 Jul 2004 08:36:12 -0000	1.3
@@ -460,6 +460,8 @@
 @define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
 @define('INSTALL_EMBED', 'Is serendipity embedded?');
 @define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 @define('INSTALL_BLOCKREF', 'Blocked Referers');
 @define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!');
 @define('INSTALL_REWRITE', 'URL Rewriting');
@@ -502,14 +504,10 @@
 @define('TRACKBACK_SIZE', 'No Trackback sent: Target URI exceeded filesize of %s bytes.');
 @define('TRACKBACK_NO_DATA', 'No Trackback sent: Target contained no data');
 @define('SUCCESS', 'Success');
-@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text'); // Translate
-@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text'); // Translate
-@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo'); // Translate
-@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo'); // Translate
-
-
-
-
+@define('POWERED_BY_SHOW_TEXT', 'Show "Serendipity" as text');
+@define('POWERED_BY_SHOW_TEXT_DESC', 'Will display "Serendipity Weblog" as text');
+@define('POWERED_BY_SHOW_IMAGE', 'Show "Serendipity" with a logo');
+@define('POWERED_BY_SHOW_IMAGE_DESC', 'Displays the Serendipity logo');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity NEWS,1.165,1.166 exit.php,1.5,1.6 serendipity_db_mysqli.inc.php,1.1,1.2 serendipity_db_mysql.inc.php,1.19,1.20 serendipity_db_postgres.inc.php,1.13,1.14 serendipity_db_sqlite.inc.php,1.7,1.8 serendipity_functions.inc.php,1.311,1.312

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28128

Modified Files:
	NEWS exit.php serendipity_db_mysqli.inc.php 
	serendipity_db_mysql.inc.php serendipity_db_postgres.inc.php 
	serendipity_db_sqlite.inc.php serendipity_functions.inc.php 
Log Message:
* Use '+' instead of '_' for URL generation - lets google recognize single
words instead of one huge

* Exit Tracking: Do not allow spammers to randomly submit URLs. We only
allow links to be tracked which we entered. Those are inserted in
serendipity_references, and we can fetch the ID. I talked this over with
Kristian Koehntopp, but please test this.


Index: serendipity_db_mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysqli.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_db_mysqli.inc.php	16 Jun 2004 18:28:58 -0000	1.1
+++ serendipity_db_mysqli.inc.php	5 Jul 2004 08:25:49 -0000	1.2
@@ -7,7 +7,7 @@
  *   array of field values if it returned a single row and $single is true
  *   array of array of field values if it returned row(s)
  */
-function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false) {
+function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) {
     global $serendipity;
     $type_map = array('assoc' => MYSQLI_ASSOC, 'num' => MYSQLI_NUM, 'both' => MYSQLI_BOTH);
 
@@ -49,8 +49,13 @@
             }
 
             $rows = array();
-            while ( $row = mysqli_fetch_array($c, $result_type) ) {
-                $rows[] = $row;
+            while ($row = mysqli_fetch_array($c, $result_type)) {
+                if (!empty($assocKey) && !empty($assocVal)) {
+                    // You can fetch a key-associated array via the two function parameters assocKey and assocVal
+                    $rows[$row[$assocKey]] = $row[$assocVal];
+                } else {
+                    $rows[] = $row;
+                }
             }
             return $rows;
     }

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_db_postgres.inc.php	6 Jun 2004 20:30:00 -0000	1.13
+++ serendipity_db_postgres.inc.php	5 Jul 2004 08:25:49 -0000	1.14
@@ -45,7 +45,7 @@
     return pg_last_oid($serendipity['dbLastResult']);
 }
 
-function serendipity_db_query($sql, $single = false, $result_type = "both") {
+function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) {
     global $serendipity;
     static $type_map = array(
                          'assoc' => PGSQL_ASSOC,
@@ -88,7 +88,13 @@
         default:
             $rows = array();
             for ($i = 0; $i < $n; $i++) {
-                $rows[] = pg_fetch_array($serendipity['dbLastResult'], $i, $result_type);
+                if (!empty($assocKey) && !empty($assocVal)) {
+                    // You can fetch a key-associated array via the two function parameters assocKey and assocVal
+                    $row = pg_fetch_array($serendipity['dbLastResult'], $i, $result_type);
+                    $rows[$row[$assocKey]] = $row[$assocVal];
+                } else {
+                    $rows[] = pg_fetch_array($serendipity['dbLastResult'], $i, $result_type);
+                }
             }
             return $rows;
     }

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- NEWS	3 Jul 2004 16:33:10 -0000	1.165
+++ NEWS	5 Jul 2004 08:25:49 -0000	1.166
@@ -3,7 +3,17 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-    * Actually log the IP of users whom submit comments and blogs which 
+    * Track Exits plugin: Now only uses the link id for link referal.
+      Reduces URI length and makes random exit.php calling useless for
+      spammers, as no URL is tracked, which the author didn't refer to
+      (garvinhicking, isotopp)
+
+    * Use '+' as separator for words in our "nice" URLs, so Google and
+      others can recognize 'a+nifty+word' as 'a nifty word'. Previously
+      this was indexed as one single word. Thanks to Absynth for
+      pointing this out. (garvinhicking)
+
+    * Actually log the IP of users who submit comments and blogs which
       trackback (tomsommer)
 
     * Plugin hook 'backend_publish' now executed on entries saved as
@@ -22,7 +32,7 @@
     * Added dutch and portugues language. Thanks to Paul de Bruyne and
       Ranulfo Netto!
 
-    * Multi User: Fixed bug #977695 where simple editors couldn't re-edit 
+    * Multi User: Fixed bug #977695 where simple editors couldn't re-edit
       their entries (garvinhicking)
 
     * Auto-Trackback from serendipity will now only fetch links smaller

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- serendipity_functions.inc.php	5 Jul 2004 06:28:14 -0000	1.311
+++ serendipity_functions.inc.php	5 Jul 2004 08:25:49 -0000	1.312
@@ -640,7 +640,7 @@
     elseif (is_array($range) && count($range)==2) {
         $startts = $range[0];
         $endts   = $range[1];
-        $and = " WHERE timestamp >= $startts AND timestamp <= $endts";    
+        $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
     }
      else {
         if ($modified_since) {
@@ -993,7 +993,7 @@
 
                      'y',
 
-                     '_');
+                     '+');
 
     $str = str_replace($from, $to, $str);
     return preg_replace('#[^' . PAT_FILENAME . ']#i', '', $str);

Index: exit.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/exit.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exit.php	8 Jul 2003 09:13:27 -0000	1.5
+++ exit.php	5 Jul 2004 08:25:49 -0000	1.6
@@ -2,21 +2,28 @@
 
 include_once 'serendipity_config.inc.php';
 
-$entry_id = 0;
 $url      = $serendipity['baseURL'];
 
-if ( isset($_GET['url']) &&
-    !empty($_GET['url'])) {
-    if ( isset($_GET['entry_id']) &&
-        !empty($_GET['entry_id'])) {
-        $entry_id = $_GET['entry_id'];
+if (isset($_GET['url_id']) && !empty($_GET['url_id']) && isset($_GET['entry_id']) && !empty($_GET['entry_id'])) {
+
+    // See if the submitted link is in our database and should be tracked
+    $links = serendipity_db_query("SELECT link FROM {$serendipity['dbPrefix']}references WHERE id = {$_GET['url_id']} AND entry_id = {$_GET['entry_id']}", true);
+
+    if (is_array($links) && isset($links['link'])) {
+        // URL is valid. Track it.
+        $url = $links['link'];
+        serendipity_track_url('exits', $url, $_GET['entry_id']);
+    } elseif (isset($_GET['url']) && !empty($_GET['url'])) {
+        // URL is invalid. But a URL-location was sent, so we want to redirect the user kindly.
+        $url = str_replace('&amp;', '&', base64_decode($_GET['url']));
     }
 
+} elseif (isset($_GET['url']) && !empty($_GET['url'])) {
+    // No entry-link ID was submitted. Possibly a spammer tried to mis-use the script to get into the top-list.
     $url = str_replace('&amp;', '&', base64_decode($_GET['url']));
-
-    serendipity_track_url('exits', $url, $entry_id);
 }
 
 header('Location: ' . $url);
+exit;
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_db_sqlite.inc.php	21 Jun 2004 14:55:32 -0000	1.7
+++ serendipity_db_sqlite.inc.php	5 Jul 2004 08:25:49 -0000	1.8
@@ -64,7 +64,7 @@
     return $row;
 }
 
-function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false)
+function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false)
 {
     global $serendipity;
     static $type_map = array(
@@ -104,7 +104,12 @@
         $rows = array();
 
         while (($row = serendipity_db_sqlite_fetch_array($res, $type_map[$result_type]))) {
-            $rows[] = $row;
+            if (!empty($assocKey) && !empty($assocVal)) {
+                // You can fetch a key-associated array via the two function parameters assocKey and assocVal
+                $rows[$row[$assocKey]] = $row[$assocVal];
+            } else {
+                $rows[] = $row;
+            }
         }
 
         if ($debug) fwrite($fp, '[' . date('d.m.Y H:i') . '] SQLITE RESULT: ' . print_r($rows, true). "\n\n");

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_db_mysql.inc.php	6 Jun 2004 20:30:00 -0000	1.19
+++ serendipity_db_mysql.inc.php	5 Jul 2004 08:25:49 -0000	1.20
@@ -7,7 +7,7 @@
  *   array of field values if it returned a single row and $single is true
  *   array of array of field values if it returned row(s)
  */
-function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false) {
+function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false, $assocKey=false, $assocVal=false) {
     global $serendipity;
     static $type_map = array(
                          'assoc' => MYSQL_ASSOC,
@@ -55,7 +55,12 @@
 
             $rows = array();
             while (($row = mysql_fetch_array($c, $result_type))) {
-                $rows[] = $row;
+                if (!empty($assocKey) && !empty($assocVal)) {
+                    // You can fetch a key-associated array via the two function parameters assocKey and assocVal
+                    $rows[$row[$assocKey]] = $row[$assocVal];
+                } else {
+                    $rows[] = $row;
+                }
             }
             return $rows;
     }

[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,1.9,1.10

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28128/plugins/serendipity_event_trackexits

Modified Files:
	serendipity_event_trackexits.php 
Log Message:
* Use '+' instead of '_' for URL generation - lets google recognize single
words instead of one huge

* Exit Tracking: Do not allow spammers to randomly submit URLs. We only
allow links to be tracked which we entered. Those are inserted in
serendipity_references, and we can fetch the ID. I talked this over with
Kristian Koehntopp, but please test this.


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_trackexits.php	29 Jun 2004 22:09:22 -0000	1.9
+++ serendipity_event_trackexits.php	5 Jul 2004 08:25:50 -0000	1.10
@@ -22,6 +22,7 @@
 
 class serendipity_event_trackexits extends serendipity_event
 {
+var $links;
 
     function introspect(&$propbag)
     {
@@ -69,7 +70,7 @@
         switch($name) {
             case 'commentredirection':
                 $propbag->add('type',        'select');
-                $propbag->add('select_values', array('none'     => PLUGIN_EVENT_TRACKBACK_COMMENTREDIRECTION_NONE, 
+                $propbag->add('select_values', array('none'     => PLUGIN_EVENT_TRACKBACK_COMMENTREDIRECTION_NONE,
                                                      's9y'      => PLUGIN_EVENT_TRACKBACK_COMMENTREDIRECTION_S9Y,
                                                      'google'   => PLUGIN_EVENT_TRACKBACK_COMMENTREDIRECTION_GOOGLE));
                 $propbag->add('name',        PLUGIN_EVENT_TRACKBACK_COMMENTREDIRECTION);
@@ -103,6 +104,10 @@
                             $element = $temp['element'];
 
                             $serendipity['encodeExitsCallback_entry_id'] = (isset($eventData['entry_id']) ? $eventData['entry_id'] : $eventData['id']);
+
+                            // Fetch all existing links from the database. They have been inserted there by our trackback-discovery.
+                            $this->links = serendipity_db_query("SELECT id, link FROM {$serendipity['dbPrefix']}references WHERE entry_id = {$serendipity['encodeExitsCallback_entry_id']}", false, 'both', false, 'link', 'id');
+
                             $eventData[$element] = preg_replace_callback(
                                 "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#isUm",
                                 array($this, '_encodeExitsCallback'),
@@ -166,15 +171,27 @@
             );
         }
 
-        return sprintf(
-            '<a%shref="%sexit.php?url=%s%s" title="%s" onmouseover="window.status=\'%s\';return true;" onmouseout="window.status=\'\';return true;"',
-            $buffer[1],
-            $serendipity['baseURL'],
-            base64_encode($url),
-            ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
-            $url,
-            $url
-        );
+        if (isset($this->links[$url])) {
+            return sprintf(
+                '<a%shref="%sexit.php?url_id=%s%s" title="%s" onmouseover="window.status=\'%s\';return true;" onmouseout="window.status=\'\';return true;"',
+                $buffer[1],
+                $serendipity['baseURL'],
+                $this->links[$url],
+                ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
+                $url,
+                $url
+            );
+        } else {
+            return sprintf(
+                '<a%shref="%sexit.php?url=%s%s" title="%s" onmouseover="window.status=\'%s\';return true;" onmouseout="window.status=\'\';return true;"',
+                $buffer[1],
+                $serendipity['baseURL'],
+                base64_encode($url),
+                ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
+                $url,
+                $url
+            );
+        }
     }
 }
 

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.40,1.41 serendipity_functions.inc.php,1.310,1.311

[Kristian K. <is...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9362

Modified Files:
	serendipity_config_local.tpl serendipity_functions.inc.php 
Log Message:
Prototypical implementation of Top Links as text, optional as links
(configuration setting included).


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- serendipity_functions.inc.php	4 Jul 2004 15:55:49 -0000	1.310
+++ serendipity_functions.inc.php	5 Jul 2004 06:28:14 -0000	1.311
@@ -2960,16 +2960,25 @@
                   LIMIT $limit";
     }
 
+    $link = serendipity_get_config_var('top_as_links', false, true);
     $rows = serendipity_db_query($query);
     echo "<span class='serendipityReferer'>";
     if (is_array($rows)) {
         foreach ($rows as $row) {
-            printf(
-                '<a href="%1$s://%2$s" title="%2$s" >%2$s</a> (%3$s)<br />',
-                $row['scheme'],
-                $row['host'],
-                $row['total']
-            );
+            if ($link) {
+                printf(
+                    '<a href="%1$s://%2$s" title="%2$s" >%2$s</a> (%3$s)<br />',
+                    $row['scheme'],
+                    $row['host'],
+                    $row['total']
+                );
+            } else {
+                printf(
+                    '%1$s (%2$s)<br />',
+                    $row['host'],
+                    $row['total']
+                );
+            }
         }
     }
     echo "</span>";

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_config_local.tpl	21 Jun 2004 14:55:32 -0000	1.40
+++ serendipity_config_local.tpl	5 Jul 2004 06:28:14 -0000	1.41
@@ -37,6 +37,7 @@
 $serendipity['XHTML11']              = '{INSTALL_XHTML11|XHTML11|bool|0|255}';              // INSTALL_XHTML11_DESC
 $serendipity['enablePopup']          = '{INSTALL_POPUP|enablePopup|bool|1|255}';            // INSTALL_POPUP_DESC
 $serendipity['embed']                = '{INSTALL_EMBED|embed|bool||255}';                   // INSTALL_EMBED_DESC
+$serendipity['top_as_links']         = '{INSTALL_TOP_AS_LINKS|top_as_links|bool||0|255}';      // INSTALL_TOP_AS_LINKS_DESC
 $serendipity['blockReferer']         = '{INSTALL_BLOCKREF|blockReferer|string|;|255}';      // INSTALL_BLOCKREF_DESC
 $serendipity['rewrite']              = '{INSTALL_REWRITE|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // INSTALL_REWRITE_DESC
 

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.56,1.57 serendipity_lang_en.inc.php,1.46,1.47

[Kristian K. <is...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9362/lang

Modified Files:
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
Log Message:
Prototypical implementation of Top Links as text, optional as links
(configuration setting included).


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_lang_de.inc.php	1 Jul 2004 18:35:18 -0000	1.56
+++ serendipity_lang_de.inc.php	5 Jul 2004 06:28:15 -0000	1.57
@@ -460,6 +460,8 @@
 @define('INSTALL_POPUP_DESC', 'Sollen die Links zu den Kommentaren, Trackbacks etc. mit Popups geöffnet werden?');
 @define('INSTALL_EMBED', 'Eingebettete Nutzung von Serendipity aktivieren?');
 @define('INSTALL_EMBED_DESC', 'Falls serendipity innerhalb einer normalen Seite eingebettet werden soll, aktivieren Sie diese Option. Serendipity stellt dann nur Inhalte dar, und Sie können sich um Header und Footer kümmern. Lesen Sie die Datei README für weitere Informationen.');
+@define('INSTALL_TOP_AS_LINKS', 'Top Exits/Referrers als Link anzeigen?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'Die Top Exits und Top Referrer des Blogs werden nun per Default nur noch als Text angezeigt, um Google Spamming zu verhindern. Wenn sie weiterhin als Links angezeigt werden sollen, ist diese Option einzuschalten.');
 @define('INSTALL_BLOCKREF', 'Geblockte Referer');
 @define('INSTALL_BLOCKREF_DESC', 'Sollen spezielle Hosts aus der Referrer-Liste gesperrt werden? Hostnamen getrennt mit ";" eingeben. Jeder Hostname wird als Teilstring überprüft, so dass "goo" sowohl "google.com" als auch "googlegroups.com" sperren würde.');
 @define('INSTALL_REWRITE', 'URL-Formung');
@@ -512,4 +514,4 @@
 
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_lang_en.inc.php	1 Jul 2004 18:35:18 -0000	1.46
+++ serendipity_lang_en.inc.php	5 Jul 2004 06:28:15 -0000	1.47
@@ -462,6 +462,8 @@
 @define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
 @define('INSTALL_EMBED', 'Is serendipity embedded?');
 @define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
+@define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');
+@define('INSTALL_TOP_AS_LINKS_DESC', 'By default, serendipity now shows the top exits and top referrers of your blog as plain text to prevent google spamming. If you still want to see these links as links, enable this setting.');
 @define('INSTALL_BLOCKREF', 'Blocked Referers');
 @define('INSTALL_BLOCKREF_DESC', 'Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with \';\' and note that the host is blocked by substring matches!');
 @define('INSTALL_REWRITE', 'URL Rewriting');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.309,1.310

[Jannis H. <jhe...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16793

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixes the step backword made in from 1.307 to 1.308 of serendipity_functions.inc.php.



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- serendipity_functions.inc.php	3 Jul 2004 16:33:10 -0000	1.309
+++ serendipity_functions.inc.php	4 Jul 2004 15:55:49 -0000	1.310
@@ -595,7 +595,8 @@
 
 /**
 * Give it a range in YYYYMMDD format to gather the desired entries
-* (For february 2002 you would pass 200202 e.g.
+* (For february 2002 you would pass 200202 for all entries withing
+* two timestamps you would pass array(timestamp1,timestamp2)
 **/
 function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '') {
     global $serendipity;
@@ -635,7 +636,13 @@
         if ($drafts) {
             $and .= " AND $drafts";
         }
-    } else {
+    }
+    elseif (is_array($range) && count($range)==2) {
+        $startts = $range[0];
+        $endts   = $range[1];
+        $and = " WHERE timestamp >= $startts AND timestamp <= $endts";    
+    }
+     else {
         if ($modified_since) {
             $unix_modified = strtotime($modified_since);
             if ($unix_modified != -1) {

[php-blog-cvs] serendipity NEWS,1.164,1.165 serendipity_functions.inc.php,1.308,1.309

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5526

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
We have an 'ip' field in our database, but we don't use it for anything - that's a real shame


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- serendipity_functions.inc.php	2 Jul 2004 12:47:46 -0000	1.308
+++ serendipity_functions.inc.php	3 Jul 2004 16:33:10 -0000	1.309
@@ -1535,6 +1535,7 @@
     if (serendipity_db_bool($ca['allow_comments']) || !is_array($ca)) {
         $title         = serendipity_db_escape_string(isset($commentInfo['title']) ? $commentInfo['title'] : '');
         $comments      = $commentInfo['comment'];
+        $ip            = $_SERVER['REMOTE_ADDR'];
         $commentsFixed = serendipity_db_escape_string($commentInfo['comment']);
         $name          = serendipity_db_escape_string($commentInfo['name']);
         $url           = serendipity_db_escape_string($commentInfo['url']);
@@ -1548,8 +1549,8 @@
         }
 
         $t      = time();
-        $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, author, email, url, body, type, timestamp, title, subscribed)";
-        $query .= " VALUES ('$id', '$parentid', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe')";
+        $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, ip, author, email, url, body, type, timestamp, title, subscribed)";
+        $query .= " VALUES ('$id', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe')";
 
         serendipity_db_query($query);
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- NEWS	2 Jul 2004 12:47:46 -0000	1.164
+++ NEWS	3 Jul 2004 16:33:10 -0000	1.165
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Actually log the IP of users whom submit comments and blogs which 
+      trackback (tomsommer)
+
     * Plugin hook 'backend_publish' now executed on entries saved as
       draft first and after that as a public. Fixes weblogpings not sent
       to those entries. (garvinhicking)

[php-blog-cvs] serendipity NEWS,1.163,1.164 serendipity_functions.inc.php,1.307,1.308

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18298

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
call 'Backend_publish' hook for entries saved first as 'draft' and then as
'publish'.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- serendipity_functions.inc.php	1 Jul 2004 20:50:22 -0000	1.307
+++ serendipity_functions.inc.php	2 Jul 2004 12:47:46 -0000	1.308
@@ -595,8 +595,7 @@
 
 /**
 * Give it a range in YYYYMMDD format to gather the desired entries
-* (For february 2002 you would pass 200202 for all entries withing
-* two timestamps you would pass array(timestamp1,timestamp2)
+* (For february 2002 you would pass 200202 e.g.
 **/
 function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '') {
     global $serendipity;
@@ -636,11 +635,6 @@
         if ($drafts) {
             $and .= " AND $drafts";
         }
-    }
-    elseif (is_array($range) && count($range)==2) {
-        $startts = $range[0];
-        $endts   = $range[1];
-        $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
     } else {
         if ($modified_since) {
             $unix_modified = strtotime($modified_since);
@@ -1412,8 +1406,10 @@
 
     $i = 0;
     foreach ($comments as $comment) {
+        $i++;
+
         if (!isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
-            $i++;
+
             $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
             if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') {
                 $comment['url'] = 'http://' . $comment['url'];
@@ -2379,8 +2375,9 @@
 
     serendipity_purgeEntry($entry['id'], $entry['timestamp']);
 
-    if ($entry['isdraft'] == 'false' &&
-        $newEntry) {
+    // Send publish tags if either a new article has been inserted from scratch, or if the entry was previously
+    // stored as draft and is now published
+    if ($entry['isdraft'] == 'false' && ($newEntry || $_entry['isdraft'] == 'true')) {
         serendipity_plugin_api::hook_event('backend_publish', $entry);
     }
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- NEWS	1 Jul 2004 18:35:17 -0000	1.163
+++ NEWS	2 Jul 2004 12:47:46 -0000	1.164
@@ -3,6 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Plugin hook 'backend_publish' now executed on entries saved as
+      draft first and after that as a public. Fixes weblogpings not sent
+      to those entries. (garvinhicking)
+
     * Added the ability to toggle the display of the Serendipity logo and
       text in the "Powered by" plugin (tomsommer)
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.306,1.307

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15532

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed comment number not calculated correct when subreplies exist


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- serendipity_functions.inc.php	24 Jun 2004 20:00:53 -0000	1.306
+++ serendipity_functions.inc.php	1 Jul 2004 20:50:22 -0000	1.307
@@ -1412,10 +1412,8 @@
 
     $i = 0;
     foreach ($comments as $comment) {
-        $i++;
-
         if (!isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
-
+            $i++;
             $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
             if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') {
                 $comment['url'] = 'http://' . $comment['url'];