php-blog-cvs — Serendipity commit list

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

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

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

Modified Files:
	serendipity_plugin_recententries.php 
Log Message:
- Use '-' as separator for IDs and words in our URI
- Don't use the title of an entry as GUID in RSS feeds
- Convert some static '/categories' to PATH_CATEGORIES
Bumps version to 0.6.12-CVS, requires rewrite update


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

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

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

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

Modified Files:
	serendipity_plugin_history.php 
Log Message:
- Use '-' as separator for IDs and words in our URI
- Don't use the title of an entry as GUID in RSS feeds
- Convert some static '/categories' to PATH_CATEGORIES
Bumps version to 0.6.12-CVS, requires rewrite update


Index: serendipity_plugin_history.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_history/serendipity_plugin_history.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_plugin_history.php	4 Aug 2004 17:39:59 -0000	1.10
+++ serendipity_plugin_history.php	24 Aug 2004 17:33:04 -0000	1.11
@@ -205,8 +205,7 @@
         for($x=0; $x < $e_c; $x++) {
             $url = serendipity_archiveURL($e[$x]['id'],
                                           $e[$x]['title'],
-                                          'serendipityHTTPPath',
-                                          false
+                                          'serendipityHTTPPath'
             );
             $date = ($displaydate=='0') ? '' : strftime($dateformat,$e[$x]['timestamp']);
             $t = ($maxlength==0 || strlen($e[$x]['title'])<=$maxlength) ? 

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments serendipity_plugin_comments.php,1.22,1.23

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

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

Modified Files:
	serendipity_plugin_comments.php 
Log Message:
- Use '-' as separator for IDs and words in our URI
- Don't use the title of an entry as GUID in RSS feeds
- Convert some static '/categories' to PATH_CATEGORIES
Bumps version to 0.6.12-CVS, requires rewrite update


Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_plugin_comments.php	5 Aug 2004 13:41:21 -0000	1.22
+++ serendipity_plugin_comments.php	24 Aug 2004 17:33:04 -0000	1.23
@@ -148,7 +148,7 @@
                   PLUGIN_COMMENTS_ABOUT,
 
                   $user,
-                  ' <a class="highlight" href="' . serendipity_archiveURL($row['entry_id'], $row['subject'], 'baseURL', false) .'#c' . $row['comment_id'] . '" title="' . htmlspecialchars($row['subject']) . '">'
+                  ' <a class="highlight" href="' . serendipity_archiveURL($row['entry_id'], $row['subject'], 'baseURL') .'#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/lang serendipity_lang_de.inc.php,1.91,1.92

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
spelling corrections by timbalu, thanks!


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- serendipity_lang_de.inc.php	24 Aug 2004 09:27:38 -0000	1.91
+++ serendipity_lang_de.inc.php	24 Aug 2004 17:14:47 -0000	1.92
@@ -96,7 +96,7 @@
 @define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.');
 @define('ERROR_SOMETHING', 'Fehler: Irgend etwas stimmt nicht.');
 @define('ADDING_IMAGE', 'Bild hinzufügen...');
-@define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br>Fertig.');
+@define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br />Fertig.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fehler: Diese Datei existiert schon auf dem Server!');
 @define('GO', 'Los!');
 @define('NEWSIZE', 'Neue Größe ');
@@ -149,13 +149,13 @@
 @define('TRACKBACK_SPECIFIC', 'Trackback für spezifische URI dieses Eintrags');
 @define('DIRECT_LINK', 'Direkter Link zu diesem Eintrag');
 @define('COMMENT_ADDED', 'Kommentar wurde hinzugefügt. ');
-@define('COMMENT_ADDED_CLICK', 'Klick %shier um zu den Kommentaren zurückzukehren%s und %shier um das Fenster zu schließen%s.');
+@define('COMMENT_ADDED_CLICK', 'Klicken Sie %shier, um zu den Kommentaren zurückzukehren%s und %shier, um das Fenster zu schließen%s.');
 @define('COMMENTS_DISABLE', 'Kommentare für diesen Eintrag nicht mehr zulassen');
 @define('COMMENTS_ENABLE', 'Kommentare für diesen Eintrag zulassen');
 @define('COMMENTS_CLOSED', 'Die Kommentarfunktion wurde vom Besitzer dieses Blogs in diesem Eintrag deaktiviert. ');
 @define('COMMENT_NOT_ADDED', 'Kommentar wurde nicht hinzugefügt, da der Eintrag geschlossen wurde.');
-@define('COMMENT_NOT_ADDED_CLICK', 'Klick %shier um zu den Kommentaren zurückzukehren%s und %shier um das Fenster zu schließen%s.');
-@define('EMPTY_COMMENT', 'Kommentar enthielt nichts, bitte %szurück gehen%s und erneut versuchen');
+@define('COMMENT_NOT_ADDED_CLICK', 'Klicken Sie %shier, um zu den Kommentaren zurückzukehren%s und %shier, um das Fenster zu schließen%s.');
+@define('EMPTY_COMMENT', 'Ihr Kommentar war leer, bitte %sgehen Sie zurück%s und versuchen es erneut');
 @define('ENTRIES_FOR', 'Einträge am %s');
 @define('DOCUMENT_NOT_FOUND', 'Das Dokument %s wurde nicht gefunden.');
 @define('USERNAME', 'Benutzername');
@@ -299,7 +299,7 @@
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity hat entdeckt, dass derzeit Version %s verwendet wird. Jedoch wurde Version %s installiert, daher müssten Sie die <a href="%s">Installation aktualisieren</a>!');
 @define('SERENDIPITY_UPGRADER_WELCOME', 'Willkommen beim Serendipity Aktualisierungs-Agenten');
 @define('SERENDIPITY_UPGRADER_PURPOSE', 'Ich möchte Ihnen gerne beim Aktualisieren der Serendipity %s Installation helfen.');
-@define('SERENDIPITY_UPGRADER_WHY', 'Diese Seite erscheint, da gerade Serendipity %s installiert wurde, die aber Datenbank noch nicht an diese Version angepasst wurde.');
+@define('SERENDIPITY_UPGRADER_WHY', 'Diese Seite erscheint, da gerade Serendipity %s installiert wurde, aber die Datenbank noch nicht an diese Version angepasst wurde.');
 @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Datenbank-Aktualisierungen (%s)');
 @define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Die folgenden .sql Dateien wurden gefunden und müssen nun ausgeführt werden, bevor Serendipity wieder wie gewohnt funktioniert.');
 @define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Versionsabhängige Funktionen');
@@ -311,7 +311,7 @@
 @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Serendipity wurde an die neue Version angepasst');
 @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Sie haben den automatischen Aktualisierungsvorgang ignoriert. Bitte stellen Sie sicher, dass die Datenbank anhand der .sql Dateien aktualisiert wird und die geplanten Funktionen aufgerufen werden.');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Die Serendipity-Installation ist nun auf die Version %s aktualisiert.');
-@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Zurück zum %sblog%s');
+@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Zurück zum %sBlog%s');
 @define('MANAGE_USERS', 'Benutzerverwaltung');
 @define('EDIT_USERS', 'Benutzer bearbeiten');
 @define('CREATE_USERS', 'Benutzer anlegen');
@@ -385,7 +385,7 @@
 @define('INSTALL_RELTEMPLPATH_DESC', 'Der Pfad zum Verzeichnis, der die Templates enthält - Relativ zum HTTP-Pfad');
 @define('INSTALL_RELUPLOADPATH', 'Relativer Upload-Pfad');
 @define('INSTALL_RELUPLOADPATH_DESC', 'Der Pfad zum Uploadverzeichnis für den Browser - Relativ zum HTTP-Pfad');
-@define('INSTALL_URL', 'URL zum blog');
+@define('INSTALL_URL', 'URL zum Blog');
 @define('INSTALL_URL_DESC', 'Stamm-URL zur Serendipity-Installation');
 @define('INSTALL_INDEXFILE', 'Index-Datei');
 @define('INSTALL_INDEXFILE_DESC', 'Welche Datei wird als Indexdatei verwendet (index.php)');

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.90,1.91

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
german translation, added three missing constants


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_lang_de.inc.php	14 Aug 2004 23:33:15 -0000	1.90
+++ serendipity_lang_de.inc.php	24 Aug 2004 09:27:38 -0000	1.91
@@ -503,41 +503,44 @@
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Externe Links klickbar?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"Nein": Ungeprüfte externe Links (Top Exits, Top Referer, Kommentare) werden unterdrückt/als Text angezeigt, um Googlespam zu verhindern (empfohlen). "Ja": Externe Links werden als Hyperlinks angezeigt. Diese Einstellung kann in den einzelnen Plugins überschrieben werden.');
 @define('PAGE_BROWSE_COMMENTS', 'Seite %s von %s, %s Kommentare insgesamt');
-@define('FILTERS', 'Filters'); // Translate
-@define('FIND_ENTRIES', 'Find entries'); // Translate
-@define('FIND_COMMENTS', 'Find comments'); // Translate
-@define('FIND_MEDIA', 'Find media'); // Translate
-@define('FILTER_DIRECTORY', 'Directory'); // Translate
-@define('SORT_BY', 'Sort by'); // Translate
-@define('TRACKBACK_COULD_NOT_CONNECT', 'No Trackback sent: Could not open connection to %s on port %d'); // Translate
-@define('MEDIA', 'Media'); // Translate
-@define('MEDIA_LIBRARY', 'Media library'); // Translate
-@define('ADD_MEDIA', 'Add media'); // Translate
-@define('ENTER_MEDIA_URL', 'Enter an URL of a file to fetch:'); // Translate
-@define('ENTER_MEDIA_UPLOAD', 'Select a file you wish to upload:'); // Translate
-@define('SAVE_FILE_AS', 'Save the file as:'); // Translate
-@define('STORE_IN_DIRECTORY', 'Store inside the following directory: '); // Translate
-@define('MEDIA_RENAME', 'Rename this file'); // Translate
-@define('IMAGE_RESIZE', 'Resize this image'); // Translate
-@define('MEDIA_DELETE', 'Delete this file'); // Translate
-@define('FILES_PER_PAGE', 'Files per page'); // Translate
-@define('CLICK_FILE_TO_INSERT', 'Click the file you want to insert:'); // Translate
-@define('SELECT_FILE', 'Select file to insert'); // Translate
-@define('MEDIA_FULLSIZE', 'Fullsize'); // Translate
-@define('CALENDAR_BOW_DESC', 'The day of the week that should be considered the beginning of the week. Default is Monday'); // Translate
-@define('SUPERUSER', 'Blog Administration'); // Translate
-@define('ALLOWS_YOU_BLAHBLAH', 'Provides a link in the sidebar to your blog administration'); // Translate
-@define('CALENDAR', 'Calendar'); // Translate
-@define('SUPERUSER_OPEN_ADMIN', 'Open administration'); // Translate
-@define('SUPERUSER_OPEN_LOGIN', 'Open login screen'); // Translate
-@define('INVERT_SELECTIONS', 'Invert Selections'); // Translate
-@define('COMMENTS_DELETE_CONFIRM', 'Are you sure you wish to delete the selected comments?'); // Translate
-@define('COMMENT_DELETE_CONFIRM', 'Are you sure you wish to delete comment #%d, written by %s?'); // Translate
-@define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
-@define('VIEW_COMMENT', 'View comment'); // Translate
-@define('VIEW_ENTRY', 'View entry'); // Translate
-@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
-@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
+@define('FILTERS', 'Filter');
+@define('FIND_ENTRIES', 'Einträge durchsuchen');
+@define('FIND_COMMENTS', 'Kommentare durchsuchen');
+@define('FIND_MEDIA', 'Mediendaten durchsuchen');
+@define('FILTER_DIRECTORY', 'Verzeichnis');
+@define('SORT_BY', 'Sortieren nach');
+@define('TRACKBACK_COULD_NOT_CONNECT', 'Kein Trackback: Konnte Verbindung zu %s auf Port %d nicht herstellen');
+@define('MEDIA', 'Mediendatenbank');
+@define('MEDIA_LIBRARY', 'Mediendatenbank');
+@define('ADD_MEDIA', 'Mediendaten hinzufügen');
+@define('ENTER_MEDIA_URL', 'URL zum Download angeben:');
+@define('ENTER_MEDIA_UPLOAD', 'Bild zum Hochladen angeben:');
+@define('SAVE_FILE_AS', 'Datei speichern mit Name:');
+@define('STORE_IN_DIRECTORY', 'In diesem Verzeichnis ablegen: ');
+@define('MEDIA_RENAME', 'Datei umbenennen');
+@define('IMAGE_RESIZE', 'Dateiausmaße ändern');
+@define('MEDIA_DELETE', 'Datei löschen');
+@define('FILES_PER_PAGE', 'Dateien pro Seite');
+@define('CLICK_FILE_TO_INSERT', 'Auf eine Datei klicken um es einzufügen:');
+@define('SELECT_FILE', 'Bitte wählen Sie eine Datei');
+@define('MEDIA_FULLSIZE', 'Vollbild');
+@define('CALENDAR_BOW_DESC', 'Welcher Tag gibt den Wochenanfang an? Standard ist Montag.');
+@define('SUPERUSER', 'Verwaltung des Blog');
+@define('ALLOWS_YOU_BLAHBLAH', 'Zeigt einen Link zur Verwaltung des Blogs in der Seitenleiste an');
+@define('CALENDAR', 'Kalender');
+@define('SUPERUSER_OPEN_ADMIN', 'Zur Verwaltung des Blog');
+@define('SUPERUSER_OPEN_LOGIN', 'Login zum Blog');
+@define('INVERT_SELECTIONS', 'Auswahl umkehren');
+@define('COMMENTS_DELETE_CONFIRM', 'Sollen die markierten Kommentare gelöscht werden?');
+@define('COMMENT_DELETE_CONFIRM', 'Soll das Kommentar #%d von %s wirklich gelöscht werden?');
+@define('DELETE_SELECTED_COMMENTS', 'Markierte Kommentare löschen');
+@define('VIEW_COMMENT', 'Kommentar ansehen');
+@define('VIEW_ENTRY', 'Eintrag ansehen');
+@define('DELETE_FILE', 'Datei namens <b>%s</b> gelöscht');
+@define('ABOUT_TO_DELETE_FILE', 'Sie sind dabei die Datei <b>%s</b> zu löschen.<br />Wenn Sie die Date in einem Ihrer Einträge verwenden, wird das Löschen Lücken erzeugen.<br />Soll trotzdem fortgefahren werden?<br /><br />');
+@define('ADD_IMAGE_BLAHBLAH', '<b>Bild/Datei zur Sammlung hinzufügen:</b><p>Hier können Sie eine Datei (z.B. ein Bild) hochladen, oder mitteilen, von wo es geladen werden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind oft brauchbar, aber auf jeden Fall witzig :)<p><b>Methode wählen:</b><br>');
+@define('A_NEW_TRACKBACK_BLAHBLAH', 'Ein neues Trackback für den Blog-Eintrag namens "%s" wurde empfangen.');
+@define('LOGIN', 'Login');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/templates/moz-modern layout.php,1.5,1.6

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

Update of /cvsroot/php-blog/serendipity/templates/moz-modern
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1966/moz-modern

Modified Files:
	layout.php 
Log Message:
put a pointer for template designers on how to modify smilies


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/layout.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- layout.php	7 Apr 2004 12:42:45 -0000	1.5
+++ layout.php	24 Aug 2004 07:59:50 -0000	1.6
@@ -4,6 +4,20 @@
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
+/* To customize smilies with individual images from a theme, you can
+   use an array like this:
+   $serendipity['custom_emoticons'] = array(
+     ":'("  => serendipity_getTemplateFile('img/cry_smile.gif'),
+     ':-)'  => serendipity_getTemplateFile('img/regular_smile.gif'),
+     ':-O'  => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+     ':O'   => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+     ...
+    );
+
+    This will override the default list of emoticons set inside the file
+    plugins/serendipity_event_emoticate/serendipity_event_emoticate.php
+*/
+
 if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
     ob_start();
     serendipity_plugin_api::generate_plugins('left', 'div');

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.11,1.12

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

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

Modified Files:
	layout.php 
Log Message:
put a pointer for template designers on how to modify smilies


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- layout.php	5 May 2004 09:14:32 -0000	1.11
+++ layout.php	24 Aug 2004 07:59:50 -0000	1.12
@@ -9,6 +9,20 @@
 #                                                                        #
 ##########################################################################
 
+/* To customize smilies with individual images from a theme, you can
+   use an array like this:
+   $serendipity['custom_emoticons'] = array(
+     ":'("  => serendipity_getTemplateFile('img/cry_smile.gif'),
+     ':-)'  => serendipity_getTemplateFile('img/regular_smile.gif'),
+     ':-O'  => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+     ':O'   => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+     ...
+    );
+
+    This will override the default list of emoticons set inside the file
+    plugins/serendipity_event_emoticate/serendipity_event_emoticate.php
+*/
+
 $OPENSHADOW = '<table  cellspacing="0" width="100%" cellpadding="0" style="padding:0px">
                  <tr>
                    <td valign="top" align="left" style="padding:10px;border-top:1px solid #cdcdcd; border-left: 1px solid #cdcdcd;">

[php-blog-cvs] serendipity/templates/default layout.php,1.18,1.19

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

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

Modified Files:
	layout.php 
Log Message:
put a pointer for template designers on how to modify smilies


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/layout.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- layout.php	7 Aug 2004 16:38:30 -0000	1.18
+++ layout.php	24 Aug 2004 07:59:49 -0000	1.19
@@ -12,6 +12,19 @@
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
+/* To customize smilies with individual images from a theme, you can
+   use an array like this:
+   $serendipity['custom_emoticons'] = array(
+     ":'("  => serendipity_getTemplateFile('img/cry_smile.gif'),
+     ':-)'  => serendipity_getTemplateFile('img/regular_smile.gif'),
+     ':-O'  => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+     ':O'   => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+     ...
+    );
+
+    This will override the default list of emoticons set inside the file
+    plugins/serendipity_event_emoticate/serendipity_event_emoticate.php
+*/
 ?>
 <div id="serendipity_banner">
     <h1><a class="homelink1" href="<?php echo $serendipity['baseURL']; ?>"><?php echo htmlspecialchars($serendipity['blogTitle']) ?></a></h1>

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.8,1.9

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

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

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
* Replace emoticons with new and transparent icons
* Added ability to define emoticons for a specific theme, this can be done by setting $serendipity['custom_emoticons'] in layout.php


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_event_emoticate.php	10 Jul 2004 08:24:13 -0000	1.8
+++ serendipity_event_emoticate.php	23 Aug 2004 18:15:58 -0000	1.9
@@ -49,27 +49,52 @@
             $conf_array[] = $element['name'];
         }
         $propbag->add('configuration', $conf_array);
-
-        // A Set of emoticons to rewrite
-        $this->smiles = array(
-            ":'("  => serendipity_getTemplateFile('img/cry_smile.gif'),
-            ':-)'  => serendipity_getTemplateFile('img/regular_smile.gif'),
-            ':-O'  => serendipity_getTemplateFile('img/embaressed_smile.gif'),
-            ':O'   => serendipity_getTemplateFile('img/embaressed_smile.gif'),
-            ':-('  => serendipity_getTemplateFile('img/sad_smile.gif'),
-            ':('   => serendipity_getTemplateFile('img/sad_smile.gif'),
-            ':)'   => serendipity_getTemplateFile('img/regular_smile.gif'),
-            '8-)'  => serendipity_getTemplateFile('img/shades_smile.gif'),
-            ':-D'  => serendipity_getTemplateFile('img/teeth_smile.gif'),
-            ':D'   => serendipity_getTemplateFile('img/teeth_smile.gif'),
-            '8)'   => serendipity_getTemplateFile('img/shades_smile.gif'),
-            ':-P'  => serendipity_getTemplateFile('img/tounge_smile.gif'),
-            ';-)'  => serendipity_getTemplateFile('img/wink_smile.gif'),
-            ';)'   => serendipity_getTemplateFile('img/wink_smile.gif'),
-            ':P'   => serendipity_getTemplateFile('img/tounge_smile.gif')
-        );
+        
     }
 
+    function getEmoticons() {
+        global $serendipity;
+
+        /* Avoid multiple runs of serendipity_getTemplateFile(), 
+           in other words - if we already have a list of smilies, don't bother looking for another */
+        if ( sizeof($this->smilies) != 0 ) {
+            return $this->smilies;
+        }
+
+        /* Hijack global variable $serendipity['custom_emoticons'] if it exists */
+        if ( isset($serendipity['custom_emoticons']) && is_array($serendipity['custom_emoticons']) ) {
+            $this->smilies = $serendipity['custom_emoticons'];
+        } else {
+            $this->smilies = array(
+                ":'("  => serendipity_getTemplateFile('img/emoticons/cry.png'),
+
+                ':-)'  => serendipity_getTemplateFile('img/emoticons/smile.png'),
+                ':)'   => serendipity_getTemplateFile('img/emoticons/smile.png'),
+
+                ':|'   => serendipity_getTemplateFile('img/emoticons/normal.png'),
+
+                ':-O'  => serendipity_getTemplateFile('img/emoticons/eek.png'),
+                ':O'   => serendipity_getTemplateFile('img/emoticons/eek.png'),
+
+                ':-('  => serendipity_getTemplateFile('img/emoticons/sad.png'),
+                ':('   => serendipity_getTemplateFile('img/emoticons/sad.png'),
+
+                '8-)'  => serendipity_getTemplateFile('img/emoticons/cool.png'),
+                '8)'   => serendipity_getTemplateFile('img/emoticons/cool.png'),
+
+                ':-D'  => serendipity_getTemplateFile('img/emoticons/laugh.png'),
+                ':D'   => serendipity_getTemplateFile('img/emoticons/laugh.png'),
+
+                ':-P'  => serendipity_getTemplateFile('img/emoticons/tongue.png'),
+                ':P'   => serendipity_getTemplateFile('img/emoticons/tongue.png'),
+
+                ';-)'  => serendipity_getTemplateFile('img/emoticons/wink.png'),
+                ';)'   => serendipity_getTemplateFile('img/emoticons/wink.png'),
+            );
+        }
+
+        return $this->smilies;
+    }
 
     function generate_content(&$title) {
         $title = PLUGIN_EVENT_EMOTICATE_NAME;
@@ -88,7 +113,6 @@
 
     function event_hook($event, &$bag, &$eventData) {
         global $serendipity;
-
         $hooks = &$bag->get('event_hooks');
 
         if (isset($hooks[$event])) {
@@ -97,13 +121,12 @@
 
                     foreach ($this->markup_elements as $temp) {
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
-                            $element = $temp['element'];
+                            $element = &$eventData[$temp['element']];
 
-                            foreach ($this->smiles as $key => $value) {
-                                $eventData[$element] = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m",
+                            foreach ($this->getEmoticons() as $key => $value) {
+                                $element = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m",
                                     "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" class=\"emoticon\" />$2",
-                                    $eventData[$element]
-                                );
+                                    $element);
                             }
                         }
                     }

[php-blog-cvs] serendipity/templates/default/img/emoticons cool.png,NONE,1.1 cry.png,NONE,1.1 eek.png,NONE,1.1 laugh.png,NONE,1.1 normal.png,NONE,1.1 sad.png,NONE,1.1 smile.png,NONE,1.1 tongue.png,NONE,1.1 wink.png,NONE,1.1

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

Update of /cvsroot/php-blog/serendipity/templates/default/img/emoticons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15226/templates/default/img/emoticons

Added Files:
	cool.png cry.png eek.png laugh.png normal.png sad.png 
	smile.png tongue.png wink.png 
Log Message:
* Replace emoticons with new and transparent icons
* Added ability to define emoticons for a specific theme, this can be done by setting $serendipity['custom_emoticons'] in layout.php


--- NEW FILE: tongue.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: smile.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cool.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: eek.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cry.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sad.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: wink.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: normal.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: laugh.png ---
(This appears to be a binary file; contents omitted.)

[php-blog-cvs] serendipity/templates/default/img cry_smile.gif,1.1,NONE embaressed_smile.gif,1.1,NONE omg_smile.gif,1.3,NONE regular_smile.gif,1.1,NONE sad_smile.gif,1.1,NONE shades_smile.gif,1.1,NONE teeth_smile.gif,1.1,NONE tounge_smile.gif,1.1,NONE wink_smile.gif,1.1,NONE

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

Update of /cvsroot/php-blog/serendipity/templates/default/img
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15226/templates/default/img

Removed Files:
	cry_smile.gif embaressed_smile.gif omg_smile.gif 
	regular_smile.gif sad_smile.gif shades_smile.gif 
	teeth_smile.gif tounge_smile.gif wink_smile.gif 
Log Message:
* Replace emoticons with new and transparent icons
* Added ability to define emoticons for a specific theme, this can be done by setting $serendipity['custom_emoticons'] in layout.php


--- teeth_smile.gif DELETED ---

--- embaressed_smile.gif DELETED ---

--- tounge_smile.gif DELETED ---

--- cry_smile.gif DELETED ---

--- omg_smile.gif DELETED ---

--- shades_smile.gif DELETED ---

--- sad_smile.gif DELETED ---

--- regular_smile.gif DELETED ---

--- wink_smile.gif DELETED ---

[php-blog-cvs] serendipity/templates/default/img/emoticons - New directory

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

Update of /cvsroot/php-blog/serendipity/templates/default/img/emoticons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13097/emoticons

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/default/img/emoticons added to the repository

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.402,1.403 index.php,1.47,1.48

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

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

Modified Files:
	serendipity_functions.inc.php index.php 
Log Message:
use $serendipity['short_archives'] instead of a GET variable for displaying short archives, not to let the user screw up display by adding that switch to other display pages.
As well fix that *all* short links are shown, and not only 15 ($limit).
(Part of Bug #1009715)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- serendipity_functions.inc.php	21 Aug 2004 13:01:27 -0000	1.402
+++ serendipity_functions.inc.php	23 Aug 2004 08:50:01 -0000	1.403
@@ -630,6 +630,11 @@
 
     $and = '';
 
+    if (isset($serendipity['short_archives']) && $serendipity['short_archives']) {
+        // In the short listing of all titles for a month, we don't want to have a limit applied.
+        $limit = '';
+    }
+
     if ($full === true) {
         $body = ', e.body, e.extended';
     } else {
@@ -1156,7 +1161,7 @@
         $bydate[$d][] = $entries[$x];
     }
 
-    if (!isset($serendipity['GET']['short']) || !$serendipity['GET']['short']) {
+    if (!isset($serendipity['short_archives']) || !$serendipity['short_archives']) {
         foreach ($bydate as $date => $ents) {
 ?>
 

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- index.php	21 Aug 2004 12:38:20 -0000	1.47
+++ index.php	23 Aug 2004 08:50:02 -0000	1.48
@@ -71,7 +71,7 @@
     $range = $matches[1];
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['range']  = $range;
-    $_GET['serendipity']['short']  = true;
+    $serendipity['short_archives'] = true;
 
     if (strlen($range) == 6) {
         $date = date('m/Y', mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.401,1.402 serendipity_admin_entries.inc.php,1.34,1.35

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

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

Modified Files:
	serendipity_functions.inc.php 
	serendipity_admin_entries.inc.php 
Log Message:
fix bug #1013174 - when previewing entry, the pagination footer should not be shown


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- serendipity_functions.inc.php	21 Aug 2004 12:38:20 -0000	1.401
+++ serendipity_functions.inc.php	21 Aug 2004 13:01:27 -0000	1.402
@@ -1386,7 +1386,7 @@
         } // end for-loop (dates)
 
         if (!isset($serendipity['GET']['id']) &&
-               (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false) &&
+               (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) &&
                (count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) {
             serendipity_printEntryFooter();
         } else {

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_admin_entries.inc.php	3 Aug 2004 18:04:35 -0000	1.34
+++ serendipity_admin_entries.inc.php	21 Aug 2004 13:01:27 -0000	1.35
@@ -28,7 +28,7 @@
     $perPage = (!empty($serendipity['GET']['sort']['perPage']) ? $serendipity['GET']['sort']['perPage'] : $per_page[0]);
     $page    = (int)$serendipity['GET']['page'];
     $offSet  = $perPage*$page;
-    
+
     if (empty($serendipity['GET']['sort']['ordermode'])) {
         $serendipity['GET']['sort']['ordermode'] = 'DESC';
     }
@@ -206,7 +206,7 @@
                         </td>
                         <td align="right">
                             [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo EDIT ?></a>]
-                          - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo DELETE ?></a>] 
+                          - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo DELETE ?></a>]
                         </td>
                     </tr>
                 </table>
@@ -297,6 +297,7 @@
             }
         } else {
             // Only display the preview
+            $serendipity['hidefooter'] = true;
             if (!is_numeric($entry['timestamp'])) $entry['timestamp']  = time();
             if (!isset($entry['trackbacks']) || !$entry['trackbacks']) $entry['trackbacks'] = 0;
             if (!isset($entry['comments']) || !$entry['comments'])     $entry['comments']   = 0;

[php-blog-cvs] serendipity index.php,1.46,1.47 serendipity_functions.inc.php,1.400,1.401

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

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

Modified Files:
	index.php serendipity_functions.inc.php 
Log Message:
Fix more pagination issues:
* When restricted to a 'range' the index.php would no langer recognize a 
  matched page because the URI does not match the regex
* Appending of a category was done with '?&' instead of '&' only
* Hide pagination footer for search results, fixed false if-condition for 
  hidden footer


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -d -r1.400 -r1.401
--- serendipity_functions.inc.php	20 Aug 2004 10:55:32 -0000	1.400
+++ serendipity_functions.inc.php	21 Aug 2004 12:38:20 -0000	1.401
@@ -421,7 +421,7 @@
         $categoryid  = serendipity_db_escape_string($_categoryid[0]);
 
         if (is_numeric($categoryid)) {
-            $base_query   = '?serendipity[category]=' . $categoryid;
+            $base_query   = 'serendipity[category]=' . $categoryid;
             $add_query    = '&' . $base_query;
             $querystring = "SELECT timestamp
                               FROM {$serendipity['dbPrefix']}entries e,
@@ -962,6 +962,7 @@
                     ORDER BY
                             timestamp DESC";
 
+    $serendipity['hidefooter'] = true;
     return serendipity_db_query($querystring);
 }
 
@@ -1079,7 +1080,12 @@
         $add_query = '';
         if (is_array($serendipity['GET'])) {
             $page_get_array = $serendipity['GET'];
-            unset($page_get_array['range']);
+            if ((isset($serendipity['GET']['calendarZoom']) && isset($serendipity['GET']['range']) && $serendipity['GET']['calendarZoom'] == $serendipity['GET']['range'])
+                 || (!isset($serendipity['GET']['calendarZoom']) && $serendipity['GET']['action'] != 'read')) {
+                // The 'range' variable is always set by the layout.php, even if we didn't specify one. But to still be able to paginate through ALL entries, we need to not propagate this variable in special cases where s9y automatically sets the 'range' variable.
+                unset($page_get_array['range']);
+            }
+
             unset($page_get_array['page']);
             unset($page_get_array['action']);
             unset($page_get_array['adminAction']);
@@ -1380,8 +1386,8 @@
         } // end for-loop (dates)
 
         if (!isset($serendipity['GET']['id']) &&
-               (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false &&
-               count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) {
+               (!isset($serendipity['GET']['hidefooter']) || $serendipity['GET']['hidefooter'] == false) &&
+               (count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) {
             serendipity_printEntryFooter();
         } else {
             serendipity_printEntryFooter(true);

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- index.php	28 Jul 2004 08:18:31 -0000	1.46
+++ index.php	21 Aug 2004 12:38:20 -0000	1.47
@@ -39,11 +39,14 @@
 }
 
 
-if (preg_match(PAT_ARCHIVES, $uri, $matches)) {
-    $range                             = $matches[1];
+if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range']) && is_numeric($serendipity['GET']['range'])) {
+    if (!empty($serendipity['GET']['range'])) {
+        $range                         = $serendipity['GET']['range'];
+    } else {
+        $range                         = $matches[1];
+    }
     $_GET['serendipity']['action']     = 'read';
     $_GET['serendipity']['range']      = $range;
-    $_GET['serendipity']['hidefooter'] = true;
 
     if (strlen($range) == 6) {
         $date = serendipity_formatTime('%B %Y', mktime(0, 0, 0, substr($range, 4, 6), 2, substr($range, 0, 4)));

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.399,1.400 NEWS,1.203,1.204

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

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

Modified Files:
	serendipity_functions.inc.php NEWS 
Log Message:
Pagination now properly works for browsing months and categories. 
Previously paging worked through all entries and not a filter by
date/category. [Bug #1009715]



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- NEWS	20 Aug 2004 07:44:36 -0000	1.203
+++ NEWS	20 Aug 2004 10:55:32 -0000	1.204
@@ -3,6 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Pagination now properly works for browsing months and categories.
+      Previously paging worked through all entries and not a filter
+      by date/category. [Bug #1009715] (garvinhicking)
+
     * Remote RSS feed can now contain a bullet image, skip blank head-
       lines and toggle the display of the date. Thanks to Joseph Guhlin!
       (garvinhicking)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -d -r1.399 -r1.400
--- serendipity_functions.inc.php	19 Aug 2004 20:51:55 -0000	1.399
+++ serendipity_functions.inc.php	20 Aug 2004 10:55:32 -0000	1.400
@@ -743,6 +743,18 @@
         $distinct = '';
     }
 
+    // Store the unique query condition for entries for later reference, like getting the total article count.
+    $serendipity['fullCountQuery'] = "
+                FROM
+                    {$serendipity['dbPrefix']}entries AS e
+                    LEFT JOIN {$serendipity['dbPrefix']}authors a
+                        ON e.authorid = a.authorid
+                    LEFT JOIN {$serendipity['dbPrefix']}entrycat ec
+                        ON e.id = ec.entryid
+                    LEFT JOIN {$serendipity['dbPrefix']}category c
+                        ON ec.categoryid = c.categoryid
+                    $and";
+
     $query = "SELECT $distinct
                     e.id,
                     e.title,
@@ -760,17 +772,9 @@
                     a.email
 
                     $body
-              FROM
-                    {$serendipity['dbPrefix']}entries AS e
-                    LEFT JOIN {$serendipity['dbPrefix']}authors a
-                        ON e.authorid = a.authorid
-                    LEFT JOIN {$serendipity['dbPrefix']}entrycat ec
-                        ON e.id = ec.entryid
-                    LEFT JOIN {$serendipity['dbPrefix']}category c
-                        ON ec.categoryid = c.categoryid $and
+                    {$serendipity['fullCountQuery']}
                     $group
-                    ORDER BY
-                        $orderby
+                    ORDER BY $orderby
                     $limit";
 
     $ret = serendipity_db_query($query);
@@ -1075,9 +1079,8 @@
         $add_query = '';
         if (is_array($serendipity['GET'])) {
             $page_get_array = $serendipity['GET'];
-            unset($page_get_array['calendarZoom']);
-            unset($page_get_array['page']);
             unset($page_get_array['range']);
+            unset($page_get_array['page']);
             unset($page_get_array['action']);
             unset($page_get_array['adminAction']);
 
@@ -1086,26 +1089,7 @@
             }
         }
 
-        if (isset($serendipity['GET']['category'])) {
-            $_categoryid = explode('_', $serendipity['GET']['category']);
-            $categoryid  = serendipity_db_escape_string($_categoryid[0]);
-
-            if (is_numeric($categoryid)) {
-                $querystring  = "SELECT count(e.id)
-                                   FROM {$serendipity['dbPrefix']}entries e,
-                                     {$serendipity['dbPrefix']}entrycat ec,
-                                     {$serendipity['dbPrefix']}category c
-                                   WHERE e.isdraft = 'false'
-                                     AND e.id = ec.entryid AND ec.categoryid = c.categoryid
-                                     AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
-            }
-        }
-        if (empty($querystring)) {
-            $querystring  = "SELECT count(e.id)
-                               FROM {$serendipity['dbPrefix']}entries e
-                               WHERE e.isdraft = 'false'";
-        }
-
+        $querystring  = "SELECT count(e.id) {$serendipity['fullCountQuery']}"; // The unique query condition was built previously in serendipity_fetchEntries()
         $query        = serendipity_db_query($querystring);
 
         $totalEntries = $query[0][0];

[php-blog-cvs] serendipity NEWS,1.202,1.203

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

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

Modified Files:
	NEWS 
Log Message:
patch from the forums:
* display date toggle
* bullet image
* skip headlines that are blank


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- NEWS	18 Aug 2004 14:08:30 -0000	1.202
+++ NEWS	20 Aug 2004 07:44:36 -0000	1.203
@@ -3,6 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Remote RSS feed can now contain a bullet image, skip blank head-
+      lines and toggle the display of the date. Thanks to Joseph Guhlin!
+      (garvinhicking)
+
     * Karma-Plugin disallows clicking from Googlebots following java-
       script links (garvinhicking)
 

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.4,1.5

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

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

Modified Files:
	serendipity_plugin_remoterss.php 
Log Message:
patch from the forums:
* display date toggle
* bullet image
* skip headlines that are blank


Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_plugin_remoterss.php	22 Jun 2004 13:45:49 -0000	1.4
+++ serendipity_plugin_remoterss.php	20 Aug 2004 07:44:37 -0000	1.5
@@ -20,6 +20,11 @@
         @define('PLUGIN_REMOTERSS_CACHETIME_BLAHBLAH', 'Die Inhalte des fremden Feeds werden gecached. Sobald der Cache älter ist als X Minuten wird er aktualisiert (Standard: 3 Stunden)');
         @define('PLUGIN_REMOTERSS_FEEDTYPE', 'Typ des Feeds');
         @define('PLUGIN_REMOTERSS_FEEDTYPE_BLAHBLAH', 'Wählen Sie das Format des einzubindenden Feeds');
+        @define('PLUGIN_REMOTERSS_BULLETIMG', 'Bullet Image');
+        @define('PLUGIN_REMOTERSS_BULLETIMG_BLAHBLAH', 'Image to display before each headline.');
+        @define('PLUGIN_REMOTERSS_DISPLAYDATE', 'Display Date');
+        @define('PLUGIN_REMOTERSS_DISPLAYDATE_BLAHBLAH', 'Display the date below the headline?');
+
         break;
 
     case 'en':
@@ -40,6 +45,10 @@
         @define('PLUGIN_REMOTERSS_CACHETIME_BLAHBLAH', 'The contents of a feed are stored in a cache which will be updated as soon as its older than X minutes (Default: 3 hours)');
         @define('PLUGIN_REMOTERSS_FEEDTYPE', 'Feedtype');
         @define('PLUGIN_REMOTERSS_FEEDTYPE_BLAHBLAH', 'Choose the format of the remote Feed');
+        @define('PLUGIN_REMOTERSS_BULLETIMG', 'Bullet Image');
+        @define('PLUGIN_REMOTERSS_BULLETIMG_BLAHBLAH', 'Image to display before each headline.');
+        @define('PLUGIN_REMOTERSS_DISPLAYDATE', 'Display Date');
+        @define('PLUGIN_REMOTERSS_DISPLAYDATE_BLAHBLAH', 'Display the date below the headline?');
 
         break;
 }
@@ -263,7 +272,7 @@
     function introspect(&$propbag) {
         $propbag->add('name',        PLUGIN_REMOTERSS_TITLE);
         $propbag->add('description', PLUGIN_REMOTERSS_BLAHBLAH);
-        $propbag->add('configuration', array('number', 'dateformat', 'sidebartitle', 'rssuri', 'target', 'cachetime', 'feedtype', 'markup'));
+        $propbag->add('configuration', array('number', 'displaydate', 'dateformat', 'sidebartitle', 'rssuri', 'target', 'cachetime', 'feedtype', 'bulletimg', 'markup'));
     }
 
     function introspect_config_item($name, &$propbag) {
@@ -326,6 +335,21 @@
                 $propbag->add('default', 10800);
                 break;
 
+            case 'bulletimg':
+                $propbag->add('type', 'string');
+                $propbag->add('name', PLUGIN_REMOTERSS_BULLETIMG);
+                $propbag->add('description', PLUGIN_REMOTERSS_BULLETIMG_BLAHBLAH);
+                $propbag->add('default', '');
+                break;
+
+
+            case 'displaydate':
+                $propbag->add('type', 'boolean');
+                $propbag->add('name', PLUGIN_REMOTERSS_DISPLAYDATE);
+                $propbag->add('description', PLUGIN_REMOTERSS_BLAHBLAH);
+                $propbag->add('default', 'true');
+                break;
+
             default:
                 return false;
         }
@@ -336,6 +360,7 @@
         global $serendipity;
 
         $number       = $this->get_config('number');
+        $displaydate  = $this->get_config('displaydate','true');
         $dateformat   = $this->get_config('dateformat');
         $sidebartitle = $this->get_config('sidebartitle');
         $rssuri       = $this->get_config('rssuri');
@@ -343,6 +368,7 @@
         $cachetime    = $this->get_config('cachetime');
         $feedtype     = $this->get_config('feedtype', 'rss');
         $markup       = $this->get_config('markup', 'false');
+        $bulletimg    = $this->get_config('bulletimg');
 
         $title = $sidebartitle;
 
@@ -376,9 +402,16 @@
                     $i = 0;
                     $content = '';
                     while (($showAll || ($i < $number)) && ($item = $c->getNextItem())) {
-                        $content .= '<a href="' . $item['link'] . '" target="'.$target.'">' . $item['title'] . "</a><br>\n";
+                        if (empty($item['title'])) {
+                            continue;
+                        }
+                        $content .= '<a href="' . $item['link'] . '" target="'.$target.'">';
+                        if (!empty($bulletimg)) {
+                            $content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> ';
+                        }
+                        $content .= $item['title'] . "</a><br>\n";
                         $item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
-                        if (!($item['timestamp'] == -1)) {
+                        if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) {
                             $content .= '<div class="serendipitySideBarDate">'
                                       . htmlspecialchars(serendipity_formatTime($dateformat, $item['timestamp']))
                                       . '</div><br />';
@@ -480,4 +513,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.398,1.399

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Ask for confirmation when clicking the (delete) link in each comment


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -d -r1.398 -r1.399
--- serendipity_functions.inc.php	16 Aug 2004 18:50:38 -0000	1.398
+++ serendipity_functions.inc.php	19 Aug 2004 20:51:55 -0000	1.399
@@ -1619,7 +1619,7 @@
             echo ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp']));
 
             if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
-                echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments">' . DELETE . '</a>)';
+                echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments" onclick="return confirm(\''. sprintf(COMMENT_DELETE_CONFIRM, $comment['id'], htmlspecialchars($name)) .'\')">' . DELETE . '</a>)';
             }
 
             /* Allow people to easily reply to this comment */

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.12,1.13

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
those nasty googlebots even index a location.href javascript. so exclude
them from the karma logging.


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_event_karma.php	9 Jul 2004 09:35:12 -0000	1.12
+++ serendipity_event_karma.php	18 Aug 2004 14:08:30 -0000	1.13
@@ -264,6 +264,12 @@
                         return ;
                     }
 
+                    if (stristr($_SERVER['HTTP_USER_AGENT'], 'google')) {
+                        // We don't want googlebots hitting the karma-voting
+                        $this->karmaVote = 'invalid1';
+                        return ;
+                    }
+
                     // Voting takes place here.
                     $q = 'SELECT *
                             FROM ' . $serendipity['dbPrefix'] . 'entries AS e

[php-blog-cvs] serendipity NEWS,1.201,1.202

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

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

Modified Files:
	NEWS 
Log Message:
those nasty googlebots even index a location.href javascript. so exclude
them from the karma logging.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- NEWS	14 Aug 2004 15:03:46 -0000	1.201
+++ NEWS	18 Aug 2004 14:08:30 -0000	1.202
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Karma-Plugin disallows clicking from Googlebots following java-
+      script links (garvinhicking)
+
     * Improved link detection routine for sending trackbacks, fixes
       problems with bbcode-transformed URLs (garvinhicking)
 

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.74,1.75 serendipity_functions_images.inc.php,1.32,1.33 serendipity_functions_installer.inc.php,1.30,1.31

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions_images.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
* Fixed bug with quicktime movies in PHP < 4 3.9, use a wrapping serendipity_getimagesize() call for special places.
* Fixed bug to correctly autodetect serendipity core directory when document-root is not the real document-root, as found on some hosting setups. Tested working on shared setups.



Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- serendipity_admin_installer.inc.php	9 Aug 2004 09:49:54 -0000	1.74
+++ serendipity_admin_installer.inc.php	18 Aug 2004 10:15:45 -0000	1.75
@@ -17,7 +17,7 @@
     if (!empty($_POST['serendipityPath'])) {
         $serendipity_core = $_POST['serendipityPath'];
     } else {
-        $serendipity_core = $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/';
+        $serendipity_core = serendipity_httpCoreDir();
     }
 } else {
     $serendipity_core = $serendipity['serendipityPath'];

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_functions_installer.inc.php	9 Aug 2004 09:49:54 -0000	1.30
+++ serendipity_functions_installer.inc.php	18 Aug 2004 10:15:45 -0000	1.31
@@ -267,7 +267,7 @@
     $abort = false;
     if (IS_installed !== true && $_abort !== true) {
         $serendipity_root = dirname($_SERVER['PHP_SELF']) . '/';
-        $serendipity_core = $_SERVER['DOCUMENT_ROOT'] . $serendipity_root;
+        $serendipity_core = serendipity_httpCoreDir();
         $old_htaccess     = @file_get_contents($serendipity_core . '.htaccess');
         $fp               = @fopen($serendipity_core . '.htaccess', 'w');
         $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
@@ -758,4 +758,12 @@
         return true;
     }
 }
+
+function serendipity_httpCoreDir() {
+    if (!empty($_SERVER['SCRIPT_FILENAME'])) {
+        return dirname($_SERVER['SCRIPT_FILENAME']) . '/';
+    }
+
+    return $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/';
+}
 ?>
\ No newline at end of file

Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_functions_images.inc.php	14 Aug 2004 23:33:15 -0000	1.32
+++ serendipity_functions_images.inc.php	18 Aug 2004 10:15:45 -0000	1.33
@@ -188,27 +188,18 @@
     }
 
     // Calculate name of thumbnail
-    $t   = serendipity_parseFileName($file);
-    $f   = $t[0];
-    $suf = $t[1];
+    $t       = serendipity_parseFileName($file);
+    $f       = $t[0];
+    $suf     = $t[1];
+    $ft_mime = serendipity_guessMime($suf);
 
     $infile  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $file;
     $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $serendipity['thumbSuffix'] . '.' . $suf;
-    $fdim = @getimagesize($infile);
+    $fdim    = @serendipity_getimagesize($infile, $ft_mime);
 
-    if (!is_array($fdim)) {
-        // The file is no image.
-        $fdim = array(
-                  0 => 0,
-                  1 => 0,
-                  'mime' => serendipity_guessMime($suf)
-        );
+    if (isset($fdim['noimage'])) {
         $r = array(0, 0);
     } else {
-        if (empty($fdim['mime'])) {
-            $fdim['mime'] = serendipity_guessMime($suf);
-        }
-
         if ($serendipity['magick'] !== true) {
             $r = serendipity_resize_image_gd($infile, $outfile, $size);
         } else {
@@ -266,7 +257,7 @@
     $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total);
 
     foreach ($serendipity['imageList'] as $k => $file) {
-        $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
+        $is_image = (0 === strpos(strtolower($file['mime']), "image/"));
 
         if ($is_image) {
             $update   = false;
@@ -533,10 +524,10 @@
             continue;
         }
 
-        $ffull  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x];
-        $fthumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        $fbase  = basename($f[0]);
-        $fdir   = dirname($f[0]) . DIRECTORY_SEPARATOR;
+        $ffull   = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x];
+        $fthumb  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+        $fbase   = basename($f[0]);
+        $fdir    = dirname($f[0]) . DIRECTORY_SEPARATOR;
         if ($fdir == '.' . DIRECTORY_SEPARATOR) {
             $fdir = '';
         }
@@ -546,11 +537,8 @@
             continue;
         }
 
-        $fdim   = getimagesize($ffull);
-
-        if (empty($fdim['mime'])) {
-            $fdim['mime'] = serendipity_guessMime($f[1]);
-        }
+        $ft_mime = serendipity_guessMime($f[1]);
+        $fdim    = serendipity_getimagesize($ffull, $ft_mime);
 
         $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images
                                             WHERE name = '" . serendipity_db_escape_string($fbase) . "'
@@ -1014,4 +1002,33 @@
 
     return true;
 }
-?>
+
+function serendipity_getimagesize($file, $ft_mime = '', $suf = '') {
+    if (empty($ft_mime) && !empty($suf)) {
+        $ft_mime = serendipity_guessMime($suf);
+    }
+
+    $fdim = @getimagesize($file);
+
+    if (is_array($fdim)) {
+        if (empty($fdim['mime'])) {
+            $fdim['mime'] = $ft_mime;
+        }
+
+        if ($fdim['mime'] == 'image/vnd.wap.wbmp' && $ft_mime == 'video/x-quicktime') {
+            // PHP Versions prior to 4.3.9 reported .mov files wrongly as WAP. Fix this and mark the file as 'non-image' with 0x0 dimensions
+            $fdim['mime'] = $ft_mime;
+        }
+    } else {
+        // The file is no image. Return a fake array so that files are inserted (but without a thumb)
+        $fdim = array(
+            0         => 0,
+            1         => 0,
+            'mime'    => $ft_mime,
+            'noimage' => true
+        );
+    }
+
+    return $fdim;
+}
+?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.397,1.398

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
this should fix trackback problems


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -d -r1.397 -r1.398
--- serendipity_functions.inc.php	14 Aug 2004 19:55:44 -0000	1.397
+++ serendipity_functions.inc.php	16 Aug 2004 18:50:38 -0000	1.398
@@ -2465,7 +2465,7 @@
 {
     global $serendipity;
 
-    if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"]?[^>]*>([^<]*)</a>@i', $text, $matches)) {
+    if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"][^>]*>([^<]*)</a>@i', $text, $matches)) {
         return;
     }
 

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.8,1.9 serendipity_lang_cs.inc.php,1.55,1.56 serendipity_lang_cz.inc.php,1.55,1.56 serendipity_lang_da.inc.php,1.72,1.73 serendipity_lang_de.inc.php,1.89,1.90 serendipity_lang_en.inc.php,1.73,1.74 serendipity_lang_es.inc.php,1.71,1.72 serendipity_lang_fr.inc.php,1.51,1.52 serendipity_lang_nl.inc.php,1.29,1.30 serendipity_lang_pt.inc.php,1.29,1.30

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_nl.inc.php serendipity_lang_pt.inc.php 
Log Message:
Some more renames for the media library


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_lang_cs.inc.php	14 Aug 2004 15:12:52 -0000	1.55
+++ serendipity_lang_cs.inc.php	14 Aug 2004 23:33:15 -0000	1.56
@@ -218,12 +218,9 @@
 @define('RESIZE_DONE', 'Hotovo (upraven rozmìr %s obrázkù).');
 @define('SYNCING', 'Synchronizace databáze s adresáøem obrázkù');
 @define('SYNC_DONE', 'Hotovo (synchronizováno %s obrázkù).');
-@define('DELETE_IMAGE', 'Vymazán obrázek s názvem <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'Nelze vymazat obrázek <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Vymazán náhled obrázku s názvem <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Nelze nalézt soubor s názvem <b>%s</b>, možná je opravdu vymazán?');
-@define('ABOUT_TO_DELETE_FILE', 'Chcete vymazat <b>%s</b>.<br />Pokud je tento soubor použit v nìkterém vašem záznamu, bude zobrazen prázdný obrázek.<br />Jste si jist touto akcí?<br /><br />');
-@define('IMAGE_DELETE', 'Vymazat obrázek');
 @define('ABORT_NOW', 'Zrušit');
 @define('REMOTE_FILE_NOT_FOUND', 'Soubor nebyl na vzdáleném serveru nalezen, jste si jist že URL: <b>%s</b> je správné?');
 @define('FILE_FETCHED', '%s nalezen');
@@ -544,6 +541,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* 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.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- serendipity_lang_da.inc.php	14 Aug 2004 15:12:52 -0000	1.72
+++ serendipity_lang_da.inc.php	14 Aug 2004 23:33:15 -0000	1.73
@@ -212,12 +212,9 @@
 @define('RESIZE_DONE', 'Færdig (Ændrede %s billeder).');
 @define('SYNCING', 'Synkronisere databasen med billedemappen');
 @define('SYNC_DONE', 'Færdig (Synkroniserede %s billeder).');
-@define('DELETE_IMAGE', 'Slettede billedet ved navn <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette billedet <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Slettede billedet ved navn <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Kunne ikke finde filen ved navn <b>%s</b>, måske er den allerede slettet?');
-@define('ABOUT_TO_DELETE_FILE', 'Du er ved at slette <b>%s</b><br />Hvis du bruger denne fil i nogle af dine artikler, vil det forasage døde billeder<br />Er du sikker på du vil foresætte?<br /><br />');
-@define('IMAGE_DELETE', 'Slet dette billede');
 @define('ABORT_NOW', 'Afbryd nu');
 @define('REMOTE_FILE_NOT_FOUND', 'Filen kunne ikke findes på serveren, er du sikker på URLen: <b>%s</b> er korrekt?');
 @define('FILE_FETCHED', '%s hentet: %s');
@@ -539,6 +536,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* 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.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- serendipity_lang_fr.inc.php	14 Aug 2004 15:12:52 -0000	1.51
+++ serendipity_lang_fr.inc.php	14 Aug 2004 23:33:16 -0000	1.52
@@ -213,12 +213,9 @@
 @define('RESIZE_DONE', 'Terminé (redimensionné %s images).');
 @define('SYNCING', 'Synchronisation de la base de données avec le répertoire des images');
 @define('SYNC_DONE', 'Terminé (synchronisé %s images).');
-@define('DELETE_IMAGE', 'Supprimer l\'image intitulée <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'Impossible de supprimer l\'image <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Suppression de l\'aperçu de l\'image intitulée <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Impossible de trouver le fichier intitulé <b>%s</b>, peut etre a t il déjà été supprimé?');
-@define('ABOUT_TO_DELETE_FILE', 'Vous allez supprimer <b>%s</b><br />Si vous utilisez ce fichier dans des news, cela causera des liens morts<br />Etes vous sûr de vouloir continuer?<br /><br />');
-@define('IMAGE_DELETE', 'Supprimer cette image');
 @define('ABORT_NOW', 'Annuler maintenant');
 @define('REMOTE_FILE_NOT_FOUND', 'Le fichier n\'a pas été trouvé sur le serveur, êtes vous sûr que l\'URL: <b>%s</b> est correcte?');
 @define('FILE_FETCHED', '%s transformé en %s');
@@ -543,6 +540,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* 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.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_lang_cz.inc.php	14 Aug 2004 15:12:52 -0000	1.55
+++ serendipity_lang_cz.inc.php	14 Aug 2004 23:33:15 -0000	1.56
@@ -217,12 +217,9 @@
 @define('RESIZE_DONE', 'Hotovo (upraven rozmìr %s obrázkù).');
 @define('SYNCING', 'Synchronizace databáze s adresáøem obrázkù');
 @define('SYNC_DONE', 'Hotovo (synchronizováno %s obrázkù).');
-@define('DELETE_IMAGE', 'Vymazán obrázek s názvem <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'Nelze vymazat obrázek <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Vymazán náhled obrázku s názvem <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Nelze nalézt soubor s názvem <b>%s</b>, mo¾ná je opravdu vymazán?');
-@define('ABOUT_TO_DELETE_FILE', 'Chcete vymazat <b>%s</b>.<br />Pokud je tento soubor pou¾it v nìkterém va¹em záznamu, bude zobrazen prázdný obrázek.<br />Jste si jist touto akcí?<br /><br />');
-@define('IMAGE_DELETE', 'Vymazat obrázek');
 @define('ABORT_NOW', 'Zru¹it');
 @define('REMOTE_FILE_NOT_FOUND', 'Soubor nebyl na vzdáleném serveru nalezen, jste si jist ¾e URL: <b>%s</b> je správné?');
 @define('FILE_FETCHED', '%s nalezen');
@@ -542,6 +539,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* 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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_nl.inc.php	14 Aug 2004 15:12:52 -0000	1.29
+++ serendipity_lang_nl.inc.php	14 Aug 2004 23:33:16 -0000	1.30
@@ -216,12 +216,9 @@
 @define('RESIZE_DONE', 'Gedaane ( %s aangepast).');
 @define('SYNCING', 'Syncronizeren van de database met de beeldfolder');
 @define('SYNC_DONE', 'Gedaan ( %s Beelden gesynchroniseerd).');
-@define('DELETE_IMAGE', 'Verwijder het beeld met als naam <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'Onmogelijk om het beeld te verwijderen <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'verwijder de thumbnail voor het beeld met als naam <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Ik kan het bestand <b>%s</b> niet vinden, het werd vermoedelijk reeds verwijderd');
-@define('ABOUT_TO_DELETE_FILE', 'Je gaat nu het bestand <b>%s</b><br />verwijderen Als je het gebruikt in sommige van je logs is het beter het te behouden. <br />Wil je toch doorgaan?<br /><br />');
-@define('IMAGE_DELETE', 'Beeld verwijderen');
 @define('ABORT_NOW', 'Stop nu');
 @define('REMOTE_FILE_NOT_FOUND', 'Bestand niet gevonden op de server. Ben je zeker dat de URL: <b>%s</b> juist is?');
 @define('FILE_FETCHED', '%s opgeladen als %s');
@@ -544,6 +541,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* 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.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- serendipity_lang_en.inc.php	14 Aug 2004 15:12:52 -0000	1.73
+++ serendipity_lang_en.inc.php	14 Aug 2004 23:33:15 -0000	1.74
@@ -218,11 +218,7 @@
 @define('RESIZE_DONE', 'Done (resized %s images).');
 @define('SYNCING', 'Syncronizing the database with the image folder');
 @define('SYNC_DONE', 'Done (Syncronized %s images).');
-@define('DELETE_IMAGE', 'Deleted the image entitled <b>%s</b>');
-@define('DELETE_IMAGE_FAIL' , 'Unable to delete image <b>%s</b>');
-@define('DELETE_THUMBNAIL', 'Deleted the image thumbnail entitled <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Unable to locate the file entitled <b>%s</b>, maybe it has already been deleted?');
-@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead images<br />Are you sure you wish to proceed?<br /><br />');
 @define('ABORT_NOW', 'Abort now');
 @define('REMOTE_FILE_NOT_FOUND', 'File was not located on the remote server, are you sure the URL: <b>%s</b> is correct?');
 @define('FILE_FETCHED', '%s fetched as %s');
@@ -542,6 +538,10 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments');
 @define('VIEW_COMMENT', 'View comment');
 @define('VIEW_ENTRY', 'View entry');
+@define('DELETE_FILE_FAIL' , 'Unable to delete file <b>%s</b>');
+@define('DELETE_THUMBNAIL', 'Deleted the image thumbnail entitled <b>%s</b>');
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>');
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_lang_es.inc.php	14 Aug 2004 15:12:52 -0000	1.71
+++ serendipity_lang_es.inc.php	14 Aug 2004 23:33:16 -0000	1.72
@@ -212,12 +212,9 @@
 @define('ENTER_NEW_NAME', 'Introduzca el nuevo nombre para: ');
 @define('RESIZING', 'Cambiando el tamaño');
 @define('RESIZE_DONE', 'Terminado (las imágenes %s cambiaron de tamaño).');
-@define('DELETE_IMAGE', 'Eliminada la imagen titulada <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'No se puede eliminar la imagen <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Eliminada la imagen miniatura titulada <b>%s</b>');
 @define('FILE_NOT_FOUND', 'No es posible encontrar el archivo titulado <b>%s</b>, ¿es posible que lo haya borrado ya?');
-@define('ABOUT_TO_DELETE_FILE', 'Vas a borrar <b>%s</b><br />Si estas usando este archivo en alguno de tus posts provocara un error<br />¿Estas seguro de querer continuar?<br /><br />');
-@define('IMAGE_DELETE', 'Borra esta imagen');
 @define('ABORT_NOW', 'Salir ahora');
 @define('REMOTE_FILE_NOT_FOUND', 'El archivo no fue localizado en el servidor remoto, ¿estas seguro de que la URL: <b>%s</b> es correcta?');
 @define('FILE_FETCHED', '%s enlazado: %s');
@@ -539,6 +536,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_bg.inc.php	14 Aug 2004 15:12:52 -0000	1.8
+++ serendipity_lang_bg.inc.php	14 Aug 2004 23:33:15 -0000	1.9
@@ -211,12 +211,9 @@
 @define('RESIZE_DONE', 'Ãîòîâî (ïðîìåíåíè %s êàðòèíêè).');
 @define('SYNCING', 'Ñèíõðîíèçèðàíå íà áàçàòà äàííè ñ ïàïêàòà ñ êàðòèíêèòå');
 @define('SYNC_DONE', 'Ãîòîâî (ñèíõðîíèçèðàíè %s êàðòèíêè).');
-@define('DELETE_IMAGE', 'Èçòðèâàíå íà èçîáðàæåíèå ñ èìåòî <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'Íå ìîãà äà èçòðèÿ èçîáðàæåíèå <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Èçòðèâàíå íà òúìáíåéë <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Íå ìîãà äà íàìåðÿ ôàéëà <b>%s</b>, ìîæå áè âå÷å å èçòðèò?');
-@define('ABOUT_TO_DELETE_FILE', 'Âèå èñêàòå äà èçòðèåòå <b>%s</b><br />Àêî ïîëçâàòå òîçè ôàéë â íÿêîå âàøå ñúîáùåíèå, ìîæå äà ñå ïîëó÷è ãðåøêà<br />Ñèãóðåí ëè ñòå, ÷å èñêàòå äà ïðîäúëæèòå?<br /><br />');
-@define('IMAGE_DELETE', 'Èçòðèéòå òàçè êàðòèíêà');
 @define('ABORT_NOW', 'Ñïðåòå äåéñòâèåòî ñåãà');
 @define('REMOTE_FILE_NOT_FOUND', 'Ôàéëà íå å íàìåðåí íà îòäàëå÷åíèÿ ñúðâúð, ñèãóðåí ëè ñòå ÷ð àäðåñà: <b>%s</b> å âåðåí?');
 @define('FILE_FETCHED', '%s èçòåãëåí êàòî %s');
@@ -337,6 +334,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- serendipity_lang_de.inc.php	14 Aug 2004 15:12:52 -0000	1.89
+++ serendipity_lang_de.inc.php	14 Aug 2004 23:33:15 -0000	1.90
@@ -212,12 +212,9 @@
 @define('ENTER_NEW_NAME', 'Bitte einen neuen Namen eingeben für: ');
 @define('RESIZING', 'Anpassen der Bildgröße');
 @define('RESIZE_DONE', 'Fertig (%s Bildgrößen angepaßt).');
-@define('DELETE_IMAGE', 'Bild namens <b>%s</b> gelöscht');
 @define('DELETE_IMAGE_FAIL' , 'Kann Bild namens <b>%s</b> nicht löschen');
 @define('DELETE_THUMBNAIL', 'Vorschaubilder zu <b>%s</b> gelöscht');
 @define('FILE_NOT_FOUND', 'Die Datei namens <b>%s</b> kann nicht gefunden werden, vielleicht wurde diese schon gelöscht?');
-@define('ABOUT_TO_DELETE_FILE', 'Die Datei <b>%s</b> soll gelöscht werde.<br />Wenn das Bild in einem Eintrag verwendet wurde, so wird durch das Löschen eine Lücke erzeugt.<br />Soll das Bild dennoch gelöscht werde?<br /><br />');
-@define('IMAGE_DELETE', 'Bild löschen');
 @define('ABORT_NOW', 'Abbrechen');
 @define('REMOTE_FILE_NOT_FOUND', 'Die Datei konnte auf dem Server nicht gefunden werden. Sind Sie sicher, dass die URL <b>%s</b> korrekt ist?');
 @define('FILE_FETCHED', '%s geladen als %s');
@@ -539,6 +536,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* 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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_pt.inc.php	14 Aug 2004 15:12:52 -0000	1.29
+++ serendipity_lang_pt.inc.php	14 Aug 2004 23:33:16 -0000	1.30
@@ -214,12 +214,9 @@
 @define('RESIZE_DONE', 'Pronto (%s imagens redimensionadas).');
 @define('SYNCING', 'Sincronizando o banco de dados com o diretório de imagens');
 @define('SYNC_DONE', 'Pronto (%s imagens sincronizadas).');
-@define('DELETE_IMAGE', 'Excluir a imagem entitulada <b>%s</b>');
 @define('DELETE_IMAGE_FAIL' , 'Não foi possível excluir a imagem <b>%s</b>');
 @define('DELETE_THUMBNAIL', 'Excluir a miniatura da imagem entitulada <b>%s</b>');
 @define('FILE_NOT_FOUND', 'Não foi possível localizar o arquivo entitulado <b>%s</b>, será que foi excluído?');
-@define('ABOUT_TO_DELETE_FILE', 'Você está prestes a excluir <b>%s</b><br />Se você está usando esse arquivo em alguma das seus artigos, a imagem não será mais exibida<br />Deseja realmente prosseguir com a exclusão?<br /><br />');
-@define('IMAGE_DELETE', 'Excluir esta imagem');
 @define('ABORT_NOW', 'Cancelar agora');
 @define('REMOTE_FILE_NOT_FOUND', 'O arquivo não foi localizado no servidor, tem certeza sobre a URL: <b>%s</b> está correta?');
 @define('FILE_FETCHED', '%s buscado como %s');
@@ -540,6 +537,8 @@
 @define('DELETE_SELECTED_COMMENTS', 'Delete selected comments'); // Translate
 @define('VIEW_COMMENT', 'View comment'); // Translate
 @define('VIEW_ENTRY', 'View entry'); // Translate
+@define('DELETE_FILE', 'Deleted the file entitled <b>%s</b>'); // Translate
+@define('ABOUT_TO_DELETE_FILE', 'You are about to delete <b>%s</b><br />If you are using this file in some of your entries, it will cause dead links or images<br />Are you sure you wish to proceed?<br /><br />'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin_images.inc.php,1.28,1.29 serendipity_functions_images.inc.php,1.31,1.32

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

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

Modified Files:
	serendipity_admin_images.inc.php 
	serendipity_functions_images.inc.php 
Log Message:
Some more renames for the media library


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_functions_images.inc.php	14 Aug 2004 22:42:04 -0000	1.31
+++ serendipity_functions_images.inc.php	14 Aug 2004 23:33:15 -0000	1.32
@@ -76,9 +76,9 @@
 
     if (file_exists($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dFile)) {
         if (@unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dFile)) {
-            printf(DELETE_IMAGE . '<br />', $dFile);
+            printf(DELETE_FILE . '<br />', $dFile);
         } else {
-            printf(DELETE_IMAGE_FAIL . '<br />', $dFile);
+            printf(DELETE_FILE_FAIL . '<br />', $dFile);
         }
 
         if (@unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dThumb)) {

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_admin_images.inc.php	11 Aug 2004 09:32:53 -0000	1.28
+++ serendipity_admin_images.inc.php	14 Aug 2004 23:33:15 -0000	1.29
@@ -51,7 +51,7 @@
 ?>
     <form method="get" name="delete_image">
         <div>
-            <input type="button" value="<?php echo IMAGE_DELETE ?>" onclick="location.href='<?php echo $newLoc; ?>'" />
+            <input type="button" value="<?php echo DUMP_IT ?>" onclick="location.href='<?php echo $newLoc; ?>'" />
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <input type="button" value="<?php echo ABORT_NOW ?>"    onclick="location.href='<?php echo $abortLoc; ?>'" />
         </div>