php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/plugins/serendipity_plugin_shoutbox serendipity_plugin_shoutbox.php,1.3,1.4

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

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

Modified Files:
	serendipity_plugin_shoutbox.php 
Log Message:
Two conversion bugs fixed.


Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_plugin_shoutbox.php	21 Mar 2004 08:59:43 -0000	1.3
+++ serendipity_plugin_shoutbox.php	21 Mar 2004 09:59:47 -0000	1.4
@@ -138,7 +138,7 @@
                               WHERE id = %d
                               LIMIT 1",
                                     $serendipity['dbPrefix'],
-                                    $serendipity['GET']['shout_id']);
+                                    $serendipity['GET']['comment_id']);
             serendipity_db_query($sql);
          }
 
@@ -207,7 +207,7 @@
                 if ($_SESSION['serendipityAuthedUser'] === true) {
                     $deleteLink =  ' | <a href="' . $serendipity['baseURL']
                                   . '?serendipity[action]=shoutboxdelete&amp;serendipity[comment_id]=' 
-                                  . $row['shout_id'] . '">' . PLUGIN_SHOUTBOX_DELETE . '</a>';                
+                                  . $row['comment_id'] . '">' . PLUGIN_SHOUTBOX_DELETE . '</a>';                
                 }
                 $entry = array('comment' => wordwrap($comment, $wordwrap, "\n",1));
                 serendipity_plugin_api::hook_event('frontend_display', $entry);

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

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

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

Modified Files:
	serendipity_plugin_shoutbox.php 
Log Message:
Matthias sent an updated shoutbox plugin that added "delete comment"
functionality. Because Matthias codebase diverges from the codebase within
the, his file needed gentle prodding to integrate his changes into the
'official' version.

Here is the diff.

CVS


Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_plugin_shoutbox.php	16 Mar 2004 09:06:55 -0000	1.2
+++ serendipity_plugin_shoutbox.php	21 Mar 2004 08:59:43 -0000	1.3
@@ -6,8 +6,10 @@
     case 'de':
         @define('PLUGIN_SHOUTBOX_NAME', 'Shoutbox');
         @define('PLUGIN_SHOUTBOX_BLAHBLAH', 'Zeigt eine Shoutbox für beliebige Kommentare');
+        @define('PLUGIN_SHOUTBOX_DELETE', 'Löschen');
+        @define('PLUGIN_SHOUTBOX_SUBMIT', 'Abschicken');
         @define('PLUGIN_SHOUTBOX_WORDWRAP', 'Zeilenumbruch');
-        @define('PLUGIN_SHOUTBOX_WORDWRAP_BLAHBLAH', 'Nach wievielen Wörtern soll ein Zeilenumbruch eingefügt werden? (Standard: 30)');
+        @define('PLUGIN_SHOUTBOX_WORDWRAP_BLAHBLAH', 'Nach wievielen Zeichen soll ein Zeilenumbruch eingefügt werden?');
         @define('PLUGIN_SHOUTBOX_MAXCHARS', 'Zeichen pro Kommentar');
         @define('PLUGIN_SHOUTBOX_MAXCHARS_BLAHBLAH', 'Wieviele Zeichen sollen pro Kommentar gezeigt werden? (Standard: 120)');
         @define('PLUGIN_SHOUTBOX_MAXENTRIES', 'Anzahl an Kommentaren');
@@ -18,9 +20,11 @@
     case 'es':
     default:
         @define('PLUGIN_SHOUTBOX_NAME', 'Shoutbox');
+        @define('PLUGIN_SHOUTBOX_DELETE', 'Delete');
+        @define('PLUGIN_SHOUTBOX_SUBMIT', 'Shout it out');
         @define('PLUGIN_SHOUTBOX_BLAHBLAH', 'Displays a shoutbox for unrelated comments');
         @define('PLUGIN_SHOUTBOX_WORDWRAP', 'Wordwrap');
-        @define('PLUGIN_SHOUTBOX_WORDWRAP_BLAHBLAH', 'How many words until a wordwrap will occur? (Default: 30)');
+        @define('PLUGIN_SHOUTBOX_WORDWRAP_BLAHBLAH', 'How many chars until a wordwrap will occur? (Default: 30)');
         @define('PLUGIN_SHOUTBOX_MAXCHARS', 'Maximum chars per comment');
         @define('PLUGIN_SHOUTBOX_MAXCHARS_BLAHBLAH', 'How many chars will be displayed for each comment? (Default: 120)');
         @define('PLUGIN_SHOUTBOX_MAXENTRIES', 'Maximum number of comments');
@@ -101,11 +105,11 @@
 
             // Create table, if not yet existant
             if ($this->get_config('version') != '1.0') {
-                $q   = "CREATE TABLE {$serendipity['dbPrefix']}shoutbox (
-                            id {AUTOINCREMENT} {PRIMARY},
-                            timestamp int(10) {UNSIGNED} NULL,
-                            ip varchar(15) default NULL,
-                            body text
+                $q   = "CREATE TABLE {$serendipity['dbPrefix']}shoutbox (
+                            id {AUTOINCREMENT} {PRIMARY},
+                            timestamp int(10) {UNSIGNED} NULL,
+                            ip varchar(15) default NULL,
+                            body text
                         )";
                 $sql = serendipity_db_schema_import($q);
                 $this->set_config('version', '1.0');
@@ -128,6 +132,15 @@
                     serendipity_db_escape_string($_REQUEST['serendipity']['shouttext']));
             serendipity_db_query($sql);
         }
+        if ( $serendipity['GET']['action'] == 'shoutboxdelete' 
+          && $_SESSION['serendipityAuthedUser'] === true) {
+            $sql  = sprintf("DELETE from %sshoutbox
+                              WHERE id = %d
+                              LIMIT 1",
+                                    $serendipity['dbPrefix'],
+                                    $serendipity['GET']['shout_id']);
+            serendipity_db_query($sql);
+         }
 
         if (!$max_entries || !is_numeric($max_entries) || $max_entries < 1) {
             $max_entries = 15;
@@ -153,11 +166,13 @@
             case 'de':
                     $loc = setlocale(LC_ALL, 'de_DE');
                     if (!$loc) $loc = setlocale(LC_ALL, 'de');
+                    $out = '%s zu%s';
                 break;
             
             case 'en':
                     $loc = setlocale(LC_ALL, 'en_US');
                     if (!$loc) $loc = setlocale(LC_ALL, 'en');
+                    $out = '%s about%s';
                 break;
         }
        ?>
@@ -165,7 +180,7 @@
             <div>
                 <input type="hidden" name="action" value="fillshoutbox" />
                 <textarea name="serendipity[shouttext]" rows="4" style="width: 90%"></textarea>
-                <input name='submit' type='submit' value='Abschicken' />
+                <input name='submit' type='submit' value='<?php echo PLUGIN_SHOUTBOX_SUBMIT; ?>' />
             </div>
         </form><br />
 <?php
@@ -184,13 +199,25 @@
                 $comments = wordwrap(strip_tags($row['comment']), $max_chars, '@@@', 1);
                 $aComment = explode('@@@', $comments);
                 $comment  = $aComment[0];
+                if (count($aComment) > 1) {
+                    $comment .= ' [...]';
+                }
                 
-                $entry = array('comment' => wordwrap($comment, $wordwrap, "\n"));
+                $deleteLink = "";
+                if ($_SESSION['serendipityAuthedUser'] === true) {
+                    $deleteLink =  ' | <a href="' . $serendipity['baseURL']
+                                  . '?serendipity[action]=shoutboxdelete&amp;serendipity[comment_id]=' 
+                                  . $row['shout_id'] . '">' . PLUGIN_SHOUTBOX_DELETE . '</a>';                
+                }
+                $entry = array('comment' => wordwrap($comment, $wordwrap, "\n",1));
                 serendipity_plugin_api::hook_event('frontend_display', $entry);
 
-                echo "<b>" . htmlentities(strftime($dateformat, $row['stamp'])) . "</b><br />\n"
-                      . $entry['comment']
-                      . "<br /><br /><br />\n\n";
+                printf(
+                     "<b>" . htmlentities(strftime($dateformat, $row['stamp'])) . '</b> <br />' . "\n"
+                     . $entry['comment'] 
+                     . $deleteLink
+                     . '<br /><br /><br />' . "\n\n"
+                );
             }
         }
 ?>

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

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

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

Modified Files:
	serendipity_event_trackexits.php 
Log Message:
global track_exits is obsolete. Fix getting the right entry_id.


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_trackexits.php	18 Mar 2004 12:09:05 -0000	1.2
+++ serendipity_event_trackexits.php	19 Mar 2004 11:32:23 -0000	1.3
@@ -72,20 +72,19 @@
             switch($event) {
                 case 'frontend_display':
 
-                    if (isset($serendipity['track_exits']) && $serendipity['track_exits']) {
-                        foreach ($this->markup_elements as $temp) {
-                            if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
-                                $element = $temp['element'];
-    
-                                $serendipity['encodeExitsCallback_entry_id'] = $eventData['entry_id'];
-                                $eventData[$element] = preg_replace_callback(
-                                    "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#isUm",
-                                    array($this, '_encodeExitsCallback'),
-                                    $eventData[$element]
-                                );
-                            }
+                    foreach ($this->markup_elements as $temp) {
+                        if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
+                            $element = $temp['element'];
+
+                            $serendipity['encodeExitsCallback_entry_id'] = (isset($eventData['entry_id']) ? $eventData['entry_id'] : $eventData['id']);
+                            $eventData[$element] = preg_replace_callback(
+                                "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#isUm",
+                                array($this, '_encodeExitsCallback'),
+                                $eventData[$element]
+                            );
                         }
                     }
+
                     return true;
                     break;
 

[php-blog-cvs] serendipity/sql db.sql,1.4,1.5

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

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

Modified Files:
	db.sql 
Log Message:
unnecessary ',' at the end of images-table breaks insertion of the table


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db.sql	19 Mar 2004 11:05:15 -0000	1.4
+++ db.sql	19 Mar 2004 11:22:46 -0000	1.5
@@ -153,5 +153,5 @@
   dimensions_width int(11) not null default '0',
   dimensions_height int(11) not null default '0',
   date int(11) not null default '0',
-  thumbnail_name varchar(255) not null default '',
+  thumbnail_name varchar(255) not null default ''
 );

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.228,1.229

[Sebastian B. <ber...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Make code for exit/referer tracking more sane.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- serendipity_functions.inc.php	18 Mar 2004 20:50:52 -0000	1.228
+++ serendipity_functions.inc.php	19 Mar 2004 11:05:13 -0000	1.229
@@ -2196,7 +2196,7 @@
 
     serendipity_db_query(
       @sprintf(
-        "UPDATE %s
+        "UPDATE %s%s
             SET count = count + 1
           WHERE scheme = '%s'
             AND host   = '%s'
@@ -2204,9 +2204,10 @@
             AND path   = '%s'
             AND query  = '%s'
             AND day    = CURRENT_DATE
-                %s",
+            %s",
 
-        $serendipity['dbPrefix'] . $list,
+        $serendipity['dbPrefix'],
+        $list,
         $url_parts['scheme'],
         $url_parts['host'],
         $url_parts['port'],
@@ -2219,17 +2220,18 @@
     if (serendipity_db_affected_rows() == 0) {
         serendipity_db_query(
           sprintf(
-            "INSERT INTO %s
-                    (day, count, scheme, host, port, path, query%s)
-             VALUES ( CURRENT_DATE, 1, '%s', '%s', '%s', '%s', '%s'%s)",
-            $serendipity['dbPrefix'] . $list,
-            ($entry_id != 0) ? ', entry_id' : '',
+            "INSERT INTO %s%s
+                    (entry_id, day, count, scheme, host, port, path, query)
+             VALUES (%d, CURRENT_DATE, 1, '%s', '%s', '%s', '%s', '%s')",
+
+            $serendipity['dbPrefix'],
+            $list,
+            $entry_id,
             $url_parts['scheme'],
             $url_parts['host'],
             $url_parts['port'],
             $url_parts['path'],
-            $url_parts['query'],
-            ($entry_id != 0) ? ", '$entry_id'" : ''
+            $url_parts['query']
           )
         );
     }

[php-blog-cvs] serendipity/sql db.sql,1.3,1.4

[Sebastian B. <ber...@us...>]

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

Modified Files:
	db.sql 
Log Message:
Make code for exit/referer tracking more sane.

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db.sql	16 Mar 2004 09:25:37 -0000	1.3
+++ db.sql	19 Mar 2004 11:05:15 -0000	1.4
@@ -72,7 +72,7 @@
 #
 
 CREATE TABLE {PREFIX}exits (
-  entry_id {AUTOINCREMENT},
+  entry_id int(11) NOT NULL default '0',
   day date NOT NULL,
   count int(11) NOT NULL default '0',
   scheme varchar(5),
@@ -88,7 +88,7 @@
 #
 
 CREATE TABLE {PREFIX}referrers (
-  entry_id {AUTOINCREMENT},
+  entry_id int(11) NOT NULL default '0',
   day date NOT NULL,
   count int(11) NOT NULL default '0',
   scheme varchar(5),

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.18,1.19

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
We use ISO-8859-1 for german language, so it is safe to use the "native"
umlauts in the language file, which are then converted by htmlentities().


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_admin_plugins.inc.php	18 Mar 2004 20:40:38 -0000	1.18
+++ serendipity_admin_plugins.inc.php	19 Mar 2004 10:18:39 -0000	1.19
@@ -89,7 +89,7 @@
             $plugin->introspect($bag);
 
             $name  = htmlentities($bag->get('name'));
-            $desc  = $bag->get('description'); /* htmlentities() here will show ä instead of proper umlauts */
+            $desc  = htmlentities($bag->get('description'));
             if ($event_only) {
                 $place = '<input type="hidden" name="serendipity[placement][' . $plugin_data['name'] . ']" value="event" />';
             } else {

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.24,1.25

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
We use ISO-8859-1 for german language, so it is safe to use the "native"
umlauts in the language file, which are then converted by htmlentities().


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_de.inc.php	15 Mar 2004 12:30:52 -0000	1.24
+++ serendipity_lang_de.inc.php	19 Mar 2004 10:18:39 -0000	1.25
@@ -13,8 +13,8 @@
 @define('DATE_LOCALES', 'german, de_DE, de');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 
-@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfläche');
-@define('HAVE_TO_BE_LOGGED_ON', 'Sie müssen angemeldet sein, um diese Seite zu sehen:');
+@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfläche');
+@define('HAVE_TO_BE_LOGGED_ON', 'Sie müssen angemeldet sein, um diese Seite zu sehen:');
 @define('WRONG_USERNAME_OR_PASSWORD', 'Das Passwort oder der Username war falsch. Bitte wiederholen Sie die Eingabe.');
 @define('APPEARANCE', 'Aussehen');
 @define('MANAGE_STYLES', 'Styles verwalten');
@@ -22,7 +22,7 @@
 @define('ADMIN', 'Admin:');
 @define('CONFIGURATION', 'Konfiguration');
 @define('IMPORT_EXPORT_ENTRIES', 'Import/Export');
-@define('BACK_TO_BLOG', 'Zurück zum Weblog');
+@define('BACK_TO_BLOG', 'Zurück zum Weblog');
 @define('LOGOUT', 'Abmelden');
 @define('LOGGEDOUT', 'Abgemeldet.');
 @define('CREATE', 'Erstellen');
@@ -33,35 +33,35 @@
 @define('NEW_TRACKBACK_TO', 'Neues Trackback für');
 @define('NEW_COMMENT_TO', 'Neuer Kommentar für');
 @define('RECENT', 'Das neueste...');
-@define('OLDER', 'Älteres...');
+@define('OLDER', 'Älteres...');
 @define('ANONYMOUS', 'Anonym');
 @define('LINK_TO_COMMENT', 'Link zu Kommentar #');
 @define('CLICK_CAT_TO_EDIT', 'Zum Bearbeiten auf eine Kategorie klicken');
 @define('CREATE_NEW_CAT', 'Neue Kategorie');
-@define('SELECT_IMAGE', 'Bitte wählen Sie ein Bild');
-@define('I_WANT_THUMB', 'Ich möchte die Vorschau im Eintrag haben.');
-@define('I_WANT_BIG_IMAGE', 'Ich möchte das grosse Bild im Eintrag haben.');
+@define('SELECT_IMAGE', 'Bitte wählen Sie ein Bild');
+@define('I_WANT_THUMB', 'Ich möchte die Vorschau im Eintrag haben.');
+@define('I_WANT_BIG_IMAGE', 'Ich möchte das grosse Bild im Eintrag haben.');
 @define('I_WANT_NO_LINK', 'Das Bild soll kein Link sein');
 @define('I_WANT_IT_TO_LINK', 'Das Bild soll hierhin linken:');
-@define('BACK', 'Zurück');
-@define('FORWARD', 'Vorwärts');
+@define('BACK', 'Zurück');
+@define('FORWARD', 'Vorwärts');
 @define('DONE', 'Fertig');
-@define('CLICK_IMAGE_TO_INSERT', 'Auf ein Bild klicken um es einzufügen:');
-@define('WELCOME_BACK', 'Willkommen zurück,');
-@define('ADD_PLUGIN', 'Plugin hinzufügen');
+@define('CLICK_IMAGE_TO_INSERT', 'Auf ein Bild klicken um es einzufügen:');
+@define('WELCOME_BACK', 'Willkommen zurück,');
+@define('ADD_PLUGIN', 'Plugin hinzufügen');
 @define('TITLE', 'Titel');
 @define('PLUGIN', 'Plugin');
 @define('DESCRIPTION', 'Beschreibung');
 @define('PLACEMENT', 'Platzierung');
-@define('DELETE', 'Löschen');
+@define('DELETE', 'Löschen');
 @define('SAVE', 'Speichern');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Neues Plugin auswählen');
+@define('SELECT_A_PLUGIN_TO_ADD', 'Neues Plugin auswählen');
 @define('UP', 'HOCH');
 @define('DOWN', 'RUNTER');
-@define('ENTRIES', 'Einträge:');
+@define('ENTRIES', 'Einträge:');
 @define('NEW_ENTRY', 'Neuer Eintrag');
-@define('EDIT_ENTRIES', 'Einträge bearbeiten');
-@define('DELETE_ENTRIES', 'Eintrag löschen');
+@define('EDIT_ENTRIES', 'Einträge bearbeiten');
+@define('DELETE_ENTRIES', 'Eintrag löschen');
 @define('CATEGORIES', 'Kategorien');
 @define('EDIT_CATEGORIES', 'Kategorien bearbeiten');
 @define('IMAGES', 'Bilder:');
@@ -69,16 +69,16 @@
 @define('WARNING_THIS_BLAHBLAH', "ACHTUNG:\\nDas kann jetzt lange dauern, wenn für viele Bilder noch keine Vorschau existiert.");
 @define('CREATE_THUMBS', 'Vorschauen erneuern');
 @define('MANAGE_IMAGES', 'Bilder verwalten');
-@define('ADMIN_INTERFACE', 'Verwaltungsoberfläche');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Autorenoberfläche');
-@define('AUTHOR_SUITE', 'Serendipity Autorenoberfläche');
+@define('ADMIN_INTERFACE', 'Verwaltungsoberfläche');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Autorenoberfläche');
+@define('AUTHOR_SUITE', 'Serendipity Autorenoberfläche');
 @define('NAME', 'Name');
 @define('EMAIL', 'Email');
 @define('HOMEPAGE', 'Homepage');
 @define('COMMENT', 'Kommentar');
 @define('REMEMBER_INFO', 'Daten merken? ');
 @define('SUBMIT_COMMENT', 'Kommentar abschicken');
-@define('NO_ENTRIES_TO_PRINT', 'Keine Einträge vorhanden.');
+@define('NO_ENTRIES_TO_PRINT', 'Keine Einträge vorhanden.');
 @define('COMMENTS', 'Kommentare');
 @define('ADD_COMMENT', 'Kommentar schreiben');
 @define('NO_COMMENTS', 'Noch keine Kommentare.');
@@ -91,43 +91,43 @@
 @define('EXTENDED_BODY', 'Erweiterter Eintrag');
 @define('CATEGORY', 'Kategorie:');
 @define('TEMPLATE_NAME', 'Template Name');
-@define('CHOOSE_STYLESHEET', 'Bitte ein Stylesheet wählen...');
+@define('CHOOSE_STYLESHEET', 'Bitte ein Stylesheet wählen...');
 @define('EDIT', 'Bearbeiten');
 @define('MAKE_DEFAULT', 'Als Standard');
 @define('CREATE_NEW_STYLESHEET', 'Neues Stylesheet');
-@define('NO_ENTRIES_BLAHBLAH', 'Für ihre Suche %s konnte kein Eintrag gefunden werden' . "\n");
+@define('NO_ENTRIES_BLAHBLAH', 'Für ihre Suche %s konnte kein Eintrag gefunden werden' . "\n");
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Ihre Suche nach %s ergab %s Treffer:');
 @define('IMAGE', 'Bild');
 @define('ERROR_FILE_NOT_EXISTS', ' Alte Datei existiert nicht!');
 @define('ERROR_FILE_EXISTS', 'Fehler: Neuer Dateiname existiert schon, bitte einen anderen wählen.');
 @define('ERROR_SOMETHING', 'Fehler: Irgendentwas stimmt nicht.');
-@define('ADDING_IMAGE', 'Bild hinzufügen...');
+@define('ADDING_IMAGE', 'Bild hinzufügen...');
 @define('THUMB_CREATED_DONE', 'Vorschau erstellt.<br>Fertig.');
 @define('ERROR_FILE_EXISTS_ALREADY', 'Fehler: Diese Datei existiert schon auf dem Server!');
 @define('ERROR_UNKNOWNE_NOUPLOAD', 'Unbekannter Fehler aufgetreten, Datei nicht hochgeladen.');
-@define('ADD_IMAGE_BLAHBLAH', '<b>Bild zur Sammlung hinzuf&uuml;gen:</b><p>Hier k&ouml;nnen Sie ein Bild hochladen, oder mir sagen, von wo ich es downloaden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind meistens brauchbar, aber auf jeden Fall witzig :)<p><b>Methode w&auml;hlen:</b><br>');
+@define('ADD_IMAGE_BLAHBLAH', '<b>Bild zur Sammlung hinzufügen:</b><p>Hier können Sie ein Bild hochladen, oder mir sagen, von wo ich es downloaden soll! Wenn das passende Bild fehlt, einfach bei Google danach suchen. Probieren Sie mal <a href="http://images.google.de" target="_blank">Googles Bildsuche</a>, die Resultate sind meistens brauchbar, aber auf jeden Fall witzig :)<p><b>Methode wählen:</b><br>');
 @define('ENTER_IMAGE_URL', 'Bildurl zum Download angeben:');
 @define('ENTER_IMAGE_TO_UP', 'Bild zum Hochladen eingeben:');
 @define('GO', 'Los!');
-@define('NEWSIZE', 'Neue Gr&ouml;&szlig;e ');
-@define('RESIZE_BLAHBLAH', '<b>Gr&ouml;&szlig; von %s &auml;ndern</b><p>');
-@define('ORIGINAL_SIZE', 'Originalgr&ouml;&szlig;: <i>%sx%s</i> Pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier k&ouml;nnen sie die Bildgr&ouml;&szlig;e &auml;ndern. Um die Proportionen beizubehalten, einfach einen der beiden Werte eingeben, und anschlie&szlig;end die TAB taste dr&uuml;cken, und Sie erhalten eine Vorschau mit korrekten Proportionen.');
+@define('NEWSIZE', 'Neue Größe ');
+@define('RESIZE_BLAHBLAH', '<b>Größe von %s ändern</b><p>');
+@define('ORIGINAL_SIZE', 'Originalgröße: <i>%sx%s</i> Pixel');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Hier können sie die Bildgröße ändern. Um die Proportionen beizubehalten, einfach einen der beiden Werte eingeben, und anschließend die TAB taste drücken, und Sie erhalten eine Vorschau mit korrekten Proportionen.');
 @define('DATE_FORMAT_1', 'd.m.Y');
 @define('CALENDAR', 'Kalender');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Kalender');
 @define('QUICKSEARCH', 'Schnellsuche');
-@define('SEARCH_FOR_ENTRY', 'Nach Eintr&auml;gen suchen');
+@define('SEARCH_FOR_ENTRY', 'Nach Einträgen suchen');
 @define('ARCHIVES', 'Archive');
-@define('BROWSE_ARCHIVES', 'Die Archive durchst&ouml;bern');
+@define('BROWSE_ARCHIVES', 'Die Archive durchstöbern');
 @define('TOP_REFERRER', 'Top Referrer');
 @define('SHOWS_TOP_SITES', 'Zeigt die Top-Seiten, die auf Ihr Blog linken');
 @define('TOP_EXITS', 'Top Exits');
 @define('SHOWS_TOP_EXIT', 'Zeigt die Top-Exit-Links Ihres Blogs');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication-Links');
-@define('SUPERUSER', 'Eigent&uuml;mer');
-@define('ALLOWS_YOU_BLAHBLAH', 'Link zum Konfigurieren von Serendipity und zum Schreiben von Eintr&auml;gen - WICHTIG');
+@define('SUPERUSER', 'Eigentümer');
+@define('ALLOWS_YOU_BLAHBLAH', 'Link zum Konfigurieren von Serendipity und zum Schreiben von Einträgen - WICHTIG');
 @define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Zeigt einen Hinweis, dass Serendipity die Blog Software ist');
 @define('HTML_NUGGET', 'HTML Klotz');
@@ -137,8 +137,8 @@
 @define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
 @define('QUICKJUMP', 'Schnellauswahl');
 @define('SEARCH_TOO_SHORT', 'Bitte geben Sie einen Suchbegriff mit mindestens drei Zeichen an.');
-@define('YOU_CHOSE', 'Sie haben sich f&uuml;r  %s entschieden');
-@define('IMAGE_SIZE', 'Bildgr&ouml;&szlig;e');
+@define('YOU_CHOSE', 'Sie haben sich für  %s entschieden');
+@define('IMAGE_SIZE', 'Bildgröße');
 @define('IMAGE_AS_A_LINK', 'Bild als Link');
 @define('POWERED_BY', 'Powered by');
 @define('SUPERUSER', 'Besitzer login');
@@ -147,9 +147,9 @@
 @define('NO_TRACKBACKS', 'Keine Trackbacks');
 @define('TOPICS_OF', 'Themen in');
 @define('VIEW_FULL', 'ganz anzeigen');
-@define('VIEW_TOPICS', '&Uuml;berschriften anzeigen');
+@define('VIEW_TOPICS', 'Überschriften anzeigen');
 @define('AT', 'um');
-@define('SET_AS_TEMPLATE', 'Als Template w&auml;hlen');
+@define('SET_AS_TEMPLATE', 'Als Template wählen');
 @define('VIEW_EXTENDED_ENTRY', 'Gesamten Beitrag ansehen');
 @define('IN', 'in');
 @define('EXCERPT', 'Auszug');
@@ -162,17 +162,17 @@
 @define('THUMBNAIL_FAILED_COPY', 'Wanted to use %s as it\'s own thumbnail, but failed to copy!');
 @define('AUTHOR', 'Author');
 @define('LAST_UPDATED', 'Zuletzt aktualisiert');
-@define('TRACKBACK_SPECIFIC', 'Trackback f&uuml;r spezifische URI dieses Eintrags');
+@define('TRACKBACK_SPECIFIC', 'Trackback für spezifische URI dieses Eintrags');
 @define('DIRECT_LINK', 'Direkter Link zu diesem Eintrag');
 @define('COMMENT_ADDED', 'Dein Kommentar wurde hinzugefügt. ');
-@define('COMMENT_ADDED_CLICK', 'Klick %shier um zu den Kommentaren zur&uuml;ckzukehren%s und %shier um das Fenster zu schlie&szlig;en%s.');
+@define('COMMENT_ADDED_CLICK', 'Klick %shier um zu den Kommentaren zurückzukehren%s und %shier um das Fenster zu schließen%s.');
 @define('COMMENTS_DISABLE', 'Kommentare für diesen Eintrag nicht mehr zulassen');
 @define('COMMENTS_ENABLE', 'Kommentare für diesen Eintrag zulassen');
 @define('COMMENTS_CLOSED', 'Die Kommentarfunktion wurde vom Besitzer dieses Blogs in diesem Eintrag deaktiviert. ');
 @define('COMMENT_NOT_ADDED', 'Dein Kommentar wurde nicht hinzugefügt, da der Eintrag geschlossen wurde.');
-@define('COMMENT_NOT_ADDED_CLICK', 'Klick %shier um zu den Kommentaren zur&uuml;ckzukehren%s und %shier um das Fenster zu schlie&szlig;en%s.');
-@define('EMPTY_COMMENT', 'Dein Kommentar enthielt nichts, bitte %sgeh zur&uuml;ck%s und versuch\'s nochmal');
-@define('ENTRIES_FOR', 'Eintr&auml;ge am %s');
+@define('COMMENT_NOT_ADDED_CLICK', 'Klick %shier um zu den Kommentaren zurückzukehren%s und %shier um das Fenster zu schließen%s.');
+@define('EMPTY_COMMENT', 'Dein Kommentar enthielt nichts, bitte %sgeh zurück%s und versuch\'s nochmal');
+@define('ENTRIES_FOR', 'Einträge am %s');
 @define('TOPICS_FOR', 'Themen am %s');
 @define('DOCUMENT_NOT_FOUND', 'Das Dokument %s wurde nicht gefunden.');
 @define('USERNAME', 'Benutzername');
@@ -182,7 +182,7 @@
 @define('RIGHT', 'rechts');
 @define('HIDDEN', 'versteckt');
 @define('REMOVE_TICKED_PLUGINS', 'Markierte plugins entfernen');
-@define('SAVE_CHANGES_TO_LAYOUT', '&Auml;nderungen am Layout speichern');
+@define('SAVE_CHANGES_TO_LAYOUT', 'Änderungen am Layout speichern');
 @define('COMMENTS_FROM', 'Kommentare von');
 @define('ERROR', 'Fehler');
 @define('ENTRY_SAVED', 'Eintrag gespeichert');
@@ -279,7 +279,7 @@
 @define('CONTENT', 'Inhalt');
 @define('TYPE', 'Typ');
 @define('DRAFT', 'Entwurf');
-@define('PUBLISH', 'Ver&ouml;ffentlichung');
+@define('PUBLISH', 'Veröffentlichung');
 @define('PREVIEW', 'Vorschau');
 @define('DATE', 'Datum');
 @define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!

[php-blog-cvs] Re: serendipity serendipity_functions.inc.php,1.227,1.228

[Tom S. <ts...@dr...>]

Kristian K?hntopp wrote:
> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2739
> 
> Modified Files:
> 	serendipity_functions.inc.php 
> Log Message:
> Lame half assed attempt at smuggling my 7 day extension into the main
> codebase.

Okaaay?
Isn't this a plugin to begin with? So make it configurable...

-- 
Tom Sommer, Denmark
www.dreamcoder.dk - www.tsn.dk - http://blog.dreamcoder.dk

Re: [php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.17,1.18

[Sterling H. <ste...@ph...>]

On Mar 18, 2004, at 4:03 PM, Kristian K=F6hntopp wrote:

> On Thursday 18 March 2004 21:53, Sterling Hughes wrote:
>> you need to quote entities in ouputed html, ie, ä ö and
>> ü - no?
>
> No
>
> If you do, you get &ampouml; which is shown as ä
>
> What you want is ä to be shown as =E4
>

ja - ok, i understand - you're avoiding double quoting.  makes sense.

-sterling

> Just try the plugin configuration while lang is de with and without=20
> the patch.
>
> Kristian
>
> --=20
> Jetzt auch: Kristian =3D?iso-8859-15?q?K=3DF6hntopp?=3D=20
> <kr...@xn...>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: IBM Linux Tutorials
> Free Linux tutorial presented by Daniel Robbins, President and CEO of
> GenToo technologies. Learn everything from fundamentals to system
> administration.http://ads.osdn.com/?ad_id=1470&alloc_id638&op=3Dclick
> _______________________________________________
> php-blog-cvs mailing list
> php...@li...
> https://lists.sourceforge.net/lists/listinfo/php-blog-cvs
>

Re: [php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.17,1.18

[Kristian <kr...@xn...>]

On Thursday 18 March 2004 21:53, Sterling Hughes wrote:
> you need to quote entities in ouputed html, ie, ä ö and
> ü - no?

No

If you do, you get &ampouml; which is shown as ä

What you want is ä to be shown as =E4

Just try the plugin configuration while lang is de with and without the pat=
ch.

Kristian

=2D-=20
Jetzt auch: Kristian =3D?iso-8859-15?q?K=3DF6hntopp?=3D <kris@xn--khntopp-9=
0a.de>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.227,1.228

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Lame half assed attempt at smuggling my 7 day extension into the main
codebase.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- serendipity_functions.inc.php	18 Mar 2004 15:19:48 -0000	1.227
+++ serendipity_functions.inc.php	18 Mar 2004 20:50:52 -0000	1.228
@@ -2246,11 +2246,26 @@
 function serendipity_displayTopUrlList($list, $limit) {
     global $serendipity;
 
-    $query = "SELECT host, SUM(count) AS total
-              FROM {$serendipity['dbPrefix']}$list
-              GROUP BY host
-              ORDER BY total DESC, host
-              LIMIT $limit";
+    /* HACK */
+    if ($serendipity['dbType'] == 'mysql') {
+        /* Nonportable SQL due to MySQL date functions,
+         * but produces rolling 7 day totals, which is more
+         * interesting
+         */
+        $query = "SELECT host, SUM(count) AS total
+                  FROM {$serendipity['dbPrefix']}$list
+                  WHERE day > date_sub(current_date, interval 7 day)
+                  GROUP BY host
+                  ORDER BY total DESC, host
+                  LIMIT $limit";
+    } else {
+        /* Portable version of the same query */
+        $query = "SELECT host, SUM(count) AS total
+                  FROM {$serendipity['dbPrefix']}$list
+                  GROUP BY host
+                  ORDER BY total DESC, host
+                  LIMIT $limit";
+    }
 
     $rows = serendipity_db_query($query);
     echo "<span class='serendipityReferer'>";

Re: [php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.17,1.18

[Sterling H. <ste...@ph...>]

you need to quote entities in ouputed html, ie, ä ö and 
ü - no?

-sterling
On Mar 18, 2004, at 3:40 PM, Kristian K?hntopp wrote:

>

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.17,1.18

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
"Die Archive durchstöbern" 
finally shown correctly as
"Die Archive durchstöbern"


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_admin_plugins.inc.php	27 Feb 2004 19:25:55 -0000	1.17
+++ serendipity_admin_plugins.inc.php	18 Mar 2004 20:40:38 -0000	1.18
@@ -89,7 +89,7 @@
             $plugin->introspect($bag);
 
             $name  = htmlentities($bag->get('name'));
-            $desc  = htmlentities($bag->get('description'));
+            $desc  = $bag->get('description'); /* htmlentities() here will show ä instead of proper umlauts */
             if ($event_only) {
                 $place = '<input type="hidden" name="serendipity[placement][' . $plugin_data['name'] . ']" value="event" />';
             } else {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.226,1.227

[Justin A. <jba...@us...>]

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Missed an echo statememt on the atom:name entry for atom syndication.



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- serendipity_functions.inc.php	18 Mar 2004 14:45:20 -0000	1.226
+++ serendipity_functions.inc.php	18 Mar 2004 15:19:48 -0000	1.227
@@ -1377,7 +1377,7 @@
 <entry>
     <link href="<?php echo $guid; ?>" rel="alternate" title="<?php echo utf8_encode(htmlspecialchars($entry['title'])); ?>" type="text/html" />
     <author>
-        <name><?php utf8_encode(htmlspecialchars($entry['username'])); ?></name>
+        <name><?php echo utf8_encode(htmlspecialchars($entry['username'])); ?></name>
         <email><?php echo utf8_encode(htmlspecialchars($entry['email'])); ?></email>
     </author>
     

[php-blog-cvs] serendipity rss.php,1.20,1.21 serendipity_functions.inc.php,1.225,1.226

[Justin A. <jba...@us...>]

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

Modified Files:
	rss.php serendipity_functions.inc.php 
Log Message:
Changes to atom0.3 feed: use gmdate instead of date.

use well-formed atom:name and atom:email in entry author.



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- serendipity_functions.inc.php	15 Mar 2004 09:10:24 -0000	1.225
+++ serendipity_functions.inc.php	18 Mar 2004 14:45:20 -0000	1.226
@@ -1377,12 +1377,13 @@
 <entry>
     <link href="<?php echo $guid; ?>" rel="alternate" title="<?php echo utf8_encode(htmlspecialchars($entry['title'])); ?>" type="text/html" />
     <author>
-        <name><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></name>
+        <name><?php utf8_encode(htmlspecialchars($entry['username'])); ?></name>
+        <email><?php echo utf8_encode(htmlspecialchars($entry['email'])); ?></email>
     </author>
     
-    <issued><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued>
-    <created><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created>
-    <modified><?php echo date('Y-m-d\TH:i:s\Z', $entry['last_modified']); ?></modified>
+    <issued><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></issued>
+    <created><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></created>
+    <modified><?php echo gmdate('Y-m-d\TH:i:s\Z', $entry['last_modified']); ?></modified>
     <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
 
 <?php

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rss.php	18 Feb 2004 11:48:23 -0000	1.20
+++ rss.php	18 Mar 2004 14:45:20 -0000	1.21
@@ -170,7 +170,7 @@
 HEAD;
 break;
 case 'atom0.3':
-    $modified = date('Y-m-d\TH:i:s\Z', $entries[0]['last_modified']);
+    $modified = gmdate('Y-m-d\TH:i:s\Z', $entries[0]['last_modified']);
     print <<<HEAD
 <feed version="0.3"
    xmlns="http://purl.org/atom/ns#"
@@ -215,4 +215,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

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

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

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

Modified Files:
	serendipity_event_trackexits.php 
Log Message:
Propper variable checking (should speed up things)


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_trackexits.php	26 Feb 2004 11:29:11 -0000	1.1
+++ serendipity_event_trackexits.php	18 Mar 2004 12:09:05 -0000	1.2
@@ -72,9 +72,9 @@
             switch($event) {
                 case 'frontend_display':
 
-                    if ($serendipity['track_exits']) {
+                    if (isset($serendipity['track_exits']) && $serendipity['track_exits']) {
                         foreach ($this->markup_elements as $temp) {
-                            if ($this->get_config($temp['name']) != 'false') {
+                            if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
                                 $element = $temp['element'];
     
                                 $serendipity['encodeExitsCallback_entry_id'] = $eventData['entry_id'];

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

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

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

Modified Files:
	serendipity_event_textwiki.php 
Log Message:
Propper variable checking (should speed up things)


Index: serendipity_event_textwiki.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textwiki/serendipity_event_textwiki.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_textwiki.php	26 Feb 2004 11:29:11 -0000	1.1
+++ serendipity_event_textwiki.php	18 Mar 2004 12:09:05 -0000	1.2
@@ -79,7 +79,7 @@
             switch($event) {
                 case 'frontend_display':
                     foreach ($this->markup_elements as $temp) {
-                        if ($this->get_config($temp['name']) != 'false') {
+                        if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
                             $eventData[$element] = $this->wiki->transform($eventData[$element]);
                         } 

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

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

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

Modified Files:
	serendipity_event_nl2br.php 
Log Message:
Propper variable checking (should speed up things)


Index: serendipity_event_nl2br.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_nl2br.php	26 Feb 2004 11:29:10 -0000	1.1
+++ serendipity_event_nl2br.php	18 Mar 2004 12:09:05 -0000	1.2
@@ -73,7 +73,7 @@
               case 'frontend_display':
 
                 foreach ($this->markup_elements as $temp) {
-                    if ($this->get_config($temp['name']) != 'false') {
+                    if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
                         $element = $temp['element'];
                         $eventData[$element] = nl2br($eventData[$element]);
                     } 

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

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

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

Modified Files:
	serendipity_event_s9ymarkup.php 
Log Message:
Propper variable checking (should speed up things)


Index: serendipity_event_s9ymarkup.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_s9ymarkup/serendipity_event_s9ymarkup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_s9ymarkup.php	26 Feb 2004 11:29:10 -0000	1.1
+++ serendipity_event_s9ymarkup.php	18 Mar 2004 12:09:05 -0000	1.2
@@ -77,9 +77,9 @@
                 case 'frontend_display':
 
                     foreach ($this->markup_elements as $temp) {
-                        if ($this->get_config($temp['name']) != 'false') {
+                        if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
-                            $eventData[$element] = $this->_s9y_markup($eventData[$element], $eventData['entry_id']);
+                            $eventData[$element] = $this->_s9y_markup($eventData[$element]);
                         }
                     }
                     return true;
@@ -101,7 +101,7 @@
     }
 
 
-    function _s9y_markup($text, $id) {
+    function _s9y_markup($text) {
         $text = str_replace('\_', chr(1), $text);
         $text = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$text);
         $text = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$text);

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

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

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

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
Propper variable checking (should speed up things)


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_emoticate.php	3 Mar 2004 09:07:01 -0000	1.2
+++ serendipity_event_emoticate.php	18 Mar 2004 12:09:04 -0000	1.3
@@ -95,7 +95,7 @@
                 case 'frontend_display':
 
                     foreach ($this->markup_elements as $temp) {
-                        if ($this->get_config($temp['name']) != 'false') {
+                        if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
     
                             foreach ($this->smiles as $key => $value) {

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

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

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

Modified Files:
	serendipity_event_contentrewrite.php 
Log Message:
Propper variable checking (should speed up things)


Index: serendipity_event_contentrewrite.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_contentrewrite.php	26 Feb 2004 11:29:09 -0000	1.4
+++ serendipity_event_contentrewrite.php	18 Mar 2004 12:09:04 -0000	1.5
@@ -270,7 +270,7 @@
         
                             // \1 and \3 are the prepend/append strings (usually whitespaces) and $new containing the new value
                             foreach ($this->markup_elements as $temp) {
-                                if ($this->get_config($temp['name']) != 'false') {
+                                if ($this->get_config($temp['name']) != 'false' && isset($eventData[$temp['element']])) {
                                     $element = $temp['element'];
                                     $eventData[$element] = preg_replace($regex, '\1' . $new . '\3', $eventData[$element]);
                                 }

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

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

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

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
Propper variable checking (should speed up things)


Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_bbcode.php	26 Feb 2004 11:29:09 -0000	1.1
+++ serendipity_event_bbcode.php	18 Mar 2004 12:09:04 -0000	1.2
@@ -130,7 +130,7 @@
                 case 'frontend_display':
 
                     foreach ($this->markup_elements as $temp) {
-                        if ($this->get_config($temp['name']) != 'false') {
+                        if ($this->get_config($temp['name']) != 'false'&& isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
                             $eventData[$element] = $this->bbcode($eventData[$element]);
                         } 

[php-blog-cvs] serendipity README,1.3,1.4 serendipity_admin_upgrader.inc.php,1.3,1.4

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

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

Modified Files:
	README serendipity_admin_upgrader.inc.php 
Log Message:
CSS info


Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README	15 Mar 2004 10:12:47 -0000	1.3
+++ README	17 Mar 2004 08:46:33 -0000	1.4
@@ -63,6 +63,29 @@
   per-template 'img/' subdirectories. If you modified the original files, you need
   to copy your versions inside the 'templates/default/img/' directory.
 
+* A home-link has been added to the page headers. For that, two new CSS classes
+  have been introduced: #homelink1 (header), homelink2 (subheader).
+  If you have a custom template, you need to adapt to those changes. To make them
+  look like your header previously has, insert this in your style.css:
+  
+  a.homelink1,
+  a.homelink1:hover,
+  a.homelink1:link,
+  a.homelink1:visited,
+  #serendipity_banner h1 {
+    ... your css-definitions ...
+    text-decoration: none;
+  }
+
+  a.homelink2,
+  a.homelink2:hover,
+  a.homelink2:link,
+  a.homelink2:visited,
+  #serendipity_banner h2 {
+    ... your css-definitions ...
+    text-decoration: none;
+  }
+
 ###############################################################################
 # NOTES ON UPDATING FROM 0.4 -> 0.5                                           #
 ###############################################################################

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_upgrader.inc.php	15 Mar 2004 10:12:47 -0000	1.3
+++ serendipity_admin_upgrader.inc.php	17 Mar 2004 08:46:33 -0000	1.4
@@ -1,12 +1,4 @@
 <?php
-/*
-  TODO
-  
-  * 0.5.1-CVS in 0.6 umbenennen: 0.5.1-CVS als 'versionInstalled' soll keine Aktionen von 0.5 ausfuehren.
-  * Von 0.5 sollen Updates auf 0.5.1 und 0.6 ausgefuehrt werden.
-  * 0.5.1 auf 0.6 kein Update
-*/
-
 require_once('serendipity_functions_installer.inc.php');
 
 $abortLoc   = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=ignore';
@@ -107,6 +99,28 @@
     if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.6', '<')) {
         echo '<br /><strong>0.6 - Move images</strong>';
         echo '<br />[INFO] Smilies and XML-Buttons were moved from pixel/ to template/default/img<br />';
+
+        echo '<br /><strong>0.6 - Template/CSS changes</strong>';
+        echo '<br />[INFO] A home-link has been added to the page headers. For that, two new CSS classes have been introduced: #homelink1 (header), homelink2 (subheader).<br />';
+        echo 'If you have a custom template, you need to adapt to those changes. To make themlook like your header previously has, insert this in your style.css:<br /><br />';
+  
+        echo '<pre>a.homelink1,
+  a.homelink1:hover,
+  a.homelink1:link,
+  a.homelink1:visited,
+  #serendipity_banner h1 {
+    ... your css-definitions ...
+    text-decoration: none;
+  }
+
+  a.homelink2,
+  a.homelink2:hover,
+  a.homelink2:link,
+  a.homelink2:visited,
+  #serendipity_banner h2 {
+    ... your css-definitions ...
+    text-decoration: none;
+  }</pre><br />';
     }
 
     /*

[php-blog-cvs] serendipity NEWS,1.89,1.90

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

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

Modified Files:
	NEWS 
Log Message:
Optimized indizes (thanks, zem!)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- NEWS	16 Mar 2004 08:59:54 -0000	1.89
+++ NEWS	16 Mar 2004 09:25:37 -0000	1.90
@@ -3,6 +3,8 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Optimized db indizes on 'entries' (zem)
+
     * Added shoutbox plugin (Matthias Lange, garvinhicking)
 
     * Renamed "0.5.1" to "0.6" because of changes. Updated upgrade-