php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.11.2.3,1.11.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_statistics.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -d -r1.11.2.3 -r1.11.2.4
--- serendipity_event_statistics.php	28 Oct 2004 20:17:32 -0000	1.11.2.3
+++ serendipity_event_statistics.php	29 Oct 2004 11:02:37 -0000	1.11.2.4
@@ -119,6 +119,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_STATISTICS_NAME);
         $propbag->add('description',   PLUGIN_EVENT_STATISTICS_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
             'backend_sidebar_entries' => true,
             'backend_sidebar_entries_event_display_statistics' => true
@@ -475,4 +478,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.4.2.21,1.4.2.22

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_spamblock.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.4.2.21
retrieving revision 1.4.2.22
diff -u -d -r1.4.2.21 -r1.4.2.22
--- serendipity_event_spamblock.php	28 Oct 2004 20:17:25 -0000	1.4.2.21
+++ serendipity_event_spamblock.php	29 Oct 2004 11:02:37 -0000	1.4.2.22
@@ -116,6 +116,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_SPAMBLOCK_TITLE);
         $propbag->add('description',   PLUGIN_EVENT_SPAMBLOCK_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
@@ -513,4 +516,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_mailer serendipity_event_mailer.php,1.5.2.2,1.5.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_mailer.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- serendipity_event_mailer.php	29 Oct 2004 09:34:03 -0000	1.5.2.2
+++ serendipity_event_mailer.php	29 Oct 2004 11:02:36 -0000	1.5.2.3
@@ -34,6 +34,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_MAILER_NAME);
         $propbag->add('description',   PLUGIN_EVENT_MAILER_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Sebastian Nohn, Kristian Köhntopp, Garvin Hicking');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
             'backend_publish' => true
         ));
@@ -114,4 +117,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_s9ymarkup serendipity_event_s9ymarkup.php,1.5.2.4,1.5.2.5

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_s9ymarkup.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_s9ymarkup.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_s9ymarkup/serendipity_event_s9ymarkup.php,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -d -r1.5.2.4 -r1.5.2.5
--- serendipity_event_s9ymarkup.php	9 Oct 2004 19:04:41 -0000	1.5.2.4
+++ serendipity_event_s9ymarkup.php	29 Oct 2004 11:02:36 -0000	1.5.2.5
@@ -24,7 +24,10 @@
 
         $propbag->add('name',          PLUGIN_EVENT_S9YMARKUP_NAME);
         $propbag->add('description',   PLUGIN_EVENT_S9YMARKUP_DESC);
-        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true));
 
         $this->markup_elements = array(
             array(
@@ -131,4 +134,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_searchhighlight serendipity_event_searchhighlight.php,1.4.2.3,1.4.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_searchhighlight.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_searchhighlight.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_searchhighlight/serendipity_event_searchhighlight.php,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -d -r1.4.2.3 -r1.4.2.4
--- serendipity_event_searchhighlight.php	28 Oct 2004 20:17:25 -0000	1.4.2.3
+++ serendipity_event_searchhighlight.php	29 Oct 2004 11:02:37 -0000	1.4.2.4
@@ -27,7 +27,7 @@
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Tom Sommer');
         $propbag->add('version',       '1.0');
-        $propbag->add('event_hooks', array('frontend_display' => true, 'css' => true));
+        $propbag->add('event_hooks',   array('frontend_display' => true, 'css' => true));
 
         $this->markup_elements = array(
             array(
@@ -220,4 +220,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_livesearch serendipity_event_livesearch.php,1.7.2.1,1.7.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_livesearch.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_livesearch.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- serendipity_event_livesearch.php	28 Oct 2004 20:17:24 -0000	1.7.2.1
+++ serendipity_event_livesearch.php	29 Oct 2004 11:02:36 -0000	1.7.2.2
@@ -25,10 +25,13 @@
 
         $propbag->add('name',          PLUGIN_EVENT_LIVESEARCH_NAME);
         $propbag->add('description',   PLUGIN_EVENT_LIVESEARCH_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Christian Stocker, Garvin Hicking');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
-            'external_plugin'  => true,
-            'frontend_header' => true,
-            'css' => true,
+            'external_plugin'    => true,
+            'frontend_header'    => true,
+            'css'                => true,
             'quicksearch_plugin' => true
         ));
     }
@@ -161,4 +164,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_nl2br serendipity_event_nl2br.php,1.4.2.2,1.4.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_nl2br.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_nl2br.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- serendipity_event_nl2br.php	22 Sep 2004 11:48:07 -0000	1.4.2.2
+++ serendipity_event_nl2br.php	29 Oct 2004 11:02:36 -0000	1.4.2.3
@@ -21,7 +21,10 @@
 
         $propbag->add('name',          PLUGIN_EVENT_NL2BR_NAME);
         $propbag->add('description',   PLUGIN_EVENT_NL2BR_DESC);
-        $propbag->add('event_hooks', array('frontend_display' => true));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',   array('frontend_display' => true));
 
         $this->markup_elements = array(
             array(
@@ -97,4 +100,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_entryproperties serendipity_event_entryproperties.php,1.1.2.5,1.1.2.6

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_entryproperties.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_entryproperties.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/Attic/serendipity_event_entryproperties.php,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- serendipity_event_entryproperties.php	22 Sep 2004 10:58:58 -0000	1.1.2.5
+++ serendipity_event_entryproperties.php	29 Oct 2004 11:02:35 -0000	1.1.2.6
@@ -1,305 +1,308 @@
-<?php # $Id$
-
-switch ($serendipity['lang']) {
-    case 'de':
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_TITLE', 'Erweiterte Eigenschaften von Artikeln');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(nicht-öffentliche Artikel, dauerhafte Artikel)');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS', 'Dauerhafte Artikel');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS', 'Artikel können gelesen werden von');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE', 'mir selbst');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER', 'Co-Autoren');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC', 'allen');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE', 'Artikel cachen?');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'Falls diese Option aktiviert ist, wird eine Cache-Version des Artikels gespeichert. Dieses Caching wird zwar die Performance erhöhen, aber Flexibilität anderer Plugins einschränken.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE', 'Cachen aller Artikel');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT', 'Suche nach zu cachenden Artikeln...');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO', 'Bearbeite Artikel %d bis %d');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_BUILDING', 'Erzeuge cache für Artikel #%d, <em>%s</em>...');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHED', 'Artikel gecached.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DONE', 'Alle Artikel gecached.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_ABORTED', 'Caching der Artikel ABGEBROCHEN.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_TOTAL', ' (insgesamt %d Artikel vorhanden)...');
-        break;
-
-    case 'en':
-    case 'es':
-    default:
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_TITLE', 'Extended properties for entries');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(non-public articles, sticky posts)');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS', 'Mark this entry as a Sticky Post');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS', 'Entries can be read by');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE', 'Myself');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER', 'Co-authors');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC', 'Everyone');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE', 'Allow to cache entries?');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'If enabled, a cached version will be generated on every saving. Caching will increase performance, but decrease flexibility for other plugins.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE', 'Build cached entries');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT', 'Fetching next batch of entries...');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO', 'Fetching entries %d to %d');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_BUILDING', 'Building cache for entry #%d, <em>%s</em>...');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHED', 'Entry cached.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DONE', 'Entry caching completed.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_ABORTED', 'Entry caching ABORTED.');
-        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_TOTAL', ' (totalling %d entries)...');
-        break;
-}
-
-class serendipity_event_entryproperties extends serendipity_event
-{
-var $services;
-
-    function introspect(&$propbag)
-    {
-        global $serendipity;
-
-        $propbag->add('name',          PLUGIN_EVENT_ENTRYPROPERTIES_TITLE);
-        $propbag->add('description',   PLUGIN_EVENT_ENTRYPROPERTIES_DESC);
-        $propbag->add('event_hooks',    array(
-            'frontend_fetchentries'                             => true,
-            'frontend_fetchentry'                               => true,
-            'backend_publish'                                   => true,
-            'backend_save'                                      => true,
-            'backend_display'                                   => true,
-            'frontend_entryproperties'                          => true,
-            'backend_sidebar_entries_event_display_buildcache'  => true,
-            'backend_sidebar_entries'                           => true
-        ));
-
-        $propbag->add('configuration', array('cache'));
-        $this->supported_properties = array('is_sticky', 'access', 'cache_body', 'cache_extended');
-    }
-
-    function introspect_config_item($name, &$propbag)
-    {
-        switch($name) {
-            case 'cache':
-                $propbag->add('type',        'boolean');
-                $propbag->add('name',        PLUGIN_EVENT_ENTRYPROPERTIES_CACHE);
-                $propbag->add('description', PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC);
-                $propbag->add('default',     'true');
-                break;
-        }
-        return true;
-    }
-
-    function generate_content(&$title) {
-        $title = PLUGIN_EVENT_ENTRYPROPERTIES_TITLE;
-    }
-
-    function event_hook($event, &$bag, &$eventData, $addData = null) {
-        global $serendipity;
-
-        $hooks = &$bag->get('event_hooks');
-        $is_cache = serendipity_db_bool($this->get_config('cache', 'true'));
-        if (isset($hooks[$event])) {
-            switch($event) {
-                case 'backend_display':
-                    $is_sticky =    (isset($eventData['properties']['ep_is_sticky']) && serendipity_db_bool($eventData['properties']['ep_is_sticky']))
-                                 || (isset($serendipity['POST']['properties']['is_sticky']) && serendipity_db_bool($serendipity['POST']['properties']['is_sticky']))
-                               ? 'checked="checked"'
-                               : '';
-                    $access_values = array(
-                        PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE => 'private',
-                        PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER  => 'member',
-                        PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC  => 'public',
-                    );
-
-                    if (isset($eventData['properties']['ep_access'])) {
-                        $access = $eventData['properties']['ep_access'];
-                    } elseif (isset($serendipity['POST']['properties']['access'])) {
-                        $access = $serendipity['POST']['properties']['access'];
-                    } else {
-                        $access = 'public';
-                    }
-?>
-                    <fieldset style="margin: 5px">
-                        <legend><?php echo PLUGIN_EVENT_ENTRYPROPERTIES_TITLE; ?></legend>
-                            <input type="checkbox" name="serendipity[properties][is_sticky]" id="properties_is_sticky" value="true" <?php echo $is_sticky; ?> />
-                                <label title="<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS; ?>" for="serendipity[properties][is_sticky]">&nbsp;<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS; ?>&nbsp;&nbsp;</label><br />
-
-                            <?php echo PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS; ?>:
-<?php
-                    foreach($access_values AS $radio_title => $radio_value) {
-?>
-                            <input type="radio" name="serendipity[properties][access]" id="properties_access_<?php echo $radio_value; ?>" value="<?php echo $radio_value; ?>" <?php echo $radio_value == $access ? 'checked="checked"' : ''; ?> />
-                                <label title="<?php echo $radio_title; ?>" for="id_properties_access_<?php echo $radio_value; ?>">&nbsp;<?php echo $radio_title; ?>&nbsp;&nbsp;</label>
-<?php
-                    }
-?>
-                            <br />
-                    </fieldset>
-<?php
-                    return true;
-                    break;
-
-                case 'backend_sidebar_entries':
-?>
-                        &bull; <a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=buildcache"><?php echo PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE; ?></a><br />
-<?php
-                    return true;
-                    break;
-
-                case 'backend_sidebar_entries_event_display_buildcache':
-                    if ($is_cache) {
-                        $per_fetch = 25;
-                        $page = (isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1);
-                        $from = ($page-1)*$per_fetch;
-                        $to   = ($page)*$per_fetch;
-
-                        printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO, $from, $to);
-                        $entries = serendipity_fetchEntries(
-                            null,
-                            true,
-                            $per_fetch,
-                            false,
-                            false,
-                            'timestamp DESC',
-                            '',
-                            true
-                        );
-
-                        $total = serendipity_getTotalEntries();
-                        printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_TOTAL . '<br />', $total);
-
-                        foreach($entries AS $idx => $entry) {
-                            printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_BUILDING . '<br />', $entry['id'], htmlspecialchars($entry['title']));
-                            serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$entry['id'] . " AND property LIKE 'ep_cache_%'");
-                            serendipity_plugin_api::hook_event('frontend_display', $entry);
-                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_body', '" . serendipity_db_escape_string($entry['body']) . "')");
-                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_extended', '" . serendipity_db_escape_string($entry['extended']) . "')");
-                            echo PLUGIN_EVENT_ENTRYPROPERTIES_CACHED . '<br /><br />';
-                        }
-
-                        echo '<br />';
-
-                        if ($to < $total) {
-?>
-                        <script type="text/javascript">
-                            if (confirm("<?php echo htmlspecialchars(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT); ?>")) {
-                                location.href = "?serendipity[adminModule]=event_display&serendipity[adminAction]=buildcache&serendipity[page]=<?php echo ($page+1); ?>";
-                            } else {
-                                alert("<?php echo htmlspecialchars(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_ABORTED); ?>");
-                            }
-                        </script>
-<?php
-                        } else {
-                            echo '<div class="serendipity_msg_notice">' . PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DONE . '</div>';
-                        }
-                    }
-                    return true;
-                    break;
-
-                case 'backend_publish':
-                case 'backend_save':
-                    if (!isset($serendipity['POST']['properties']) || !is_array($serendipity['POST']['properties']) || !isset($eventData['id'])) {
-                        return true;
-                    }
-
-                    if ($is_cache) {
-                        $serendipity['POST']['properties']['cache_body']     = $eventData['body'];
-                        $serendipity['POST']['properties']['cache_extended'] = $eventData['extended'];
-                    }
-
-                    // Get existing data
-                    $property = serendipity_fetchEntryProperties($eventData['id']);
-
-                    foreach($this->supported_properties AS $prop_key) {
-                        $prop_val = (isset($serendipity['POST']['properties'][$prop_key]) ? $serendipity['POST']['properties'][$prop_key] : null);
-                        $prop_key = 'ep_' . $prop_key;
-                        if (!isset($property[$prop_key]) && !empty($prop_val)) {
-                            $q = "INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$eventData['id'] . ", '" . serendipity_db_escape_string($prop_key) . "', '" . serendipity_db_escape_string($prop_val) . "')";
-                        } elseif ($property[$propkey] != $prop_val && !empty($prop_val)) {
-                            $q = "UPDATE {$serendipity['dbPrefix']}entryproperties SET value = '" . serendipity_db_escape_string($prop_val) . "' WHERE entryid = " . (int)$eventData['id'] . " AND property = '" . serendipity_db_escape_string($prop_key) . "'";
-                        } else {
-                            $q = "DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$eventData['id'] . " AND property = '" . serendipity_db_escape_string($prop_key) . "'";
-                        }
-
-                        serendipity_db_query($q);
-                    }
-                    return true;
-                    break;
-
-                case 'frontend_entryproperties':
-                    $q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ")";
-
-                    $properties = serendipity_db_query($q);
-                    if (!is_array($properties)) {
-                        return true;
-                    }
-
-                    foreach($properties AS $idx => $row) {
-                        $eventData[$addData[$row['entryid']]]['properties'][$row['property']] = $row['value'];
-                    }
-                    return true;
-                    break;
-
-                case 'frontend_fetchentries':
-                case 'frontend_fetchentry':
-                    $conds = array();
-                    if ($_SESSION['serendipityAuthedUser'] === true) {
-                        $conds[] = " (ISNULL(ep_access.property) OR ep_access.value = 'member' OR ep_access.value = 'public' OR (ep_access.value = 'private' AND e.authorid = " . (int)$serendipity['authorid'] . ")) ";
-                    }
-
-                    if (count($conds) > 0) {
-                        $cond = implode(' AND ', $conds);
-                        if (empty($eventData['and'])) {
-                            $eventData['and'] = " WHERE $cond ";
-                        } else {
-                            $eventData['and'] .= " AND $cond ";
-                        }
-                    }
-
-                    $conds = array();
-                    $conds[] = 'ep_sticky.value IS NULL AS orderkey,';
-                    if ($iscache && (!isset($addData['noCache']) || !$addData['noCache'])) {
-                        $conds[] = 'ep_cache_extended,';
-                        $conds[] = 'ep_cache_body,';
-                    }
-
-                    $cond = implode("\n", $conds);
-                    if (empty($eventData['addkey'])) {
-                        $eventData['addkey'] = $cond;
-                    } else {
-                        $eventData['addkey'] .= $cond;
-                    }
-
-                    $cond = 'orderkey ASC';
-                    if (empty($eventData['orderby'])) {
-                        $eventData['orderby'] = $cond;
-                    } else {
-                        $eventData['orderby'] = $cond . ', ' . $eventData['orderby'];
-                    }
-
-                    $joins = array();
-                    if ($is_cache && (!isset($addData['noCache']) || !$addData['noCache'])) {
-                        $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_extended
-                                                 ON (e.id = ep_cache_extended.entryid AND ep_cache_extended.property = 'ep_cache_extended')";
-                        $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_body
-                                                 ON (e.id = ep_cache_body.entryid AND ep_cache_body.property = 'ep_cache_body')";
-                    }
-                    $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_access
-                                             ON (e.id = ep_access.entryid AND ep_access.property = 'ep_access')";
-                    $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_sticky
-                                             ON (e.id = ep_sticky.entryid AND ep_sticky.property = 'ep_is_sticky')";
-                    $cond = implode("\n", $joins);
-                    if (empty($eventData['joins'])) {
-                        $eventData['joins'] = $cond;
-                    } else {
-                        $eventData['joins'] .= $cond;
-                    }
-
-                    return true;
-                    break;
-
-                default:
-                    return false;
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
-}
-
-/* vim: set sts=4 ts=4 expandtab : */
-?>
+<?php # $Id$
+
+switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_TITLE', 'Erweiterte Eigenschaften von Artikeln');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(nicht-öffentliche Artikel, dauerhafte Artikel)');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS', 'Dauerhafte Artikel');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS', 'Artikel können gelesen werden von');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE', 'mir selbst');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER', 'Co-Autoren');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC', 'allen');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE', 'Artikel cachen?');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'Falls diese Option aktiviert ist, wird eine Cache-Version des Artikels gespeichert. Dieses Caching wird zwar die Performance erhöhen, aber Flexibilität anderer Plugins einschränken.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE', 'Cachen aller Artikel');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT', 'Suche nach zu cachenden Artikeln...');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO', 'Bearbeite Artikel %d bis %d');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_BUILDING', 'Erzeuge cache für Artikel #%d, <em>%s</em>...');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHED', 'Artikel gecached.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DONE', 'Alle Artikel gecached.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_ABORTED', 'Caching der Artikel ABGEBROCHEN.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_TOTAL', ' (insgesamt %d Artikel vorhanden)...');
+        break;
+
+    case 'en':
+    case 'es':
+    default:
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_TITLE', 'Extended properties for entries');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_DESC', '(non-public articles, sticky posts)');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS', 'Mark this entry as a Sticky Post');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS', 'Entries can be read by');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE', 'Myself');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER', 'Co-authors');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC', 'Everyone');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE', 'Allow to cache entries?');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC', 'If enabled, a cached version will be generated on every saving. Caching will increase performance, but decrease flexibility for other plugins.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE', 'Build cached entries');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT', 'Fetching next batch of entries...');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO', 'Fetching entries %d to %d');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_BUILDING', 'Building cache for entry #%d, <em>%s</em>...');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHED', 'Entry cached.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DONE', 'Entry caching completed.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_ABORTED', 'Entry caching ABORTED.');
+        @define('PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_TOTAL', ' (totalling %d entries)...');
+        break;
+}
+
+class serendipity_event_entryproperties extends serendipity_event
+{
+var $services;
+
+    function introspect(&$propbag)
+    {
+        global $serendipity;
+
+        $propbag->add('name',          PLUGIN_EVENT_ENTRYPROPERTIES_TITLE);
+        $propbag->add('description',   PLUGIN_EVENT_ENTRYPROPERTIES_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',    array(
+            'frontend_fetchentries'                             => true,
+            'frontend_fetchentry'                               => true,
+            'backend_publish'                                   => true,
+            'backend_save'                                      => true,
+            'backend_display'                                   => true,
+            'frontend_entryproperties'                          => true,
+            'backend_sidebar_entries_event_display_buildcache'  => true,
+            'backend_sidebar_entries'                           => true
+        ));
+
+        $propbag->add('configuration', array('cache'));
+        $this->supported_properties = array('is_sticky', 'access', 'cache_body', 'cache_extended');
+    }
+
+    function introspect_config_item($name, &$propbag)
+    {
+        switch($name) {
+            case 'cache':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        PLUGIN_EVENT_ENTRYPROPERTIES_CACHE);
+                $propbag->add('description', PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DESC);
+                $propbag->add('default',     'true');
+                break;
+        }
+        return true;
+    }
+
+    function generate_content(&$title) {
+        $title = PLUGIN_EVENT_ENTRYPROPERTIES_TITLE;
+    }
+
+    function event_hook($event, &$bag, &$eventData, $addData = null) {
+        global $serendipity;
+
+        $hooks = &$bag->get('event_hooks');
+        $is_cache = serendipity_db_bool($this->get_config('cache', 'true'));
+        if (isset($hooks[$event])) {
+            switch($event) {
+                case 'backend_display':
+                    $is_sticky =    (isset($eventData['properties']['ep_is_sticky']) && serendipity_db_bool($eventData['properties']['ep_is_sticky']))
+                                 || (isset($serendipity['POST']['properties']['is_sticky']) && serendipity_db_bool($serendipity['POST']['properties']['is_sticky']))
+                               ? 'checked="checked"'
+                               : '';
+                    $access_values = array(
+                        PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PRIVATE => 'private',
+                        PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_MEMBER  => 'member',
+                        PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS_PUBLIC  => 'public',
+                    );
+
+                    if (isset($eventData['properties']['ep_access'])) {
+                        $access = $eventData['properties']['ep_access'];
+                    } elseif (isset($serendipity['POST']['properties']['access'])) {
+                        $access = $serendipity['POST']['properties']['access'];
+                    } else {
+                        $access = 'public';
+                    }
+?>
+                    <fieldset style="margin: 5px">
+                        <legend><?php echo PLUGIN_EVENT_ENTRYPROPERTIES_TITLE; ?></legend>
+                            <input type="checkbox" name="serendipity[properties][is_sticky]" id="properties_is_sticky" value="true" <?php echo $is_sticky; ?> />
+                                <label title="<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS; ?>" for="serendipity[properties][is_sticky]">&nbsp;<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS; ?>&nbsp;&nbsp;</label><br />
+
+                            <?php echo PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS; ?>:
+<?php
+                    foreach($access_values AS $radio_title => $radio_value) {
+?>
+                            <input type="radio" name="serendipity[properties][access]" id="properties_access_<?php echo $radio_value; ?>" value="<?php echo $radio_value; ?>" <?php echo $radio_value == $access ? 'checked="checked"' : ''; ?> />
+                                <label title="<?php echo $radio_title; ?>" for="id_properties_access_<?php echo $radio_value; ?>">&nbsp;<?php echo $radio_title; ?>&nbsp;&nbsp;</label>
+<?php
+                    }
+?>
+                            <br />
+                    </fieldset>
+<?php
+                    return true;
+                    break;
+
+                case 'backend_sidebar_entries':
+?>
+                        &bull; <a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=buildcache"><?php echo PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE; ?></a><br />
+<?php
+                    return true;
+                    break;
+
+                case 'backend_sidebar_entries_event_display_buildcache':
+                    if ($is_cache) {
+                        $per_fetch = 25;
+                        $page = (isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1);
+                        $from = ($page-1)*$per_fetch;
+                        $to   = ($page)*$per_fetch;
+
+                        printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNO, $from, $to);
+                        $entries = serendipity_fetchEntries(
+                            null,
+                            true,
+                            $per_fetch,
+                            false,
+                            false,
+                            'timestamp DESC',
+                            '',
+                            true
+                        );
+
+                        $total = serendipity_getTotalEntries();
+                        printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_TOTAL . '<br />', $total);
+
+                        foreach($entries AS $idx => $entry) {
+                            printf(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_BUILDING . '<br />', $entry['id'], htmlspecialchars($entry['title']));
+                            serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$entry['id'] . " AND property LIKE 'ep_cache_%'");
+                            serendipity_plugin_api::hook_event('frontend_display', $entry);
+                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_body', '" . serendipity_db_escape_string($entry['body']) . "')");
+                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$entry['id'] . ", 'ep_cache_extended', '" . serendipity_db_escape_string($entry['extended']) . "')");
+                            echo PLUGIN_EVENT_ENTRYPROPERTIES_CACHED . '<br /><br />';
+                        }
+
+                        echo '<br />';
+
+                        if ($to < $total) {
+?>
+                        <script type="text/javascript">
+                            if (confirm("<?php echo htmlspecialchars(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_FETCHNEXT); ?>")) {
+                                location.href = "?serendipity[adminModule]=event_display&serendipity[adminAction]=buildcache&serendipity[page]=<?php echo ($page+1); ?>";
+                            } else {
+                                alert("<?php echo htmlspecialchars(PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_ABORTED); ?>");
+                            }
+                        </script>
+<?php
+                        } else {
+                            echo '<div class="serendipity_msg_notice">' . PLUGIN_EVENT_ENTRYPROPERTIES_CACHE_DONE . '</div>';
+                        }
+                    }
+                    return true;
+                    break;
+
+                case 'backend_publish':
+                case 'backend_save':
+                    if (!isset($serendipity['POST']['properties']) || !is_array($serendipity['POST']['properties']) || !isset($eventData['id'])) {
+                        return true;
+                    }
+
+                    if ($is_cache) {
+                        $serendipity['POST']['properties']['cache_body']     = $eventData['body'];
+                        $serendipity['POST']['properties']['cache_extended'] = $eventData['extended'];
+                    }
+
+                    // Get existing data
+                    $property = serendipity_fetchEntryProperties($eventData['id']);
+
+                    foreach($this->supported_properties AS $prop_key) {
+                        $prop_val = (isset($serendipity['POST']['properties'][$prop_key]) ? $serendipity['POST']['properties'][$prop_key] : null);
+                        $prop_key = 'ep_' . $prop_key;
+                        if (!isset($property[$prop_key]) && !empty($prop_val)) {
+                            $q = "INSERT INTO {$serendipity['dbPrefix']}entryproperties (entryid, property, value) VALUES (" . (int)$eventData['id'] . ", '" . serendipity_db_escape_string($prop_key) . "', '" . serendipity_db_escape_string($prop_val) . "')";
+                        } elseif ($property[$propkey] != $prop_val && !empty($prop_val)) {
+                            $q = "UPDATE {$serendipity['dbPrefix']}entryproperties SET value = '" . serendipity_db_escape_string($prop_val) . "' WHERE entryid = " . (int)$eventData['id'] . " AND property = '" . serendipity_db_escape_string($prop_key) . "'";
+                        } else {
+                            $q = "DELETE FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$eventData['id'] . " AND property = '" . serendipity_db_escape_string($prop_key) . "'";
+                        }
+
+                        serendipity_db_query($q);
+                    }
+                    return true;
+                    break;
+
+                case 'frontend_entryproperties':
+                    $q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ")";
+
+                    $properties = serendipity_db_query($q);
+                    if (!is_array($properties)) {
+                        return true;
+                    }
+
+                    foreach($properties AS $idx => $row) {
+                        $eventData[$addData[$row['entryid']]]['properties'][$row['property']] = $row['value'];
+                    }
+                    return true;
+                    break;
+
+                case 'frontend_fetchentries':
+                case 'frontend_fetchentry':
+                    $conds = array();
+                    if ($_SESSION['serendipityAuthedUser'] === true) {
+                        $conds[] = " (ISNULL(ep_access.property) OR ep_access.value = 'member' OR ep_access.value = 'public' OR (ep_access.value = 'private' AND e.authorid = " . (int)$serendipity['authorid'] . ")) ";
+                    }
+
+                    if (count($conds) > 0) {
+                        $cond = implode(' AND ', $conds);
+                        if (empty($eventData['and'])) {
+                            $eventData['and'] = " WHERE $cond ";
+                        } else {
+                            $eventData['and'] .= " AND $cond ";
+                        }
+                    }
+
+                    $conds = array();
+                    $conds[] = 'ep_sticky.value IS NULL AS orderkey,';
+                    if ($iscache && (!isset($addData['noCache']) || !$addData['noCache'])) {
+                        $conds[] = 'ep_cache_extended,';
+                        $conds[] = 'ep_cache_body,';
+                    }
+
+                    $cond = implode("\n", $conds);
+                    if (empty($eventData['addkey'])) {
+                        $eventData['addkey'] = $cond;
+                    } else {
+                        $eventData['addkey'] .= $cond;
+                    }
+
+                    $cond = 'orderkey ASC';
+                    if (empty($eventData['orderby'])) {
+                        $eventData['orderby'] = $cond;
+                    } else {
+                        $eventData['orderby'] = $cond . ', ' . $eventData['orderby'];
+                    }
+
+                    $joins = array();
+                    if ($is_cache && (!isset($addData['noCache']) || !$addData['noCache'])) {
+                        $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_extended
+                                                 ON (e.id = ep_cache_extended.entryid AND ep_cache_extended.property = 'ep_cache_extended')";
+                        $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_cache_body
+                                                 ON (e.id = ep_cache_body.entryid AND ep_cache_body.property = 'ep_cache_body')";
+                    }
+                    $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_access
+                                             ON (e.id = ep_access.entryid AND ep_access.property = 'ep_access')";
+                    $joins[] = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties ep_sticky
+                                             ON (e.id = ep_sticky.entryid AND ep_sticky.property = 'ep_is_sticky')";
+                    $cond = implode("\n", $joins);
+                    if (empty($eventData['joins'])) {
+                        $eventData['joins'] = $cond;
+                    } else {
+                        $eventData['joins'] .= $cond;
+                    }
+
+                    return true;
+                    break;
+
+                default:
+                    return false;
+                    break;
+            }
+        } else {
+            return false;
+        }
+    }
+}
+
+/* vim: set sts=4 ts=4 expandtab : */
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_htmlvalidator serendipity_event_htmlvalidator.php,1.5,1.5.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_htmlvalidator.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_htmlvalidator.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- serendipity_event_htmlvalidator.php	23 Jun 2004 11:13:09 -0000	1.5
+++ serendipity_event_htmlvalidator.php	29 Oct 2004 11:02:35 -0000	1.5.2.1
@@ -34,6 +34,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_HTMLVALIDATOR_NAME);
         $propbag->add('description',   PLUGIN_EVENT_HTMLVALIDATOR_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
             'backend_preview' => true,
             'backend_display' => true,
@@ -253,4 +256,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.10.2.6,1.10.2.7

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_emoticate.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -u -d -r1.10.2.6 -r1.10.2.7
--- serendipity_event_emoticate.php	9 Oct 2004 19:04:41 -0000	1.10.2.6
+++ serendipity_event_emoticate.php	29 Oct 2004 11:02:34 -0000	1.10.2.7
@@ -24,7 +24,10 @@
 
         $propbag->add('name',          PLUGIN_EVENT_EMOTICATE_NAME);
         $propbag->add('description',   PLUGIN_EVENT_EMOTICATE_DESC);
-        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true));
 
         $this->markup_elements = array(
             array(
@@ -174,4 +177,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.14.2.7,1.14.2.8

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_karma.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.14.2.7
retrieving revision 1.14.2.8
diff -u -d -r1.14.2.7 -r1.14.2.8
--- serendipity_event_karma.php	28 Oct 2004 20:17:24 -0000	1.14.2.7
+++ serendipity_event_karma.php	29 Oct 2004 11:02:35 -0000	1.14.2.8
@@ -106,7 +106,10 @@
 
         $propbag->add('name',          PLUGIN_KARMA_NAME);
         $propbag->add('description',   PLUGIN_KARMA_BLAHBLAH);
-        $propbag->add('event_hooks', array('frontend_configure' => true, 'entry_display' => true, 'css' => true, 'event_additional_statistics' => true));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',   array('frontend_configure' => true, 'entry_display' => true, 'css' => true, 'event_additional_statistics' => true));
         $propbag->add('scrambles_true_content', true);
 
         $propbag->add('configuration', array('karma_active', 'visits_active', 'max_entrytime', 'max_votetime', 'extended_only', 'max_karmatime', 'logging'));

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.7.2.2,1.7.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_blogpdf.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- serendipity_event_blogpdf.php	28 Oct 2004 20:17:22 -0000	1.7.2.2
+++ serendipity_event_blogpdf.php	29 Oct 2004 11:02:33 -0000	1.7.2.3
@@ -148,6 +148,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_BLOGPDF_NAME);
         $propbag->add('description',   PLUGIN_EVENT_BLOGPDF_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
             'external_plugin'  => true,
             'entries_footer'   => true,
@@ -416,4 +419,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,1.7.2.4,1.7.2.5

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_bbcode.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -d -r1.7.2.4 -r1.7.2.5
--- serendipity_event_bbcode.php	8 Oct 2004 12:05:05 -0000	1.7.2.4
+++ serendipity_event_bbcode.php	29 Oct 2004 11:02:33 -0000	1.7.2.5
@@ -24,7 +24,10 @@
 
         $propbag->add('name',          PLUGIN_EVENT_BBCODE_NAME);
         $propbag->add('description',   PLUGIN_EVENT_BBCODE_DESC);
-        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true, 'css' => true));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Jez Hancock, Garvin Hicking');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true, 'css' => true));
 
         $this->markup_elements = array(
             array(

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.12.2.1,1.12.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_creativecommons.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- serendipity_event_creativecommons.php	28 Oct 2004 20:17:23 -0000	1.12.2.1
+++ serendipity_event_creativecommons.php	29 Oct 2004 11:02:34 -0000	1.12.2.2
@@ -38,8 +38,11 @@
 class serendipity_event_creativecommons extends serendipity_event {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        PLUGIN_CREATIVECOMMONS_NAME);
-        $propbag->add('description', PLUGIN_CREATIVECOMMONS_DESC);
+        $propbag->add('name',          PLUGIN_CREATIVECOMMONS_NAME);
+        $propbag->add('description',   PLUGIN_CREATIVECOMMONS_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Evan Nemerson');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array('nc', 'nd', 'txt', 'cc_v2'));
         $propbag->add('event_hooks',
                       array('frontend_display:rss-1.0:per_entry' => true,
@@ -349,4 +352,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_contentrewrite serendipity_event_contentrewrite.php,1.9.2.2,1.9.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_contentrewrite.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_event_contentrewrite.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -d -r1.9.2.2 -r1.9.2.3
--- serendipity_event_contentrewrite.php	28 Oct 2004 20:17:22 -0000	1.9.2.2
+++ serendipity_event_contentrewrite.php	29 Oct 2004 11:02:33 -0000	1.9.2.3
@@ -63,6 +63,9 @@
 
         $propbag->add('name',          PLUGIN_EVENT_CONTENTREWRITE_NAME);
         $propbag->add('description',   PLUGIN_EVENT_CONTENTREWRITE_DESCRIPTION);
+        $propbag->add('stackable',     true);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
         $propbag->add('event_hooks',    array(
             'frontend_display' => true
         ));
@@ -291,4 +294,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.44.2.4,1.44.2.5 serendipity_sidebar_items.php,1.84.2.8,1.84.2.9

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_admin_plugins.inc.php 
	serendipity_sidebar_items.php 
Log Message:
Added version/authorship information to all plugins, as far as I could reconstruct them.
Added 'stackable' attribute everywhere. I decided certain plugins should not be stackable, this is left up to discussion, but I think I chose reasonable ones.


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.84.2.8
retrieving revision 1.84.2.9
diff -u -d -r1.84.2.8 -r1.84.2.9
--- serendipity_sidebar_items.php	16 Oct 2004 17:27:13 -0000	1.84.2.8
+++ serendipity_sidebar_items.php	29 Oct 2004 11:02:33 -0000	1.84.2.9
@@ -6,6 +6,9 @@
         $propbag->add('name',        CALENDAR);
         $propbag->add('description', QUICKJUMP_CALENDAR);
         $propbag->add('configuration', array('beginningOfWeek'));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
     }
 
     function introspect_config_item($name, &$propbag)
@@ -212,8 +215,11 @@
 class serendipity_quicksearch_plugin extends serendipity_plugin {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        QUICKSEARCH);
-        $propbag->add('description', SEARCH_FOR_ENTRY);
+        $propbag->add('name',          QUICKSEARCH);
+        $propbag->add('description',   SEARCH_FOR_ENTRY);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
     }
 
     function generate_content(&$title)
@@ -237,8 +243,11 @@
 class serendipity_archives_plugin extends serendipity_plugin {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        ARCHIVES);
-        $propbag->add('description', BROWSE_ARCHIVES);
+        $propbag->add('name',          ARCHIVES);
+        $propbag->add('description',   BROWSE_ARCHIVES);
+        $propbag->add('stackable',     true);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array('frequency', 'count'));
     }
 
@@ -306,8 +315,11 @@
 class serendipity_topreferrers_plugin extends serendipity_plugin {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        TOP_REFERRER);
-        $propbag->add('description', SHOWS_TOP_SITES);
+        $propbag->add('name',          TOP_REFERRER);
+        $propbag->add('description',   SHOWS_TOP_SITES);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array('limit', 'use_links'));
     }
 
@@ -359,8 +371,11 @@
 class serendipity_topexits_plugin extends serendipity_plugin {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        TOP_EXITS);
-        $propbag->add('description', SHOWS_TOP_EXIT);
+        $propbag->add('name',          TOP_EXITS);
+        $propbag->add('description',   SHOWS_TOP_EXIT);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array('limit', 'use_links'));
     }
 
@@ -412,8 +427,11 @@
 class serendipity_syndication_plugin extends serendipity_plugin {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        SYNDICATION);
-        $propbag->add('description', SHOWS_RSS_BLAHBLAH);
+        $propbag->add('name',          SYNDICATION);
+        $propbag->add('description',   SHOWS_RSS_BLAHBLAH);
+        $propbag->add('stackable',     true);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array(
                                         'fullfeed',
                                         'show_0.91',
@@ -704,8 +722,11 @@
 class serendipity_superuser_plugin extends serendipity_plugin {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        SUPERUSER);
-        $propbag->add('description', ALLOWS_YOU_BLAHBLAH);
+        $propbag->add('name',          SUPERUSER);
+        $propbag->add('description',   ALLOWS_YOU_BLAHBLAH);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array('https'));
     }
 
@@ -747,6 +768,9 @@
     {
         $propbag->add('name',          POWERED_BY);
         $propbag->add('description',   ADVERTISES_BLAHBLAH);
+        $propbag->add('stackable',     true);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array(
                                         'image',
                                         'text'));
@@ -799,6 +823,9 @@
     {
         $propbag->add('name',          HTML_NUGGET);
         $propbag->add('description',   HOLDS_A_BLAHBLAH);
+        $propbag->add('stackable',     true);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array(
                                         'title',
                                         'content',
@@ -878,6 +905,9 @@
 
         $propbag->add('name',        CATEGORIES);
         $propbag->add('description', CATEGORY_PLUGIN_DESC);
+        $propbag->add('stackable',     true);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
         $propbag->add('configuration', array('authorid', 'image'));
 
         $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");
@@ -941,4 +971,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.44.2.4
retrieving revision 1.44.2.5
diff -u -d -r1.44.2.4 -r1.44.2.5
--- serendipity_admin_plugins.inc.php	29 Oct 2004 10:25:08 -0000	1.44.2.4
+++ serendipity_admin_plugins.inc.php	29 Oct 2004 11:02:32 -0000	1.44.2.5
@@ -546,7 +546,7 @@
                 </tr>
 <?php if (count($pluginInfo) > 0) { ?>
                 <tr>
-                    <td style="padding-left: 10px; font-size: x-small"><?php echo implode(', ', $pluginInfo); ?></td>
+                    <td style="padding-left: 10px; font-size: x-small"><?php echo implode('; ', $pluginInfo); ?></td>
                 </tr>
 <?php } ?>
             </table>

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.44.2.3,1.44.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_admin_plugins.inc.php 
Log Message:
do not print unknown version/author info to not clutter desktop space


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.44.2.3
retrieving revision 1.44.2.4
diff -u -d -r1.44.2.3 -r1.44.2.4
--- serendipity_admin_plugins.inc.php	28 Oct 2004 20:17:10 -0000	1.44.2.3
+++ serendipity_admin_plugins.inc.php	29 Oct 2004 10:25:08 -0000	1.44.2.4
@@ -518,6 +518,15 @@
     foreach ($pluginstack as $plug) {
         $jsLine = " onmouseout=\"document.getElementById('serendipity_plugin_". $plug['class_name'] ."').className='';\"";
         $jsLine .= " onmouseover=\"document.getElementById('serendipity_plugin_". $plug['class_name'] ."').className='serendipity_admin_list_item_uneven';\"";
+
+        $pluginInfo = array();
+        if (!empty($plug['author'])) {
+            $pluginInfo[] = AUTHOR  . ': ' . $plug['author'];
+        }
+
+        if (!empty($plug['version'])) {
+            $pluginInfo[] = VERSION  . ': ' . $plug['version'];
+        }
 ?>
     <tr id="serendipity_plugin_<?php echo $plug['class_name']; ?>">
         <td colspan="2" <?php echo $jsLine ?>>
@@ -535,9 +544,11 @@
                 <tr>
                     <td style="padding-left: 10px"><?php echo $plug['desc'] ?></td>
                 </tr>
+<?php if (count($pluginInfo) > 0) { ?>
                 <tr>
-                    <td style="padding-left: 10px; font-size: x-small"><?php echo AUTHOR ?>: <?php echo (!empty($plug['author']) ? $plug['author'] : UNKNOWN) ?>, <?php echo VERSION ?>: <?php echo (!empty($plug['version']) ? $plug['version'] : NA) ?></td>
+                    <td style="padding-left: 10px; font-size: x-small"><?php echo implode(', ', $pluginInfo); ?></td>
                 </tr>
+<?php } ?>
             </table>
         </td>
     </tr>

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.98.2.7,1.98.2.8

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_de.inc.php 
Log Message:
german translation


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.7
retrieving revision 1.98.2.8
diff -u -d -r1.98.2.7 -r1.98.2.8
--- serendipity_lang_de.inc.php	28 Oct 2004 20:17:20 -0000	1.98.2.7
+++ serendipity_lang_de.inc.php	29 Oct 2004 10:16:49 -0000	1.98.2.8
@@ -574,15 +574,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'Der Kalenderinterval, der zwischen den Einträgen verwendet werden soll');
 @define('ARCHIVE_COUNT', 'Anzahl von Einträgen im Archiv');
 @define('ARCHIVE_COUNT_DESC', 'Die Anzahl der angezeigten Monate, Wochen oder Tagen');
-@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
-@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
-@define('EVENT_PLUGIN', 'event plugin'); // Translate
-@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
-@define('UNKNOWN', 'Unknown'); // Translate
-@define('VERSION', 'version'); // Translate
-@define('NA', 'N/A'); // Translate
-@define('INSTALL', 'Install'); // Translate
-@define('ALREADY_INSTALLED', 'Already installed'); // Translate
-@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Es folgt eine Liste installierter Plugins');
+@define('SIDEBAR_PLUGIN', 'Seitenleisten-Plugin');
+@define('EVENT_PLUGIN', 'Ereignis-Plugin');
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Hier klicken um %s zu installieren');
+@define('UNKNOWN', 'Unbekannte');
+@define('VERSION', 'version');
+@define('NA', 'Nicht verfügbar');
+@define('INSTALL', 'Installieren');
+@define('ALREADY_INSTALLED', 'Bereits installiert');
+@define('SELECT_A_PLUGIN_TO_ADD', 'Plugin zur Installation wählen');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.37,1.38

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

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

Modified Files:
	serendipity_functions_images.inc.php 
Log Message:
fixed real cause for bug #1007755 and fixed not resizing horizontally scaled
images


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_functions_images.inc.php	14 Sep 2004 12:56:08 -0000	1.37
+++ serendipity_functions_images.inc.php	29 Oct 2004 10:11:25 -0000	1.38
@@ -635,17 +635,21 @@
         $div_width  = $width  / $newwidth;
         $div_height = $height / $newwidth;
 
-        if ($div_width <= 1 || $div_height <= 1) {
-            // do not scale small images
+        if ($div_width <= 1 && $div_height <= 1) {
+            // do not scale small images where both sides are smaller than the thumbnail dimensions
             $newheight = $height;
             $newwidth  = $width;
         } elseif ($div_width >= $div_height) {
             // max width - calculate height, keep width as scaling base
             $newheight = round($height / $div_width);
+            // make sure the height is at least 1 pixel for extreme images
+            $newheight = ($newheight >= 1 ? $newheight : 1);
         } else {
             // max height - calculate width, keep height as scaling base
             $newheight = $newwidth;
             $newwidth  = round($width / $div_height);
+            // make sure the width is at least 1 pixel for extreme images
+            $newwidth  = ($newwidth >= 1 ? $newwidth : 1);
         }
     }
 

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.36.2.2,1.36.2.3

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions_images.inc.php 
Log Message:
fix image calculations, see mailinglist


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -u -d -r1.36.2.2 -r1.36.2.3
--- serendipity_functions_images.inc.php	28 Oct 2004 20:35:30 -0000	1.36.2.2
+++ serendipity_functions_images.inc.php	29 Oct 2004 10:11:08 -0000	1.36.2.3
@@ -635,17 +635,21 @@
         $div_width  = $width  / $newwidth;
         $div_height = $height / $newwidth;
 
-        if ($div_width <= 1) {
-            // do not scale small images
+        if ($div_width <= 1 && $div_height <= 1) {
+            // do not scale small images where both sides are smaller than the thumbnail dimensions
             $newheight = $height;
             $newwidth  = $width;
         } elseif ($div_width >= $div_height) {
             // max width - calculate height, keep width as scaling base
             $newheight = round($height / $div_width);
+            // make sure the height is at least 1 pixel for extreme images
+            $newheight = ($newheight >= 1 ? $newheight : 1);
         } else {
             // max height - calculate width, keep height as scaling base
             $newheight = $newwidth;
             $newwidth  = round($width / $div_height);
+            // make sure the width is at least 1 pixel for extreme images
+            $newwidth  = ($newwidth >= 1 ? $newwidth : 1);
         }
     }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_mailer serendipity_event_mailer.php,1.5.2.1,1.5.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_mailer.php 
Log Message:
I think that's what it's meant to be. The plugin does not send notification, it sends the actual entry after publishing.


Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- serendipity_event_mailer.php	28 Oct 2004 20:17:25 -0000	1.5.2.1
+++ serendipity_event_mailer.php	29 Oct 2004 09:34:03 -0000	1.5.2.2
@@ -15,8 +15,8 @@
     case 'en':
     case 'es':
     default:
-        @define('PLUGIN_EVENT_MAILER_NAME', 'Mail notifier');
-        @define('PLUGIN_EVENT_MAILER_DESC', 'Sends a mail to your when new entries are made to your blog');
+        @define('PLUGIN_EVENT_MAILER_NAME', 'Send entries via E-Mail');
+        @define('PLUGIN_EVENT_MAILER_DESC', 'Let you send a newly created entry via E-Mail to a specific address');
         @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)');
         @define('PLUGIN_EVENT_MAILER_LINK', 'Mail link to article?');

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.36.2.1,1.36.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions_images.inc.php 
Log Message:
- Fix scale problem with... ehh ... some images


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
diff -u -d -r1.36.2.1 -r1.36.2.2
--- serendipity_functions_images.inc.php	14 Sep 2004 13:11:17 -0000	1.36.2.1
+++ serendipity_functions_images.inc.php	28 Oct 2004 20:35:30 -0000	1.36.2.2
@@ -635,7 +635,7 @@
         $div_width  = $width  / $newwidth;
         $div_height = $height / $newwidth;
 
-        if ($div_width <= 1 || $div_height <= 1) {
+        if ($div_width <= 1) {
             // do not scale small images
             $newheight = $height;
             $newwidth  = $width;
@@ -1040,4 +1040,4 @@
         'dimensions_height' => SORT_ORDER_HEIGHT
     );
 }
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity serendipity_admin_templates.inc.php,1.5,1.5.2.1 serendipity_functions.inc.php,1.419.2.58,1.419.2.59

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_admin_templates.inc.php 
	serendipity_functions.inc.php 
Log Message:
- Move printing/listing of templates out of _functions, we don't need it as a function


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.58
retrieving revision 1.419.2.59
diff -u -d -r1.419.2.58 -r1.419.2.59
--- serendipity_functions.inc.php	28 Oct 2004 12:01:24 -0000	1.419.2.58
+++ serendipity_functions.inc.php	28 Oct 2004 20:22:53 -0000	1.419.2.59
@@ -154,58 +154,6 @@
     serendipity_set_config_var('template', $theme);
 }
 
-function serendipity_printTemplates($themelist) {
-    global $serendipity;
-?>
-<div>
-    <form method="post" action="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php?serendipity[adminModule]=templates&amp;serendipity[adminAction]=save">
-<?php
-    foreach ($themelist as $theme) {
-        $info = serendipity_fetchTemplateInfo($theme);
-        if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png')) {
-            $preview = '<img src="templates/' . $theme . '/preview.png" width="100" style="border: 1px #000000 solid" />';
-        } else {
-            $preview = '&nbsp;';
-        }
-
-        if (serendipity_get_config_var('template', $serendipity['defaultTemplate']) == $theme) {
-            $is_active = 'checked="checked"';
-        } else {
-            $is_active = '';
-        }
-
-        $jsLine  = " onmousedown=\"document.getElementById('serendipity_theme_radio_". $theme ."').checked = true;\"";
-        $jsLine .= " onmouseout=\"document.getElementById('serendipity_theme_". $theme ."').className='';\"";
-        $jsLine .= " onmouseover=\"document.getElementById('serendipity_theme_". $theme ."').className='serendipity_admin_list_item_uneven'; style.cursor = 'pointer';\"";
-?>
-    <table width="100%" id="serendipity_theme_<?php echo $theme; ?>">
-        <tr>
-            <td colspan="3" <?php echo $jsLine ?>><strong><?php echo $info['name']; ?></strong></td>
-        </tr>
-
-        <tr>
-            <td width="100" <?php echo $jsLine ?> style="padding-left: 10px"><?php echo $preview; ?></td>
-
-            <td valign="top" <?php echo $jsLine ?>>
-                <?php echo AUTHOR; ?>      : <?php echo $info['author'];?><br />
-                <?php echo LAST_UPDATED; ?>: <?php echo $info['date'];  ?>
-            </td>
-
-            <td valign="middle" align="center" width="70" <?php echo $jsLine ?>>
-                <div><input type="radio" name="serendipity[theme]" value="<?php echo $theme; ?>" id="serendipity_theme_radio_<?php echo $theme; ?>" <?php echo $is_active; ?> /></div>
-            </td>
-        </tr>
-    </table>
-    <br />
-<?php
-    }
-?>
-        <div align="right"><input type="submit" name="submit" value="<?php echo SET_AS_TEMPLATE; ?>" /></div>
-    </form>
-</div>
-<?php
-}
-
 function serendipity_displayCommentForm($id, $url = '', $comments = NULL, $data = NULL, $showToolbar = true, $moderate_comments = true, $entry = null) {
     global $serendipity;
 

Index: serendipity_admin_templates.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_templates.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- serendipity_admin_templates.inc.php	4 Apr 2004 16:24:46 -0000	1.5
+++ serendipity_admin_templates.inc.php	28 Oct 2004 20:22:53 -0000	1.5.2.1
@@ -11,9 +11,55 @@
 if ($serendipity['GET']['adminAction'] == 'save' ) {
     serendipity_saveTemplateSelection($serendipity['POST']['theme']);
 }
+?>
 
-echo SELECT_TEMPLATE;
-serendipity_printTemplates(serendipity_fetchTemplates());
+<?php echo SELECT_TEMPLATE; ?>
+<div>
+    <form method="post" action="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php?serendipity[adminModule]=templates&amp;serendipity[adminAction]=save">
+<?php
+    foreach (serendipity_fetchTemplates() as $theme) {
+        $info = serendipity_fetchTemplateInfo($theme);
+        if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png')) {
+            $preview = '<img src="templates/' . $theme . '/preview.png" width="100" style="border: 1px #000000 solid" />';
+        } else {
+            $preview = '&nbsp;';
+        }
+
+        if (serendipity_get_config_var('template', $serendipity['defaultTemplate']) == $theme) {
+            $is_active = 'checked="checked"';
+        } else {
+            $is_active = '';
+        }
+
+        $jsLine  = " onmousedown=\"document.getElementById('serendipity_theme_radio_". $theme ."').checked = true;\"";
+        $jsLine .= " onmouseout=\"document.getElementById('serendipity_theme_". $theme ."').className='';\"";
+        $jsLine .= " onmouseover=\"document.getElementById('serendipity_theme_". $theme ."').className='serendipity_admin_list_item_uneven'; style.cursor = 'pointer';\"";
+?>
+    <table width="100%" id="serendipity_theme_<?php echo $theme; ?>">
+        <tr>
+            <td colspan="3" <?php echo $jsLine ?>><strong><?php echo $info['name']; ?></strong></td>
+        </tr>
+
+        <tr>
+            <td width="100" <?php echo $jsLine ?> style="padding-left: 10px"><?php echo $preview; ?></td>
 
+            <td valign="top" <?php echo $jsLine ?>>
+                <?php echo AUTHOR; ?>      : <?php echo $info['author'];?><br />
+                <?php echo LAST_UPDATED; ?>: <?php echo $info['date'];  ?>
+            </td>
+
+            <td valign="middle" align="center" width="70" <?php echo $jsLine ?>>
+                <div><input type="radio" name="serendipity[theme]" value="<?php echo $theme; ?>" id="serendipity_theme_radio_<?php echo $theme; ?>" <?php echo $is_active; ?> /></div>
+            </td>
+        </tr>
+    </table>
+    <br />
+<?php
+    }
+?>
+        <div align="right"><input type="submit" name="submit" value="<?php echo SET_AS_TEMPLATE; ?>" /></div>
+    </form>
+</div>
+<?php
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.6,1.15.2.7 serendipity_lang_cs.inc.php,1.61.2.6,1.61.2.7 serendipity_lang_cz.inc.php,1.61.2.5,1.61.2.6 serendipity_lang_da.inc.php,1.79.2.7,1.79.2.8 serendipity_lang_de.inc.php,1.98.2.6,1.98.2.7 serendipity_lang_en.inc.php,1.79.2.7,1.79.2.8 serendipity_lang_es.inc.php,1.77.2.7,1.77.2.8 serendipity_lang_fr.inc.php,1.58.2.7,1.58.2.8 serendipity_lang_it.inc.php,1.1.2.6,1.1.2.7 serendipity_lang_nl.inc.php,1.36.2.6,1.36.2.7 serendipity_lang_no.inc.php,1.2.2.6,1.2.2.7 serendipity_lang_pt.inc.php,1.36.2.7,1.36.2.8

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
- New plugin manager
- Give some of the plugin longer descriptions
- Allow plugins to set 'stackable' directive to false which will prevent it from being installed more than once - Still 'beta'
- MFH plugin config redirection fix


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.6
retrieving revision 1.61.2.7
diff -u -d -r1.61.2.6 -r1.61.2.7
--- serendipity_lang_cs.inc.php	27 Oct 2004 08:54:50 -0000	1.61.2.6
+++ serendipity_lang_cs.inc.php	28 Oct 2004 20:17:19 -0000	1.61.2.7
@@ -59,7 +59,6 @@
 @define('PLACEMENT', 'Umístìní');
 @define('DELETE', 'Vymazat');
 @define('SAVE', 'Uložit');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte pøidávaný plugin');
 @define('UP', 'Nahoru');
 @define('DOWN', 'Dolù');
 @define('ENTRIES', 'záznamy');
@@ -578,5 +577,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -d -r1.2.2.6 -r1.2.2.7
--- serendipity_lang_no.inc.php	27 Oct 2004 08:54:51 -0000	1.2.2.6
+++ serendipity_lang_no.inc.php	28 Oct 2004 20:17:22 -0000	1.2.2.7
@@ -51,7 +51,6 @@
 @define('DESCRIPTION', 'Beskrivelse');
 @define('PLACEMENT', 'Plassering');
 @define('DELETE', 'Slett');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Velg den plugin-en du vil legge til');
 @define('UP', 'OPP');
 @define('DOWN', 'NED');
 @define('ENTRIES', 'artikler');
@@ -573,4 +572,14 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.36.2.6
retrieving revision 1.36.2.7
diff -u -d -r1.36.2.6 -r1.36.2.7
--- serendipity_lang_nl.inc.php	27 Oct 2004 08:54:51 -0000	1.36.2.6
+++ serendipity_lang_nl.inc.php	28 Oct 2004 20:17:22 -0000	1.36.2.7
@@ -61,7 +61,6 @@
 @define('PLACEMENT', 'Plaats');
 @define('DELETE', 'Verwijder');
 @define('SAVE', 'Bewaar');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Kies de plugin die je wilt toevoegen');
 @define('UP', 'OP');
 @define('DOWN', 'NEER');
 @define('ENTRIES', 'Logs:');
@@ -583,6 +582,16 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.79.2.7
retrieving revision 1.79.2.8
diff -u -d -r1.79.2.7 -r1.79.2.8
--- serendipity_lang_en.inc.php	16 Oct 2004 17:27:14 -0000	1.79.2.7
+++ serendipity_lang_en.inc.php	28 Oct 2004 20:17:20 -0000	1.79.2.8
@@ -59,7 +59,6 @@
 @define('PLACEMENT', 'Placement');
 @define('DELETE', 'Delete');
 @define('SAVE', 'Save');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Select a plugin to add');
 @define('UP', 'UP');
 @define('DOWN', 'DOWN');
 @define('ENTRIES', 'entries');
@@ -575,7 +574,16 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list');
 @define('ARCHIVE_COUNT', 'Number of items in the list');
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display');
-
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins');
+@define('SIDEBAR_PLUGIN', 'sidebar plugin');
+@define('EVENT_PLUGIN', 'event plugin');
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s');
+@define('UNKNOWN', 'Unknown');
+@define('VERSION', 'version');
+@define('NA', 'N/A');
+@define('INSTALL', 'Install');
+@define('ALREADY_INSTALLED', 'Already installed');
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -u -d -r1.15.2.6 -r1.15.2.7
--- serendipity_lang_bg.inc.php	27 Oct 2004 08:54:49 -0000	1.15.2.6
+++ serendipity_lang_bg.inc.php	28 Oct 2004 20:17:11 -0000	1.15.2.7
@@ -55,7 +55,6 @@
 @define('PLACEMENT', 'Ïîëîæåíèå');
 @define('DELETE', 'Èçòðèâàíå');
 @define('SAVE', 'Çàïàçâàíå');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Äîáàâåòå ìîäóë');
 @define('UP', 'Íàãîðå');
 @define('DOWN', 'Íàäîëó');
 @define('ENTRIES', 'Ñúäúðæàíèå:');
@@ -560,5 +559,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.36.2.7
retrieving revision 1.36.2.8
diff -u -d -r1.36.2.7 -r1.36.2.8
--- serendipity_lang_pt.inc.php	27 Oct 2004 08:54:51 -0000	1.36.2.7
+++ serendipity_lang_pt.inc.php	28 Oct 2004 20:17:22 -0000	1.36.2.8
@@ -57,7 +57,6 @@
 @define('PLACEMENT', 'Localização');
 @define('DELETE', 'Excluir');
 @define('SAVE', 'Salvar');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Selecione um plugin para ser adicionado');
 @define('UP', 'Acima');
 @define('DOWN', 'Abaixo');
 @define('ENTRIES', 'Artigos:');
@@ -579,6 +578,16 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- serendipity_lang_it.inc.php	27 Oct 2004 08:54:50 -0000	1.1.2.6
+++ serendipity_lang_it.inc.php	28 Oct 2004 20:17:21 -0000	1.1.2.7
@@ -59,7 +59,6 @@
 @define('PLACEMENT', 'Posizionamento');
 @define('DELETE', 'Cancella');
 @define('SAVE', 'Salva');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Scegli il plugin da aggiungere');
 @define('UP', 'SU');
 @define('DOWN', 'GIU`');
 @define('ENTRIES', 'notizie');
@@ -575,6 +574,16 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.79.2.7
retrieving revision 1.79.2.8
diff -u -d -r1.79.2.7 -r1.79.2.8
--- serendipity_lang_da.inc.php	27 Oct 2004 08:54:50 -0000	1.79.2.7
+++ serendipity_lang_da.inc.php	28 Oct 2004 20:17:20 -0000	1.79.2.8
@@ -54,7 +54,6 @@
 @define('DESCRIPTION', 'Beskrivelse');
 @define('PLACEMENT', 'Placering');
 @define('DELETE', 'Slet');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Vælg det plugin du vil tilføje');
 @define('UP', 'OP');
 @define('DOWN', 'NED');
 @define('ENTRIES', 'artikler');
@@ -573,5 +572,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58.2.7
retrieving revision 1.58.2.8
diff -u -d -r1.58.2.7 -r1.58.2.8
--- serendipity_lang_fr.inc.php	27 Oct 2004 08:54:50 -0000	1.58.2.7
+++ serendipity_lang_fr.inc.php	28 Oct 2004 20:17:21 -0000	1.58.2.8
@@ -61,7 +61,6 @@
 @define('PLACEMENT', 'Emplacement');
 @define('DELETE', 'Supprimer');
 @define('SAVE', 'Enregistrer');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Sélectionnez un plugin à ajouter');
 @define('UP', '+HAUT');
 @define('DOWN', '+BAS');
 @define('ENTRIES', 'billets');
@@ -581,5 +580,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.61.2.5
retrieving revision 1.61.2.6
diff -u -d -r1.61.2.5 -r1.61.2.6
--- serendipity_lang_cz.inc.php	27 Oct 2004 08:54:50 -0000	1.61.2.5
+++ serendipity_lang_cz.inc.php	28 Oct 2004 20:17:19 -0000	1.61.2.6
@@ -59,7 +59,6 @@
 @define('PLACEMENT', 'Umístìní');
 @define('DELETE', 'Vymazat');
 @define('SAVE', 'Ulo¾it');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte pøidávaný plugin');
 @define('UP', 'Nahoru');
 @define('DOWN', 'Dolù');
 @define('ENTRIES', 'záznamy');
@@ -576,5 +575,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.77.2.7
retrieving revision 1.77.2.8
diff -u -d -r1.77.2.7 -r1.77.2.8
--- serendipity_lang_es.inc.php	27 Oct 2004 09:13:57 -0000	1.77.2.7
+++ serendipity_lang_es.inc.php	28 Oct 2004 20:17:20 -0000	1.77.2.8
@@ -58,7 +58,6 @@
 @define('PLACEMENT', 'Localización');
 @define('DELETE', 'Borrar');
 @define('SAVE', 'Guardar');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Selecciona el plugin que quieres añadir');
 @define('UP', 'ARRIBA');
 @define('DOWN', 'ABAJO');
 @define('ENTRIES', 'posts');
@@ -584,5 +583,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'The calendar interval to use between each item in the list'); // Translate
 @define('ARCHIVE_COUNT', 'Number of items in the list'); // Translate
 @define('ARCHIVE_COUNT_DESC', 'The total number of months, weeks or days to display'); // Translate
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.6
retrieving revision 1.98.2.7
diff -u -d -r1.98.2.6 -r1.98.2.7
--- serendipity_lang_de.inc.php	27 Oct 2004 08:54:50 -0000	1.98.2.6
+++ serendipity_lang_de.inc.php	28 Oct 2004 20:17:20 -0000	1.98.2.7
@@ -57,7 +57,6 @@
 @define('PLACEMENT', 'Platzierung');
 @define('DELETE', 'Löschen');
 @define('SAVE', 'Speichern');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Neues Plugin auswählen');
 @define('UP', 'HOCH');
 @define('DOWN', 'RUNTER');
 @define('ENTRIES', 'Einträge');
@@ -575,5 +574,15 @@
 @define('ARCHIVE_FREQUENCY_DESC', 'Der Kalenderinterval, der zwischen den Einträgen verwendet werden soll');
 @define('ARCHIVE_COUNT', 'Anzahl von Einträgen im Archiv');
 @define('ARCHIVE_COUNT_DESC', 'Die Anzahl der angezeigten Monate, Wochen oder Tagen');
+@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', 'Below is a list of installed plugins'); // Translate
+@define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
+@define('EVENT_PLUGIN', 'event plugin'); // Translate
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
+@define('UNKNOWN', 'Unknown'); // Translate
+@define('VERSION', 'version'); // Translate
+@define('NA', 'N/A'); // Translate
+@define('INSTALL', 'Install'); // Translate
+@define('ALREADY_INSTALLED', 'Already installed'); // Translate
+@define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_templatechooser serendipity_event_templatechooser.php,1.3,1.3.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_templatechooser.php 
Log Message:
- New plugin manager
- Give some of the plugin longer descriptions
- Allow plugins to set 'stackable' directive to false which will prevent it from being installed more than once - Still 'beta'
- MFH plugin config redirection fix


Index: serendipity_event_templatechooser.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_templatechooser/serendipity_event_templatechooser.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- serendipity_event_templatechooser.php	26 Apr 2004 11:01:51 -0000	1.3
+++ serendipity_event_templatechooser.php	28 Oct 2004 20:17:32 -0000	1.3.2.1
@@ -9,7 +9,7 @@
     case 'en':
     default:
         @define('PLUGIN_EVENT_TEMPLATECHOOSER_NAME',     'Template chooser');
-        @define('PLUGIN_EVENT_TEMPLATECHOOSER_DESC',     'Allows users to change the template');
+        @define('PLUGIN_EVENT_TEMPLATECHOOSER_DESC',     'Allows your visitors to change template on the fly');
         break;
 }
 
@@ -18,7 +18,7 @@
     function introspect(&$propbag)
     {
         global $serendipity;
-        
+
         $propbag->add('name',          PLUGIN_EVENT_TEMPLATECHOOSER_NAME);
         $propbag->add('description',   PLUGIN_EVENT_TEMPLATECHOOSER_DESC);
         $propbag->add('event_hooks', array('frontend_configure' => true));
@@ -26,16 +26,16 @@
         // Register (multiple) dependencies. KEY is the name of the depending plugin. VALUE is a mode of either 'remove' or 'keep'.
         // If the mode 'remove' is set, removing the plugin results in a removal of the depending plugin. 'Keep' meens to
         // not touch the depending plugin.
-        $this->dependencies = array('serendipity_plugin_templatedropdown' => 'remove'); 
+        $this->dependencies = array('serendipity_plugin_templatedropdown' => 'remove');
     }
-    
+
     function generate_content(&$title) {
         $title = PLUGIN_EVENT_TEMPLATECHOOSER_NAME;
     }
 
     function event_hook($event, &$bag, &$eventData) {
         global $serendipity;
- 
+
         $hooks = &$bag->get('event_hooks');
 
         if (isset($hooks[$event])) {
@@ -49,7 +49,7 @@
                 if (isset($_SESSION['serendipityUseTemplate']) ) {
                     $eventData['template'] = $_SESSION['serendipityUseTemplate'];
                 }
-                
+
                 return true;
                 break;