php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping serendipity_event_weblogping.php,NONE,1.1

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

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

Added Files:
	serendipity_event_weblogping.php 
Log Message:
New event plugins:
Content-Rewrite (hotwords-plugin, like the old one)
Mailer (mails entries via E-Mail)
Weblogping (performs XML-RPC weblog services pinging)


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

[php-blog-cvs] serendipity/plugins/serendipity_event_mailer serendipity_event_mailer.php,NONE,1.1

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

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

Added Files:
	serendipity_event_mailer.php 
Log Message:
New event plugins:
Content-Rewrite (hotwords-plugin, like the old one)
Mailer (mails entries via E-Mail)
Weblogping (performs XML-RPC weblog services pinging)


--- NEW FILE: serendipity_event_mailer.php ---
<?php # $Id: serendipity_event_mailer.php,v 1.1 2004/02/09 15:12:54 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_MAILER_NAME', 'Artikel mailen');
        @define('PLUGIN_EVENT_MAILER_DESC', 'Verschickt jeden neuen Artikel im Blog via E-Mail');
        @define('PLUGIN_EVENT_MAILER_RECIPIENT', 'Mail-Empfänger');
        @define('PLUGIN_EVENT_MAILER_RECIPIENTDESC', 'Die E-Mail Adresse an die die Artikel verschickt werden sollen (empfohlen: Eine Mailing-Liste)');
        break;
    
    case 'en':
    case 'es':
    default:
        @define('PLUGIN_EVENT_MAILER_NAME', 'Mail entry');
        @define('PLUGIN_EVENT_MAILER_DESC', 'Mails each new entry to your blog via E-Mail');
        @define('PLUGIN_EVENT_MAILER_RECIPIENT', 'Mail recipient');
        @define('PLUGIN_EVENT_MAILER_RECIPIENTDESC', 'E-Mail address you want to send the entries to (suggested: a mailing list)');
        break;
}

class serendipity_event_mailer extends serendipity_event
{
    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_MAILER_NAME);
        $propbag->add('description',   PLUGIN_EVENT_MAILER_DESC);
        $propbag->add('event_hooks',    array(
            'backend_publish' => true
        ));
        
        $propbag->add('configuration', array('mailto'));
    }

    function introspect_config_item($name, &$propbag)
    {
        switch($name) {
            case 'mailto':
                $propbag->add('type',        'string');
                $propbag->add('name',        PLUGIN_EVENT_MAILER_RECIPIENT);
                $propbag->add('description', PLUGIN_EVENT_MAILER_RECIPIENTDESC);
                break;
            default:
                break;
        }
        
        return true;
    }

    function generate_content(&$title) {
        $title = 'Entry mailer';
    }

    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
        
        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'backend_publish':
                    $mail = array(
                      'to'      => $this->get_config('mailto'),
                      'subject' => '[' . $serendipity['blogTitle'] . '] ' . $eventData['title'],
                      'body'    => $eventData['body'] . $eventData['extended'] . $serendipity['signature'],
                      'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
                    );
                    
                    mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
                    return true;
                    break;
                
                default:
                    return false;
                    break;
            }
        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments serendipity_plugin_comments.php,1.13,1.14

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

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

Modified Files:
	serendipity_plugin_comments.php 
Log Message:
Moved languages inside plugins


Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_plugin_comments.php	3 Feb 2004 16:29:57 -0000	1.13
+++ serendipity_plugin_comments.php	9 Feb 2004 15:14:39 -0000	1.14
@@ -1,5 +1,30 @@
 <?php # $Id$
 
+switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_COMMENTS_BLAHBLAH', 'Zeigt die letzten Kommentare');
+        @define('PLUGIN_COMMENTS_WORDWRAP', 'Zeilenumbruch');
+        @define('PLUGIN_COMMENTS_WORDWRAP_BLAHBLAH', 'Nach wievielen Wörtern soll ein Zeilenumbruch eingefügt werden? (Standard: 30)');
+        @define('PLUGIN_COMMENTS_MAXCHARS', 'Zeichen pro Kommentar');
+        @define('PLUGIN_COMMENTS_MAXCHARS_BLAHBLAH', 'Wieviele Zeichen sollen pro Kommentar gezeigt werden? (Standard: 120)');
+        @define('PLUGIN_COMMENTS_MAXENTRIES', 'Anzahl an Kommentaren');
+        @define('PLUGIN_COMMENTS_MAXENTRIES_BLAHBLAH', 'Wieviele Kommentare sollen gezeigt werden? (Standard: 15)');
+        break;
+    
+    case 'en':
+    case 'es':
+    default:
+        @define('PLUGIN_COMMENTS_BLAHBLAH', 'Displays the last comments to your entries');
+        @define('PLUGIN_COMMENTS_WORDWRAP', 'Wordwrap');
+        @define('PLUGIN_COMMENTS_WORDWRAP_BLAHBLAH', 'How many words until a wordwrap will occur? (Default: 30)');
+        @define('PLUGIN_COMMENTS_MAXCHARS', 'Maximum chars per comment');
+        @define('PLUGIN_COMMENTS_MAXCHARS_BLAHBLAH', 'How many chars will be displayed for each comment? (Default: 120)');
+        @define('PLUGIN_COMMENTS_MAXENTRIES', 'Maximum number of comments');
+        @define('PLUGIN_COMMENTS_MAXENTRIES_BLAHBLAH', 'How many comments will be shown? (Default: 15)');
+
+        break;
+}
+
 class serendipity_plugin_comments extends serendipity_plugin
 {
     function introspect(&$propbag)
@@ -7,7 +32,7 @@
         global $serendipity;
         
         $propbag->add('name',          COMMENTS);
-        $propbag->add('description',   COMMENTS_PLUGIN_BLAHBLAH);
+        $propbag->add('description',   PLUGIN_COMMENTS_BLAHBLAH);
         
         $propbag->add('configuration', array(
                                              'wordwrap',
@@ -22,20 +47,20 @@
         switch($name) {
             case 'wordwrap':
                 $propbag->add('type', 'string');
-                $propbag->add('name', COMMENTS_PLUGIN_WORDWRAP);
-                $propbag->add('description', COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH);
+                $propbag->add('name', PLUGIN_COMMENTS_WORDWRAP);
+                $propbag->add('description', PLUGIN_COMMENTS_WORDWRAP_BLAHBLAH);
                 break;
 
             case 'max_chars':
                 $propbag->add('type', 'string');
-                $propbag->add('name', COMMENTS_PLUGIN_MAXCHARS);
-                $propbag->add('description', COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH);
+                $propbag->add('name', PLUGIN_COMMENTS_MAXCHARS);
+                $propbag->add('description', PLUGIN_COMMENTS_MAXCHARS_BLAHBLAH);
                 break;
 
             case 'max_entries':
                 $propbag->add('type', 'string');
-                $propbag->add('name', COMMENTS_PLUGIN_MAXENTRIES);
-                $propbag->add('description', COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH);
+                $propbag->add('name', PLUGIN_COMMENTS_MAXENTRIES);
+                $propbag->add('description', PLUGIN_COMMENTS_MAXENTRIES_BLAHBLAH);
                 break;
 
             case 'language':

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.1,1.2

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

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

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
Added missing CVS Tags
Corrected some coding guideline issues


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_functions_images.inc.php	8 Feb 2004 17:56:27 -0000	1.1
+++ serendipity_functions_images.inc.php	9 Feb 2004 14:31:35 -0000	1.2
@@ -1,10 +1,10 @@
-<?php
+<?php # $Id$
 
 
 /**
 * Get a list of images
 **/
-function serendipity_fetchImagesFromDatabase($start = 0, $limit=0, &$total) {
+function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total) {
     global $serendipity;
     $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images ORDER BY date DESC", false, 'assoc');
     if ( !is_array($rs) ) {
@@ -23,6 +23,7 @@
     $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images WHERE id = ". $id, true, 'assoc');
     return $rs;
 }
+
 function serendipity_updateImageInDatabase($updates, $id) {
     global $serendipity;
     $i=0;
@@ -185,7 +186,6 @@
 
 function serendipity_guessMIME($extension) {
     switch ( $extension ) {
-    
     }
 
     return $mime;
@@ -199,41 +199,46 @@
 
     $i=0;
     $files = serendipity_fetchImages();
-    for($x=0; $x<count($files); $x++) {
+    $fcount = count($files);
+    for ($x = 0; $x < $fcount; $x++) {
         $update = $q = array();
-        $f = serendipity_parseFileName($files[$x]);
-        $ffull = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x];
+        $f      = serendipity_parseFileName($files[$x]);
+        $ffull  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x];
         $fthumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        $fdim = getimagesize($ffull);
+        $fdim   = getimagesize($ffull);
 
-        if ( !isset($fdim['mime']) ) {
+        if (!isset($fdim['mime'])) {
             $fdim['mime'] = serendipity_guessMime($f[1]);
         }
         
         $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images 
-                                                        WHERE name = '$f[0]' 
-                                                            AND mime = '$fdim[mime]'", true, 'assoc');
-        if ( is_array($rs) ) {
+                                            WHERE name = '$f[0]' 
+                                              AND mime = '$fdim[mime]'", true, 'assoc');
+        if (is_array($rs)) {
             $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $rs['name'] . '.' . $rs['thumbnail_name'] . '.' . $rs['extension'];
-            if ( $rs['dimensions_width'] != $fdim[0] ) {
+            if ($rs['dimensions_width'] != $fdim[0]) {
                 $update['dimensions_width'] = $fdim[0];
             }
-            if ( $rs['dimensions_height'] != $fdim[1] ) {
+            
+            if ($rs['dimensions_height'] != $fdim[1]) {
                 $update['dimensions_height'] = $fdim[1];
             }
-            if ( $rs['size'] != filesize($ffull) ) {
+            
+            if ($rs['size'] != filesize($ffull)) {
                 $update['size'] = filesize($ffull);
             }
-            if ( !file_exists($checkfile) && file_exists($fthumb) ) {
+            
+            if (!file_exists($checkfile) && file_exists($fthumb)) {
                 $update['thumbnail_name'] = $serendipity['thumbSuffix'];
             }
 
             /* Do the database update, if needed */
             serendipity_updateImageInDatabase($update, $rs['id']);
-            if ( sizeof($update) != 0 ) { $i++; }
-
+            if (sizeof($update) != 0) { 
+                $i++; 
+            }
         } else {
-            if ( file_exists($fthumb) ) {
+            if (file_exists($fthumb)) {
                 $thumbnail = $serendipity['thumbSuffix'];
             }
             serendipity_insertImageInDatabase($f[0], $f[1], $fdim['mime'], filesize($ffull), $fdim[0], $fdim[1], $thumbnail, filemtime($ffull));
@@ -273,13 +278,13 @@
     }
 
     /* If our loader does not exist, we are doomed */
-    if ( !function_exists($loadfn) ) {
+    if (!function_exists($loadfn)) {
         return false;
     }
 
     /* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG */
-    if ( !function_exists($savefn) ) {
-        if ( function_exists('imagepng') ) {
+    if (!function_exists($savefn)) {
+        if (function_exists('imagepng')) {
             $savefn = 'imagepng';
         } else {
             return false;
@@ -300,19 +305,19 @@
     return array($newwidth, $newheight);
 }
 
-function serendipity_displayImageList($start = 0, $end = 10, $lineBreak=NULL, $manage=false, $url=NULL) {
+function serendipity_displayImageList($start = 0, $end = 10, $lineBreak = NULL, $manage = false, $url = NULL) {
     global $serendipity;
 
     $serendipity['imageList'] = serendipity_fetchImagesFromDatabase($start, $end, $totalImages);
-    $inc   = $end - $start;
+    $inc = $end - $start;
     
-    if ( isset($serendipity['GET']['adminModule']) ) {
-        $extraParems = 'serendipity[adminModule]='. $serendipity['GET']['adminModule'] .'&';
+    if (isset($serendipity['GET']['adminModule'])) {
+        $extraParems = 'serendipity[adminModule]='. $serendipity['GET']['adminModule'] .'&amp;';
     }
 
     $left = '<input type="button" value="&lt;&lt;&lt;" onclick="location.href=\'?'. $extraParems .'serendipity[start]=' . ($start-$end) . '\';" '. (($start <= 0) ? 'disabled' : '') .'>' . "\n";
     $right = '<input type="button" value="&gt;&gt;&gt;" onclick="location.href=\'?'. $extraParems .'serendipity[start]=' . ($start+$end) . '\';" '. (($totalImages < $start+$end) ? 'disabled' : '') .'>' . "\n";
-    if ( is_null($lineBreak) ) {
+    if (is_null($lineBreak)) {
         $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));
     }
 ?>
@@ -329,7 +334,7 @@
 
     <tr>
 <?php
-        foreach ( $serendipity['imageList'] as $k => $file ) {
+        foreach ($serendipity['imageList'] as $k => $file) {
             ++$x; $preview = '';
             $i      = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $file['name'] .'.'. $file['thumbnail_name'] .'.'. $file['extension']);
             $imgsrc = $serendipity['uploadHTTPPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
@@ -340,8 +345,10 @@
             }
 ?>
                 <td class="serendipity_admin_list_item" nowrap="nowrap" align="center" valign="bottom">
-<?php echo $preview; ?>
-<?php if ( $manage ) { ?>
+<?php 
+            echo $preview;
+            if ($manage) { 
+?>
 <table border="0" width="100%" style="border-bottom: 1px solid #000000">
     <tr>
         <td valign="middle"><font size="1">Org: <?php echo $file['dimensions_width'] . 'x' . $file['dimensions_height']; ?><br>Thumb: <?php echo $i[0] . 'x' . $i[1]; ?></font></td>
@@ -377,4 +384,4 @@
 </table>
 <?php
 }
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.39,1.40

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Introducing event plugins (see mailing list)


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_sidebar_items.php	3 Feb 2004 18:08:08 -0000	1.39
+++ serendipity_sidebar_items.php	9 Feb 2004 15:21:41 -0000	1.40
@@ -457,16 +457,17 @@
             $authors[$row['authorid']] = $row['username'];
         }
 
-        $this->select_values = $authors;
+        $this->author_select_values = $authors;
     }
 
     function introspect_config_item($name, &$propbag)
     {
         switch($name) {
             case 'authorid':
-                $propbag->add('type',        'select');
-                $propbag->add('name',        CATEGORIES_TO_FETCH);
-                $propbag->add('description', CATEGORIES_TO_FETCH_DESC);
+                $propbag->add('type',         'select');
+                $propbag->add('name',         CATEGORIES_TO_FETCH);
+                $propbag->add('description',  CATEGORIES_TO_FETCH_DESC);
+                $propbag->add('select_values', $this->author_select_values);
                 break;
 
             default:

[php-blog-cvs] serendipity/plugins/serendipity_event_contentrewrite serendipity_event_contentrewrite.php,NONE,1.1

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

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

Added Files:
	serendipity_event_contentrewrite.php 
Log Message:
New event plugins:
Content-Rewrite (hotwords-plugin, like the old one)
Mailer (mails entries via E-Mail)
Weblogping (performs XML-RPC weblog services pinging)


--- NEW FILE: serendipity_event_contentrewrite.php ---
<?php # $Id: serendipity_event_contentrewrite.php,v 1.1 2004/02/09 15:12:54 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_CONTENTREWRITE_FROM', 'quelle');
        @define('PLUGIN_EVENT_CONTENTREWRITE_TO', 'ziel');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NAME', 'Wort-Ersetzer');
        @define('PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION', 'Ersetzt ein Wort mit einem neuen Inhalt, z.B. für Akronyme');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWTITLE', 'Neuer Titel');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWTDESCRIPTION', 'Der Akronym-Titel des neuen Eintrages ({quelle})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDTITLE', 'Titel #%d');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDTDESCRIPTION', 'Das Akronym ({quelle})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_PTITLE', 'Plugin Titel');
        @define('PLUGIN_EVENT_CONTENTREWRITE_PDESCRIPTION', 'Der Name dieses Pligins');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWDESCRIPTION', 'Neue Beschreibung');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWDDESCRIPTION', 'Die Beschreibung des neuen Eintrages ({ziel})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDDESCRIPTION', 'Beschreibung #%s');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDDDESCRIPTION', 'Die Beschreibung des Eintrages ({ziel})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRING', 'Umformungsmaske');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRINGDESC', 'Ein beliebiger Text der zur Ersetzung verwendet werden soll. Fügen Sie {quelle} und {ziel} The string used to rewrite. Place {from} and {to} anywhere you like to get a rewrite.' . "\n" . 'Example: <acronym title="{to}">{from}</acronym>');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHAR', 'Rewrite char');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHARDESC', 'If there is any char you append to force rewriting, enter it here. If you want to only replace \'serendipity*\' with what you entered for that word but want the \'*\' removed, enter that char here. NOTE: You can\'t use a different rewrite_char for a plugin having the same rewrite_string!');
        break;
        
    case 'en':
    case 'es':
    default:
        @define('PLUGIN_EVENT_CONTENTREWRITE_FROM', 'from');
        @define('PLUGIN_EVENT_CONTENTREWRITE_TO', 'to');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NAME', 'Content Rewriter');
        @define('PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION', 'Replaces any word with a new string (like for Acronyms)');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWTITLE', 'New Title');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWTDESCRIPTION', 'Enter the acronym-title for a new item here ({from})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDTITLE', 'Title #%d');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDTDESCRIPTION', 'Enter the acronym here ({from})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_PTITLE', 'Plugin-Title');
        @define('PLUGIN_EVENT_CONTENTREWRITE_PDESCRIPTION', 'The name of this plugin');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWDESCRIPTION', 'New Description');
        @define('PLUGIN_EVENT_CONTENTREWRITE_NEWDDESCRIPTION', 'Enter the description for a new item here ({to})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDDESCRIPTION', 'Description #%s');
        @define('PLUGIN_EVENT_CONTENTREWRITE_OLDDDESCRIPTION', 'Enter the description here ({to})');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRING', 'Rewrite string');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRINGDESC', 'The string used to rewrite. Place {from} and {to} anywhere you like to get a rewrite.' . "\n" . 'Example: <acronym title="{to}">{from}</acronym>');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHAR', 'Rewrite char');
        @define('PLUGIN_EVENT_CONTENTREWRITE_REWRITECHARDESC', 'If there is any char you append to force rewriting, enter it here. If you want to only replace \'serendipity*\' with what you entered for that word but want the \'*\' removed, enter that char here. NOTE: You can\'t use a different rewrite_char for a plugin having the same rewrite_string!');
        break;
}

class serendipity_event_contentrewrite extends serendipity_event
{
var $rewrite_from, $rewrite_to;

    function cleanup() {
        // Cleanup. Remove all empty configs on SAVECONF-Submit.
        serendipity_plugin_api::remove_plugin_value($this->instance, array('title', 'description'));
        
        return true;
    }
    
    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_CONTENTREWRITE_NAME);
        $propbag->add('description',   PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION);
        $propbag->add('event_hooks',    array(
            'frontend_display' => true
        ));
        
        if ($_POST['SAVECONF']) $this->cleanup();
        $rows = serendipity_db_query("SELECT name, value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '" . $this->instance . "/%'");

        $counter = 0;
        $values  = array();
        $values[] = 'title';
        $values[] = 'rewrite_string';
        $values[] = 'rewrite_char';
        $this->title_values = array();
        $this->descr_values = array();
        $this->rewrite_from = array();
        $this->rewrite_to   = array();

        if (is_array($rows)) {
            foreach ($rows as $row) {
                $plugin_value = str_replace($this->instance . '/', '', $row['name']);
                preg_match('|^(.+)_([0-9]+)$|msU', $plugin_value, $reg_counter);

                $found = false;
                if ($reg_counter[1] == 'title') {
                    $this->title_values[] = $plugin_value;
                    $this->rewrite_from[] = $row['value'];
                    $found = true;
                } elseif ($reg_counter[1] == 'description') {
                    $this->descr_values[] = $plugin_value;
                    $this->rewrite_to[]   = $row['value'];
                    $found = true;
                }
                
                if ($found) {
                    $next_counter = $reg_counter[2] + 1;
                    $counter      = ($next_counter > $counter ? $next_counter : $counter);
                }
            }
        }
        
        $counter        = ($counter > 0 ? $counter + 1 : $counter);

        if (count($this->title_values) == count($this->descr_values)) {
            foreach($this->title_values AS $key => $val) {
                $values[] = $this->title_values[$key];
                $values[] = $this->descr_values[$key];
            }
        }

        $values[] = 'title'       . '_' . $counter;
        $values[] = 'description' . '_' . $counter;
        
        $propbag->add('configuration', $values);

        $this->counter = $counter;
    }

    function introspect_config_item($name, &$propbag)
    {
        preg_match('|^(.+)_([0-9]+)$|msU', $name, $switch);
        
        if (!isset($switch[2])) {
            $switch[1] = $name;
            $switch[2] = 'empty';
        }
        
        switch($switch[1]) {
            case 'title':
            
                    if ($switch[2] != 'empty') {
                        $propbag->add('type',        'string');
                        
                        if ($this->counter == $switch[2]) {
                            $propbag->add('name',        PLUGIN_EVENT_CONTENTREWRITE_NEWTITLE);
                            $propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_NEWTDESCRIPTION);
                        } else {
                            $propbag->add('name',        sprintf(PLUGIN_EVENT_CONTENTREWRITE_OLDTITLE, $switch[2]));
                            $propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_OLDTDESCRIPTION);
                        }
                    } else {
                        $propbag->add('type',        'string');
                        $propbag->add('name',        PLUGIN_EVENT_CONTENTREWRITE_PTITLE);
                        $propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_PDESCRIPTION);
                    }
                    break;

            case 'description':
                    $propbag->add('type',        'string');

                    if ($this->counter == $switch[2]) {
                        $propbag->add('name',        PLUGIN_EVENT_CONTENTREWRITE_NEWDESCRIPTION);
                        $propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_NEWDDESCRIPTION);
                    } else {
                        $propbag->add('name',        sprintf(PLUGIN_EVENT_CONTENTREWRITE_OLDDESCRIPTION, $switch[2]));
                        $propbag->add('description', PLUGIN_EVENT_CONTENTREWRITE_OLDDDESCRIPTION);
                    }
                    break;

            case 'rewrite_string':
                    $propbag->add('type',         'string');
                    $propbag->add('name',         PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRING);
                    $propbag->add('description',  PLUGIN_EVENT_CONTENTREWRITE_REWRITESTRINGDESC);
                    break;

            case 'rewrite_char':
                    $propbag->add('type',         'string');
                    $propbag->add('name',         PLUGIN_EVENT_CONTENTREWRITE_REWRITECHAR);
                    $propbag->add('description',  PLUGIN_EVENT_CONTENTREWRITE_REWRITECHARDESC);
                    break;

            default:
                    return false;
        }
        return true;
    }

    function generate_content(&$title)
    {
        $title = $this->get_config('title');
?>
<table>
<?php
        foreach($this->rewrite_from AS $key => $val) {
?>
    <tr>
        <th style="font-size: 8pt; font-color: white;"><?= htmlentities($val); ?></th>
        <td><?= htmlentities($this->rewrite_to[$key]); ?></td>
    </tr>
<?php
        }
?>
</table>
<?php
    }
    
    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
        
        $hooks = &$bag->get('event_hooks');
        if (isset($hooks[$event])) {
            switch($event) {
                case 'frontend_display':
                    $char   = &$this->get_config('rewrite_char');
                    $string = &$this->get_config('rewrite_string');

                    foreach($this->rewrite_from AS $nr => $v_from) {
                        $v_to   = $this->rewrite_to[$nr];
                        
                        if ($v_from != '' && $v_to != '') {
                            // Use the supplied rewrite string and replace the {from} and {to} values with the ones we got from the plugin
                            $new =
                              str_replace(
                                array(
                                  '{' . PLUGIN_EVENT_CONTENTREWRITE_FROM . '}',
                                  '{' . PLUGIN_EVENT_CONTENTREWRITE_TO . '}'
                                ),
        
                                array(
                                  str_replace(
                                    $char,
                                    '',
                                    $v_from
                                  ),
        
                                  $v_to
                                ),
        
                                $string
                            );
                            
                            // Build a regular expression (ungreedy, multiline) with our quoted value. $val here is the word needing the replacement
                            $regex = '°([^\d\w])(' . preg_quote($v_from) . ')([^\d\w])°msU';
        
                            // \1 and \3 are the prepend/append strings (usually whitespaces) and $new containing the new value
                            $eventData   = preg_replace($regex, '\1' . $new . '\3', $eventData);
                        }
                    }

                    return true;
                    break;
            }
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/plugins/serendipity_plugin_eventwrapper - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_eventwrapper added to the repository

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.200,1.201

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Introducing event plugins (see mailing list)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- serendipity_functions.inc.php	8 Feb 2004 17:56:27 -0000	1.200
+++ serendipity_functions.inc.php	9 Feb 2004 15:20:52 -0000	1.201
@@ -7,9 +7,9 @@
 include_once("${serendipity['serendipityPath']}compat.php");
 include_once("${serendipity['serendipityPath']}serendipity_functions_config.inc.php");
 include_once("${serendipity['serendipityPath']}bundled-libs/XML/RPC.php");
+include_once("${serendipity['serendipityPath']}serendipity_plugin_api.php");
 include_once("${serendipity['serendipityPath']}serendipity_functions_images.inc.php");
 
-
 function serendipity_logout() {
     $_SESSION['serendipityAuthedUser'] = false;
     session_destroy();
@@ -665,6 +665,7 @@
     $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['action']);
@@ -757,7 +758,11 @@
         <h4 class="serendipity_title"><a href="<?php echo $entryLink; ?>"><?php echo htmlentities($entry['title']); ?></a></h4>
 
         <div class="serendipity_entry">
-            <?php echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id']))) . $html_extended; ?>
+<?php
+                $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id']))) . $html_extended;
+                serendipity_plugin_api::hook_event('frontend_display', $article);
+                echo $article;
+?>
 
             <div class='serendipity_entryFooter'>
 <?php
@@ -1277,7 +1282,11 @@
     <title mode="escaped" type="text/html"><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title>
     <content type="application/xhtml+xml" xml:base="<?php echo $serendipity['baseURL']; ?>" xml:space="preserve">
         <div xmlns="http://www.w3.org/1999/xhtml">
-            <?php echo utf8_encode(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)))); ?>
+<?php
+                    $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)));
+                    serendipity_plugin_api::hook_event('frontend_display', $article);
+                    echo utf8_encode($article);
+?>
         </div>
     </content>
 </entry>
@@ -1307,7 +1316,11 @@
 ?>
     <author><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></author>
     <content:encoded>
-        <?php echo utf8_encode(htmlspecialchars(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext))))); ?>
+<?php
+                    $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)));
+                    serendipity_plugin_api::hook_event('frontend_display', $article);
+                    echo utf8_encode(htmlspecialchars($article));
+?>
     </content:encoded>
     <pubDate><?php echo date('r', $entry['timestamp']); ?></pubDate>
     <guid><?php echo $guid; ?></guid>
@@ -1330,7 +1343,11 @@
     <title><?php echo utf8_encode(htmlspecialchars($entry['title'])); ?></title>
     <link><?php echo $guid; ?></link>
     <description>
-        <?php echo utf8_encode(htmlspecialchars(nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext))))); ?>
+<?php
+                $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)));
+                serendipity_plugin_api::hook_event('frontend_display', $article);
+                echo utf8_encode(htmlspecialchars($article));
+?>
     </description>
     <dc:publisher><?php echo utf8_encode(htmlspecialchars($serendipity['blogTitle'])); ?></dc:publisher>
     <dc:creator><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator>
@@ -1359,102 +1376,6 @@
     return('<tt>' . str_replace(' ', '&nbsp;', $arg[1]) . '</tt>');
 }
 
-function serendipity_content_rewrite($str) {
-    global $serendipity;
-
-    // Do this only once!
-    if (!class_exists('serendipity_plugin_api')) {
-        include_once('serendipity_plugin_api.php');
-    }
-
-    // If this variable is not set, this function is called for the first time.
-    // Now let's search for plugins needing content rewriting
-    if (!isset($serendipity['content_rewrite']['active'])) {
-
-        // We set this to false, so when this function is called later, it won't have to enumerate all plugins again
-        $serendipity['content_rewrite']['active'] = false;
-
-        // Get those nifty plugins
-        $plugins = serendipity_plugin_api::enum_plugins();
-
-        if (is_array($plugins)) {
-
-            // store the rewrite items in our main container for later usage.
-            $serendipity['content_rewrite']['data']['rewrite_from'] = array();
-            $serendipity['content_rewrite']['data']['rewrite_to']   = array();
-
-            // load each plugin to make some introspection
-            foreach ($plugins as $plugin_data) {
-                $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']);
-                $bag    = new serendipity_property_bag;
-                $plugin->introspect($bag);
-
-                if ($bag->get('rewrite_active') === true) {
-
-                    // Store necessary data in our main container
-                    $serendipity['content_rewrite']['string'] = $plugin->get_config('rewrite_string');
-
-                    if ($serendipity['content_rewrite']['string'] != '') {
-                        $rewrite_from = $bag->get('rewrite_from');
-                        $serendipity['content_rewrite']['data']['rewrite_char'][$serendipity['content_rewrite']['string']] = &$plugin->get_config('rewrite_char');
-
-                        foreach($rewrite_from AS $nr => $key) {
-                            $serendipity['content_rewrite']['data']['rewrite_from'][$serendipity['content_rewrite']['string']][] = $plugin->get_config($key);
-                        }
-
-                        $rewrite_to = $bag->get('rewrite_to');
-                        foreach($rewrite_to AS $nr => $key) {
-                            $serendipity['content_rewrite']['data']['rewrite_to'][$serendipity['content_rewrite']['string']][]   = $plugin->get_config($key);
-                        }
-
-                        // We now have at least one active plugin.
-                        $serendipity['content_rewrite']['active'] = true;
-                    }
-                }
-            }
-        }
-    }
-
-    // Check if we have any plugin data needing rewrite
-    if (is_array($serendipity['content_rewrite']['data']['rewrite_from'])) {
-        foreach($serendipity['content_rewrite']['data']['rewrite_from'] AS $rewrite_string => $rewrite_values) {
-            foreach($rewrite_values AS $key => $val) {
-                if (trim($val) != '') {
-
-                    // Use the supplied rewrite string and replace the {from} and {to} values with the ones we got from the plugin
-                    $new =
-                      str_replace(
-                        array(
-                          '{from}',
-                          '{to}'
-                        ),
-
-                        array(
-                          str_replace(
-                            $serendipity['content_rewrite']['data']['rewrite_char'][$rewrite_string],
-                            '',
-                            $val
-                          ),
-
-                          $serendipity['content_rewrite']['data']['rewrite_to'][$rewrite_string][$key]
-                        ),
-
-                        $rewrite_string
-                      );
-
-                    // Build a regular expression (ungreedy, multiline) with our quoted value. $val here is the word needing the replacement
-                    $regex = '°([^\d\w])(' . preg_quote($val) . ')([^\d\w])°msU';
-
-                    // \1 and \3 are the prepend/append strings (usually whitespaces) and $new containing the new value
-                    $str   = preg_replace($regex, '\1' . $new . '\3', $str);
-                }
-            }
-        }
-    }
-
-    return $str;
-}
-
 function serendipity_markup_text($str, $entry_id = 0) {
     global $serendipity;
 
@@ -1498,9 +1419,6 @@
         );
     }
 
-    // Do some content rewrite, if necessary
-    $ret = serendipity_content_rewrite($ret);
-
     return $ret;
 }
 
@@ -1901,11 +1819,9 @@
 
     serendipity_purgeEntry($entry['id'], $entry['timestamp']);
 
-    # XXX this may not handle a previously-entered draft being made live
-    if ($serendipity['announce_entries'] &&
-        $entry['isdraft'] == 'false' &&
+    if ($entry['isdraft'] == 'false' &&
         $newEntry) {
-        serendipity_announceEntry();
+        serendipity_plugin_api::hook_event('backend_publish', $entry);
     }
 
     return (int)$entry['id'];
@@ -2104,34 +2020,16 @@
                 </td>
             </tr>
             
-<?php
-    if ($serendipity['announce_entries']) {
-?>
             <tr>
                 <td colspan="3">
                     <br />
                     <fieldset>
                         <legend><b><?php echo ADVANCED_OPTIONS; ?></b></legend>
-                        <fieldset>
-                            <legend><?php echo PING_WEBLOGS; ?></legend>
-<?php
-    $services = array('blogs' => 'blo.gs', 'blogrolling' => 'blogrolling.com', 'technorati' => 'technorati.com', 'weblogs' => 'weblogs.com', 'bloggde' => 'blogg.de', 'yahoo' => 'yahoo.com');
-    foreach($services AS $service => $service_desc) {
-        // Detect if the current checkbox needs to be saved. We use the field chk_timestamp to see,
-        // if the form has already been submitted and individual changes shall be preserved
-        $selected = (($serendipity['POST']['chk_timestamp'] && $serendipity['POST']['announce_entries_' . $service]) || (!isset($serendipity['POST']['chk_timestamp']) && $serendipity['announce_entries_' . $service])? 'checked="checked"' : '');
-?>
-                                <input style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[announce_entries_<?php echo $service; ?>]" id="serendipity[announce_entries_<?php echo $service; ?>]" value="true" <?php echo $selected; ?> />
-                                    <label style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[announce_entries_<?php echo $service; ?>]">&nbsp;&nbsp;<?php echo $service_desc; ?>&nbsp;&nbsp;</label>
 <?php
-    }
+    serendipity_plugin_api::hook_event('backend_display', $entry);
 ?>
-                    </fieldset>
                 </td>
             </tr>
-<?php
-    }
-?>
         </table>
     </form>
 <?php
@@ -2485,105 +2383,6 @@
     }
 }
 
-/**
-* Announces a new entry to any ping services that are registered.
-**/
-function serendipity_announceEntry() {
-    global $serendipity;
-
-    $services = array();
-
-    if ($serendipity['POST']['announce_entries_blogs'] == 'true') {
-        $services[] = array(
-          'host'     => 'ping.blo.gs',
-          'path'     => '/',
-          'extended' => true
-        );
-    }
-
-    if ($serendipity['POST']['announce_entries_blogrolling'] == 'true') {
-        $services[] = array(
-          'host' => 'rpc.blogrolling.com',
-          'path' => '/pinger/'
-        );
-    }
-
-    if ($serendipity['POST']['announce_entries_technorati'] == 'true') {
-        $services[] = array(
-          'host' => 'rpc.technorati.com',
-          'path' => '/rpc/ping'
-        );
-    }
-
-    if ($serendipity['POST']['announce_entries_weblogs'] == 'true') {
-        $services[] = array(
-          'host' => 'rpc.weblogs.com',
-          'path' => '/RPC2'
-        );
-    }
-
-    if ($serendipity['POST']['announce_entries_bloggde'] == 'true') {
-        $services[] = array(
-          'host' => 'xmlrpc.blogg.de',
-          'path' => '/'
-        );
-    }
-
-    if ($serendipity['POST']['announce_entries_yahoo'] == 'true') {
-        $services[] = array(
-          'host' => 'api.my.yahoo.com',
-          'path' => '/RPC2'
-        );
-    }
-
-    foreach ($services as $service => $details) {
-        printf(SENDING_PING . '...<br />', $details['host']);
-
-        # XXX append $serendipity['indexFile'] to baseURL?
-        $args = array(
-          new XML_RPC_Value(
-            $serendipity['blogTitle'],
-            'string'
-          ),
-          new XML_RPC_Value(
-            $serendipity['baseURL'],
-            'string'
-          )
-        );
-
-        if ($details['extended']) {
-            # the checkUrl: for when the main page is not really the main page
-            $args[] = new XML_RPC_Value(
-              '',
-              'string'
-            );
-
-            # the rssUrl
-            $args[] = new XML_RPC_Value(
-              $serendipity['baseURL'] . 'rss.php?version=2.0',
-              'string'
-            );
-        }
-
-        $message = new XML_RPC_Message(
-          $details['extended'] ? 'weblogUpdates.extendedPing' : 'weblogUpdates.ping',
-          $args
-        );
-
-        $client = new XML_RPC_Client(
-          $details['path'],
-          $details['host']
-        );
-
-        # 15 second timeout may not be long enough for weblogs.com
-        $result = $client->send($message, 15);
-
-        # TODO do something with the result? (do we care?)
-    }
-
-    return true;
-}
-
 function serendipity_discover_rss($name, $ext, $default = '2.0') {
     if ($name == 'atom') {
         $ver = 'atom0.3';

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.7,1.8 serendipity_lang_en.inc.php,1.6,1.7 serendipity_lang_es.inc.php,1.6,1.7

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

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

Modified Files:
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php 
Log Message:
New languag strings for event plugins, removed external plugin strings


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_de.inc.php	9 Feb 2004 14:15:01 -0000	1.7
+++ serendipity_lang_de.inc.php	9 Feb 2004 15:15:56 -0000	1.8
@@ -300,27 +300,16 @@
 @define('DO_MARKUP', 'Textformatierung(en) durchführen');
 @define('DO_MARKUP_DESCRIPTION', 'Textformatierung(en) durchführen, wie z.B. Smilies, Schnellformatierung via *, /, _, ...). Dadurch wird jeglicher eingegebener HTML-Code beibehalten. Standardmäßig sind Textformatierungen aktiviert.');
 @define('AUTOMATIC_LOGIN', 'Daten speichern');
-@define('RECENTENTRIES_PLUGIN_TITLE', 'Aktuelle Einträge');
-@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Zeigt die Titel der aktuellsten Einträge mit Datum');
-@define('RECENTENTRIES_PLUGIN_NUMBER', 'Anzahl der Einträge');
-@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'Wieviele Einträge sollen angezeigt werden? (Standard: 10)');
-@define('COMMENTS_PLUGIN_BLAHBLAH', 'Zeigt die letzten Kommentare');
-@define('COMMENTS_PLUGIN_WORDWRAP', 'Zeilenumbruch');
-@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'Nach wievielen Wörtern soll ein Zeilenumbruch eingefügt werden? (Standard: 30)');
-@define('COMMENTS_PLUGIN_MAXCHARS', 'Zeichen pro Kommentar');
-@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'Wieviele Zeichen sollen pro Kommentar gezeigt werden? (Standard: 120)');
-@define('COMMENTS_PLUGIN_MAXENTRIES', 'Anzahl an Kommentaren');
-@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'Wieviele Kommentare sollen gezeigt werden? (Standard: 15)');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Datumsformat');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Das Datumsformat des Eintrages, mithilfe von PHPs strftime() Variablen. (Standard: "%s")');
 @define('GENERAL_PLUGIN_LANGUAGE', 'Anzeigesprache');
 @define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'In welcher Sprache soll das Datum formatiert werden? ("en|de", Standard "en")');
 @define('ERROR_TEMPLATE_FILE', 'Die Templatedatei konnte nicht geöffnet werden, bitte die serendipity-Version aktualisieren!');
 @define('ADVANCED_OPTIONS', 'Erweiterte Optionen');
-@define('PING_WEBLOGS', 'Einträge ankündigen (via XML-RPC ping) bei:');
-@define('SENDING_PING', 'Sende XML-RPC ping zu %s');
 @define('EDIT_ENTRY', 'Eintrag bearbeiten');
 @define('HTACCESS_ERROR', 'Um die Webserverkonfiguration zu testen benötigt serendipity die Möglichkeit, die Datei ".htaccess" zu erstellen. Das aufgrund von rechteproblemen nicht möglich. Bitte passen sie die Rechte wie folgt an: <br />&nbsp;&nbsp;%s<br />und laden Sie diese Seite neu.');
+@define('SIDEBAR_PLUGINS', 'Seitenleisten Plugins');
+@define('EVENT_PLUGINS', 'Ereignis Plugins');
 @define('SYNCING', 'Synchronsizere Datenbank mit Bilder-Ordner');
 @define('SYNC_DONE', 'Fertig (%s Bilder synchronisiert).');
  

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang_en.inc.php	8 Feb 2004 17:56:28 -0000	1.6
+++ serendipity_lang_en.inc.php	9 Feb 2004 15:15:56 -0000	1.7
@@ -302,27 +302,16 @@
 @define('ALL_CATEGORIES', 'All categories');
 @define('DO_MARKUP', 'Perform Markup Transformations');
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text. Default is "Yes".');
-@define('RECENTENTRIES_PLUGIN_TITLE', 'Recent Entries');
-@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Shows the titles and dates of the most recent entries');
-@define('RECENTENTRIES_PLUGIN_NUMBER', 'Number of entries');
-@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'How many entries should be displayed? (Default: 10)');
-@define('COMMENTS_PLUGIN_BLAHBLAH', 'Displays the last comments to your entries');
-@define('COMMENTS_PLUGIN_WORDWRAP', 'Wordwrap');
-@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'How many words until a wordwrap will occur? (Default: 30)');
-@define('COMMENTS_PLUGIN_MAXCHARS', 'Maximum chars per comment');
-@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'How many chars will be displayed for each comment? (Default: 120)');
-@define('COMMENTS_PLUGIN_MAXENTRIES', 'Maximum number of comments');
-@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'How many comments will be shown? (Default: 15)');
 @define('GENERAL_PLUGIN_DATEFORMAT', 'Dateformatting');
 @define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'The format of the entry\'s actual date, using PHPs strftime() variables. (Default: "%s")');
 @define('GENERAL_PLUGIN_LANGUAGE', 'Output language');
 @define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'What is your output language used for date and text formatting? ("en|de", default "en")');
 @define('ERROR_TEMPLATE_FILE', 'Unable to open template file, please update serendipity!');
 @define('ADVANCED_OPTIONS', 'Advanced Options');
-@define('PING_WEBLOGS', 'Announce entries (via XML-RPC ping) to:');
-@define('SENDING_PING', 'Sending XML-RPC ping to host %s');
 @define('EDIT_ENTRY', 'Edit entry');
 @define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br />&nbsp;&nbsp;%s<br />and reload this page.');
+@define('SIDEBAR_PLUGINS', 'Sidebar Plugins');
+@define('EVENT_PLUGINS', 'Event Plugins');
 
 /* 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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang_es.inc.php	9 Feb 2004 14:15:01 -0000	1.6
+++ serendipity_lang_es.inc.php	9 Feb 2004 15:15:56 -0000	1.7
@@ -300,6 +300,8 @@
 @define('NEXT_PAGE', 'Pagina siguiente');
 @define('ALL_CATEGORIES', 'Todas las categorías');
 @define('HTACCESS_ERROR', 'To check your local webserver installation, serendipity needs to be able to write the file ".htaccess". This was not possible because of permission errors. Please adjust the permissions like this: <br />&nbsp;&nbsp;%s<br />and reload this page.');
+@define('SIDEBAR_PLUGINS', 'Sidebar Plugins');
+@define('EVENT_PLUGINS', 'Event Plugins');
 @define('SYNCING', 'Syncronizing the database with the image folder');
 @define('SYNC_DONE', 'Done (Syncronized %s images).');
  

[php-blog-cvs] serendipity db_update-0.5-0.5.1.sql,1.1,1.2 serendipity_config_local.tpl,1.29,1.30

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

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

Modified Files:
	db_update-0.5-0.5.1.sql serendipity_config_local.tpl 
Log Message:
Introducing event plugins (see mailing list)


Index: db_update-0.5-0.5.1.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db_update-0.5-0.5.1.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update-0.5-0.5.1.sql	8 Feb 2004 17:56:27 -0000	1.1
+++ db_update-0.5-0.5.1.sql	9 Feb 2004 15:20:03 -0000	1.2
@@ -10,3 +10,11 @@
   `date` int(11) NOT NULL default '0',
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
+
+UPDATE serendipity_plugins
+   SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
+ WHERE name LIKE '%serendipity_plugin_content_rewrite%';
+
+UPDATE serendipity_config
+   SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
+ WHERE name LIKE '%serendipity_plugin_content_rewrite%';

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_config_local.tpl	2 Feb 2004 09:38:22 -0000	1.29
+++ serendipity_config_local.tpl	9 Feb 2004 15:20:03 -0000	1.30
@@ -46,14 +46,4 @@
 $serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert}';    // Full path & name of your image magick convert binary
 $serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb}';            // Thumbnails will be named original.Suffix.ext
 $serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110}';                          // Static width of auto-generated thumbnails
-
-// Pinging of Weblog Services
-# Announcement of new weblog entries
-$serendipity['announce_entries']              = '{Announce Entries|announce_entries|bool|0}';             // Do you want new entries to be announced?
-$serendipity['announce_entries_blogs']        = '{blo.gs|announce_entries_blogs|bool|0}';                 // Do you want new entries to be announced on blo.gs?
-$serendipity['announce_entries_blogrolling']  = '{blogrolling.com|announce_entries_blogrolling|bool|0}';  // Do you want new entries to be announced on blogrolling.com?
-$serendipity['announce_entries_technorati']   = '{technorati.com|announce_entries_technorati|bool|0}';    // Do you want new entries to be announced on technorati.com?
-$serendipity['announce_entries_weblogs']      = '{weblogs.com|announce_entries_weblogs|bool|0}';          // Do you want new entries to be announced on weblogs.com?
-$serendipity['announce_entries_bloggde']      = '{blogg.de|announce_entries_bloggde|bool|0}';             // Do you want new entries to be announced on blogg.de?
-$serendipity['announce_entries_yahoo']        = '{yahoo.com|announce_entries_yahoo|bool|0}';              // Do you want new entries to be announced on yahoo.com?
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_plugin_content_rewrite serendipity_plugin_content_rewrite.php,1.2,NONE

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

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

Removed Files:
	serendipity_plugin_content_rewrite.php 
Log Message:
Removed.
Superseded by serendipity_event_contentrewrite.


--- serendipity_plugin_content_rewrite.php DELETED ---

[php-blog-cvs] serendipity serendipity_plugin_api.php,1.8,1.9

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

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

Modified Files:
	serendipity_plugin_api.php 
Log Message:
Introducing event plugins (see mailing list)


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_plugin_api.php	5 Dec 2003 11:27:54 -0000	1.8
+++ serendipity_plugin_api.php	9 Feb 2004 15:21:19 -0000	1.9
@@ -49,7 +49,7 @@
      * of the same class, then the persistent state will be copied.
      * This allows the user to clone a plugin.
      */
-    function create_plugin_instance($plugin_class_id, $copy_from_instance = null)
+    function create_plugin_instance($plugin_class_id, $copy_from_instance = null, $default_placement = 'right')
     {
         global $serendipity;
 
@@ -57,15 +57,15 @@
 
         $key = $plugin_class_id . ':' . $id;
 
-        $rs = serendipity_db_query("SELECT MAX(sort_order) as sort_order_max FROM {$serendipity['dbPrefix']}plugins", true, 'num');
+        $rs = serendipity_db_query("SELECT MAX(sort_order) as sort_order_max FROM {$serendipity['dbPrefix']}plugins WHERE placement = '$default_placement'", true, 'num');
 
         if (is_array($rs)) {
             $nextidx = intval($rs[0]+1);
         } else {
             $nextidx = 0;
         }
-
-        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order) values ('$key', $nextidx)");
+        
+        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order, placement) values ('$key', $nextidx, '$default_placement')");
 
         return $key;
     }
@@ -76,9 +76,23 @@
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}plugins where name='$plugin_instance_id'");
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config  where name LIKE '$plugin_instance_id/%'");
     }
+    
+    function remove_plugin_value($plugin_instance_id, $where)
+    {
+        global $serendipity;
+        $where_sql = array();
+        foreach($where AS $key) {
+            $where_sql[] = "(name LIKE '{$plugin_instance_id}/{$key}_%' AND value = '')";
+        }
+        
+        $query = "DELETE FROM  {$serendipity['dbPrefix']}config
+                                    WHERE  " . implode(' OR ', $where_sql);
+
+        serendipity_db_query($query);
+    }
 
     /* Retrieves a list of available plugins */
-    function enum_plugin_classes()
+    function enum_plugin_classes($event_only = false)
     {
         global $serendipity;
 
@@ -92,11 +106,13 @@
             }
 
             $p = get_parent_class($class_name);
-            while ($p != 'serendipity_plugin' && $p !== false) {
+            while ($p != 'serendipity_plugin' && $p != 'serendipity_event' && $p !== false) {
                 $p = get_parent_class($p);
             }
 
-            if ($p == 'serendipity_plugin') {
+            if ($p == 'serendipity_plugin' && !$event_only ) {
+                $classes[] = '@' . $class_name;
+            } elseif ($p == 'serendipity_event' && $event_only) {
                 $classes[] = '@' . $class_name;
             }
         }
@@ -109,6 +125,14 @@
                 continue;
             }
             
+            if ($event_only && strncmp($f, 'serendipity_event_', 18) != 0) {
+                continue;
+            }
+            
+            if (!$event_only && strncmp($f, 'serendipity_event_', 18) == 0) {
+                continue;
+            }
+            
             if (file_exists($ppath . '/' . $f . '/' . $f . '.php')) {
                 $classes[] = $f;
             }
@@ -117,14 +141,18 @@
     }
 
     /* Retrieves a list of plugin instances */
-    function enum_plugins($filter = '*')
+    function enum_plugins($filter = '*', $negate = false)
     {
         global $serendipity;
 
         $sql = "SELECT * from {$serendipity['dbPrefix']}plugins ";
 
         if ($filter !== '*') {
-            $sql .= "WHERE placement='$filter' ";
+            if ($negate) {
+                $sql .= "WHERE NOT placement='$filter' ";
+            } else {
+                $sql .= "WHERE placement='$filter' ";
+            }
         }
 
         $sql .= ' ORDER BY placement, sort_order';
@@ -203,6 +231,82 @@
 
         echo "</$tagname>\n";
     }
+    
+    function get_plugin_title(&$plugin, $default_title = '')
+    {
+        global $serendipity;
+
+        // Generate plugin output. Make sure that by probing the plugin, no events are actually called. After that,
+        // restore setting of 'no_events'.
+        
+        $ne = ($serendipity['no_events'] ? TRUE : FALSE);
+        $serendipity['no_events'] = TRUE;
+        ob_start();
+        $plugin->generate_content($title);
+        ob_end_clean();
+        $serendipity['no_events'] = $ne;
+
+        if (strlen(trim($title)) == 0) {
+            if (!empty($default_title)) {
+                $title = $default_title;
+            } else {
+                $title = $plugin->instance;
+            }
+        }
+        
+        return $title;
+    }
+
+    function &get_event_plugins($instance = false) {
+        global $serendipity;
+        
+        if (!is_array($serendipity['event_plugins'])) {
+            $plugins = serendipity_plugin_api::enum_plugins('event');
+            $serendipity['event_plugins'] = array();
+
+            if (!is_array($plugins)) {
+                return false;
+            }
+
+            foreach ($plugins as $plugin_data) {
+                if ($serendipity['event_plugins'][$plugin_data['name']]['p'] =& serendipity_plugin_api::load_plugin($plugin_data['name'])) {
+                    /* query for its name, description and configuration data */
+                    $serendipity['event_plugins'][$plugin_data['name']]['b'] = new serendipity_property_bag;
+                    $serendipity['event_plugins'][$plugin_data['name']]['p']->introspect($serendipity['event_plugins'][$plugin_data['name']]['b']);
+                    $serendipity['event_plugins'][$plugin_data['name']]['t'] = serendipity_plugin_api::get_plugin_title($serendipity['event_plugins'][$plugin_data['name']]['p']);
+                }
+            }
+        }
+
+        if ($instance) {
+            if (isset($serendipity['event_plugins'][$instance]['p'])) {
+                return $serendipity['event_plugins'][$instance]['p'];
+            } else {
+                return false;
+            }
+        } else {
+            return $serendipity['event_plugins'];
+        }
+    }
+    
+    function hook_event($event_name, &$eventData) {
+        global $serendipity;
+
+        // Can be bypassed globally
+        // $serendipity['no_events'] = TRUE;
+        if (!$serendipity['no_events']) {
+            $plugins = &serendipity_plugin_api::get_event_plugins();
+            
+            if (is_array($plugins)) {
+                foreach($plugins AS $plugin => $plugin_data) {
+                    $bag = &$plugin_data['b'];
+                    $plugin_data['p']->event_hook($event_name, $plugin_data['b'], $eventData);
+                }
+            }
+        }
+        
+        return true;
+    }
 }
 
 /* holds a bunch of properties; you can have multiple
@@ -308,7 +412,7 @@
         $title = 'Sample!';
         echo     'This is a sample!';
     }
-
+    
     /* Fetches a configuration value for this plugin */
     function get_config($name, $defaultvalue = null)
     {
@@ -323,6 +427,41 @@
 
         return serendipity_set_config_var($name, $value);
     }
+
+    /* Called by serendipity after insertion of a config item. If you want to kick out certain
+     * elements based on contents, create the corresponding function here.
+     */
+    function cleanup()
+    {
+        // Cleanup. Remove all empty configs on SAVECONF-Submit.
+        // serendipity_plugin_api::remove_plugin_value($this->instance, array('title', 'description'));
+        return true;
+    }
+}
+
+class serendipity_event extends serendipity_plugin {
+    /* Events can be called on several occasions when s9y performs an action.
+     * One or multiple plugin can be registered for each of those hooks.
+     */
+
+    /* Be sure to call this method from your derived classes constructors,
+     * otherwise your config data will not be stored or retrieved correctly
+     */
+
+    function serendipity_event($instance)
+    {
+        $this->instance = $instance;
+    }
+
+    function event_hook($event, &$bag, &$eventData) {
+        // Define event hooks here, if you want you plugin to execute those instead of being a sidebar item.
+        // Look at external plugins 'serendipity_event_mailer' or 'serendipity_event_weblogping' for usage.
+        // Currently available events:
+        //   backend_publish
+        //   backend_display
+        //   frontend_display
+        return true;
+    }
 }
 
 include_once 'serendipity_sidebar_items.php';

[php-blog-cvs] serendipity/plugins/serendipity_event_contentrewrite - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite added to the repository

[php-blog-cvs] serendipity/plugins/serendipity_plugin_recententries serendipity_plugin_recententries.php,1.1,1.2

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

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

Modified Files:
	serendipity_plugin_recententries.php 
Log Message:
Moved languages inside plugins


Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_plugin_recententries.php	20 Jan 2004 09:11:52 -0000	1.1
+++ serendipity_plugin_recententries.php	9 Feb 2004 15:14:39 -0000	1.2
@@ -2,11 +2,30 @@
 
 // Contributed by Christian Machmeier <cm...@re...>
 
+switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_RECENTENTRIES_TITLE', 'Aktuelle Einträge');
+        @define('PLUGIN_RECENTENTRIES_BLAHBLAH', 'Zeigt die Titel der aktuellsten Einträge mit Datum');
+        @define('PLUGIN_RECENTENTRIES_NUMBER', 'Anzahl der Einträge');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH', 'Wieviele Einträge sollen angezeigt werden? (Standard: 10)');
+        break;
+    
+    case 'en':
+    case 'es':
+    default:
+        @define('PLUGIN_RECENTENTRIES_TITLE', 'Recent Entries');
+        @define('PLUGIN_RECENTENTRIES_BLAHBLAH', 'Shows the titles and dates of the most recent entries');
+        @define('PLUGIN_RECENTENTRIES_NUMBER', 'Number of entries');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH', 'How many entries should be displayed? (Default: 10)');
+
+        break;
+}
+
 class serendipity_plugin_recententries extends serendipity_plugin {
 
     function introspect(&$propbag) {
-        $propbag->add('name',        RECENTENTRIES_PLUGIN_TITLE);
-        $propbag->add('description', RECENTENTRIES_PLUGIN_BLAHBLAH);
+        $propbag->add('name',        PLUGIN_RECENTENTRIES_TITLE);
+        $propbag->add('description', PLUGIN_RECENTENTRIES_BLAHBLAH);
         $propbag->add('configuration', array('number', 'language', 'dateformat'));
     }
 
@@ -14,8 +33,8 @@
         switch($name) {
             case 'number':
                 $propbag->add('type', 'string');
-                $propbag->add('name', RECENTENTRIES_PLUGIN_NUMBER);
-                $propbag->add('description', RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH);
+                $propbag->add('name', PLUGIN_RECENTENTRIES_NUMBER);
+                $propbag->add('description', PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH);
                 break;
 
             case 'language':
@@ -67,7 +86,7 @@
                 break;
         }
 
-        $title = RECENTENTRIES_PLUGIN_TITLE;
+        $title = PLUGIN_RECENTENTRIES_TITLE;
                 
         $entries = serendipity_db_query("SELECT id,
                                                 title,

[php-blog-cvs] serendipity/plugins/serendipity_event_mailer - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer added to the repository

[php-blog-cvs] serendipity db_update-0.5-0.5.1.sql,NONE,1.1 serendipity_functions_images.inc.php,NONE,1.1 NEWS,1.62,1.63 serendipity_admin_image_selector.php,1.14,1.15 serendipity_admin_images.inc.php,1.13,1.14 serendipity_entries.php,1.21,1.22 serendipity_functions.inc.php,1.199,1.200

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

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

Modified Files:
	NEWS serendipity_admin_image_selector.php 
	serendipity_admin_images.inc.php serendipity_entries.php 
	serendipity_functions.inc.php 
Added Files:
	db_update-0.5-0.5.1.sql serendipity_functions_images.inc.php 
Log Message:
Image-Sync functions.
Move image records into database for better handling
Clean up image functions, move them to a new functions file

Please test and remember to run db_update-0.5-0.5.1.sql


--- NEW FILE: db_update-0.5-0.5.1.sql ---
CREATE TABLE `serendipity_images` (
  `id` int(11) NOT NULL auto_increment,
  `name` varchar(255) NOT NULL default '',
  `extension` varchar(5) NOT NULL default '',
  `mime` varchar(15) NOT NULL default '',
  `size` int(11) NOT NULL default '0',
  `dimensions_width` int(11) NOT NULL default '0',
  `dimensions_height` int(11) NOT NULL default '0',
  `thumbnail_name` varchar(255) NOT NULL default '',
  `date` int(11) NOT NULL default '0',
  PRIMARY KEY  (`id`)
) TYPE=MyISAM;

--- NEW FILE: serendipity_functions_images.inc.php ---
<?php


/**
* Get a list of images
**/
function serendipity_fetchImagesFromDatabase($start = 0, $limit=0, &$total) {
    global $serendipity;
    $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images ORDER BY date DESC", false, 'assoc');
    if ( !is_array($rs) ) {
        return array();
    }

    $total = sizeof($rs)+1;
    if ( $limit > 0 ) {
        $rs = @array_slice($rs, $start, $limit);
    }
    return $rs;
}

function serendipity_fetchImageFromDatabase($id) {
    global $serendipity;
    $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images WHERE id = ". $id, true, 'assoc');
    return $rs;
}
function serendipity_updateImageInDatabase($updates, $id) {
    global $serendipity;
    $i=0;
    if ( sizeof($updates) > 0 ) {
        foreach ( $updates as $k => $v ) {
            $q[] = $k ." = '". $v ."'";
        }
        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images SET ". implode($q, ',') ." WHERE id = ". $id);
        $i++;
    }
    return $i;
}

function serendipity_deleteImage($id) {
    global $serendipity;
    $file = serendipity_fetchImageFromDatabase($id);
    $dFile = $file['name'] .'.'. $file['extension'];
    $dThumb = $file['name'] .'.'. $file['thumbnail_name'] .'.'. $file['extension'];

    if ( file_exists($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dFile) ) {
        if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dFile) ) {
            printf(DELETE_IMAGE . '<br />', $dFile);
        } else {
            printf(DELETE_IMAGE_FAIL . '<br />', $dFile);
        }

        if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $dThumb) ) {
            printf(DELETE_THUMBNAIL . '<br />', $dThumb);
        }
    } else {
        printf(FILE_NOT_FOUND, $dFile);
    }
    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}images WHERE id = ". $id);
}

/**
* Get a list of images
**/
function serendipity_fetchImages($group = false, $start = 0, $end = 20) {
    global $serendipity;

    // Open directory
    $images = array();
    if ($dir = @opendir($serendipity['serendipityPath'] . $serendipity['uploadPath'])) {
        while(false !== ($f = readdir($dir))) {
            if ($f != '.' && $f != '..' && strpos($f, $serendipity['thumbSuffix']) === false) {
                array_push($images, $f);
            }
        }
    }
    natsort($images);

    /* BC */
    $serendipity['imageList'] = $images;
    return $images;

}

function serendipity_insertImageInDatabase($filename, $extension, $mimetype, $filesize, $width, $height, $thumbnail, $date) {
    global $serendipity;
    $sql = serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}images
                                    (name, extension, mime, size, dimensions_width, dimensions_height, thumbnail_name, date)
                                    VALUES('". $filename ."', '". $extension ."', '". $mimetype ."', ". $filesize .", ". $width.", ". $height .", '". $thumbnail ."', ". $date .")");
    return true;
}


/**
* Generate a thumbnail
**/
function serendipity_makeThumbnail($file, $size=false) {
    global $serendipity;

    if ($size===false) {
        $size = $serendipity['thumbSize'];
    }

    // Calculate name of thumbnail
    $t = serendipity_parseFileName($file);
    $f = $t[0];
    $suf = $t[1];

    $infile  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file;
    $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f . '.' . $serendipity['thumbSuffix'] . '.' . $suf;
    $fdim = getimagesize($infile);

    if ( !isset($fdim['mime']) ) {
       $fdim['mime'] = serendipity_guessMime($infile);
    }

    if ($serendipity['magick'] !== true) {
        $r = serendipity_resize_image_gd($infile, $outfile, $size);
    } else {

            /*if ($serendipity["dim"] == "height") $newSize = "*x".$serendipity["thumbSize"];
            else $newSize = $serendipity["thumbSize"]."x*"; */
        $newSize = $size . 'x' . $size;
        $r = array($size, $size);
        $cmd     = $serendipity['convert'] . " -antialias -scale $newSize $infile $outfile  2>&1";
        $res     = `$cmd`;
    }

    /* Lets assume we are all done, now we add the image to the image database */
    serendipity_insertImageInDatabase($f, $suf, $fdim['mime'], filesize($infile), $fdim[0], $fdim[1], $serendipity['thumbSuffix'], time());

    return $res;
}

/**
*  Scale an image (ignoring proportions)
**/
function serendipity_scaleImg($id, $width, $height) {
    global $serendipity;
    
    $file = serendipity_fetchImageFromDatabase($id);
    $infile = $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] .'.'. $file['extension'];

    if($serendipity['magick'] !== true) {
        serendipity_resize_image_gd($infile, $outfile, $width, $height);
    }

    $cmd = $serendipity['convert'] . ' -scale ' .  $width . 'x' . $height . ' ' . $infile . ' ' . $outfile;
    $res = `$cmd`;

    serendipity_updateImageInDatabase(array('dimensions_width' => $width, 'dimensions_height' => $height), $id);
    return;
}

/**
* Creates thumbnails for all images in the upload dir
**/
function serendipity_generateThumbs() {
    global $serendipity;

    $i=0;
    $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total);
    
    foreach ( $serendipity['imageList'] as $k => $file ) {
        $filename = $file['name'] .'.'. $file['extension'];
        $ffull = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $filename;
        $fdim = @getimagesize($ffull);
        $oldThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] .'.'. $file['thumbnail_name'] .'.'. $file['extension'];
        $newThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] .'.'. $serendipity['thumbSuffix'] .'.'. $file['extension'];

        if (!file_exists($oldThumb) && !file_exists($newThumb) && ($fdim[0] > $serendipity['thumbSize'] || $fdim[1] > $serendipity['thumbSize'])) {
            printf(RESIZE_BLAHBLAH, $filename . ': ' . serendipity_makeThumbnail($filename));
            $i++;
        } elseif (!file_exists($oldThumb)  && !file_exists($newThumb) && $fdim[0] < $serendipity['thumbSize'] && $fdim[1] < $serendipity['thumbSize']) {
            $res = copy ($ffull, $newThumb);
            if (@$res === true) {
                printf(THUMBNAIL_USING_OWN . '<br />', $filename);
            } else {
                printf('<span style="color: #ff0000">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename);
            }
        }
    }

    return $i;
}

function serendipity_guessMIME($extension) {
    switch ( $extension ) {
    
    }

    return $mime;
}

/**
* Creates thumbnails for all images in the upload dir
**/
function serendipity_syncThumbs() {
    global $serendipity;

    $i=0;
    $files = serendipity_fetchImages();
    for($x=0; $x<count($files); $x++) {
        $update = $q = array();
        $f = serendipity_parseFileName($files[$x]);
        $ffull = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x];
        $fthumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
        $fdim = getimagesize($ffull);

        if ( !isset($fdim['mime']) ) {
            $fdim['mime'] = serendipity_guessMime($f[1]);
        }
        
        $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images 
                                                        WHERE name = '$f[0]' 
                                                            AND mime = '$fdim[mime]'", true, 'assoc');
        if ( is_array($rs) ) {
            $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $rs['name'] . '.' . $rs['thumbnail_name'] . '.' . $rs['extension'];
            if ( $rs['dimensions_width'] != $fdim[0] ) {
                $update['dimensions_width'] = $fdim[0];
            }
            if ( $rs['dimensions_height'] != $fdim[1] ) {
                $update['dimensions_height'] = $fdim[1];
            }
            if ( $rs['size'] != filesize($ffull) ) {
                $update['size'] = filesize($ffull);
            }
            if ( !file_exists($checkfile) && file_exists($fthumb) ) {
                $update['thumbnail_name'] = $serendipity['thumbSuffix'];
            }

            /* Do the database update, if needed */
            serendipity_updateImageInDatabase($update, $rs['id']);
            if ( sizeof($update) != 0 ) { $i++; }

        } else {
            if ( file_exists($fthumb) ) {
                $thumbnail = $serendipity['thumbSuffix'];
            }
            serendipity_insertImageInDatabase($f[0], $f[1], $fdim['mime'], filesize($ffull), $fdim[0], $fdim[1], $thumbnail, filemtime($ffull));
            $i++;
        }
    }
    return $i;
}

function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newheight=null)
{
    if (!function_exists('imagecopyresampled')) {
        return false;
    }

    $inf = pathinfo(strtolower($infilename));
    switch ($inf['extension']) {
        case 'gif':
            $loadfn = 'imagecreatefromgif';
            $savefn = 'imagegif';
            break;

        case 'jpeg':
        case 'jpg':
        case 'jfif':
            $loadfn = 'imagecreatefromjpeg';
            $savefn = 'imagejpeg';
            break;

        case 'png':
            $loadfn = 'imagecreatefrompng';
            $savefn = 'imagepng';
            break;

        default:
            return false;
    }

    /* If our loader does not exist, we are doomed */
    if ( !function_exists($loadfn) ) {
        return false;
    }

    /* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG */
    if ( !function_exists($savefn) ) {
        if ( function_exists('imagepng') ) {
            $savefn = 'imagepng';
        } else {
            return false;
        }
    }

    $in = $loadfn($infilename);
    /* todo: Never - ever - enlarge an original image */
    if (is_null($newheight)) {
        $newheight = (imagesy($in) / imagesx($in)) * $newwidth;
    }
    $out = imagecreatetruecolor($newwidth, $newheight);
    imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, imagesx($in), imagesy($in));
    $savefn($out, $outfilename);
    $out = null;
    $in  = null;

    return array($newwidth, $newheight);
}

function serendipity_displayImageList($start = 0, $end = 10, $lineBreak=NULL, $manage=false, $url=NULL) {
    global $serendipity;

    $serendipity['imageList'] = serendipity_fetchImagesFromDatabase($start, $end, $totalImages);
    $inc   = $end - $start;
    
    if ( isset($serendipity['GET']['adminModule']) ) {
        $extraParems = 'serendipity[adminModule]='. $serendipity['GET']['adminModule'] .'&';
    }

    $left = '<input type="button" value="&lt;&lt;&lt;" onclick="location.href=\'?'. $extraParems .'serendipity[start]=' . ($start-$end) . '\';" '. (($start <= 0) ? 'disabled' : '') .'>' . "\n";
    $right = '<input type="button" value="&gt;&gt;&gt;" onclick="location.href=\'?'. $extraParems .'serendipity[start]=' . ($start+$end) . '\';" '. (($totalImages < $start+$end) ? 'disabled' : '') .'>' . "\n";
    if ( is_null($lineBreak) ) {
        $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));
    }
?>
<table border="0" width="100%">
    <tr>
        <td align="left" colspan="<?php echo floor($lineBreak/2); ?>">
            <?php echo $left; ?>
        </td>

        <td align="right" colspan="<?php echo ceil($lineBreak/2); ?>">
            <?php echo $right; ?>
        </td>
    </tr>

    <tr>
<?php
        foreach ( $serendipity['imageList'] as $k => $file ) {
            ++$x; $preview = '';
            $i      = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $file['name'] .'.'. $file['thumbnail_name'] .'.'. $file['extension']);
            $imgsrc = $serendipity['uploadHTTPPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];

            if (file_exists($imgsrc)) {
                $preview .= '<img src="' . $imgsrc . '" border="0"'. (( $manage) ? '' : '') .' alt="'. $file['name'] . '" />';
                if ( $url ) { $preview = '<a href="'.$url.'&serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
            }
?>
                <td class="serendipity_admin_list_item" nowrap="nowrap" align="center" valign="bottom">
<?php echo $preview; ?>
<?php if ( $manage ) { ?>
<table border="0" width="100%" style="border-bottom: 1px solid #000000">
    <tr>
        <td valign="middle"><font size="1">Org: <?php echo $file['dimensions_width'] . 'x' . $file['dimensions_height']; ?><br>Thumb: <?php echo $i[0] . 'x' . $i[1]; ?></font></td>
        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_FULLSIZE; ?>" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo ($file['dimensions_height'] + 20); ?>,width=<?php echo ($file['dimensions_width'] + 20); ?>,toolbar=no,menubar=no,location=no');" /></td>
        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RENAME; ?>"   alt="<?php echo IMAGE_RENAME; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png"  border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_DELETE; ?>"   alt="<?php echo IMAGE_DELETE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
    </tr>
</table>
<?php } ?>
                </td>

<?php
        // Newline?
        if ($x%$lineBreak == 0) {
?>
    </tr>
    <tr>
<?php
        }
    }
?>
    </tr>
    <tr>
        <td align="left" colspan="<?php echo floor($lineBreak/2); ?>">
            <?php echo $left; ?>
        </td>

        <td align="right" colspan="<?php echo ceil($lineBreak/2); ?>">
            <?php echo $right; ?>
        </td>
    </tr>
</table>
<?php
}
?>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- NEWS	8 Feb 2004 12:06:05 -0000	1.62
+++ NEWS	8 Feb 2004 17:56:27 -0000	1.63
@@ -2,6 +2,8 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Redesigned image manager (tomsommer)
+    * Added image syncronization with database (tomsommer)
     * Fix leaking draft entries by directly entering URL or using quicksearch (garvinhicking)
     * Now able to use CommentAPI to post entries to an RSS/Atom feed, like from RSS Bandit (garvinhicking)
 

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_admin_image_selector.php	11 Nov 2003 16:17:04 -0000	1.14
+++ serendipity_admin_image_selector.php	8 Feb 2004 17:56:27 -0000	1.15
@@ -20,72 +20,6 @@
     die(HAVE_TO_BE_LOGGED_ON);
 }
 
-function serendipity_displayImageList($start = 0, $end = 20) {
-    global $serendipity;
-
-    serendipity_fetchImages(true);
-    $inc   = $end - $start;
-    $files = array_slice($serendipity['imageList'], $start, $inc);
-
-    if ($start > 0) {
-        $left = '<input type="button" value="&lt;&lt;&lt;" onclick="location.href=\'?serendipity[start]=' . max(0, $start - $inc) . '&serendipity[end]=' . $start . '\';">' . "\n";
-    }
-
-    if (count($serendipity["imageList"]) > $end) {
-        $right = '<input type="button" value="&gt;&gt;&gt;" onclick="location.href=\'?serendipity[start]=' . $end . '&serendipity[end]=' . ($end + $inc) . '\';">' . "\n";
-    }
-
-    $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));
-?>
-<table border="0">
-    <tr>
-        <td align="left" colspan="<?php echo floor($linebreak/2); ?>">
-            <?php echo $left; ?>
-        </td>
-
-        <td align="right" colspan="<?php echo ceil($linebreak/2); ?>">
-            <?php echo $right; ?>
-        </td>
-    </tr>
-
-    <tr>
-<?php
-    for ($x=0; $x<count($files); $x++) {
-        // Parse filename and image info
-        $f      = serendipity_parseFileName($files[$x]);
-        $i      = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $files[$x]);
-        $imgsrc = $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        // Display thumbnails
-?>
-        <td height="<?php echo $serendipity['thumbSize']; ?>" align="center" valign="middle">
-            <a href="?serendipity[step]=1&amp;serendipity[image]=<?php echo $files[$x]; ?>">
-                <img src="<?php echo $imgsrc; ?>" hspace="15" border="0" />
-            </a>
-        </td>
-<?php
-        // Newline?
-        if (($x+1)%$lineBreak == 0) {
-?>
-    </tr>
-    <tr>
-<?php
-        }
-    }
-?>
-    </tr>
-    <tr>
-        <td align="left" colspan="<?php echo floor($linebreak/2); ?>">
-            <?php echo $left; ?>
-        </td>
-
-        <td align="right" colspan="<?php echo ceil($linebreak/2); ?>">
-            <?php echo $right; ?>
-        </td>
-    </tr>
-</table>
-<?php
-}
-
 ?>
 <html>
     <head>
@@ -97,17 +31,17 @@
 <?php
 switch ($serendipity['GET']['step']) {
     case '1':
-        $f         = serendipity_parseFileName($serendipity["GET"]["image"]);
-        $imgsrc    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        $imgName   = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $serendipity['GET']['image'];
-        $thumbName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+        $file = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
+        $imgsrc    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $imgName   = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] .'.'. $file['extension'];
+        $thumbName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
 
 <div>
     <img align="right" src="<?php echo $imgsrc; ?>">
-    <h1><?php printf(YOU_CHOSE, $serendipity['GET']['image']); ?></h1>
+    <h1><?php printf(YOU_CHOSE, $file['name']); ?></h1>
     <p>
         <form action="#" method="GET" name="serendipity[selForm]" onSubmit="serendipity_imageSelector_done()">
             <div>
@@ -131,7 +65,7 @@
                 <br />
                 <input id="radio_islink_yes" type="radio" name="serendipity[isLink]" checked="checked" /><label for="radio_islink_yes"> <?php echo I_WANT_NO_LINK; ?><br />
                 <input id="radio_islink_no"  type="radio" name="serendipity[isLink]" /><label for="radio_islink_no"> <?php echo I_WANT_IT_TO_LINK; ?></label>
-                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
+                    <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] .'.'. $file['extension']; ?>" onfocus="value='';" /><br />
                 <br />
 
                 <input type="button" value="<?php echo BACK; ?>" onclick="history.go(-1);" />
@@ -148,7 +82,7 @@
         }
 
         if (!is_numeric($serendipity['GET']['end'])) {
-            $serendipity['GET']['end'] = $serendipity['GET']['start']+ floor(750/($serendipity['thumbSize']+20))*floor(580/($serendipity['thumbSize']+20));
+            $serendipity['GET']['end'] = 15;
         }
 ?>
     <b><?php echo SELECT_IMAGE; ?></b>
@@ -157,7 +91,7 @@
     <?php echo CLICK_IMAGE_TO_INSERT; ?>
     <br />
 
-    <?php serendipity_displayImageList($serendipity['GET']['start'], $serendipity['GET']['end']);
+    <?php serendipity_displayImageList($serendipity['GET']['start'], 8, 4, false, '?serendipity[step]=1');
 }
 ?>
 

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_admin_images.inc.php	11 Nov 2003 16:17:04 -0000	1.13
+++ serendipity_admin_images.inc.php	8 Feb 2004 17:56:27 -0000	1.14
@@ -13,136 +13,37 @@
     die ("Don't hack!");
 }
 
-function serendipity_displayImageList($start = 0, $end = 20) {
-    global $serendipity;
-
-    serendipity_fetchImages(true);
-    $inc = $end - $start;
-    $files = @array_slice($serendipity['imageList'], $start, $inc);
-
-    if ($start > 0) {
-        $left  = '<input type="button" value="&lt;&lt;&lt;" onclick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . max(0, $start - $inc) . '&end=' . $start . '\';" />' . "\n";
-    }
-
-    if (count($serendipity["imageList"]) > $end) {
-        $right = '<input type="button" value="&gt;&gt;&gt;" onclick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . $end . '&end=' . ($end + $inc) . '\';" />' . "\n";
-    }
-?>
-    <script type="text/javascript" language="javascript">
-    <!--
-        function rename(fname) {
-            if(newname = prompt('<?php echo ENTER_NEW_NAME; ?>' + fname, fname)) {
-                location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[oldname]='+ escape(fname) + '&serendipity[newname]='+ escape(newname);
-            }
-        }
-    //-->
-    </script>
-
-    <div class="serendipity_admin_list">
-        <div class="serendipity_admin_list_title"><?php echo IMAGE_MANAGER; ?></div>
-
-        <table class="serendipity_admin_list">
-            <tr>
-                <td align="left" colspan="2">
-                    <?php echo $left; ?>
-                </td>
-
-                <td align="right" colspan="2">
-                    <?php echo $right; ?>
-                </td>
-            </tr>
-
-            <tr>
-<?php
-    for ($x=0; $x<count($files); $x++) {
-        // Parse filename and image info
-        $f       = serendipity_parseFileName($files[$x]);
-        $i       = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $files[$x]);
-        $_imgsrc = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        $imgsrc  = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-        if (file_exists($_imgsrc)) {
-            $preview = '<img align="left" src="' . $imgsrc . '" hspace="15" alt="" />';
-        } else {
-            $preview = '';
-        }
-?>
-                <td class="serendipity_admin_list_item" width="50%" nowrap="nowrap">
-                    <b><?php echo $files[$x]; ?></b>
-                    <br />
-
-                    <?php echo $preview; ?>
-                    <br />
-                    <?php echo $i[0] . 'x' . $i[1]; ?>
-                    <br />
+switch ($serendipity['GET']['adminAction']) {
+    case 'sync':
+        set_time_limit(0);
+        ignore_user_abort();
 
-                    <img class="serendipityImageButton" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $files[$x]; ?>','Zoom','height=<?php echo ($i[1] + 20); ?>,width=<?php echo ($i[0] + 20); ?>,toolbar=no,menubar=no,location=no');" />
-                    <img class="serendipityImageButton" alt="<?php echo IMAGE_RENAME; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo addslashes($files[$x]); ?>')" />
-             <br>
-                    <img class="serendipityImageButton" alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png"  border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
-                    <img class="serendipityImageButton" alt="<?php echo IMAGE_DELETE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
-                </td>
-<?php
-        // Linebreak?
-        if (($x+1)%2 == 0) {
-?>
-            </tr>
-            <tr>
-<?php
-        }
-    }
-?>
-            </tr>
+        echo '<p><b>' . SYNCING . '</b><br /><br />';
+        flush();
 
-            <tr>
-                <td align="left" colspan="2">
-                    <?php echo $left; ?>
-                </td>
+        $i = serendipity_syncThumbs();
+        printf(SYNC_DONE, $i);
 
-                <td align="right" colspan="2">
-                    <?php echo $right; ?>
-                </td>
-            </tr>
-        </table>
-    </div>
-<?php
-}
 
-switch ($serendipity['GET']['adminAction']) {
-    case 'genThumbs':
-        set_time_limit(0);
-        ignore_user_abort();
-        echo '<b>' . RESIZING . '</b><br /><br />';
+        echo '<p><b>' . RESIZING . '</b><br /><br />';
         flush();
 
         $i = serendipity_generateThumbs();
         printf(RESIZE_DONE, $i);
+
         break;
 
     case 'DoDelete':
         $file   = $serendipity['GET']['fname'];
-        $fThumb = serendipity_parseFileName($file);
-        $fThumb = $fThumb[0] . '.' . $serendipity['thumbSuffix'] . '.' . $fThumb[1];
-        if ( file_exists($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
-            if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
-                printf(DELETE_IMAGE . '<br />', $file);
-            } else {
-                printf(DELETE_IMAGE_FAIL . '<br />', $file);
-            }
-
-            if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $fThumb) ) {
-                printf(DELETE_THUMBNAIL . '<br />', $fThumb);
-            }
-        } else {
-            printf(FILE_NOT_FOUND, $file);
-        }
+        serendipity_deleteImage($serendipity['GET']['fid']);
         break;
 
     case 'delete':
-        $file     = $serendipity['GET']['fname'];
+        $file     = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
         $abortLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_entries.php?serendipity[adminModule]=images';
-        $newLoc   = $abortLoc . '&serendipity[adminAction]=DoDelete&serendipity[fname]=' . $file;
+        $newLoc   = $abortLoc . '&serendipity[adminAction]=DoDelete&serendipity[fid]=' . $serendipity['GET']['fid'];
 
-        printf(ABOUT_TO_DELETE_FILE, $file);
+        printf(ABOUT_TO_DELETE_FILE, $file['name'] .'.'. $file['extension']);
 ?>
     <form method="get" name="delete_image">
         <div>
@@ -155,22 +56,18 @@
         break;
 
     case 'rename':
-        $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['oldname'];
-        $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'];
-
-        if ($serendipity['GET']['oldname'] != '' && $serendipity['GET']['newname']!= '' &&
-             file_exists($oldfile) &&
-            !file_exists($newfile)) {
-
+        $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
+        $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $file['extension'];
+        $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension']; 
+        if ( $serendipity['GET']['newname']!= '' && file_exists($oldfile) && !file_exists($newfile) ) {
             // Rename file
             rename($oldfile, $newfile);
 
             // Rename thumbnail
-            $f = serendipity_parseFileName($serendipity['GET']['oldname']);
-            $f2= serendipity_parseFileName($serendipity['GET']['newname']);
-            rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $f[0] . '.' . $serendipity['thumbSuffix'] . '.' .  $f[1],
-                    $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f2[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f2[1]);
+            rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] .  $file['name'] . '.' . $file['thumbnail_name'] . '.' .  $file['extension'],
+                    $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $serendipity['thumbSuffix'] . '.' . $file['extension']);
 
+            serendipity_updateImageInDatabase(array('thumbnail_name' => $serendipity['thumbSuffix'], 'name' => $serendipity['GET']['newname']), $serendipity['GET']['fid']);
             // Forward user to overview (we don't want the user's back button to rename things again)
 ?>
     <script language="javascript" type="text/javascript">
@@ -273,28 +170,28 @@
     break;
 
     case 'scale':
+        $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
         printf(
           SCALING_IMAGE . '<br />',
 
-          $serendipity['GET']['fname'],
+          $file['name'] .'.'. $file['extension'],
           $serendipity['GET']['width'],
           $serendipity['GET']['height']
         );
 
-        echo serendipity_scaleImg($serendipity['GET']['fname'], $serendipity['GET']['width'], $serendipity['GET']['height']) . '<br />';
+        echo serendipity_scaleImg($serendipity['GET']['fid'], $serendipity['GET']['width'], $serendipity['GET']['height']) . '<br />';
         echo DONE . '<br />';
-
         // Forward user to overview (we don't want the user's back button to rename things again)
 ?>
     <script language="javascript" type="text/javascript">
-        location.href="?serendipity[adminModule]=images";
+       // location.href="?serendipity[adminModule]=images";
     </script>
 <?php
         break;
 
     case 'scaleSelect':
-        $f = serendipity_parseFileName($serendipity['GET']['fname']);
-        $s = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $serendipity['GET']['fname']);
+        $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
+        $s = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $file['name'] .'.'. $file['extension']);
 ?>
     <script type="text/javascript" language="javascript">
     <!--
@@ -330,7 +227,7 @@
 
             <input type="hidden" name="serendipity[adminModule]" value="images" />
             <input type="hidden" name="serendipity[adminAction]" value="scale" />
-            <input type="hidden" name="serendipity[fname]"       value="<?php echo $serendipity["GET"]["fname"]; ?>" />
+            <input type="hidden" name="serendipity[fid]"         value="<?php echo $serendipity["GET"]["fid"]; ?>" />
 
             <input type="text" size="4" name="serendipity[width]"   onchange="rescale('width' , value);" value="<?php echo $s[0]; ?>" />x
             <input type="text" size="4" name="serendipity[height]"  onchange="rescale('height', value);" value="<?php echo $s[1]; ?>" />
@@ -343,15 +240,28 @@
         </div>
     </form>
 
-    <img src="<?php echo $serendipity['uploadHTTPPath'] . $serendipity['GET']['fname']; ?>" name="serendipityScaleImg" style="width: <?php echo $s[0]; ?>px; height: <?php echo $s[1]; ?>px;" alt="" />
+    <img src="<?php echo $serendipity['uploadHTTPPath'] . $file['name'] .'.'. $file['extension'] ; ?>" name="serendipityScaleImg" style="width: <?php echo $s[0]; ?>px; height: <?php echo $s[1]; ?>px;" alt="" />
 <?php
         break;
 
     default:
-        if (isset($_GET['start'])) {
-            serendipity_displayImageList($_GET['start'], $_GET['end'] ? $_GET['end'] : NULL);
+?>
+<script type="text/javascript" language="javascript">
+    <!--
+        function rename(id, fname) {
+            if(newname = prompt('<?php echo ENTER_NEW_NAME; ?>' + fname, fname)) {
+                location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[fid]='+ escape(id) + '&serendipity[newname]='+ escape(newname);
+            }
+        }
+    //-->
+    </script>
+
+
+<?php
+        if (isset($serendipity['GET']['start'])) {
+            serendipity_displayImageList($serendipity['GET']['start'], 8, 2, true);
         } else {
-            serendipity_displayImageList();
+            serendipity_displayImageList(0, 8, 2, true);
         }
 
         break;

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_entries.php	23 Jan 2004 05:50:21 -0000	1.21
+++ serendipity_entries.php	8 Feb 2004 17:56:27 -0000	1.22
@@ -73,7 +73,7 @@
                     <div class="serendipitySideBarContent">
                         &bull; <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=addSelect"><?php echo ADD_IMAGES; ?></a><br />
                         &bull; <a href="?serendipity[adminModule]=images"><?php echo MANAGE_IMAGES; ?></a><br />
-                        &bull; <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=genThumbs" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br />
+                        &bull; <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br />
                     </div>
                 </div>
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- serendipity_functions.inc.php	8 Feb 2004 12:06:05 -0000	1.199
+++ serendipity_functions.inc.php	8 Feb 2004 17:56:27 -0000	1.200
@@ -2,11 +2,13 @@
 # Copyright (c) 2003-2004, Jannis Hermanns
 # All rights reserved.  See LICENSE file for licensing details
 
+$serendipity['imageList'] = array();
 include_once("${serendipity['serendipityPath']}serendipity_db.inc.php");
 include_once("${serendipity['serendipityPath']}compat.php");
 include_once("${serendipity['serendipityPath']}serendipity_functions_config.inc.php");
 include_once("${serendipity['serendipityPath']}bundled-libs/XML/RPC.php");
-$serendipity['imageList'] = array();
+include_once("${serendipity['serendipityPath']}serendipity_functions_images.inc.php");
+
 
 function serendipity_logout() {
     $_SESSION['serendipityAuthedUser'] = false;
@@ -1933,28 +1935,6 @@
 
 
 /**
-* Get a list of images
-**/
-function serendipity_fetchImages($group = false, $start = 0, $end = 20) {
-    global $serendipity;
-
-    if (count($serendipity['imageList'])) {
-        return;
-    }
-
-    // Open directory
-    if ($dir = @opendir($serendipity['serendipityPath'] . $serendipity['uploadPath'])) {
-        while(false !== ($f = readdir($dir))) {
-            if ($f != '.' && $f != '..' && strpos($f, $serendipity['thumbSuffix']) === false) {
-                array_push($serendipity['imageList'], $f);
-            }
-        }
-    }
-
-    natsort($serendipity['imageList']);
-}
-
-/**
 * Split up a filename
 **/
 function serendipity_parseFileName($file) {
@@ -1964,142 +1944,6 @@
     return array($f, $suf);
 }
 
-function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newheight=null)
-{
-    if (!function_exists('imagecopyresampled')) {
-        return false;
-    }
-
-    $inf = pathinfo(strtolower($infilename));
-    switch ($inf['extension']) {
-        case 'gif':
-            $loadfn = 'imagecreatefromgif';
-            $savefn = 'imagegif';
-            break;
-
-        case 'jpeg':
-        case 'jpg':
-        case 'jfif':
-            $loadfn = 'imagecreatefromjpeg';
-            $savefn = 'imagejpeg';
-            break;
-
-        case 'png':
-            $loadfn = 'imagecreatefrompng';
-            $savefn = 'imagepng';
-            break;
-
-        default:
-            return false;
-    }
-
-    /* If our loader does not exist, we are doomed */
-    if ( !function_exists($loadfn) ) {
-        return false;
-    }
-
-    /* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG */
-    if ( !function_exists($savefn) ) {
-        if ( function_exists('imagepng') ) {
-            $savefn = 'imagepng';
-        } else {
-            return false;
-        }
-    }
-
-    $in = $loadfn($infilename);
-    if (is_null($newheight)) {
-        $newheight = (imagesy($in) / imagesx($in)) * $newwidth;
-    }
-    $out = imagecreatetruecolor($newwidth, $newheight);
-    imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, imagesx($in), imagesy($in));
-    $savefn($out, $outfilename);
-    $out = null;
-    $in  = null;
-
-    return 'OK!';
-}
-
-/**
-* Generate a thumbnail
-**/
-function serendipity_makeThumbnail($file, $size=false) {
-    global $serendipity;
-
-    if ($size===false) {
-        $size = $serendipity['thumbSize'];
-    }
-
-    // Calculate name of thumbnail
-    $t = serendipity_parseFileName($file);
-    $f = $t[0];
-    $suf = $t[1];
-
-    $infile  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file;
-    $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f . '.' . $serendipity['thumbSuffix'] . '.' . $suf;
-
-    if ($serendipity['magick'] !== true) {
-        return serendipity_resize_image_gd($infile, $outfile, $size);
-    }
-
-    /*if ($serendipity["dim"] == "height") $newSize = "*x".$serendipity["thumbSize"];
-    else $newSize = $serendipity["thumbSize"]."x*"; */
-    $newSize = $size . 'x' . $size;
-    $cmd     = $serendipity['convert'] . " -antialias -scale $newSize $infile $outfile  2>&1";
-    $res     = `$cmd`;
-
-    return $res;
-}
-
-/**
-*  Scale an image (ignoring proportions)
-**/
-function serendipity_scaleImg($file, $width, $height) {
-    global $serendipity;
-
-    $infile = $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file;
-
-    if($serendipity['magick'] !== true) {
-        return serendipity_resize_image_gd($infile, $outfile, $width, $height);
-    }
-
-    $cmd = $serendipity['convert'] . ' -scale ' .  $width . 'x' . $height . ' ' . $infile . ' ' . $outfile;
-    $res = `$cmd`;
-    return $res;
-}
-
-/**
-* Creates thumbnails for all images in the upload dir
-**/
-function serendipity_generateThumbs() {
-    global $serendipity;
-
-    $i=0;
-    serendipity_fetchImages();
-
-    $files = $serendipity['imageList'];
-    for($x=0; $x<count($files); $x++) {
-        $f = serendipity_parseFileName($files[$x]);
-        $fdim = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x]);
-
-        $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
-
-        if (!file_exists($checkfile) && ($fdim[0] > $serendipity['thumbSize'] || $fdim[1] > $serendipity['thumbSize'])) {
-            printf(RESIZE_BLAHBLAH, $files[$x] . ': ' . serendipity_makeThumbnail($files[$x]));
-            $i++;
-        } elseif (!file_exists($checkfile) && $fdim[0] < $serendipity['thumbSize'] && $fdim[1] < $serendipity['thumbSize']) {
-            $res = copy ($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $files[$x], $checkfile);
-            if ($res === true) {
-                printf(THUMBNAIL_USING_OWN . '<br />', $files[$x]);
-            } else {
-                printf('<span style="color: #ff0000">' . THUMBNAIL_FAILED_COPY . '</span><br />', $files[$x]);
-            }
-        }
-    }
-
-    return $i;
-}
-
 /**
 * Prints a form to enter new diary entries
 **/
@@ -2758,6 +2602,7 @@
     return $ver;
 }
 
+
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.5,1.6

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

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

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
Image-Sync functions.
Move image records into database for better handling
Clean up image functions, move them to a new functions file

Please test and remember to run db_update-0.5-0.5.1.sql


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_en.inc.php	3 Feb 2004 16:24:01 -0000	1.5
+++ serendipity_lang_en.inc.php	8 Feb 2004 17:56:28 -0000	1.6
@@ -237,6 +237,8 @@
 @define('IMAGE_MANAGER', 'Image Manager');
 @define('RESIZING', 'Resizing');
 @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>');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.198,1.199 NEWS,1.61,1.62 serendipity_admin_entries.inc.php,1.15,1.16

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

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

Modified Files:
	serendipity_functions.inc.php NEWS 
	serendipity_admin_entries.inc.php 
Log Message:
Fixed leaking draft data. Thanks, Kristian.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- serendipity_functions.inc.php	6 Feb 2004 22:36:59 -0000	1.198
+++ serendipity_functions.inc.php	8 Feb 2004 12:06:05 -0000	1.199
@@ -553,12 +553,14 @@
 /**
 * Fetches a specific entry
 **/
-function serendipity_fetchEntry($key, $val, $full = true) {
+function serendipity_fetchEntry($key, $val, $full = true, $fetchDrafts = 'false') {
     global $serendipity;
 
-    if ($full === true) {
-        $body = ', body, extended';
+    $drafts = '';
+    if ($fetchDrafts == 'false') {
+        $drafts = "AND isdraft = 'false'";
     }
+
     $querystring = "SELECT
                             *,
                             c.category_name,
@@ -573,6 +575,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND $key LIKE $val
+                            $drafts
                     LIMIT 1";
 
     return serendipity_db_query($querystring, true);
@@ -628,6 +631,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND MATCH (title,body,extended) AGAINST ('".addslashes($term)."')
+                            AND isdraft = 'false'
                     ORDER BY
                             timestamp DESC";
 

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- NEWS	6 Feb 2004 21:56:21 -0000	1.61
+++ NEWS	8 Feb 2004 12:06:05 -0000	1.62
@@ -2,6 +2,7 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Fix leaking draft entries by directly entering URL or using quicksearch (garvinhicking)
     * Now able to use CommentAPI to post entries to an RSS/Atom feed, like from RSS Bandit (garvinhicking)
 
 Version 0.5 (February 6th, 2004)

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_admin_entries.inc.php	21 Jan 2004 15:09:32 -0000	1.15
+++ serendipity_admin_entries.inc.php	8 Feb 2004 12:06:05 -0000	1.16
@@ -229,7 +229,7 @@
         break;
 
     case 'edit':
-        $entry = serendipity_fetchEntry('id', $serendipity['GET']['id']);
+        $entry = serendipity_fetchEntry('id', $serendipity['GET']['id'], 1, 1);
     default:
         serendipity_printEntryForm(
             '?',

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.197,1.198

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
The displayComments() functions always only gets entries of type 'NORMAL',
so why do we bother do display it? I found it rather disturbing to read
'NORMAL' for every comment.

(NOTE: In previous versions this was only showing $type, which was always
empty. It got introduced by jtate in
http://cvs.sourceforge.net/viewcvs.py/php-blog/serendipity/serendipity_functions.inc.php?r1=1.194&r2=1.195
and I guess it was only because it looked like a bug. If there are
objections, raise your voice)



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- serendipity_functions.inc.php	6 Feb 2004 21:56:21 -0000	1.197
+++ serendipity_functions.inc.php	6 Feb 2004 22:36:59 -0000	1.198
@@ -962,7 +962,7 @@
             <?php echo nl2br(serendipity_markup_text(serendipity_emoticate($body))); ?><br />
 
             <div class="serendipity_comment_source">
-                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a> - <?php echo $comment['type'] . ' '; ?>
+                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a> 
 <?php
         /* Link to the user's email */
         if ( !empty($comment['email']) ) {

[php-blog-cvs] serendipity/templates/default atom.css,1.2,1.3

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

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

Modified Files:
	atom.css 
Log Message:
Support CommentAPI: In the rss/atom feed a new element indicated a URL where
an aggregator/feedread can immediately POST a comment to an entry.

RSS Bandit (www.rssbandit.org) for Windows already supports that, however
kind of buggy right now.


Index: atom.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/atom.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atom.css	3 Feb 2004 16:24:01 -0000	1.2
+++ atom.css	6 Feb 2004 21:56:20 -0000	1.3
@@ -64,7 +64,7 @@
 }
 
 /* Using a single 'commentRSS' and 'comments' is used for compatibility to Opera */
-slash\:comments, wfw\:commentRss, commentRss, comments {
+slash\:comments, wfw\:commentRss, commentRss, comments, wfw\:comment, comment {
   display:none;
 }
 

[php-blog-cvs] serendipity wfwcomment.php,NONE,1.1 serendipity_functions.inc.php,1.196,1.197 NEWS,1.60,1.61

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

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

Modified Files:
	serendipity_functions.inc.php NEWS 
Added Files:
	wfwcomment.php 
Log Message:
Support CommentAPI: In the rss/atom feed a new element indicated a URL where
an aggregator/feedread can immediately POST a comment to an entry.

RSS Bandit (www.rssbandit.org) for Windows already supports that, however
kind of buggy right now.


--- NEW FILE: wfwcomment.php ---
<?php # $Id: wfwcomment.php,v 1.1 2004/02/06 21:56:21 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns
# All rights reserved.  See LICENSE file for licensing details

session_start();
include_once('serendipity_config.inc.php');

if ($_REQUEST['cid'] != '' && $HTTP_RAW_POST_DATA != '') {
    $comment = array();
    
    if (!preg_match('@<author[^>]*>(.*)</author[^>]*>@i', $HTTP_RAW_POST_DATA, $name)) {
        preg_match('@<dc:creator[^>]*>(.*)</dc:creator[^>]*>@i', $HTTP_RAW_POST_DATA, $name);
    }
    
    if (isset($name[1]) && !empty($name[1])) {
        if (preg_match('@^(.*)\((.*)\)@i', $name[1], $names)) {
            $comment['name'] = $names[2];
            $comment['email'] = $names[1];
        } else {
            $comment['name'] = $names[1];
        }
    }
    
    if (preg_match('@<link[^>]*>(.*)</link[^>]*>@i', $HTTP_RAW_POST_DATA, $link)) {
        $comment['url'] = $link[1];
    }
    
    if (preg_match('@<description[^>]*>(.*)</description[^>]*>@ims', $HTTP_RAW_POST_DATA, $description)) {
        if (preg_match('@^<!\[CDATA\[(.*)\]\]>@ims', $description[1], $cdata)) {
            $comment['comment'] = $cdata[1];
        } else {
            $comment['comment'] = $description[1];
        }
        
        if (!empty($comment['comment'])) {
            serendipity_saveComment($_REQUEST['cid'], $comment, 'NORMAL');
        }
    }
}
?>
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- serendipity_functions.inc.php	3 Feb 2004 23:24:49 -0000	1.196
+++ serendipity_functions.inc.php	6 Feb 2004 21:56:21 -0000	1.197
@@ -1256,6 +1256,7 @@
     <issued><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued>
     <created><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created>
     <modified><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></modified>
+    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
 
 <?php
                     if ($comments === false) {
@@ -1289,6 +1290,7 @@
 ?>
     <category><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></category>
     <comments><?php echo $guid; ?></comments>
+    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
 <?php
                     if ($comments === false) {
 ?>
@@ -1328,6 +1330,7 @@
     <dc:creator><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator>
     <dc:subject><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></dc:subject>
     <dc:date><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></dc:date>
+    <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
 <?php
                     if ($comments === false) {
 ?>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- NEWS	6 Feb 2004 14:39:12 -0000	1.60
+++ NEWS	6 Feb 2004 21:56:21 -0000	1.61
@@ -2,7 +2,7 @@
 
 Version 0.5.1 ()
 ------------------------------------
-
+    * Now able to use CommentAPI to post entries to an RSS/Atom feed, like from RSS Bandit (garvinhicking)
 
 Version 0.5 (February 6th, 2004)
 ------------------------------------

[php-blog-cvs] serendipity NEWS,1.59,1.60

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

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

Modified Files:
	NEWS 
Log Message:
0.5 is out the door. Hopefully for good. ;)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- NEWS	4 Feb 2004 20:27:17 -0000	1.59
+++ NEWS	6 Feb 2004 14:39:12 -0000	1.60
@@ -4,7 +4,7 @@
 ------------------------------------
 
 
-Version 0.5 ()
+Version 0.5 (February 6th, 2004)
 ------------------------------------
     * Fixed bug not showing comment or entry admin-tools on apparently static pages (garvinhicking, tomsommer)
     * RSS 1.0 feed supported (garvinhicking)

[php-blog-cvs] serendipity NEWS,1.54.2.4,1.54.2.5 index.php,1.28.2.2,1.28.2.3

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

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

Modified Files:
      Tag: branch-0-5
	NEWS index.php 
Log Message:
MFH, Release date


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.54.2.4
retrieving revision 1.54.2.5
diff -u -d -r1.54.2.4 -r1.54.2.5
--- NEWS	4 Feb 2004 20:55:55 -0000	1.54.2.4
+++ NEWS	6 Feb 2004 14:13:05 -0000	1.54.2.5
@@ -1,6 +1,6 @@
 # $Id$
 
-Version 0.5 ()
+Version 0.5 (February, 6th 2004)
 ------------------------------------
     * Fixed bug not showing comment or entry admin-tools on apparently static pages (garvinhicking, tomsommer)
     * RSS 1.0 feed supported (garvinhicking)

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -d -r1.28.2.2 -r1.28.2.3
--- index.php	4 Feb 2004 20:13:41 -0000	1.28.2.2
+++ index.php	6 Feb 2004 14:13:06 -0000	1.28.2.3
@@ -85,6 +85,7 @@
                                  'WHERE id=' . serendipity_db_escape_string($id), true);
     $title = $title[0];
 
+    $serendipity['blogSubTitle'] = $serendipity['blogTitle'];
     $serendipity['blogTitle'] = $title;
 
     ob_start();

[php-blog-cvs] serendipity index.php,1.30,1.31

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

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

Modified Files:
	index.php 
Log Message:
Print blogname as subtitle on entries


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- index.php	4 Feb 2004 20:13:42 -0000	1.30
+++ index.php	5 Feb 2004 17:38:06 -0000	1.31
@@ -84,6 +84,7 @@
                                  'WHERE id=' . serendipity_db_escape_string($id), true);
     $title = $title[0];
 
+    $serendipity['blogSubTitle'] = $serendipity['blogTitle'];
     $serendipity['blogTitle'] = $title;
 
     ob_start();

[php-blog-cvs] serendipity NEWS,1.54.2.3,1.54.2.4

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

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

Modified Files:
      Tag: branch-0-5
	NEWS 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.54.2.3
retrieving revision 1.54.2.4
diff -u -d -r1.54.2.3 -r1.54.2.4
--- NEWS	4 Feb 2004 19:12:25 -0000	1.54.2.3
+++ NEWS	4 Feb 2004 20:55:55 -0000	1.54.2.4
@@ -1,7 +1,8 @@
 # $Id$
 
-Version 0.5 (February 4th, 2004)
+Version 0.5 ()
 ------------------------------------
+    * Fixed bug not showing comment or entry admin-tools on apparently static pages (garvinhicking, tomsommer)
     * RSS 1.0 feed supported (garvinhicking)
     * Redirection after a comment has been added to prevent users refreshing a page and double-submitting. (garvinhicking)
     * Fixed RSS feed to only show comments when they are associated with an entry_id (garvinhicking)