php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/sql db.sql,1.18,1.19 db_update_0.5_0.5.1_mysql.sql,1.2,1.3 db_update_0.5_0.5.1_postgres.sql,1.2,1.3 db_update_0.6.2_0.6.3_mysql.sql,1.3,1.4 db_update_0.6.2_0.6.3_postgres.sql,1.4,1.5 db_update_0.6.5_0.6.6_mysql.sql,1.1,1.2 db_update_0.6.5_0.6.6_postgres.sql,1.1,1.2 db_update_0.6_0.6.1_mysql.sql,1.2,1.3 db_update_0.6_0.6.1_postgres.sql,1.3,1.4

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

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

Modified Files:
	db.sql db_update_0.5_0.5.1_mysql.sql 
	db_update_0.5_0.5.1_postgres.sql 
	db_update_0.6.2_0.6.3_mysql.sql 
	db_update_0.6.2_0.6.3_postgres.sql 
	db_update_0.6.5_0.6.6_mysql.sql 
	db_update_0.6.5_0.6.6_postgres.sql 
	db_update_0.6_0.6.1_mysql.sql db_update_0.6_0.6.1_postgres.sql 
Log Message:
* Remove pgsql error notice when querying for author on installation
* Fixed names of indices - they are not allowed to be named after an existing column. Use a consistent scheme 'key_idx' for every index key.


Index: db_update_0.6.5_0.6.6_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.5_0.6.6_postgres.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.5_0.6.6_postgres.sql	18 Jun 2004 09:04:40 -0000	1.1
+++ db_update_0.6.5_0.6.6_postgres.sql	13 Oct 2004 08:57:52 -0000	1.2
@@ -1 +1 @@
-CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file
+CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- db.sql	28 Jul 2004 16:39:48 -0000	1.18
+++ db.sql	13 Oct 2004 08:57:52 -0000	1.19
@@ -42,7 +42,7 @@
   status varchar(50) not null
 );
 
-CREATE {FULLTEXT} INDEX body on {PREFIX}comments (body);
+CREATE {FULLTEXT} INDEX body_idx on {PREFIX}comments (body);
 
 #
 # table structure for table '{PREFIX}entries'
@@ -65,7 +65,7 @@
   moderate_comments {BOOLEAN}
 );
 
-CREATE {FULLTEXT} INDEX entry on {PREFIX}entries (title,body,extended);
+CREATE {FULLTEXT} INDEX entry_idx on {PREFIX}entries (title,body,extended);
 CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
 CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 
@@ -122,7 +122,7 @@
   authorid int(11) default '0'
 );
 
-CREATE INDEX authorid ON {PREFIX}config (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 CREATE TABLE {PREFIX}suppress (
   ip varchar(15) default NULL,
@@ -134,7 +134,7 @@
   last timestamp NOT NULL
 );
 
-CREATE unique INDEX url on {PREFIX}suppress (host, ip);
+CREATE unique INDEX url_idx on {PREFIX}suppress (host, ip);
 
 CREATE TABLE {PREFIX}plugins (
   name varchar(128) not null,
@@ -144,7 +144,7 @@
   PRIMARY KEY(name)
 );
 
-CREATE INDEX authorid ON {PREFIX}config (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 CREATE TABLE {PREFIX}category (
   categoryid {AUTOINCREMENT} {PRIMARY},
@@ -171,11 +171,11 @@
   path text
 );
 
-CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);
+CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);
 
 CREATE TABLE {PREFIX}entrycat (
   entryid int(11) not null,
   categoryid int(11) not null
 );
 
-CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid);
+CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid);

Index: db_update_0.5_0.5.1_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_postgres.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.5_0.5.1_postgres.sql	11 Apr 2004 04:22:21 -0000	1.2
+++ db_update_0.5_0.5.1_postgres.sql	13 Oct 2004 08:57:52 -0000	1.3
@@ -17,15 +17,15 @@
 UPDATE {PREFIX}config
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
  WHERE name LIKE '%serendipity_plugin_content_rewrite%';
- 
+
 UPDATE {PREFIX}plugins
    SET placement = 'event'
  WHERE name LIKE '%serendipity_event_contentrewrite%';
- 
+
 ALTER TABLE {PREFIX}entries ADD COLUMN last_modified INT;
 
-CREATE INDEX timestamp ON {PREFIX}entries (timestamp);
-CREATE INDEX last_modified ON {PREFIX}entries (last_modified);
+CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
+CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 UPDATE {PREFIX}entries SET last_modified = timestamp;
 
 INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);

Index: db_update_0.6.2_0.6.3_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.2_0.6.3_mysql.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db_update_0.6.2_0.6.3_mysql.sql	26 May 2004 17:02:35 -0000	1.3
+++ db_update_0.6.2_0.6.3_mysql.sql	13 Oct 2004 08:57:52 -0000	1.4
@@ -1,2 +1,2 @@
 ALTER TABLE {PREFIX}images ADD COLUMN path text;
-CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);
+CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);

Index: db_update_0.6_0.6.1_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_postgres.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db_update_0.6_0.6.1_postgres.sql	6 Sep 2004 09:15:32 -0000	1.3
+++ db_update_0.6_0.6.1_postgres.sql	13 Oct 2004 08:57:52 -0000	1.4
@@ -8,15 +8,15 @@
 UPDATE {PREFIX}config SET authorid=0;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET NOT NULL;
 ALTER TABLE {PREFIX}config  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX config_authorid ON {PREFIX}config (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP CONSTRAINT {PREFIX}config_pkey;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}plugins  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX plugins_authorid ON {PREFIX}plugins (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD COLUMN authorid  INT;
 ALTER TABLE {PREFIX}images  ALTER COLUMN authorid SET DEFAULT '0';
-CREATE INDEX images_authorid ON {PREFIX}images (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}images (authorid);

Index: db_update_0.5_0.5.1_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_mysql.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.5_0.5.1_mysql.sql	2 Mar 2004 17:57:05 -0000	1.2
+++ db_update_0.5_0.5.1_mysql.sql	13 Oct 2004 08:57:52 -0000	1.3
@@ -18,14 +18,14 @@
 UPDATE {PREFIX}config
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
  WHERE name LIKE '%serendipity_plugin_content_rewrite%';
- 
+
 UPDATE {PREFIX}plugins
    SET placement = 'event'
  WHERE name LIKE '%serendipity_event_contentrewrite%';
 
 ALTER TABLE {PREFIX}entries ADD last_modified INT(10) UNSIGNED default null;
-CREATE INDEX timestamp ON {PREFIX}entries (timestamp);
-CREATE INDEX last_modified ON {PREFIX}entries (last_modified);
+CREATE INDEX date_idx ON {PREFIX}entries (timestamp);
+CREATE INDEX mod_idx ON {PREFIX}entries (last_modified);
 UPDATE {PREFIX}entries SET last_modified = timestamp;
 
 INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);

Index: db_update_0.6.2_0.6.3_postgres.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.2_0.6.3_postgres.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db_update_0.6.2_0.6.3_postgres.sql	6 Sep 2004 09:15:32 -0000	1.4
+++ db_update_0.6.2_0.6.3_postgres.sql	13 Oct 2004 08:57:52 -0000	1.5
@@ -1,4 +1,4 @@
 ALTER TABLE {PREFIX}images ADD COLUMN path text;
 ALTER TABLE {PREFIX}images ALTER COLUMN path SET DEFAULT '/';
 UPDATE {PREFIX}images SET path = '/';
-CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);
+CREATE {FULLTEXT} INDEX pathkey_idx on {PREFIX}images (path);

Index: db_update_0.6_0.6.1_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6_0.6.1_mysql.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db_update_0.6_0.6.1_mysql.sql	7 Apr 2004 08:17:50 -0000	1.2
+++ db_update_0.6_0.6.1_mysql.sql	13 Oct 2004 08:57:52 -0000	1.3
@@ -3,13 +3,13 @@
 UPDATE {PREFIX}authors SET userlevel = 1 WHERE authorid > 1;
 
 ALTER TABLE {PREFIX}config  ADD authorid  INT UNSIGNED NOT NULL DEFAULT '0';
-ALTER TABLE {PREFIX}config  ADD INDEX (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}config (authorid);
 
 ALTER TABLE {PREFIX}config  DROP PRIMARY KEY;
 ALTER TABLE {PREFIX}config  ADD PRIMARY KEY (name, authorid);
 
 ALTER TABLE {PREFIX}plugins  ADD authorid  INT UNSIGNED DEFAULT '0';
-ALTER TABLE {PREFIX}plugins  ADD INDEX (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}plugins (authorid);
 
 ALTER TABLE {PREFIX}images  ADD authorid  INT UNSIGNED DEFAULT '0';
-ALTER TABLE {PREFIX}images  ADD INDEX (authorid);
+CREATE INDEX authorid_idx ON {PREFIX}images (authorid);

Index: db_update_0.6.5_0.6.6_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.6.5_0.6.6_mysql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.6.5_0.6.6_mysql.sql	18 Jun 2004 09:04:40 -0000	1.1
+++ db_update_0.6.5_0.6.6_mysql.sql	13 Oct 2004 08:57:52 -0000	1.2
@@ -1 +1 @@
-CREATE UNIQUE INDEX entryid ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file
+CREATE UNIQUE INDEX entryid_idx ON {PREFIX}entrycat (entryid, categoryid);
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_db_postgres.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-serv13315

Modified Files:
	serendipity_db_postgres.inc.php 
Log Message:
* Remove pgsql error notice when querying for author on installation
* Fixed names of indices - they are not allowed to be named after an existing column. Use a consistent scheme 'key_idx' for every index key.


Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_db_postgres.inc.php	9 Sep 2004 10:52:02 -0000	1.18
+++ serendipity_db_postgres.inc.php	13 Oct 2004 08:57:52 -0000	1.19
@@ -65,7 +65,11 @@
                          'both'  => PGSQL_BOTH
     );
 
-    $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql);
+    if ($reportErr || !$serendipity['production']) {
+        $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql);
+    } else {
+        $serendipity['dbLastResult'] = @pg_query($serendipity['dbConn'], $sql);
+    }
 
     if (!$serendipity['dbLastResult']) {
         if (!$serendipity['production']) {

[php-blog-cvs] serendipity serendipity_db_mysql.inc.php,1.22.2.2,1.22.2.3 serendipity_functions.inc.php,1.419.2.48,1.419.2.49

[Evan N. <tad...@us...>]

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

Modified Files:
      Tag: branch-smarty
	serendipity_db_mysql.inc.php serendipity_functions.inc.php 
Log Message:
Make WP importer work with MySQL, i18n stuff.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.48
retrieving revision 1.419.2.49
diff -u -d -r1.419.2.48 -r1.419.2.49
--- serendipity_functions.inc.php	11 Oct 2004 22:32:47 -0000	1.419.2.48
+++ serendipity_functions.inc.php	12 Oct 2004 21:00:11 -0000	1.419.2.49
@@ -2367,22 +2367,22 @@
     }
 
     if ( !extension_loaded('mysql') ) {
-        return 'You must have the MySQL extension in order to access the WordPress database.';
+        return MYSQL_REQUIRED;;
     }
 
     $wpdb = @mysql_connect($wp['host'], $wp['user'], $wp['pass']);
     if ( !$wpdb ) {
-        return 'Could not connect to MySQL database: ' . mysql_error($wpdb);
+        return sprintf(COULDNT_CONNECT, mysql_error($wpdb));
     }
 
     if ( !@mysql_select_db($wp['name']) ) {
-        return 'Could not select database: ' . mysql_error($wpdb);
+        return sprintf(COULDNT_SELECT_DB, mysql_error($wpdb));
     }
 
     /* Users */
     $res = @mysql_query("SELECT ID, user_login, user_pass, user_email, user_level FROM {$wp['prefix']}users;", $wpdb);
     if ( !$res ) {
-        return 'Could not select user information: ' . mysql_error($wpdb);
+        return sprintf(COULDNT_COULDNT_SELECT_USER_INFO, mysql_error($wpdb));
     }
 
     for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
@@ -2407,7 +2407,7 @@
     /* Categories */
     $res = @mysql_query("SELECT cat_ID, cat_name, category_description, category_parent FROM {$wp['prefix']}categories ORDER BY category_parent, cat_ID;", $wpdb);
     if ( !$res ) {
-        return 'Could not select category information: ' . mysql_error($wpdb);
+        return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($wpdb));
     }
 
     // Get all the info we need
@@ -2449,7 +2449,7 @@
     /* Entries */
     $res = @mysql_query("SELECT * FROM {$wp['prefix']}posts ORDER BY post_date;", $wpdb);
     if ( !$res ) {
-        return 'Could not select entry information: ' . mysql_error($wpdb);
+        return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb));
     }
 
     for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
@@ -2476,7 +2476,7 @@
     /* Entry/category */
     $res = @mysql_query("SELECT * FROM {$wp['prefix']}post2cat;", $wpdb);
     if ( !$res ) {
-        return 'Could not select entry/category information: ' . mysql_error($wpdb);
+        return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb));
     }
 
     while ( $a = mysql_fetch_assoc($res) ) {
@@ -2498,7 +2498,7 @@
     /* Comments */
     $res = @mysql_query("SELECT * FROM {$wp['prefix']}comments;", $wpdb);
     if ( !$res ) {
-        return 'Could not select comment information: ' . mysql_error($wpdb);
+        return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($wpdb));
     }
 
     while ( $a = mysql_fetch_assoc($res) ) {

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -d -r1.22.2.2 -r1.22.2.3
--- serendipity_db_mysql.inc.php	22 Sep 2004 10:58:56 -0000	1.22.2.2
+++ serendipity_db_mysql.inc.php	12 Oct 2004 21:00:11 -0000	1.22.2.3
@@ -17,14 +17,14 @@
 
     // highlight_string(var_export($sql, 1));
 
-    $c = mysql_query($sql);
-    if (mysql_error() != '') {
-        return '<pre>' . $sql . '</pre> / ' . mysql_error();
+    $c = mysql_query($sql, $serendipity['dbConn']);
+    if (mysql_error($serendipity['dbConn']) != '') {
+        return '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']);
     }
 
     if (!$c) {
         if (!$serendipity['production']) {
-            print '<pre>' . $sql . '</pre> / ' . mysql_error();
+            print '<pre>' . $sql . '</pre> / ' . mysql_error($serendipity['dbConn']);
             if (function_exists('debug_backtrace') && $reportErr == true) {
                 highlight_string(var_export(debug_backtrace(), 1));
             }
@@ -67,11 +67,15 @@
 }
 
 function serendipity_db_insert_id() {
-    return mysql_insert_id();
+    global $serendipity;
+
+    return mysql_insert_id($serendipity['dbConn']);
 }
 
 function serendipity_db_affected_rows() {
-    return mysql_affected_rows();
+    global $serendipity;
+
+    return mysql_affected_rows($serendipity['dbConn']);
 }
 
 function serendipity_db_escape_string($string) {

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.82,1.83

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

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

Modified Files:
	serendipity_lang_da.inc.php 
Log Message:
- Sync translations


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- serendipity_lang_da.inc.php	27 Sep 2004 10:15:38 -0000	1.82
+++ serendipity_lang_da.inc.php	12 Oct 2004 19:20:49 -0000	1.83
@@ -79,7 +79,7 @@
 @define('ADD_COMMENT', 'Tilføj kommentar');
 @define('NO_COMMENTS', 'Ingen kommentarer.');
 @define('POSTED_BY', 'Skrevet af');
-@define('ON', 'aktiv');
+@define('ON', '');
 @define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar er blevet oprettet på din blog "%s", til artiklen ved navn "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Et nyt trackback er blevet lavet til din artikel ved navn "%s".');
 @define('NO_CATEGORY', 'Ingen kategori');
@@ -544,11 +544,11 @@
 @define('SIDEBAR_PLUGINS', 'Sidebarplugins');
 @define('EVENT_PLUGINS', 'Hændelseplugins');
 @define('ADD_MEDIA_BLAHBLAH', '<b>Tilføj en fil til dit mediearkiv:</b><p>Her kan du uploade mediafiler, eller bede mig hente dem fra et sted på nette! Hvis du ikke har et passende billeder, <a href="http://images.google.com" target="_blank">prøv at søg efter billeder på google</a> der passer til dine tanker, resultatet er ofte brugbart og sjovt :)<p><b>Vælg metode:</b><br>');
-@define('COMMENTS_FILTER_SHOW', 'Show'); // Translate
-@define('COMMENTS_FILTER_ALL', 'All'); // Translate
-@define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
-@define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
-@define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
+@define('COMMENTS_FILTER_SHOW', 'Vis');
+@define('COMMENTS_FILTER_ALL', 'Alle');
+@define('COMMENTS_FILTER_APPROVED_ONLY', 'Kun godkendte');
+@define('COMMENTS_FILTER_NEED_APPROVAL', 'Afventer godkendelse');
+@define('RSS_IMPORT_BODYONLY', 'Anbring al tekst i "body" sektionen og undlad at opdele det i en "udvidet artikel" sektion.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.3,1.15.2.4 serendipity_lang_cs.inc.php,1.61.2.3,1.61.2.4 serendipity_lang_da.inc.php,1.79.2.4,1.79.2.5 serendipity_lang_de.inc.php,1.98.2.3,1.98.2.4 serendipity_lang_en.inc.php,1.79.2.5,1.79.2.6 serendipity_lang_es.inc.php,1.77.2.3,1.77.2.4 serendipity_lang_fr.inc.php,1.58.2.4,1.58.2.5 serendipity_lang_it.inc.php,1.1.2.3,1.1.2.4 serendipity_lang_nl.inc.php,1.36.2.3,1.36.2.4 serendipity_lang_no.inc.php,1.2.2.3,1.2.2.4 serendipity_lang_pt.inc.php,1.36.2.4,1.36.2.5

[Evan N. <tad...@us...>]

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_bg.inc.php serendipity_lang_cs.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:
Add import code for MT and WP.

Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.3
retrieving revision 1.61.2.4
diff -u -d -r1.61.2.3 -r1.61.2.4
--- serendipity_lang_cs.inc.php	11 Oct 2004 09:21:16 -0000	1.61.2.3
+++ serendipity_lang_cs.inc.php	11 Oct 2004 22:32:47 -0000	1.61.2.4
@@ -555,5 +555,20 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- serendipity_lang_no.inc.php	11 Oct 2004 09:21:16 -0000	1.2.2.3
+++ serendipity_lang_no.inc.php	11 Oct 2004 22:32:48 -0000	1.2.2.4
@@ -550,4 +550,19 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.3
retrieving revision 1.36.2.4
diff -u -d -r1.36.2.3 -r1.36.2.4
--- serendipity_lang_nl.inc.php	11 Oct 2004 09:21:16 -0000	1.36.2.3
+++ serendipity_lang_nl.inc.php	11 Oct 2004 22:32:48 -0000	1.36.2.4
@@ -560,5 +560,21 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.5
retrieving revision 1.79.2.6
diff -u -d -r1.79.2.5 -r1.79.2.6
--- serendipity_lang_en.inc.php	11 Oct 2004 09:21:16 -0000	1.79.2.5
+++ serendipity_lang_en.inc.php	11 Oct 2004 22:32:48 -0000	1.79.2.6
@@ -188,6 +188,21 @@
 @define('VIEW_FEED_EXPORT', 'View feed export');
 @define('IMPORT', 'Import');
 @define('EXPORT', 'Export');
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...');
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.');
+@define('MT_DATA_FILE', 'Movable Type data file');
+@define('FORCE', 'Force');
+@define('WORDPRESS_DATA', 'WordPress data');
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.');
+@define('CREATE_AUTHOR', 'Create author \'%s\'.');
+@define('CREATE_CATEGORY', 'Create category \'%s\'.');
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.');
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.');
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.');
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.');
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.');
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.');
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.');
 @define('YES', 'Yes');
 @define('NO', 'No');
 @define('USE_DEFAULT', 'Default');

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -d -r1.15.2.3 -r1.15.2.4
--- serendipity_lang_bg.inc.php	11 Oct 2004 09:21:16 -0000	1.15.2.3
+++ serendipity_lang_bg.inc.php	11 Oct 2004 22:32:47 -0000	1.15.2.4
@@ -537,5 +537,20 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.4
retrieving revision 1.36.2.5
diff -u -d -r1.36.2.4 -r1.36.2.5
--- serendipity_lang_pt.inc.php	11 Oct 2004 09:21:16 -0000	1.36.2.4
+++ serendipity_lang_pt.inc.php	11 Oct 2004 22:32:48 -0000	1.36.2.5
@@ -556,6 +556,21 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- serendipity_lang_it.inc.php	11 Oct 2004 09:21:16 -0000	1.1.2.3
+++ serendipity_lang_it.inc.php	11 Oct 2004 22:32:48 -0000	1.1.2.4
@@ -552,5 +552,21 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.4
retrieving revision 1.79.2.5
diff -u -d -r1.79.2.4 -r1.79.2.5
--- serendipity_lang_da.inc.php	11 Oct 2004 09:21:16 -0000	1.79.2.4
+++ serendipity_lang_da.inc.php	11 Oct 2004 22:32:48 -0000	1.79.2.5
@@ -550,5 +550,20 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.4
retrieving revision 1.58.2.5
diff -u -d -r1.58.2.4 -r1.58.2.5
--- serendipity_lang_fr.inc.php	11 Oct 2004 09:21:16 -0000	1.58.2.4
+++ serendipity_lang_fr.inc.php	11 Oct 2004 22:32:48 -0000	1.58.2.5
@@ -558,5 +558,20 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.3
retrieving revision 1.77.2.4
diff -u -d -r1.77.2.3 -r1.77.2.4
--- serendipity_lang_es.inc.php	11 Oct 2004 09:21:16 -0000	1.77.2.3
+++ serendipity_lang_es.inc.php	11 Oct 2004 22:32:48 -0000	1.77.2.4
@@ -559,5 +559,20 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // 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.3
retrieving revision 1.98.2.4
diff -u -d -r1.98.2.3 -r1.98.2.4
--- serendipity_lang_de.inc.php	11 Oct 2004 09:21:16 -0000	1.98.2.3
+++ serendipity_lang_de.inc.php	11 Oct 2004 22:32:48 -0000	1.98.2.4
@@ -552,5 +552,20 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Zu bewilligende');
 @define('RSS_IMPORT_BODYONLY', 'Füge den gesamten importierten Text in das einzelne "Text"-Feld ein. Verhindert die Aufteilung in den "Erweiterten Eintrag"-Bereich.');
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Volle Einträge mit erweitertem Text im RSS-Feed einbinden');
+@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
+@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.') // Translate;
+@define('MT_DATA_FILE', 'Movable Type data file'); // Translate
+@define('FORCE', 'Force'); // Translate
+@define('WORDPRESS_DATA', 'WordPress data'); // Translate
+@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
+@define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
+@define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
+@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
+@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.'); // Translate
+@define('COULDNT_SELECT_DB', 'Could not select database: %s.'); // Translate
+@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.'); // Translate
+@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.'); // Translate
+@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.'); // Translate
+@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.'); // Translate
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity NEWS,1.214.2.30,1.214.2.31 serendipity_admin_interop.inc.php,1.7.2.1,1.7.2.2 serendipity_functions.inc.php,1.419.2.47,1.419.2.48

[Evan N. <tad...@us...>]

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_admin_interop.inc.php 
	serendipity_functions.inc.php 
Log Message:
Add import code for MT and WP.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.47
retrieving revision 1.419.2.48
diff -u -d -r1.419.2.47 -r1.419.2.48
--- serendipity_functions.inc.php	11 Oct 2004 09:21:06 -0000	1.419.2.47
+++ serendipity_functions.inc.php	11 Oct 2004 22:32:47 -0000	1.419.2.48
@@ -1334,13 +1334,14 @@
     if (!is_array($ca) || serendipity_db_bool($ca['allow_comments'])) {
         $title         = serendipity_db_escape_string(isset($commentInfo['title']) ? $commentInfo['title'] : '');
         $comments      = $commentInfo['comment'];
-        $ip            = $_SERVER['REMOTE_ADDR'];
+        $ip            = isset($commentInfo['ip']) ? $commentInfo['ip'] : $_SERVER['REMOTE_ADDR'];
         $commentsFixed = serendipity_db_escape_string($commentInfo['comment']);
         $name          = serendipity_db_escape_string($commentInfo['name']);
         $url           = serendipity_db_escape_string($commentInfo['url']);
         $email         = serendipity_db_escape_string($commentInfo['email']);
         $parentid      = (isset($commentInfo['parent_id']) && is_numeric($commentInfo['parent_id'])) ? $commentInfo['parent_id'] : 0;
-        $status        = (serendipity_db_bool($ca['moderate_comments'])) ? 'pending' : 'approved';
+        $status        = isset($commentInfo['status']) ? $commentInfo['status'] : (serendipity_db_bool($ca['moderate_comments']) ? 'pending' : 'approved');
+        $t      = isset($commentInfo['time']) ? $commentInfo['time'] : time();
 
         if (isset($commentInfo['subscribe'])) {
             $subscribe = 'true';
@@ -1348,7 +1349,6 @@
             $subscribe = 'false';
         }
 
-        $t      = time();
         $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, ip, author, email, url, body, type, timestamp, title, subscribed, status)";
         $query .= " VALUES ('$id', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$status')";
 
@@ -2259,6 +2259,298 @@
     serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'");
 }
 
+/**
+* Import from Movable Type's format.
+**/
+function serendipity_importMT($contents, $force = false) {
+    global $serendipity;
+
+    if ( $serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN ) {
+        return array(MUST_BE_ADMIN);
+    }
+
+    $authors = array();
+    $categories = serendipity_fetchCategories();
+    $tasks = array();
+
+    $entries = array();
+    $n = 0;
+    foreach ( preg_split('/\r?\n--------\r?\n/', $contents) as $entry ) {
+        if ( preg_match_all('/([A-Z ]+):( |\r?\n)(.*)\r?\n(-----)?/', $entry, $res) ) {
+            $entries[$n]['categories'] = array();
+            for ( $x=0 ; $x<sizeof($res[1]) ; $x++ ) {
+                switch ( $res[1][$x] ) {
+                    case 'AUTHOR':
+                        if ( !isset($authors[$res[3][$x]]) ) {
+                            $au_inf = serendipity_fetchAuthor($res[3][$x]);
+                            if ( !is_array($au_inf) ) {
+                                $tasks[] = sprintf(CREATE_AUTHOR, htmlspecialchars($res[3][$x]));
+                                $au_inf = serendipity_fetchAuthor($serendipity['authorid']);
+                            }
+                            $authors[$res[3][$x]] = $au_inf[0];
+                        }
+                        $entries[$n]['authorid'] = $authors[$res[3][$x]]['authorid'];
+                        $entries[$n]['author'] = $authors[$res[3][$x]]['username'];
+                        break;
+                    case 'TITLE':
+                        $entries[$n]['title'] = $res[3][$x];
+                        break;
+                    case 'STATUS':
+                        $entries[$n]['isdraft'] = ($res[3][$x] == 'Publish') ? 'false' : 'true';
+                        break;
+                    case 'ALLOW COMMENTS':
+                        $entries[$n]['allow_comments'] = ($res[3][$x] == '1') ? 'true' : 'false';
+                        break;
+                    case 'DATE':
+                        $entries[$n]['timestamp'] = strtotime($res[3][$x]);
+                        if ( $entries[$n]['timestamp'] == 0 ) {
+                            $entries[$n]['timestamp'] = time();
+                        }
+                        break;
+                    case 'BODY':
+                        $entries[$n]['body'] = $res[3][$x];
+                        break;
+                    case 'EXTENDED BODY':
+                        $entries[$n]['extended'] = $res[3][$x];
+                        break;
+                    case 'PRIMARY CATEGORY':
+                    case 'CATEGORY':
+                        $cat_found = false;
+                        if ( is_array($categories) ) {
+                            for ( $y=0 ; $y<sizeof($categories) ; $y++ ) {
+                                if ( $categories[$y]['category_name'] == $res[3][$x] ) {
+                                    $cat_found = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if ( $cat_found && !in_array($categories[$y]['categoryid'], $entries[$n]['categories']) ) {
+                            $entries[$n]['categories'][] = $categories[$y]['categoryid'];
+                            $entries[$n]['categories'][] = $categories[$y]['categoryid'];
+                        }
+                        else {
+                            $tasks[] = sprintf(CREATE_CATEGORY, htmlspecialchars($res[3][$x]));
+                        }
+                        break;
+                }
+            }
+        }
+        $n++;
+    }
+
+    if ( !sizeof($tasks) || $force == true ) {
+        foreach ( $entries as $entry ) {
+            if ( !is_int($r = serendipity_updertEntry($entry)) ) {
+                echo '<div class="important">' . $r . '</div>';
+            }
+        }
+        return true;
+    }
+    else {
+        return array_unique($tasks);
+    }
+}
+
+/**
+* Import from a WordPress installation.
+**/
+function serendipity_importWP($wp) {
+    global $serendipity;
+
+    $wp['prefix'] = serendipity_db_escape_string($wp['prefix']);
+    $users = array();
+    $categories = array();
+    $entries = array();
+
+    if ( $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN ) {
+        return MUST_BE_ADMIN;
+    }
+
+    if ( !extension_loaded('mysql') ) {
+        return 'You must have the MySQL extension in order to access the WordPress database.';
+    }
+
+    $wpdb = @mysql_connect($wp['host'], $wp['user'], $wp['pass']);
+    if ( !$wpdb ) {
+        return 'Could not connect to MySQL database: ' . mysql_error($wpdb);
+    }
+
+    if ( !@mysql_select_db($wp['name']) ) {
+        return 'Could not select database: ' . mysql_error($wpdb);
+    }
+
+    /* Users */
+    $res = @mysql_query("SELECT ID, user_login, user_pass, user_email, user_level FROM {$wp['prefix']}users;", $wpdb);
+    if ( !$res ) {
+        return 'Could not select user information: ' . mysql_error($wpdb);
+    }
+
+    for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
+        $users[$x] = mysql_fetch_assoc($res);
+
+        $data = array('right_publish' => ($users[$x]['user_level'] >= 1) ? 1 : 0,
+                      'username'      => $users[$x]['user_login'],
+                      'password'      => $users[$x]['user_pass']); // WP uses md5, too.
+
+        if ( $users[$x]['user_level'] <= 1 ) {
+            $data['userlevel'] = USERLEVEL_EDITOR;
+        } elseif ( $users[$x]['user_level'] < 5 ) {
+            $data['userlevel'] = USERLEVEL_CHIEF;
+        } else {
+            $data['userlevel'] = USERLEVEL_ADMIN;
+        }
+
+        serendipity_db_insert('authors', $data);
+        $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
+    }
+
+    /* Categories */
+    $res = @mysql_query("SELECT cat_ID, cat_name, category_description, category_parent FROM {$wp['prefix']}categories ORDER BY category_parent, cat_ID;", $wpdb);
+    if ( !$res ) {
+        return 'Could not select category information: ' . mysql_error($wpdb);
+    }
+
+    // Get all the info we need
+    for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ )
+        $categories[] = mysql_fetch_assoc($res);
+
+    // Insert all categories as top level (we need to know everyone's ID before we can represent the hierarchy).
+    for ( $x=0 ; $x<sizeof($categories) ; $x++ ) {
+        $cat = array('category_name'        => $categories[$x]['cat_name'],
+                     'category_description' => $categories[$x]['category_description'],
+                     'parentid'             => 0, // <---
+                     'category_left'        => 0,
+                     'category_right'       => 0);
+
+        serendipity_db_insert('category', $cat);
+        $categories[$x]['categoryid'] = serendipity_db_insert_id('category', 'categoryid');
+    }
+
+    // There has to be a more efficient way of doing this...
+    foreach ( $categories as $cat ) {
+        if ( $cat['category_parent'] != 0 ) {
+            // Find the parent
+            $par_id = 0;
+            foreach ( $categories as $possible_par ) {
+                if ( $possible_par['cat_ID'] == $cat['category_parent'] ) {
+                    $par_id = $possible_par['categoryid'];
+                    break;
+                }
+            }
+
+            if ( $par_id != 0 ) {
+              serendipity_db_query("UPDATE {$serendipity['dbPrefix']}category SET parentid={$par_id} WHERE categoryid={$cat['categoryid']};");
+            } // else { echo "D'oh! " . random_string_of_profanity(); }
+        }
+    }
+
+    serendipity_rebuildCategoryTree();
+
+    /* Entries */
+    $res = @mysql_query("SELECT * FROM {$wp['prefix']}posts ORDER BY post_date;", $wpdb);
+    if ( !$res ) {
+        return 'Could not select entry information: ' . mysql_error($wpdb);
+    }
+
+    for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
+        $entries[$x] = mysql_fetch_assoc($res);
+
+        $entry = array('title' => $entries[$x]['post_title'],
+                       'isdraft' => ($entries[$x]['post_status'] == 'publish') ? 'false' : 'true',
+                       'allow_comments' => ($entries[$x]['comment_status '] == 'open ') ? 'true' : 'false',
+                       'timestamp' => strtotime($entries[$x]['post_date']),
+                       'body' => $entries[$x]['post_content']);
+
+        foreach ( $users as $user ) {
+            if ( $user['ID'] == $entries[$x]['post_author'] ) {
+                $entry['authorid'] = $user['authorid'];
+                break;
+            }
+        }
+
+        if ( !is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry)) ) {
+            return $entries[$x]['entryid'];
+        }
+    }
+
+    /* Entry/category */
+    $res = @mysql_query("SELECT * FROM {$wp['prefix']}post2cat;", $wpdb);
+    if ( !$res ) {
+        return 'Could not select entry/category information: ' . mysql_error($wpdb);
+    }
+
+    while ( $a = mysql_fetch_assoc($res) ) {
+        foreach ( $categories as $category ) {
+            if ( $category['cat_ID'] == $a['category_id'] ) {
+                foreach ( $entries as $entry ) {
+                    if ( $a['post_id'] == $entry['ID'] ) {
+                        $data = array('entryid' => $entry['entryid'],
+                                      'categoryid' => $category['categoryid']);
+                        serendipity_db_insert('entrycat', $data);
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    /* Comments */
+    $res = @mysql_query("SELECT * FROM {$wp['prefix']}comments;", $wpdb);
+    if ( !$res ) {
+        return 'Could not select comment information: ' . mysql_error($wpdb);
+    }
+
+    while ( $a = mysql_fetch_assoc($res) ) {
+        foreach ( $entries as $entry ) {
+            if ( $entry['ID'] == $a['comment_post_ID'] ) {
+                $comment = array('entry_id ' => $entry['entryid'],
+                                 'parent_id' => 0,
+                                 'timestamp' => strtotime($a['comment_date']),
+                                 'author' => $a['comment_author'],
+                                 'email' => $a['comment_author_email'],
+                                 'url' => $a['comment_author_url'],
+                                 'ip' => $a['comment_author_IP'],
+                                 'status' => 'approved',
+                                 'body' => $a['comment_content'],
+                                 'type' => 'NORMAL');
+
+                serendipity_db_insert('comments', $comment);
+                serendipity_approveComment($cid, $id, true);
+            }
+        }
+    }
+
+    // That was fun.
+    return false;
+}
+
+/**
+* Returns the maximum file upload size, in bytes (0 if none).
+**/
+function serendipity_maxfileuploadsize() {
+    if ( $val = trim(ini_get('upload_max_filesize')) == '' )
+        return 0;
+
+    switch(substr($val, -1)) {
+        case 'k':
+        case 'K':
+            return (int) $val * 1024;
+            break;
+        case 'm':
+        case 'M':
+            return (int) $val * 1048576;
+            break;
+        default:
+            return $val;
+   }
+}
+
+function serendipity_fetchAuthor($author) {
+    global $serendipity;
+
+    return serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}authors WHERE " . (is_numeric($author) ? "authorid={$author};" : "username='{$author}';"));
+}
 
 /**
 * Split up a filename

Index: serendipity_admin_interop.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_interop.inc.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_admin_interop.inc.php	27 Sep 2004 10:13:39 -0000	1.7.2.1
+++ serendipity_admin_interop.inc.php	11 Oct 2004 22:32:47 -0000	1.7.2.2
@@ -18,11 +18,29 @@
     <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;all=1"><?php echo VIEW_FEED_EXPORT; ?></a>
 <?php
     exit;
+} else if (isset($serendipity['POST']['import_mt'])) {
+    $tasks = serendipity_importMT(file_get_contents($_FILES['serendipity']['tmp_name']['mt_dat']), isset($serendipity['POST']['mt_force']));
+
+    if ( is_array($tasks) ) {
+        echo MAX_COMPAT_OLD_BLOG . "\n<ul>\n";
+        foreach ( array_unique($tasks) as $task ) {
+            echo "  <li>$task</li>\n";
+        }
+        echo "</ul>\n" . IMPORT_AGAIN_FORCE;
+    }
+    else {
+        echo ENTRIES_SUCCESSFULLY_INSERTED . "\n<br />\n";
+    }
+} else if (isset($serendipity['POST']['wp']['submit'])) {
+    if ( $wp_err = serendipity_importWP($serendipity['POST']['wp']) ) {
+        echo '<div class="serendipity_msg_important">' . var_dump($wp_err) . '</div>';
+    }
 }
+
 ?>
 
 <p>
-    <h3><?php echo IMPORT; ?></h3>
+    <h3><?php echo IMPORT; ?> RSS</h3>
 
     <form method="POST">
         <div>
@@ -49,6 +67,57 @@
 </p>
 
 <p>
+    <h3><?php echo IMPORT . ' ' . MT_DATA_FILE; ?></h3>
+
+    <form method="post" enctype="multipart/form-data">
+<?php if (serendipity_maxFileUploadSize()) { ?>
+        <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo serendipity_maxFileUploadSize(); ?>" />
+<?php } ?>
+        <div>
+            <label for="serendipity[mt_dat]"><?php echo MT_DATA_FILE; ?></label>
+            <input id="serendipity[mt_dat]" type="file" name="serendipity[mt_dat]" size="30" />
+        </div>
+        <div>
+            <label for="serendipity[mt_force]"><?php echo FORCE; ?></label>
+            <input id="serendipity[mt_force]" type="checkbox" name="serendipity[mt_force]" size="30" />
+        </div>
+        <div>
+            <input type="submit" name="serendipity[import_mt]" value="<?php echo IMPORT . ' ' . MT_DATA_FILE; ?>" />
+        </div>
+    </form>
+</p>
+
+<p>
+    <h3><?php echo IMPORT . ' ' . WORDPRESS_DATA; ?></h3>
+
+    <form method="post">
+        <div>
+            <label for="serendipity_wp_host"><?php echo INSTALL_DBHOST; ?>:</label>
+            <input type="text" name="serendipity[wp][host]" value="<?php echo isset($serendipity['POST']['wp']['host']) ? $serendipity['POST']['wp']['host'] : $serendipity['dbHost']; ?>" id="serendipity_wp_host"/>
+        </div>
+        <div>
+            <label for="serendipity_wp_user"><?php echo INSTALL_DBUSER; ?>:</label>
+            <input type="text" name="serendipity[wp][user]" value="<?php echo isset($serendipity['POST']['wp']['user']) ? $serendipity['POST']['wp']['user'] : $serendipity['dbUser']; ?>" id="serendipity_wp_user"/>
+        </div>
+        <div>
+            <label for="serendipity_wp_pass"><?php echo INSTALL_DBPASS; ?>:</label>
+            <input type="password" name="serendipity[wp][pass]" <?php echo isset($serendipity['POST']['wp']['pass']) ? 'value="' . $serendipity['POST']['wp']['pass'] . '" ' : ($serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN ? 'value="' . $serendipity['dbPass'] . '" ' : '') ?>id="serendipity_wp_pass"/>
+        </div>
+        <div>
+            <label for="serendipity_wp_name"><?php echo INSTALL_DBNAME; ?>:</label>
+            <input type="text" name="serendipity[wp][name]" value="<?php echo isset($serendipity['POST']['wp']['name']) ? $serendipity['POST']['wp']['name'] : $serendipity['dbName']; ?>" id="serendipity_wp_name"/>
+        </div>
+        <div>
+            <label for="serendipity_wp_prefix"><?php echo INSTALL_DBPREFIX; ?>:</label>
+            <input type="text" name="serendipity[wp][prefix]" value="<?php echo isset($serendipity['POST']['wp']['prefix']) ? $serendipity['POST']['wp']['prefix'] : 'wp_'; ?>" id="serendipity_wp_prefix"/>
+        </div>
+        <div>
+            <input type="submit" name="serendipity[wp][submit]" value="<?php echo IMPORT . ' ' . WORDPRESS_DATA; ?>" />
+        </div>
+    </form>
+</p>
+
+<p>
     <h3><?php echo EXPORT; ?></h3>
 
     <form method="POST">

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.30
retrieving revision 1.214.2.31
diff -u -d -r1.214.2.30 -r1.214.2.31
--- NEWS	11 Oct 2004 09:21:06 -0000	1.214.2.30
+++ NEWS	11 Oct 2004 22:32:46 -0000	1.214.2.31
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Added import tool for Movable Type data files and WordPress
+      databases. (tadpole9)
+
     * Syndication plugin offers to show full feed including extended
       entry (garvinhicking)
 

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.2,1.15.2.3 serendipity_lang_cs.inc.php,1.61.2.2,1.61.2.3 serendipity_lang_cz.inc.php,1.61.2.2,1.61.2.3 serendipity_lang_da.inc.php,1.79.2.3,1.79.2.4 serendipity_lang_de.inc.php,1.98.2.2,1.98.2.3 serendipity_lang_en.inc.php,1.79.2.4,1.79.2.5 serendipity_lang_es.inc.php,1.77.2.2,1.77.2.3 serendipity_lang_fr.inc.php,1.58.2.3,1.58.2.4 serendipity_lang_it.inc.php,1.1.2.2,1.1.2.3 serendipity_lang_nl.inc.php,1.36.2.2,1.36.2.3 serendipity_lang_no.inc.php,1.2.2.2,1.2.2.3 serendipity_lang_pt.inc.php,1.36.2.3,1.36.2.4

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31717/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:
allow users to toggle RSS fullFeed (body+extended), without links to their pages


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.2
retrieving revision 1.61.2.3
diff -u -d -r1.61.2.2 -r1.61.2.3
--- serendipity_lang_cs.inc.php	27 Sep 2004 10:13:39 -0000	1.61.2.2
+++ serendipity_lang_cs.inc.php	11 Oct 2004 09:21:16 -0000	1.61.2.3
@@ -554,6 +554,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- serendipity_lang_no.inc.php	27 Sep 2004 10:13:40 -0000	1.2.2.2
+++ serendipity_lang_no.inc.php	11 Oct 2004 09:21:16 -0000	1.2.2.3
@@ -549,5 +549,5 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.2
retrieving revision 1.36.2.3
diff -u -d -r1.36.2.2 -r1.36.2.3
--- serendipity_lang_nl.inc.php	27 Sep 2004 10:13:40 -0000	1.36.2.2
+++ serendipity_lang_nl.inc.php	11 Oct 2004 09:21:16 -0000	1.36.2.3
@@ -559,6 +559,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.4
retrieving revision 1.79.2.5
diff -u -d -r1.79.2.4 -r1.79.2.5
--- serendipity_lang_en.inc.php	27 Sep 2004 10:13:39 -0000	1.79.2.4
+++ serendipity_lang_en.inc.php	11 Oct 2004 09:21:16 -0000	1.79.2.5
@@ -551,5 +551,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval');
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed');
 /* 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.2
retrieving revision 1.15.2.3
diff -u -d -r1.15.2.2 -r1.15.2.3
--- serendipity_lang_bg.inc.php	27 Sep 2004 10:13:39 -0000	1.15.2.2
+++ serendipity_lang_bg.inc.php	11 Oct 2004 09:21:16 -0000	1.15.2.3
@@ -536,6 +536,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.3
retrieving revision 1.36.2.4
diff -u -d -r1.36.2.3 -r1.36.2.4
--- serendipity_lang_pt.inc.php	27 Sep 2004 10:13:40 -0000	1.36.2.3
+++ serendipity_lang_pt.inc.php	11 Oct 2004 09:21:16 -0000	1.36.2.4
@@ -555,6 +555,7 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- serendipity_lang_it.inc.php	27 Sep 2004 10:13:40 -0000	1.1.2.2
+++ serendipity_lang_it.inc.php	11 Oct 2004 09:21:16 -0000	1.1.2.3
@@ -551,6 +551,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.');
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.3
retrieving revision 1.79.2.4
diff -u -d -r1.79.2.3 -r1.79.2.4
--- serendipity_lang_da.inc.php	27 Sep 2004 10:13:39 -0000	1.79.2.3
+++ serendipity_lang_da.inc.php	11 Oct 2004 09:21:16 -0000	1.79.2.4
@@ -549,6 +549,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.3
retrieving revision 1.58.2.4
diff -u -d -r1.58.2.3 -r1.58.2.4
--- serendipity_lang_fr.inc.php	27 Sep 2004 10:13:39 -0000	1.58.2.3
+++ serendipity_lang_fr.inc.php	11 Oct 2004 09:21:16 -0000	1.58.2.4
@@ -557,6 +557,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.2
retrieving revision 1.61.2.3
diff -u -d -r1.61.2.2 -r1.61.2.3
--- serendipity_lang_cz.inc.php	27 Sep 2004 10:13:39 -0000	1.61.2.2
+++ serendipity_lang_cz.inc.php	11 Oct 2004 09:21:16 -0000	1.61.2.3
@@ -552,6 +552,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.2
retrieving revision 1.77.2.3
diff -u -d -r1.77.2.2 -r1.77.2.3
--- serendipity_lang_es.inc.php	27 Sep 2004 10:13:39 -0000	1.77.2.2
+++ serendipity_lang_es.inc.php	11 Oct 2004 09:21:16 -0000	1.77.2.3
@@ -558,6 +558,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Only approved'); // Translate
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // 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.2
retrieving revision 1.98.2.3
diff -u -d -r1.98.2.2 -r1.98.2.3
--- serendipity_lang_de.inc.php	27 Sep 2004 10:13:39 -0000	1.98.2.2
+++ serendipity_lang_de.inc.php	11 Oct 2004 09:21:16 -0000	1.98.2.3
@@ -551,6 +551,6 @@
 @define('COMMENTS_FILTER_APPROVED_ONLY', 'Nur bewilligte');
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Zu bewilligende');
 @define('RSS_IMPORT_BODYONLY', 'Füge den gesamten importierten Text in das einzelne "Text"-Feld ein. Verhindert die Aufteilung in den "Erweiterten Eintrag"-Bereich.');
-
+@define('SYNDICATION_PLUGIN_FULLFEED', 'Volle Einträge mit erweitertem Text im RSS-Feed einbinden');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity NEWS,1.214.2.29,1.214.2.30 rss.php,1.28.2.1,1.28.2.2 serendipity_functions.inc.php,1.419.2.46,1.419.2.47 serendipity_sidebar_items.php,1.84.2.6,1.84.2.7

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

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

Modified Files:
      Tag: branch-smarty
	NEWS rss.php serendipity_functions.inc.php 
	serendipity_sidebar_items.php 
Log Message:
allow users to toggle RSS fullFeed (body+extended), without links to their pages


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.29
retrieving revision 1.214.2.30
diff -u -d -r1.214.2.29 -r1.214.2.30
--- NEWS	7 Oct 2004 14:01:57 -0000	1.214.2.29
+++ NEWS	11 Oct 2004 09:21:06 -0000	1.214.2.30
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Syndication plugin offers to show full feed including extended
+      entry (garvinhicking)
+
     * serendipity_event_entryproperties now supports entry caching to
       pregenerate the full article and display that instead of
       assigning event plugins time and again (garvinhicking)

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.84.2.6
retrieving revision 1.84.2.7
diff -u -d -r1.84.2.6 -r1.84.2.7
--- serendipity_sidebar_items.php	7 Oct 2004 10:40:44 -0000	1.84.2.6
+++ serendipity_sidebar_items.php	11 Oct 2004 09:21:15 -0000	1.84.2.7
@@ -382,6 +382,7 @@
         $propbag->add('name',        SYNDICATION);
         $propbag->add('description', SHOWS_RSS_BLAHBLAH);
         $propbag->add('configuration', array(
+                                        'fullfeed',
                                         'show_0.91',
                                         'show_1.0',
                                         'show_2.0',
@@ -406,6 +407,13 @@
     function introspect_config_item($name, &$propbag)
     {
         switch($name) {
+            case 'fullfeed':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        SYNDICATION_PLUGIN_FULLFEED);
+                $propbag->add('description', '');
+                $propbag->add('default',     false);
+                break;
+
             case 'show_0.91':
                 $propbag->add('type',        'boolean');
                 $propbag->add('name',        SYNDICATION_PLUGIN_091);

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -d -r1.28.2.1 -r1.28.2.2
--- rss.php	8 Oct 2004 11:08:25 -0000	1.28.2.1
+++ rss.php	11 Oct 2004 09:21:06 -0000	1.28.2.2
@@ -78,6 +78,7 @@
 
 $title       = serendipity_utf8_encode(htmlspecialchars($title));
 $description = serendipity_utf8_encode(htmlspecialchars($description));
+$fullFeed    = false;
 
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 $plugins = serendipity_plugin_api::enum_plugins();
@@ -88,6 +89,7 @@
         if (preg_match('|@serendipity_syndication_plugin|', $plugin_data['name'])) {
             $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name']);
             $additional_fields = $plugin->generate_rss_fields($title, $description, $entries);
+            $fullFeed = $plugin->get_config('fullfeed', false);
             break;
         }
     }
@@ -219,7 +221,7 @@
     die("Invalid RSS version specified\n");
 }
 
-serendipity_printEntries_rss($entries, $version, $comments);
+serendipity_printEntries_rss($entries, $version, $comments, $fullFeed);
 
 switch ($version) {
 case '0.91':

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.46
retrieving revision 1.419.2.47
diff -u -d -r1.419.2.46 -r1.419.2.47
--- serendipity_functions.inc.php	10 Oct 2004 00:39:08 -0000	1.419.2.46
+++ serendipity_functions.inc.php	11 Oct 2004 09:21:06 -0000	1.419.2.47
@@ -1558,7 +1558,7 @@
     return preg_replace($p, $r, $html);
 }
 
-function serendipity_printEntries_rss($entries, $version, $comments = false) {
+function serendipity_printEntries_rss($entries, $version, $comments = false, $fullFeed = false) {
     global $serendipity;
 
     if (is_array($entries)) {
@@ -1572,7 +1572,9 @@
             }
 
             // Embed a link to extended entry, if existing
-            if ($entry['exflag']) {
+            if ($fullFeed) {
+                $entry['body'] .= ' ' . $entry['extended'];
+            } elseif ($entry['exflag']) {
                 $ext = '<br /><a href="' . $guid . '#extended">' . sprintf(VIEW_EXTENDED_ENTRY, htmlspecialchars($entry['title'])) . '</a>';
             } else {
                 $ext = '';

[php-blog-cvs] serendipity serendipity_config.inc.php,1.93.2.14,1.93.2.15 serendipity_functions.inc.php,1.419.2.45,1.419.2.46 serendipity_functions_config.inc.php,1.10.2.1,1.10.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_config.inc.php serendipity_functions.inc.php 
	serendipity_functions_config.inc.php 
Log Message:
- Beautify


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93.2.14
retrieving revision 1.93.2.15
diff -u -d -r1.93.2.14 -r1.93.2.15
--- serendipity_config.inc.php	9 Oct 2004 23:20:35 -0000	1.93.2.14
+++ serendipity_config.inc.php	10 Oct 2004 00:39:07 -0000	1.93.2.15
@@ -122,6 +122,8 @@
     include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
 }
 
+define('IS_up2date', version_compare(serendipity_version($serendipity['version']), serendipity_version($serendipity['versionInstalled']), '<='));
+
 /*
  *  Include main functions
  */
@@ -148,6 +150,7 @@
 /*
  * If a user is logged in, fetch his preferences. He possibly wants to have a different language
  */
+
 if (isset($_SESSION['serendipityAuthorid'])) {
     serendipity_load_configuration($_SESSION['serendipityAuthorid']);
 }
@@ -155,7 +158,6 @@
 /*
  *   Load main language file again, because now we have the preferred language
  */
-define('IS_up2date', version_compare(serendipity_version($serendipity['version']), serendipity_version($serendipity['versionInstalled']), '<='));
 
 include(S9Y_INCLUDE_PATH .'serendipity_lang.inc.php');
 
@@ -183,7 +185,7 @@
 }
 
 /*
- *  Check if the installed version is highter than the version of the config
+ *  Check if the installed version is higher than the version of the config
  */
 
 if (IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader')) {
@@ -224,12 +226,14 @@
 
 
 serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
+
+
 define('SMARTY_DIR', $serendipity['serendipityPath'] . 'bundled-libs/Smarty/libs/');
 require_once SMARTY_DIR . 'Smarty.class.php';
 $serendipity['smarty'] = new Smarty;
 if ( !$serendipity['production'] ) {
-    $serendipity['smarty']->force_compile = true;
-    $serendipity['smarty']->debugging = true;
+    $serendipity['smarty']->force_compile   = true;
+    $serendipity['smarty']->debugging       = true;
 }
 $serendipity['smarty']->template_dir  = $serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['template'];
 $serendipity['smarty']->compile_dir   = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE;

Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- serendipity_functions_config.inc.php	14 Sep 2004 13:11:17 -0000	1.10.2.1
+++ serendipity_functions_config.inc.php	10 Oct 2004 00:39:11 -0000	1.10.2.2
@@ -3,25 +3,25 @@
 function serendipity_set_config_var($name, $val, $authorid = 0) {
     global $serendipity;
 
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
-        $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val, 'authorid' => $authorid));
-        $serendipity[$name] = $val;
-        if (is_string($r)) {
-            echo $r;
-        }
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
+    $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val, 'authorid' => $authorid));
+    $serendipity[$name] = $val;
+    if (is_string($r)) {
+        echo $r;
+    }
 }
 
 function serendipity_get_config_var($name, $defval = false, $empty = false) {
     global $serendipity;
-        if (isset($serendipity[$name])) {
-            if ($empty && gettype($serendipity[$name]) == 'string' && $serendipity[$name] === '') {
-                return $defval;
-            } else {
-                return $serendipity[$name];
-            }
-        } else {
+    if (isset($serendipity[$name])) {
+        if ($empty && gettype($serendipity[$name]) == 'string' && $serendipity[$name] === '') {
             return $defval;
+        } else {
+            return $serendipity[$name];
         }
+    } else {
+        return $defval;
+    }
 }
 
 function serendipity_get_user_var($name, $authorid, $default) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.45
retrieving revision 1.419.2.46
diff -u -d -r1.419.2.45 -r1.419.2.46
--- serendipity_functions.inc.php	9 Oct 2004 23:20:35 -0000	1.419.2.45
+++ serendipity_functions.inc.php	10 Oct 2004 00:39:08 -0000	1.419.2.46
@@ -1113,8 +1113,7 @@
     }
 }
 
-function serendipity_fetchComments($id, $limit = null, $order = '', $showAll = false)
-{
+function serendipity_fetchComments($id, $limit = null, $order = '', $showAll = false) {
     global $serendipity;
     $and = '';
 
@@ -1170,8 +1169,7 @@
     return $comments;
 }
 
-function serendipity_fetchTrackbacks($id, $limit = null, $showAll = false)
-{
+function serendipity_fetchTrackbacks($id, $limit = null, $showAll = false) {
     global $serendipity;
 
     if (!$showAll) {
@@ -1217,9 +1215,10 @@
     global $serendipity;
     static $_smartyComments;
 
-    /* $_smarty_comment sholds the ending smarty array
-       $level is the current depth of the recurrence
-       $i is the position in the current depth */
+    /* - $_smartyComments holds the ending smarty array.
+       - $depth is the current depth of the recurrence.
+       - $i is the position in the current depth. */
+
     if ($parentid === VIEWMODE_THREADED) {
         $parentid = 0;
     }
@@ -1505,8 +1504,7 @@
     return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} - $fromName <$to>". (!empty($fromEmail) ? "\r\nReply-To: $fromEmail" : ''). "\r\n". $serendipity['mailheaders']);
 }
 
-function serendipity_fetchReferences($id)
-{
+function serendipity_fetchReferences($id) {
     global $serendipity;
 
     $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id = '" . (int)$id . "'";
@@ -1733,8 +1731,7 @@
 /**
  * purge a statically pregenerated entry
  */
-function serendipity_purgeEntry($id, $timestamp = null)
-{
+function serendipity_purgeEntry($id, $timestamp = null) {
     global $serendipity;
 
     // If pregenerate is not set, short circuit all this logic
@@ -1762,8 +1759,7 @@
 /**
  * validate trackback response
  */
-function serendipity_trackback_is_success($resp)
-{
+function serendipity_trackback_is_success($resp) {
     if (preg_match('@<error>(\d+)</error>@', $resp, $matches)) {
         if ((int) $matches[1] === 0) {
             return true;
@@ -1847,8 +1843,7 @@
     return $res;
 }
 
-function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text)
-{
+function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text) {
     if (!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@i', $res, $matches)) {
         echo '<div>&#8226; ' . sprintf(TRACKBACK_FAILED, TRACKBACK_NOT_FOUND) . '</div>';
         return false;
@@ -1942,8 +1937,7 @@
 /**
  *
  */
-function add_trackback ($id, $title, $url, $name, $excerpt)
-{
+function add_trackback ($id, $title, $url, $name, $excerpt) {
     global $serendipity;
 
     // We can't accept a trackback if we don't get any URL
@@ -1967,8 +1961,7 @@
     return 1;
 }
 
-function add_pingback ($id, $postdata)
-{
+function add_pingback ($id, $postdata) {
     global $serendipity;
 
     if(preg_match('@<methodcall>\s*<methodName>\s*pingback.ping\s*</methodName>\s*<params>\s*<param>\s*<value>\s*<string>([^<])*</string>\s*</value>\s*</param>\s*<param>\s*<value>\s*<string>([^<])*</string>\s*</value>\s*</param>\s*</params>\s*</methodCall>@i', $postdata, $matches)) {
@@ -1988,13 +1981,11 @@
 /**
  * Cut text
  */
-function serendipity_trackback_excerpt($text)
-{
+function serendipity_trackback_excerpt($text) {
     return substr(strip_tags($text), 0, 255);
 }
 
-function report_trackback_success ()
-{
+function report_trackback_success () {
 print '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n";
 print <<<SUCCESS
 <response>
@@ -2003,8 +1994,7 @@
 SUCCESS;
 }
 
-function report_trackback_failure ()
-{
+function report_trackback_failure () {
 print '<?xml version="1.0" encoding="iso-8859-1"?>' . "\n";
 print <<<FAILURE
 <response>
@@ -2014,8 +2004,7 @@
 FAILURE;
 }
 
-function report_pingback_success ()
-{
+function report_pingback_success () {
 print '<?xml version="1.0"?>' . "\n";
 print <<<SUCCESS
 <methodResponse>
@@ -2028,8 +2017,7 @@
 SUCCESS;
 }
 
-function report_pingback_failure ()
-{
+function report_pingback_failure () {
 print '<?xml version="1.0"?>' . "\n";
 print <<<FAILURE
 <methodResponse>
@@ -2061,8 +2049,7 @@
 /**
  * search through link body, and automatically send a trackback ping.
  */
-function serendipity_handle_references($id, $author, $title, $text)
-{
+function serendipity_handle_references($id, $author, $title, $text) {
     global $serendipity;
 
     if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"][^>]*>([^<]*)</a>@i', $text, $matches)) {
@@ -2943,8 +2930,7 @@
     echo "</span>";
 }
 
-function serendipity_emit_htmlarea_code($item, $jsname)
-{
+function serendipity_emit_htmlarea_code($item, $jsname) {
     static $init = false;
     global $serendipity;
 
@@ -3096,8 +3082,7 @@
     serendipity_smarty_fetch('ARCHIVES', 'entries_archives.tpl', true);
 }
 
-function serendipity_xhtml_target($target)
-{
+function serendipity_xhtml_target($target) {
     global $serendipity;
 
     if ($serendipity['enablePopup'] != true)

[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.16,1.1.2.17

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

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

Modified Files:
      Tag: branch-smarty
	entries.tpl 
Log Message:
- Don't forget the '@'!


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -d -r1.1.2.16 -r1.1.2.17
--- entries.tpl	9 Oct 2004 23:20:35 -0000	1.1.2.16
+++ entries.tpl	9 Oct 2004 23:26:16 -0000	1.1.2.17
@@ -30,7 +30,7 @@
             {/if}
 
             {if $entry.has_extended and not $is_single_entry}
-            <br /><a href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|sprintf:$entry.title}</a><br /><br />
+            <br /><a href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a><br /><br />
             {/if}
 
             <div class='serendipity_entryFooter'>

[php-blog-cvs] serendipity serendipity_config.inc.php,1.93.2.13,1.93.2.14 serendipity_functions.inc.php,1.419.2.44,1.419.2.45

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_config.inc.php serendipity_functions.inc.php 
Log Message:
- Nuke the idea that we need to wrap sprintf()


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.44
retrieving revision 1.419.2.45
diff -u -d -r1.419.2.44 -r1.419.2.45
--- serendipity_functions.inc.php	9 Oct 2004 23:16:26 -0000	1.419.2.44
+++ serendipity_functions.inc.php	9 Oct 2004 23:20:35 -0000	1.419.2.45
@@ -3164,14 +3164,6 @@
     return (!empty($string) ? $prefix . htmlspecialchars($string) : '');
 }
 
-function serendipity_printf($data, $constant) {
-    if (defined($constant)) {
-        return sprintf(constant($constant), $data);
-    } else {
-        return sprintf($constant, $data);
-    }
-}
-
 function serendipity_smarty_hookPlugin($params, &$smarty) {
     global $serendipity;
     static $hookable = array('frontend_header',

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93.2.13
retrieving revision 1.93.2.14
diff -u -d -r1.93.2.13 -r1.93.2.14
--- serendipity_config.inc.php	9 Oct 2004 23:16:26 -0000	1.93.2.13
+++ serendipity_config.inc.php	9 Oct 2004 23:20:35 -0000	1.93.2.14
@@ -244,7 +244,6 @@
 $serendipity['smarty']->register_modifier('makeFilename', 'serendipity_makeFilename');
 $serendipity['smarty']->register_modifier('xhtml_target', 'serendipity_xhtml_target');
 $serendipity['smarty']->register_modifier('emptyPrefix', 'serendipity_emptyPrefix');
-$serendipity['smarty']->register_modifier('printf', 'serendipity_printf');
 $serendipity['smarty']->register_modifier('formatTime', 'serendipity_smarty_formatTime');
 $serendipity['smarty']->register_function('serendipity_printSidebar', 'serendipity_smarty_printSidebar');
 $serendipity['smarty']->register_function('serendipity_hookPlugin', 'serendipity_smarty_hookPlugin');

[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.15,1.1.2.16

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

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

Modified Files:
      Tag: branch-smarty
	entries.tpl 
Log Message:
- Nuke the idea that we need to wrap sprintf()


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- entries.tpl	9 Oct 2004 23:16:27 -0000	1.1.2.15
+++ entries.tpl	9 Oct 2004 23:20:35 -0000	1.1.2.16
@@ -30,7 +30,7 @@
             {/if}
 
             {if $entry.has_extended and not $is_single_entry}
-            <br /><a href="{$entry.link}#extended">{$entry.title|@printf:VIEW_EXTENDED_ENTRY}</a><br /><br />
+            <br /><a href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|sprintf:$entry.title}</a><br /><br />
             {/if}
 
             <div class='serendipity_entryFooter'>
@@ -77,23 +77,23 @@
         {$entry.plugin_display_dat}
 
         {if $CONST.DATA_UNSUBSCRIBED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@printf:UNSUBSCRIBE_OK}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@sprintf:$CONST.UNSUBSCRIBE_OK}</div><br />
         {/if}
 
         {if $CONST.DATA_TRACKBACK_DELETED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|@printf:TRACKBACK_DELETED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|@sprintf:$CONST.TRACKBACK_DELETED}</div><br />
         {/if}
 
         {if $CONST.DATA_TRACKBACK_APPROVED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|@printf:TRACKBACK_APPROVED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|@sprintf:$CONST.TRACKBACK_APPROVED}</div><br />
         {/if}
 
         {if $CONST.DATA_COMMENT_DELETED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|@printf:COMMENT_DELETED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|@sprintf:$CONST.COMMENT_DELETED}</div><br />
         {/if}
 
         {if $CONST.DATA_COMMENT_APPROVED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@printf:COMMENT_APPROVED}</div><br />
+            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</div><br />
         {/if}
 
         {if $is_single_entry and not $use_popups}

[php-blog-cvs] serendipity/templates/default comments.tpl,1.1.2.1,1.1.2.2 entries.tpl,1.1.2.14,1.1.2.15 trackbacks.tpl,1.1.2.7,1.1.2.8

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

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

Modified Files:
      Tag: branch-smarty
	comments.tpl entries.tpl trackbacks.tpl 
Log Message:
- Move recursive/threaded comments into Smarty
- Move printComment and printTrackbacks into the template, in order to use the $entry and other smarty variables within those.
- Allow the usage of sprintf, sizeof and count as a modifier in Smarty
- Remove is_cview stuff and do a more native thing in entries.tpl
- Unset large arrays to free memory
TODO: Comment preview doesn't work, yet
TODO: Annonymous comments have b0rked delete prompts


Index: comments.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/comments.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- comments.tpl	9 Sep 2004 15:00:45 -0000	1.1.2.1
+++ comments.tpl	9 Oct 2004 23:16:27 -0000	1.1.2.2
@@ -1,2 +1,27 @@
-<!-- TODO: Remove recursion of serendipity_printEntries() :( -->
-{$comments_list}
\ No newline at end of file
+{foreach from=$comments item=comment}
+    <a id="c{$comment.id}"></a>
+    <div class="serendipity_comment" style="padding-left: {$comment.depth*20}px">
+        <div class="serendipity_commentBody">{$comment.body}</div>
+        <div class="serendipity_comment_source">
+            <a href="#c{$comment.id}" title="Link to comment #{$comment.trace}">#{$comment.trace}</a>
+            {if $comment.email}
+                <a href="mailto:{$comment.email}">{$comment.username|@default:$CONST.ANONYMOUS}</a>
+            {else}
+                {$comment.username|@default:$CONST.ANONYMOUS}
+            {/if}
+            {if $comment.url}
+                (<a href="{$comment.url}" title="{$comment.url|@escape}">Link</a>)
+            {/if}
+            {$CONST.ON}
+            {$comment.timestamp|@formatTime:"%b %e %Y, %H:%M"}
+            {if $entry.is_entry_owner}
+                (<a href="{$comment.link_delete}" onclick="return confirm('{$CONST.COMMENT_DELETE_CONFIRM|@sprintf:$comment.id:$comment.username}');">delete</a>)
+            {/if}
+            {if $entry.allow_comments}
+                (<a href="#serendipity_CommentForm" onclick="document.getElementById('serendipity_replyTo').value='{$comment.id}';">Reply</a>)
+            {/if}
+        </div>
+    </div>
+{foreachelse}
+    <div class="serendipity_center">{$CONST.NO_COMMENTS}</div>
+{/foreach}

Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- entries.tpl	5 Oct 2004 19:40:40 -0000	1.1.2.14
+++ entries.tpl	9 Oct 2004 23:16:27 -0000	1.1.2.15
@@ -105,7 +105,7 @@
                         <a style="font-weight: normal" href="{$serendipityBaseURL}comment.php?type=trackback&amp;entry_id={$entry_id}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
                     </div>
                     <br />
-                        {$TRACKBACKS}
+                        {serendipity_printTrackbacks entry=$entry.id}
             </div>
         {/if}
 
@@ -115,14 +115,14 @@
                 <a id="comments"></a>
                 <div class="serendipity_commentsTitle">{$CONST.COMMENTS}</div>
                 <div class="serendipity_center">{$CONST.DISPLAY_COMMENTS_AS}
-                {if $is_cview_linear}
+                {if $entry.viewmode eq $CONST.VIEWMODE_LINEAR}
                     ({$CONST.COMMENTS_VIEWMODE_LINEAR} | <a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&amp;serendipity[cview]={$CONST.VIEWMODE_THREADED}#comments">{$CONST.COMMENTS_VIEWMODE_THREADED}</a>)
                 {else}
                     (<a href="{$serendipityHTTPPath}{$serendipityIndexFile}?url={$entry.commURL}&amp;serendipity[cview]={$CONST.VIEWMODE_LINEAR}#comments">{$CONST.COMMENTS_VIEWMODE_LINEAR}</a> | {$CONST.COMMENTS_VIEWMODE_THREADED})
                 {/if}
                 </div>
-
-                {$COMMENTS}
+                <br />
+                    {serendipity_printComments entry=$entry.id mode=$entry.viewmode}
 
                 {if $entry.is_entry_owner}
                     {if $entry.allow_comments}

Index: trackbacks.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/trackbacks.tpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- trackbacks.tpl	3 Oct 2004 00:45:16 -0000	1.1.2.7
+++ trackbacks.tpl	9 Oct 2004 23:16:27 -0000	1.1.2.8
@@ -1,11 +1,13 @@
 {foreach from=$trackbacks item=trackback}
     <div class="serendipity_comment">
-        <a href="{$trackback.url|@strip_tags}" {'blank'|@xhtml_target}>{$trackback.title}</a><br />
-        {$trackback.body|@strip_tags|@escape:all}<br />
+        <div class="serendipity_commentBody">
+            <a href="{$trackback.url|@strip_tags}" {'blank'|@xhtml_target}>{$trackback.title}</a><br />
+            {$trackback.body|@strip_tags|@escape:all}
+        </div>
         <div class="serendipity_comment_source">
             <b>Weblog:</b> {$trackback.author|@default:$CONST.ANONYMOUS}<br />
             <b>{$CONST.TRACKED}:</b> {$trackback.timestamp|@formatTime:'%b %d, %H:%M'}
-        {if $is_trackbacks_owner}
+        {if $entry.is_entry_owner}
             (<a href="{$serendipityBaseURL}comment.php?serendipity[delete]={$trackback.id}&amp;serendipity[entry]={$trackback.entry_id}&amp;serendipity[type]=trackbacks">{$CONST.DELETE}</a>)
         {/if}
         </div>

[php-blog-cvs] serendipity serendipity_config.inc.php,1.93.2.12,1.93.2.13 serendipity_functions.inc.php,1.419.2.43,1.419.2.44

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_config.inc.php serendipity_functions.inc.php 
Log Message:
- Move recursive/threaded comments into Smarty
- Move printComment and printTrackbacks into the template, in order to use the $entry and other smarty variables within those.
- Allow the usage of sprintf, sizeof and count as a modifier in Smarty
- Remove is_cview stuff and do a more native thing in entries.tpl
- Unset large arrays to free memory
TODO: Comment preview doesn't work, yet
TODO: Annonymous comments have b0rked delete prompts


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.43
retrieving revision 1.419.2.44
diff -u -d -r1.419.2.43 -r1.419.2.44
--- serendipity_functions.inc.php	7 Oct 2004 10:32:04 -0000	1.419.2.43
+++ serendipity_functions.inc.php	9 Oct 2004 23:16:26 -0000	1.419.2.44
@@ -1007,10 +1007,7 @@
 
             /* IF WE ARE DISPLAYING A FULL ENTRY */
             if (isset($serendipity['GET']['id'])) {
-                serendipity_printTrackbacks(serendipity_fetchTrackbacks($entry['id']));
-
-                ob_start(); // TODO: Remove recursion and output buffering
-                serendipity_printComments(serendipity_fetchComments($entry['id']), $viewmode);
+                $entry['viewmode'] = ($serendipity['GET']['cview']) ? $serendipity['GET']['cview'] : VIEWMODE_THREADED;
 
                 if (!empty($serendipity['POST']['preview'])) {
                     serendipity_printComments(
@@ -1028,19 +1025,8 @@
                     );
                 }
 
-                $serendipity['smarty']->assign('comments_list', ob_get_contents());
-                ob_end_clean();
-                serendipity_smarty_fetch('COMMENTS', 'comments.tpl');
-
-                if ($serendipity['GET']['cview'] == VIEWMODE_LINEAR) {
-                    $serendipity['smarty']->assign('is_cview_linear', true);
-                } else {
-                    $serendipity['smarty']->assign('is_cview_linear', false);
-                }
-
                 $serendipity['smarty']->assign(
                     array(
-                        'is_cview_linear'       => ($serendipity['GET']['cview'] == VIEWMODE_LINEAR ? true : false),
                         'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false),
                         'is_comment_added'      => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'true' ? true: false),
                         'is_comment_moderate'   => (isset($serendipity['GET']['csuccess']) && $serendipity['GET']['csuccess'] == 'moderate' ? true: false)
@@ -1069,6 +1055,7 @@
     }
 
     $serendipity['smarty']->assign('entries', $dategroup);
+    unset($entries, $dategroup);
 
     if (isset($serendipity['short_archives']) && $serendipity['short_archives']) {
         serendipity_smarty_fetch('ENTRIES', 'entries_summary.tpl', true);
@@ -1226,104 +1213,74 @@
     return $retval;
 }
 
-/*TODO: Don't know how to get recursion done with Smarty in a smarty way.*/
-function serendipity_printComments($comments, $parentid = 0, $indent = '') {
+function serendipity_printComments($comments, $parentid = 0, $depth = 0, $trace = null) {
     global $serendipity;
+    static $_smartyComments;
 
+    /* $_smarty_comment sholds the ending smarty array
+       $level is the current depth of the recurrence
+       $i is the position in the current depth */
     if ($parentid === VIEWMODE_THREADED) {
         $parentid = 0;
     }
 
-    if (!count($comments) && !$parentid) {
-?>
-            <div class="serendipity_center"><?php echo NO_COMMENTS; ?></div>
-<?php
+    /* Wait a second, we just got attacked by a call with level 0,
+       this must mean we've started over */
+    if ( $depth == 0 ) {
+        $_smartyComments = array();
     }
 
+
     $i = 0;
     foreach ($comments as $comment) {
-
         if ($parentid === VIEWMODE_LINEAR || !isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
             $i++;
 
             $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
             $comment['url']     = strip_tags($comment['url']);
+            $comment['link_delete'] = $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments';
+
+            /* Fix fucked links */
             if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') {
                 $comment['url'] = 'http://' . $comment['url'];
             }
 
             serendipity_plugin_api::hook_event('frontend_display', $comment);
 
-            /* Protect submitted mails against spam, by replacing @ with [at]*/
             if (!empty($comment['email'])) {
                 $comment['email'] = str_replace('@', '[at]', $comment['email']);
             }
 
-            $name = empty($comment['username']) ? ANONYMOUS : $comment['username'];
-            $body = $comment['comment'];
-?>
-    <div class="serendipity_comment">
-            <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="c<?php echo $comment['id']; ?>"></a>
-            <div class="serendipity_commentBody"><?php echo $body; ?></div>
-
-            <div class="serendipity_comment_source">
-                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $indent . $i; ?>">#<?php echo $indent . $i; ?></a>
-<?php
-        /* Link to the user's email */
-            if (!empty($comment['email'])) {
-                echo  '<a href="mailto:' . htmlspecialchars($comment['email']) . '"  title="' . SEND_MAIL_TO . ' ' . htmlspecialchars($name) . ' (' . htmlspecialchars(strip_tags($comment['email'])) . ')">' . htmlspecialchars($name) . '</a>';
-            } else {
-                echo htmlspecialchars($name);
-            }
-
-            /* Create a link or plain text depending on spam control settings */
-            $showlink = serendipity_get_config_var('top_as_links', true);
-            if ($showlink === true) {
-                $linktext = ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
-            } else {
-                $linktext = ' (' . htmlspecialchars($comment['url']) . ") ";
-            }
-
-            /* Link to the user's website only if the URL is valid */
-            if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
-                echo $linktext;
-            }
-
-            /* Show when the entry was made */
-            echo ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp']));
+            $comment['author']  = $comment['username'];
+            $comment['body']    = $comment['comment'];
+            $comment['pos']     = $i;
+            $comment['trace']   = $trace . $i;
+            $comment['depth']   = $depth;
 
-            if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
-                echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments" onclick="return confirm(\''. sprintf(COMMENT_DELETE_CONFIRM, $comment['id'], htmlspecialchars($name)) .'\')">' . DELETE . '</a>)';
+            $_smartyComments[] = $comment;
+            if ($comment['id'] && $parentid !== VIEWMODE_LINEAR ) {
+                serendipity_printComments($comments, $comment['id'], ($depth+1), ($trace . $i .'.'));
             }
-
-            /* Allow people to easily reply to this comment */
-            echo ' <a href="#serendipity_CommentForm" onclick="document.getElementById(\'serendipity_replyTo\').value=\'' . $comment['id'] . '\';">' . REPLY . '</a>';
-?>
-            </div>
-<?php
-                if ($comment['id'] && $parentid !== VIEWMODE_LINEAR ) {
-                    serendipity_printComments($comments, $comment['id'], $indent . $i . '.');
-                }
-?>
-        </div>
-<?php
         }
     }
 
-    if ($parentid != 0 && $parentid !== VIEWMODE_LINEAR) {
+    /* We are inside a recusive child, and we need to break out */
+    if ( $depth !== 0 ) {
         return true;
     }
+
+    $serendipity['smarty']->assign('comments', $_smartyComments);
+    unset($_smartyComments);
+
+    return serendipity_smarty_fetch('COMMENTS', 'comments.tpl');
 }
 
-function serendipity_printTrackbacks($comments)
-{
+function serendipity_printTrackbacks($trackbacks) {
     global $serendipity;
 
-    $serendipity['smarty']->assign('is_trackbacks_owner', ($_SESSION["serendipityAuthedUser"] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || isset($comment[0]) && $_SESSION['serendipityAuthorid'] == $comment[0]['authorid'])) ? true : false);
-    $serendipity['smarty']->assign('trackbacks', $comments);
-    $serendipity['smarty']->assign('trackbacks_count', sizeof($comments));
+    $serendipity['smarty']->assign('trackbacks', $trackbacks);
 
-    serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl');
+    return serendipity_smarty_fetch('TRACKBACKS', 'trackbacks.tpl');
 }
 
 function serendipity_approveComment($cid, $entry_id, $force = false) {
@@ -3197,7 +3154,7 @@
 function serendipity_smarty_fetch($block, $file, $echo = false) {
     global $serendipity;
 
-    $output = &$serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
+    $output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
     $serendipity['smarty']->assign($block, $output);
 
     return $output;
@@ -3266,6 +3223,29 @@
     }
 }
 
+function serendipity_smarty_printComments($params, &$smarty) {
+    if ( !isset($params['entry']) ) {
+        $smarty->trigger_error(__FUNCTION__ .": missing 'entry' parameter");
+        return;
+    }
+
+    if ( !isset($params['mode']) ) {
+        $params['mode'] = VIEWMODE_THREADED;
+    }
+
+    return serendipity_printComments(serendipity_fetchComments($params['entry']), $params['mode']);
+}
+
+function serendipity_smarty_printTrackbacks($params, &$smarty) {
+    if ( !isset($params['entry']) ) {
+        $smarty->trigger_error(__FUNCTION__ .": missing 'entry' parameter");
+        return;
+    }
+
+    return serendipity_printTrackbacks(serendipity_fetchTrackbacks($params['entry']));
+}
+
+
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93.2.12
retrieving revision 1.93.2.13
diff -u -d -r1.93.2.12 -r1.93.2.13
--- serendipity_config.inc.php	7 Oct 2004 14:00:13 -0000	1.93.2.12
+++ serendipity_config.inc.php	9 Oct 2004 23:16:26 -0000	1.93.2.13
@@ -235,6 +235,7 @@
 $serendipity['smarty']->compile_dir   = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE;
 $serendipity['smarty']->config_dir    = &$serendipity['smarty']->template_dir;
 $serendipity['smarty']->secure_dir    = array($serendipity['serendipityPath'] . $serendipity['templatePath']);
+$serendipity['smarty']->security_settings['MODIFIER_FUNCS'] = array('sprintf', 'sizeof', 'count');
 $serendipity['smarty']->security      = true;
 $serendipity['smarty']->use_sub_dirs  = false;
 $serendipity['smarty']->compile_check = true;
@@ -248,6 +249,9 @@
 $serendipity['smarty']->register_function('serendipity_printSidebar', 'serendipity_smarty_printSidebar');
 $serendipity['smarty']->register_function('serendipity_hookPlugin', 'serendipity_smarty_hookPlugin');
 $serendipity['smarty']->register_function('serendipity_getFile', 'serendipity_smarty_getFile');
+$serendipity['smarty']->register_function('serendipity_printComments', 'serendipity_smarty_printComments');
+$serendipity['smarty']->register_function('serendipity_printTrackbacks', 'serendipity_smarty_printTrackbacks');
+
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_textile serendipity_event_textile.php,1.6.2.4,1.6.2.5

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_textile.php 
Log Message:
- Don't hack config variables to implement 'info', use a function instead.
  If that function is defined - it will be run to display an example of the plugin as defined within the plugin

INFO: Might need tweaking, but we need to get the 'info' thing out of CVS ASAP :)


Index: serendipity_event_textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/serendipity_event_textile.php,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -d -r1.6.2.4 -r1.6.2.5
--- serendipity_event_textile.php	8 Oct 2004 12:05:06 -0000	1.6.2.4
+++ serendipity_event_textile.php	9 Oct 2004 19:04:41 -0000	1.6.2.5
@@ -56,7 +56,6 @@
         );
 
         $conf_array = array();
-        $conf_array[] = 'info';
         foreach($this->markup_elements as $element) {
             $conf_array[] = $element['name'];
         }
@@ -71,19 +70,10 @@
 
     function introspect_config_item($name, &$propbag)
     {
-        switch($name) {
-            case 'info':
-                $propbag->add('type',        'info');
-                $propbag->add('description',  PLUGIN_EVENT_TEXTILE_TRANSFORM);
-                break;
-
-            default:
-                $propbag->add('type',        'boolean');
-                $propbag->add('name',        $name);
-                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
-                $propbag->add('default', 'true');
-                break;
-        }
+        $propbag->add('type',        'boolean');
+        $propbag->add('name',        $name);
+        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+        $propbag->add('default', 'true');
         return true;
     }
 
@@ -226,4 +216,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.3,1.5.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_s9ymarkup.php 
Log Message:
- Don't hack config variables to implement 'info', use a function instead.
  If that function is defined - it will be run to display an example of the plugin as defined within the plugin

INFO: Might need tweaking, but we need to get the 'info' thing out of CVS ASAP :)


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.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- serendipity_event_s9ymarkup.php	8 Oct 2004 12:05:05 -0000	1.5.2.3
+++ serendipity_event_s9ymarkup.php	9 Oct 2004 19:04:41 -0000	1.5.2.4
@@ -46,7 +46,6 @@
         );
 
         $conf_array = array();
-        $conf_array[] = 'info';
         foreach($this->markup_elements as $element) {
             $conf_array[] = $element['name'];
         }
@@ -61,19 +60,10 @@
 
     function introspect_config_item($name, &$propbag)
     {
-        switch($name) {
-            case 'info':
-                $propbag->add('type',        'info');
-                $propbag->add('description',  PLUGIN_EVENT_S9YMARKUP_TRANSFORM);
-                break;
-
-            default:
-                $propbag->add('type',        'boolean');
-                $propbag->add('name',        $name);
-                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
-                $propbag->add('default', 'true');
-                break;
-        }
+        $propbag->add('type',        'boolean');
+        $propbag->add('name',        $name);
+        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+        $propbag->add('default', 'true');
         return true;
     }
 

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

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_emoticate.php 
Log Message:
- Don't hack config variables to implement 'info', use a function instead.
  If that function is defined - it will be run to display an example of the plugin as defined within the plugin

INFO: Might need tweaking, but we need to get the 'info' thing out of CVS ASAP :)


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.5
retrieving revision 1.10.2.6
diff -u -d -r1.10.2.5 -r1.10.2.6
--- serendipity_event_emoticate.php	8 Oct 2004 12:29:49 -0000	1.10.2.5
+++ serendipity_event_emoticate.php	9 Oct 2004 19:04:41 -0000	1.10.2.6
@@ -48,7 +48,6 @@
         foreach($this->markup_elements as $element) {
             $conf_array[] = $element['name'];
         }
-        $conf_array[] = 'info';
         $propbag->add('configuration', $conf_array);
 
     }
@@ -107,30 +106,26 @@
         $title = PLUGIN_EVENT_EMOTICATE_NAME;
     }
 
+    function example() {
+        $s  = '<table cellspacing="5" style="margin-left: auto; margin-right: auto">';
+        $s .= '<tr>';
+        $i = 1;
+        foreach($this->getEmoticons() as $key => $value) {
+            $s .= '<td style="text-align: center">' . $key . '</td><td><img src="'. $value .'"></td>' . "\n";
+            if ($i++ % 7 == 0) $s .= '</tr><tr>';
+        }
+        $s .= '</tr>';
+        $s .= '</table>';
+
+        return $s;
+    }
 
     function introspect_config_item($name, &$propbag)
     {
-        switch($name) {
-            case 'info':
-                $smiley_list   = '<table cellspacing="10" style="margin-left: auto; margin-right: auto">';
-                $smiley_top    = '';
-                $smiley_bottom = '';
-                foreach($this->getEmoticons() as $key => $value) {
-                    $smiley_top    .= '<td style="text-align: center">' . $key . '</td>';
-                    $smiley_bottom .= '<td style="text-align: center"><img src="' . $value . '" style="display: inline; vertical-allign: bottom;" class="emoticon" /></td>';
-                }
-                $smiley_list .= '<tr>' . $smiley_top . '</tr><tr>' . $smiley_bottom . '</tr></table>';
-                $propbag->add('type',        'info');
-                $propbag->add('description',  $smiley_list);
-                break;
-
-            default:
-                $propbag->add('type',        'boolean');
-                $propbag->add('name',        $name);
-                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
-                $propbag->add('default', 'true');
-                break;
-        }
+        $propbag->add('type',        'boolean');
+        $propbag->add('name',        $name);
+        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+        $propbag->add('default', 'true');
         return true;
     }
 

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.44.2.1,1.44.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_admin_plugins.inc.php 
Log Message:
- Don't hack config variables to implement 'info', use a function instead.
  If that function is defined - it will be run to display an example of the plugin as defined within the plugin

INFO: Might need tweaking, but we need to get the 'info' thing out of CVS ASAP :)


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -d -r1.44.2.1 -r1.44.2.2
--- serendipity_admin_plugins.inc.php	8 Oct 2004 12:05:04 -0000	1.44.2.1
+++ serendipity_admin_plugins.inc.php	9 Oct 2004 19:04:40 -0000	1.44.2.2
@@ -510,10 +510,6 @@
             case 'hidden':
                 ?><tr><td colspan="2"><input type="hidden" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $cbag->get('value'); ?>" /></td></tr><?php
                 break;
-
-            case 'info':
-                ?><tr><td colspan="2"><?php echo $cbag->get('description'); ?></td></tr><?php
-                break;
         }
     }
 ?>
@@ -521,12 +517,24 @@
 <br />
     <div style="padding-left: 20px">
         <input type="submit" name="SAVECONF" value="<?php echo SAVE; ?>" />
-    </div>
-</form>
 <?php
     if (isset($_POST['SAVECONF'])) {
         echo '<span class="serendipity_msg_notice">' . DONE . ': '. $statusMsg .'</span>';
     }
+?>
+    </div>
+<?php
+    if (method_exists($plugin, 'example') ) {
+?>
+    <div>
+        <?php echo $plugin->example() ?>
+    </div>
+<?php
+    }
+?>
+    </div>
+</form>
+<?php
 } else {
     /* show general plugin list */
 

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.10.2.4,1.10.2.5

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_emoticate.php 
Log Message:
improved layout


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.4
retrieving revision 1.10.2.5
diff -u -d -r1.10.2.4 -r1.10.2.5
--- serendipity_event_emoticate.php	8 Oct 2004 12:05:05 -0000	1.10.2.4
+++ serendipity_event_emoticate.php	8 Oct 2004 12:29:49 -0000	1.10.2.5
@@ -112,11 +112,14 @@
     {
         switch($name) {
             case 'info':
-                $smiley_list = '<table cellspacing="5" style="margin-left: auto; margin-right: auto">';
+                $smiley_list   = '<table cellspacing="10" style="margin-left: auto; margin-right: auto">';
+                $smiley_top    = '';
+                $smiley_bottom = '';
                 foreach($this->getEmoticons() as $key => $value) {
-                    $smiley_list .= '<tr><td>' . $key . '</td><td><img src="' . $value . '" style="display: inline; vertical-allign: bottom;" class="emoticon" /></td></tr>';
+                    $smiley_top    .= '<td style="text-align: center">' . $key . '</td>';
+                    $smiley_bottom .= '<td style="text-align: center"><img src="' . $value . '" style="display: inline; vertical-allign: bottom;" class="emoticon" /></td>';
                 }
-                $smiley_list .= '</table>';
+                $smiley_list .= '<tr>' . $smiley_top . '</tr><tr>' . $smiley_bottom . '</tr></table>';
                 $propbag->add('type',        'info');
                 $propbag->add('description',  $smiley_list);
                 break;

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.10.2.3,1.10.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_emoticate.php 
Log Message:
show information about markup plugins, emoticons in plugin config


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.3
retrieving revision 1.10.2.4
diff -u -d -r1.10.2.3 -r1.10.2.4
--- serendipity_event_emoticate.php	22 Sep 2004 11:48:07 -0000	1.10.2.3
+++ serendipity_event_emoticate.php	8 Oct 2004 12:05:05 -0000	1.10.2.4
@@ -48,6 +48,7 @@
         foreach($this->markup_elements as $element) {
             $conf_array[] = $element['name'];
         }
+        $conf_array[] = 'info';
         $propbag->add('configuration', $conf_array);
 
     }
@@ -109,10 +110,24 @@
 
     function introspect_config_item($name, &$propbag)
     {
-        $propbag->add('type',        'boolean');
-        $propbag->add('name',        $name);
-        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
-        $propbag->add('default', 'true');
+        switch($name) {
+            case 'info':
+                $smiley_list = '<table cellspacing="5" style="margin-left: auto; margin-right: auto">';
+                foreach($this->getEmoticons() as $key => $value) {
+                    $smiley_list .= '<tr><td>' . $key . '</td><td><img src="' . $value . '" style="display: inline; vertical-allign: bottom;" class="emoticon" /></td></tr>';
+                }
+                $smiley_list .= '</table>';
+                $propbag->add('type',        'info');
+                $propbag->add('description',  $smiley_list);
+                break;
+
+            default:
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        $name);
+                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+                $propbag->add('default', 'true');
+                break;
+        }
         return true;
     }
 

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

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_s9ymarkup.php 
Log Message:
show information about markup plugins, emoticons in plugin config


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.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- serendipity_event_s9ymarkup.php	22 Sep 2004 11:48:08 -0000	1.5.2.2
+++ serendipity_event_s9ymarkup.php	8 Oct 2004 12:05:05 -0000	1.5.2.3
@@ -46,6 +46,7 @@
         );
 
         $conf_array = array();
+        $conf_array[] = 'info';
         foreach($this->markup_elements as $element) {
             $conf_array[] = $element['name'];
         }
@@ -60,10 +61,19 @@
 
     function introspect_config_item($name, &$propbag)
     {
-        $propbag->add('type',        'boolean');
-        $propbag->add('name',        $name);
-        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
-        $propbag->add('default', 'true');
+        switch($name) {
+            case 'info':
+                $propbag->add('type',        'info');
+                $propbag->add('description',  PLUGIN_EVENT_S9YMARKUP_TRANSFORM);
+                break;
+
+            default:
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        $name);
+                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+                $propbag->add('default', 'true');
+                break;
+        }
         return true;
     }
 

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

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_bbcode.php 
Log Message:
show information about markup plugins, emoticons in plugin config


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.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- serendipity_event_bbcode.php	22 Sep 2004 11:48:07 -0000	1.7.2.3
+++ serendipity_event_bbcode.php	8 Oct 2004 12:05:05 -0000	1.7.2.4
@@ -46,6 +46,7 @@
         );
 
         $conf_array = array();
+        $conf_array[] = 'info';
         foreach($this->markup_elements as $element) {
             $conf_array[] = $element['name'];
         }
@@ -155,10 +156,19 @@
 
     function introspect_config_item($name, &$propbag)
     {
-        $propbag->add('type',        'boolean');
-        $propbag->add('name',        $name);
-        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
-        $propbag->add('default',     'true');
+        switch($name) {
+            case 'info':
+                $propbag->add('type',        'info');
+                $propbag->add('description',  PLUGIN_EVENT_BBCODE_TRANSFORM);
+                break;
+
+            default:
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        $name);
+                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+                $propbag->add('default', 'true');
+                break;
+        }
         return true;
     }
 

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.44,1.44.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_admin_plugins.inc.php 
Log Message:
show information about markup plugins, emoticons in plugin config


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -d -r1.44 -r1.44.2.1
--- serendipity_admin_plugins.inc.php	3 Sep 2004 23:12:48 -0000	1.44
+++ serendipity_admin_plugins.inc.php	8 Oct 2004 12:05:04 -0000	1.44.2.1
@@ -347,8 +347,8 @@
         if ($value === 'unset') {
             /* Try and the default value for the config item */
             $value = $cbag->get('default');
-           
-            /* Still, we don't have a value, try and get (bool)false - from an old plugin */ 
+
+            /* Still, we don't have a value, try and get (bool)false - from an old plugin */
             if ($value === '') {
                 $value = $plugin->get_config($config_item, false, true);
             }
@@ -510,6 +510,10 @@
             case 'hidden':
                 ?><tr><td colspan="2"><input type="hidden" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $cbag->get('value'); ?>" /></td></tr><?php
                 break;
+
+            case 'info':
+                ?><tr><td colspan="2"><?php echo $cbag->get('description'); ?></td></tr><?php
+                break;
         }
     }
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_textile serendipity_event_textile.php,1.6.2.3,1.6.2.4

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_textile.php 
Log Message:
show information about markup plugins, emoticons in plugin config


Index: serendipity_event_textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/serendipity_event_textile.php,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- serendipity_event_textile.php	22 Sep 2004 11:48:08 -0000	1.6.2.3
+++ serendipity_event_textile.php	8 Oct 2004 12:05:06 -0000	1.6.2.4
@@ -56,6 +56,7 @@
         );
 
         $conf_array = array();
+        $conf_array[] = 'info';
         foreach($this->markup_elements as $element) {
             $conf_array[] = $element['name'];
         }
@@ -70,10 +71,19 @@
 
     function introspect_config_item($name, &$propbag)
     {
-        $propbag->add('type',        'boolean');
-        $propbag->add('name',        $name);
-        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
-        $propbag->add('default', 'true');
+        switch($name) {
+            case 'info':
+                $propbag->add('type',        'info');
+                $propbag->add('description',  PLUGIN_EVENT_TEXTILE_TRANSFORM);
+                break;
+
+            default:
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        $name);
+                $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
+                $propbag->add('default', 'true');
+                break;
+        }
         return true;
     }
 

[php-blog-cvs] serendipity rss.php,1.28,1.29

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

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

Modified Files:
	rss.php 
Log Message:
rss is utf8, thanks to romulus :)



Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- rss.php	1 Jul 2004 11:43:07 -0000	1.28
+++ rss.php	8 Oct 2004 11:09:16 -0000	1.29
@@ -1,5 +1,5 @@
 <?php # $Id$
-header('Content-Type: text/xml');
+header('Content-Type: text/xml; charset=utf-8');
 
 include_once('serendipity_config.inc.php');
 $version = strtolower($_GET['version']);