php-blog-cvs — Serendipity commit list

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

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

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

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

[php-blog-cvs] serendipity/sql db_update_0.2_0.3_mysql.sql,1.1,1.2 db_update_0.2_0.3_pqsql.sql,1.1,1.2 db_update_0.3_0.4_mysql.sql,1.1,1.2 db_update_0.3_0.4_pgsql.sql,1.1,1.2 db_update_0.5_0.5.1_mysql.sql,1.1,1.2 db_update_0.5_0.5.1_pgsql.sql,1.1,1.2

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

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

Modified Files:
	db_update_0.2_0.3_mysql.sql db_update_0.2_0.3_pqsql.sql 
	db_update_0.3_0.4_mysql.sql db_update_0.3_0.4_pgsql.sql 
	db_update_0.5_0.5.1_mysql.sql db_update_0.5_0.5.1_pgsql.sql 
Log Message:
mmmm prefixes, tasty :)


Index: db_update_0.2_0.3_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.2_0.3_mysql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.2_0.3_mysql.sql	29 Feb 2004 19:44:04 -0000	1.1
+++ db_update_0.2_0.3_mysql.sql	2 Mar 2004 17:57:05 -0000	1.2
@@ -1,17 +1,17 @@
-ALTER TABLE serendipity_entries ADD COLUMN trackbacks INT(4) DEFAULT 0 AFTER `comments`;
+ALTER TABLE {PREFIX}entries ADD COLUMN trackbacks INT(4) DEFAULT 0 AFTER `comments`;
 
-ALTER TABLE serendipity_entries ADD COLUMN isdraft ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER `categoryid`;
+ALTER TABLE {PREFIX}entries ADD COLUMN isdraft ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER `categoryid`;
 
-ALTER TABLE serendipity_comments ADD COLUMN subscribed ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER `type`;
+ALTER TABLE {PREFIX}comments ADD COLUMN subscribed ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER `type`;
 
-INSERT INTO serendipity_config (name, value) VALUES ('allowSubscriptions', 'false');
+INSERT INTO {PREFIX}config (name, value) VALUES ('allowSubscriptions', 'false');
 
-INSERT INTO serendipity_config (name, value) VALUES ('template', 'default');
+INSERT INTO {PREFIX}config (name, value) VALUES ('template', 'default');
 
-INSERT INTO serendipity_config (name, value) VALUES ('embed', 'false');
+INSERT INTO {PREFIX}config (name, value) VALUES ('embed', 'false');
 
-INSERT INTO serendipity_config (name, value) VALUES ('indexFile', 'index.php');
+INSERT INTO {PREFIX}config (name, value) VALUES ('indexFile', 'index.php');
 
-INSERT INTO serendipity_config (name, value) VALUES ('blockReferer', ';');
+INSERT INTO {PREFIX}config (name, value) VALUES ('blockReferer', ';');
 
-INSERT INTO serendipity_config (name, value) VALUES ('XHTML11', 'false'); 
+INSERT INTO {PREFIX}config (name, value) VALUES ('XHTML11', 'false'); 

Index: db_update_0.2_0.3_pqsql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.2_0.3_pqsql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.2_0.3_pqsql.sql	29 Feb 2004 19:44:04 -0000	1.1
+++ db_update_0.2_0.3_pqsql.sql	2 Mar 2004 17:57:05 -0000	1.2
@@ -1,17 +1,17 @@
-ALTER TABLE serendipity_entries ADD COLUMN trackbacks INT(4) DEFAULT 0 AFTER `comments`;
+ALTER TABLE {PREFIX}entries ADD COLUMN trackbacks INT(4) DEFAULT 0 AFTER `comments`;
 
-ALTER TABLE serendipity_entries ADD COLUMN isdraft BOOLEAN NOT NULL FALSE AFTER `categoryid`;
+ALTER TABLE {PREFIX}entries ADD COLUMN isdraft BOOLEAN NOT NULL FALSE AFTER `categoryid`;
 
-ALTER TABLE serendipity_comments ADD COLUMN subscribed BOOLEAN NOT NULL AFTER `type`;
+ALTER TABLE {PREFIX}comments ADD COLUMN subscribed BOOLEAN NOT NULL AFTER `type`;
 
-INSERT INTO serendipity_config (name, value) VALUES ('allowSubscriptions', 'false');
+INSERT INTO {PREFIX}config (name, value) VALUES ('allowSubscriptions', 'false');
 
-INSERT INTO serendipity_config (name, value) VALUES ('template', 'default');
+INSERT INTO {PREFIX}config (name, value) VALUES ('template', 'default');
 
-INSERT INTO serendipity_config (name, value) VALUES ('embed', 'false');
+INSERT INTO {PREFIX}config (name, value) VALUES ('embed', 'false');
 
-INSERT INTO serendipity_config (name, value) VALUES ('indexFile', 'index.php');
+INSERT INTO {PREFIX}config (name, value) VALUES ('indexFile', 'index.php');
 
-INSERT INTO serendipity_config (name, value) VALUES ('blockReferer', ';');
+INSERT INTO {PREFIX}config (name, value) VALUES ('blockReferer', ';');
 
-INSERT INTO serendipity_config (name, value) VALUES ('XHTML11', 'false'); 
+INSERT INTO {PREFIX}config (name, value) VALUES ('XHTML11', 'false'); 

Index: db_update_0.3_0.4_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.3_0.4_mysql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.3_0.4_mysql.sql	29 Feb 2004 19:44:04 -0000	1.1
+++ db_update_0.3_0.4_mysql.sql	2 Mar 2004 17:57:05 -0000	1.2
@@ -1 +1 @@
-ALTER TABLE serendipity_entries ADD COLUMN allow_comments ENUM('true', 'false') NOT NULL DEFAULT 'true' AFTER isdraft;
+ALTER TABLE {PREFIX}entries ADD COLUMN allow_comments ENUM('true', 'false') NOT NULL DEFAULT 'true' AFTER isdraft;

Index: db_update_0.3_0.4_pgsql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.3_0.4_pgsql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.3_0.4_pgsql.sql	29 Feb 2004 19:44:04 -0000	1.1
+++ db_update_0.3_0.4_pgsql.sql	2 Mar 2004 17:57:05 -0000	1.2
@@ -1 +1 @@
-ALTER TABLE serendipity_entries ADD COLUMN allow_comments BOOLEAN NOT NULL TRUE AFTER isdraft;
+ALTER TABLE {PREFIX}entries ADD COLUMN allow_comments BOOLEAN NOT NULL TRUE AFTER isdraft;

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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.5_0.5.1_mysql.sql	29 Feb 2004 19:44:04 -0000	1.1
+++ db_update_0.5_0.5.1_mysql.sql	2 Mar 2004 17:57:05 -0000	1.2
@@ -1,4 +1,4 @@
-CREATE TABLE `s9ytest_images` (
+CREATE TABLE `{PREFIX}images` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(255) NOT NULL default '',
   `extension` varchar(5) NOT NULL default '',
@@ -11,13 +11,24 @@
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
+UPDATE {PREFIX}plugins
+   SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
+ WHERE name LIKE '%serendipity_plugin_content_rewrite%';
 
-ALTER TABLE s9ytest_entries ADD last_modified INT(10) UNSIGNED default null;
-CREATE INDEX timestamp ON s9ytest_entries (timestamp);
-CREATE INDEX last_modified ON s9ytest_entries (last_modified);
-UPDATE s9ytest_entries SET last_modified = timestamp;
+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%';
 
-INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
-INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
-INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
-INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);
+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);
+UPDATE {PREFIX}entries SET last_modified = timestamp;
+
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);

Index: db_update_0.5_0.5.1_pgsql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.5_0.5.1_pgsql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.5_0.5.1_pgsql.sql	29 Feb 2004 19:44:04 -0000	1.1
+++ db_update_0.5_0.5.1_pgsql.sql	2 Mar 2004 17:57:05 -0000	1.2
@@ -1,4 +1,4 @@
-CREATE TABLE serendipity_images (
+CREATE TABLE {PREFIX}images (
   id SERIAL primary key,
   name varchar(255) NOT NULL default '',
   extension varchar(5) NOT NULL default '',
@@ -10,25 +10,25 @@
   date int NOT NULL default '0'
 );
 
-UPDATE serendipity_plugins
+UPDATE {PREFIX}plugins
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
  WHERE name LIKE '%serendipity_plugin_content_rewrite%';
 
-UPDATE serendipity_config
+UPDATE {PREFIX}config
    SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
  WHERE name LIKE '%serendipity_plugin_content_rewrite%';
  
-UPDATE serendipity_plugins
+UPDATE {PREFIX}plugins
    SET placement = 'event'
  WHERE name LIKE '%serendipity_event_contentrewrite%';
  
-ALTER TABLE serendipity_entries ADD last_modified INT UNSIGNED default null;
+ALTER TABLE {PREFIX}entries ADD last_modified INT UNSIGNED default null;
 
-CREATE INDEX timestamp ON serendipity_entries (timestamp);
-CREATE INDEX last_modified ON serendipity_entries (last_modified);
-UPDATE serendipity_entries SET last_modified = timestamp;
+CREATE INDEX timestamp ON {PREFIX}entries (timestamp);
+CREATE INDEX last_modified ON {PREFIX}entries (last_modified);
+UPDATE {PREFIX}entries SET last_modified = timestamp;
 
-INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
-INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
-INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
-INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
+INSERT INTO {PREFIX}plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.11,1.12 serendipity_lang_de.inc.php,1.20,1.21 serendipity_lang_en.inc.php,1.18,1.19 serendipity_lang_es.inc.php,1.18,1.19

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

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

Modified Files:
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
Log Message:
Okay, here we go. One upgrade script comming up.

Basically it checks if the version last used to save the config is lower than the installed version

If that is the case, it opens a page (like the installer) and attempts to calculate which SQL files and functions needs to be run.
It is then up to the user to accept if he or she wants to perform these actions..

WARNING: Backup your database before you run the upgrader!
Developers will likely never have to use this script (test it anyways?), so it won't make the versioncheck if $srendipity['production'] is false



Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang_da.inc.php	27 Feb 2004 20:15:02 -0000	1.11
+++ serendipity_lang_da.inc.php	2 Mar 2004 17:35:24 -0000	1.12
@@ -331,6 +331,22 @@
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis sat til "true" vi dette anbefale linket til dit RSS feed om ikke at tillade klienter at cache dit feed. Det anbefales at sætte dette til "false".'); 
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Starten på ugen');
 @define('CALENDAR_BOW_DESC', 'Et number som beskiver hvilken ugedag ugen starter på, værdierne ligger i intervallet: 0 = søndag, 1 = mandag ... 6 = lørdag (standard: 1)');
+/* TRANSLATE */ @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has deteceted that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_WELCOME', 'Hi, and welcome to the Serendipity upgrade agent.');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PURPOSE', 'I am here i help you upgrade your Serendipity installation.');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_WHY', 'You are seeing this message because you have just installed Serendipity %s, but have not yet upgraded your database installation to fit this version');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Database updates (%s)');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'I have found the following .sql files which needs to be run before you can continue normal operation of Serendipity');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Version specific tasks');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'No version specific tasks found');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Do you whish me perform the above tasks?');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'No, I will run them manually');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Yes, please do so');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'It appears you do not need any upgrades run');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Consider Serendipity upgraded');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_de.inc.php	27 Feb 2004 20:15:02 -0000	1.20
+++ serendipity_lang_de.inc.php	2 Mar 2004 17:35:24 -0000	1.21
@@ -326,5 +326,22 @@
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week'); // TRANSLATE
 @define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 6 = saturday (default: 1)'); // TRANSLATE
 
+/* TRANSLATE */ @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has deteceted that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_WELCOME', 'Hi, and welcome to the Serendipity upgrade agent.');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PURPOSE', 'I am here i help you upgrade your Serendipity installation.');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_WHY', 'You are seeing this message because you have just installed Serendipity %s, but have not yet upgraded your database installation to fit this version');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Database updates (%s)');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'I have found the following .sql files which needs to be run before you can continue normal operation of Serendipity');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Version specific tasks');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'No version specific tasks found');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Do you whish me perform the above tasks?');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'No, I will run them manually');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Yes, please do so');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'It appears you do not need any upgrades run');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Consider Serendipity upgraded');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_en.inc.php	27 Feb 2004 20:15:02 -0000	1.18
+++ serendipity_lang_en.inc.php	2 Mar 2004 17:35:24 -0000	1.19
@@ -322,9 +322,23 @@
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
 @define('APPLY_MARKUP_TO', 'Apply markup to %s');
-
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week');
 @define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 6 = saturday (default: 1)');
-
+@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has deteceted that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');
+@define('SERENDIPITY_UPGRADER_WELCOME', 'Hi, and welcome to the Serendipity upgrade agent.');
+@define('SERENDIPITY_UPGRADER_PURPOSE', 'I am here i help you upgrade your Serendipity installation.');
+@define('SERENDIPITY_UPGRADER_WHY', 'You are seeing this message because you have just installed Serendipity %s, but have not yet upgraded your database installation to fit this version');
+@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Database updates (%s)');
+@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'I have found the following .sql files which needs to be run before you can continue normal operation of Serendipity');
+@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Version specific tasks');
+@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'No version specific tasks found');
+@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Do you whish me perform the above tasks?');
+@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'No, I will run them manually');
+@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Yes, please do so');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'It appears you do not need any upgrades run');
+@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Consider Serendipity upgraded');
+@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
+@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
+@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_es.inc.php	27 Feb 2004 20:15:03 -0000	1.18
+++ serendipity_lang_es.inc.php	2 Mar 2004 17:35:24 -0000	1.19
@@ -318,5 +318,23 @@
 @define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week'); // TRANSLATE
 @define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 6 = saturday (default: 1)'); // TRANSLATE
+
+/* TRANSLATE */ @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has deteceted that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_WELCOME', 'Hi, and welcome to the Serendipity upgrade agent.');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PURPOSE', 'I am here i help you upgrade your Serendipity installation.');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_WHY', 'You are seeing this message because you have just installed Serendipity %s, but have not yet upgraded your database installation to fit this version');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Database updates (%s)');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'I have found the following .sql files which needs to be run before you can continue normal operation of Serendipity');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Version specific tasks');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'No version specific tasks found');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Do you whish me perform the above tasks?');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'No, I will run them manually');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Yes, please do so');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'It appears you do not need any upgrades run');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Consider Serendipity upgraded');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
+/* TRANSLATE */ @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_admin_upgrader.inc.php,NONE,1.1 serendipity.css.php,1.22,1.23 serendipity_admin.php,1.28,1.29 serendipity_admin_installer.inc.php,1.56,1.57 serendipity_config.inc.php,1.54,1.55 serendipity_functions.inc.php,1.221,1.222 db.sql,1.26,NONE db_update-0.2-0.3.sql,1.5,NONE db_update-0.3-0.4.sql,1.3,NONE db_update-0.5-0.5.1.sql,1.6,NONE

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

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

Modified Files:
	serendipity.css.php serendipity_admin.php 
	serendipity_admin_installer.inc.php serendipity_config.inc.php 
	serendipity_functions.inc.php 
Added Files:
	serendipity_admin_upgrader.inc.php 
Removed Files:
	db.sql db_update-0.2-0.3.sql db_update-0.3-0.4.sql 
	db_update-0.5-0.5.1.sql 
Log Message:
Okay, here we go. One upgrade script comming up.

Basically it checks if the version last used to save the config is lower than the installed version

If that is the case, it opens a page (like the installer) and attempts to calculate which SQL files and functions needs to be run.
It is then up to the user to accept if he or she wants to perform these actions..

WARNING: Backup your database before you run the upgrader!
Developers will likely never have to use this script (test it anyways?), so it won't make the versioncheck if $srendipity['production'] is false



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

    require_once('serendipity_functions_installer.inc.php');

    $abortLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=ignore';
    $upgradeLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=upgrade';

    /* Functions which needs to be run if installed version is equal or lower */
    $tasks = array('0.5.1' => 'serendipity_syncThumbs');


    /* Fetch SQL files which needs to be run */
    $dir = opendir($serendipity['serendipityPath'] .'sql/');
    while ( ($file = readdir($dir)) !== false ) {
        if ( preg_match('@db_update_(.*)_(.*)_'. $serendipity['dbType'] .'.sql@', $file, $res) ) {
            if ( version_compare($res[1], $serendipity['versionInstalled']) >= 0) {
                $sqlfiles[] = $file;
            }
        }
    }





    if ( $serendipity['GET']['action'] == 'ignore' ) {
        /* Todo: Don't know what to put here? */ 

    } elseif ( $serendipity['GET']['action'] == 'upgrade' ) {

        /* Install SQL files */
        foreach ($sqlfiles as $sqlfile) {
            $sql = file_get_contents($serendipity['serendipityPath'] .'sql/'. $sqlfile);
            $sql = str_replace('{PREFIX}', $serendipity['dbPrefix'], $sql);
            preg_match_all("@(.*);@iUs", $sql, $res);
            foreach ( $res[0] as $sql) {
                    $r = serendipity_db_query($sql);
                    if ( is_string($r) ) {
                        $errors[] = $r;
                    }
            }
        }


        /* Call functions */
        foreach ( $tasks as $version => $function ) {
            if ( version_compare($serendipity['version'], $version, '<=') ) {
                if ( is_callable($function) ) {
                    call_user_func($function);
                } else {
                    $errors[] = 'Unable to call '. $function;
                }
            }
        }
        
        if ( is_array($errors) ) {
            echo DIAGNOSTIC_ERROR . '<br /><br />';
            echo '<span style="color: #FF0000">- ' . implode('<br />', $errors) . '</span><br /><br />';
        }

    }

    if ( $serendipity['GET']['action'] == 'ignore' || $serendipity['GET']['action'] == 'upgrade' ) {
        $r = serendipity_updateLocalConfig($serendipity['dbName'], $serendipity['dbPrefix'], $serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass'], $serendipity['dbType']);
        if ( $serendipity['GET']['action'] == 'ignore' ) {
            echo SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED;
        } elseif ( $serendipity['GET']['action'] == 'upgrade' ) {
            echo sprintf(SERENDIPITY_UPGRADER_NOW_UPGRADED, $serendipity['version']);
        }
        echo sprintf(SERENDIPITY_UPGARDER_RETURN_HERE, '<a href="'. $serendipity['serendipityHTTPPath'] .'">', '</a>');
    } else {

?>

<?php echo SERENDIPITY_UPGRADER_WELCOME ?>
<br /><?php echo SERENDIPITY_UPGRADER_PURPOSE ?>
<br /><?php echo sprintf(SERENDIPITY_UPGRADER_WHY, $serendipity['version']) ?>


<?php if ( sizeof($sqlfiles) > 0 ) { ?>
<br />
<h3><?php echo sprintf(SERENDIPITY_UPGRADER_DATABASE_UPDATES, $serendipity['dbType']) ?>:</h3>
<?php echo SERENDIPITY_UPGRADER_FOUND_SQL_FILES ?>:
<br />
<?php
    foreach ( $sqlfiles as $sqlfile ) {
        echo '<strong>- '. $sqlfile .'</strong><br />';
    }
?>
<?php } ?>



<h3><?php echo SERENDIPITY_UPGRADER_VERSION_SPECIFIC ?>:</h3>
<?php
    $taskCount = 0;

    if ( version_compare($serendipity['version'], '0.5.1', '<=') ) {
        echo '<strong>0.5.1 - Image sync</strong>';
        echo '<br />Version 0.5.1 introduces image sync with the database.';
        echo '<br />With your permission I would like to perform the image sync.';
        $taskCount++;
    }

    /*
        
    Add more versions here using:
    
        if ( [version_compare] ) {
            [Desc]
            $taskCount++;
        }

    */

    if ( $taskCount == 0 ) {
        echo SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC;
    }

?>


<br /><br />
<hr noshade>
<?php if ( $taskCount > 0 || sizeof($sqlfiles) > 0 ) { ?>
    <strong><?php echo SERENDIPITY_UPGRADER_PROCEED_QUESTION ?></strong>
    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onClick="location.href='<?php echo $abortLoc ?>'"> <input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?>" onClick="location.href='<?php echo $upgradeLoc ?>'">
<?php } else { ?>
    <strong><?php echo SERENDIPITY_UPGRADER_NO_UPGRADES ?></strong>
    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_CONSIDER_CONE ?>" onClick="location.href='<?php echo $abortLoc ?>'">
<?php } ?>
<?php } ?>

Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity.css.php	11 Feb 2004 12:23:12 -0000	1.22
+++ serendipity.css.php	2 Mar 2004 17:35:24 -0000	1.23
@@ -1,6 +1,13 @@
 <?php # $Id$
 
 include_once('compat.php');
+
+/* This is a small hack to allow CSS display during installations and upgrades */
+define('IN_installer', true);
+define('IN_upgrader', true);
+
+include_once('serendipity_config.inc.php');
+
 header('Content-type: text/css');
 function serendipity_printStylesheet($file) {
      global $serendipity;

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_admin.php	17 Feb 2004 16:39:55 -0000	1.28
+++ serendipity_admin.php	2 Mar 2004 17:35:24 -0000	1.29
@@ -2,6 +2,7 @@
 
 session_start();
 define('IN_installer', true);
+define('IN_upgrader', true);
 include('serendipity_config.inc.php');
 
 if ($serendipity['GET']['adminModule'] == 'logout'){
@@ -40,11 +41,18 @@
     <table id="mainpane">
         <tr valign="top">
 <?php
-if (!isset($serendipity['serendipityPath']) || IS_installed === false ) {
+if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) {
+    if ( IS_installed === false ) {
+        $file = 'serendipity_admin_installer.inc.php';
+    } elseif ( IS_up2date === 1 ) {
+        $file = 'serendipity_admin_upgrader.inc.php';
+    }
+
+
 ?>
     <td class="serendipity_admin">
         <div class="serendipity_date"><?php echo SERENDIPITY_INSTALLATION; ?></div>
-        <p><?php require_once('serendipity_admin_installer.inc.php'); ?>
+        <p><?php require_once($file); ?>
 <?php
 } elseif ( !serendipity_userLoggedIn() ) {
     serendipity_printLogin();

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_admin_installer.inc.php	29 Feb 2004 19:53:25 -0000	1.56
+++ serendipity_admin_installer.inc.php	2 Mar 2004 17:35:24 -0000	1.57
@@ -368,7 +368,7 @@
 
     echo CREATE_DATABASE;
     // Create tables
-    $queries = serendipity_parse_sql_tables('./db.sql');
+    $queries = serendipity_parse_sql_tables('./sql/db.sql');
     $queries = str_replace('{PREFIX}', $_POST['dbPrefix'], $queries);
 
     foreach ($queries as $query) {

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- serendipity_config.inc.php	26 Feb 2004 11:37:42 -0000	1.54
+++ serendipity_config.inc.php	2 Mar 2004 17:35:24 -0000	1.55
@@ -28,6 +28,7 @@
 // Is the possibility to comment and entry enabled by default?
 $serendipity['allowCommentsDefault'] = true;
 
+
 /*
  *   Load main language file
  */
@@ -39,6 +40,7 @@
 if ( !defined('IN_installer') && IS_installed === false ) {
     die(sprintf(SERENDIPITY_NOT_INSTALLED, 'serendipity_admin.php'));
 }
+
 if ( defined('IN_installer') && IS_installed === false) {
     return 1;
 }
@@ -48,6 +50,21 @@
  *   Load Functions
  */
 include_once("{$serendipity['serendipityPath']}serendipity_config_local.inc.php");
+
+
+/*
+ *  Check if the installed version is highter than the version of the config
+ */
+define('IS_up2date', version_compare($serendipity['version'], $serendipity['versionInstalled'], '<='));
+
+if ( IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader') ) {
+    die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], 'serendipity_admin.php'));
+}
+
+
+/*
+ *  Include main functions
+ */
 include_once("{$serendipity['serendipityPath']}serendipity_functions.inc.php");
 
 if (serendipity_FUNCTIONS_LOADED!== true) {
@@ -61,6 +78,7 @@
     die(DATABASE_ERROR);
 }
 
+
 /*
  *   Load Configuration options from the database
  */

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- serendipity_functions.inc.php	27 Feb 2004 20:15:02 -0000	1.221
+++ serendipity_functions.inc.php	2 Mar 2004 17:35:24 -0000	1.222
@@ -9,6 +9,7 @@
 include_once("${serendipity['serendipityPath']}bundled-libs/XML/RPC.php");
 include_once("${serendipity['serendipityPath']}serendipity_plugin_api.php");
 include_once("${serendipity['serendipityPath']}serendipity_functions_images.inc.php");
+include_once("${serendipity['serendipityPath']}serendipity_functions_installer.inc.php");
 
 function serendipity_logout() {
     $_SESSION['serendipityAuthedUser'] = false;

--- db.sql DELETED ---

--- db_update-0.2-0.3.sql DELETED ---

--- db_update-0.3-0.4.sql DELETED ---

--- db_update-0.5-0.5.1.sql DELETED ---

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.16,1.17

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

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

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
Fix to allow image selector to work in Mozilla-based browsers - 

add a closing tag to the label


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_admin_image_selector.php	17 Feb 2004 12:10:05 -0000	1.16
+++ serendipity_admin_image_selector.php	1 Mar 2004 16:57:23 -0000	1.17
@@ -63,7 +63,7 @@
 
                 <b><?php echo IMAGE_AS_A_LINK; ?>:</b>
                 <br />
-                <input id="radio_islink_yes" type="radio" name="serendipity[isLink]" checked="checked" /><label for="radio_islink_yes"> <?php echo I_WANT_NO_LINK; ?><br />
+                <input id="radio_islink_yes" type="radio" name="serendipity[isLink]" checked="checked" /><label for="radio_islink_yes"> <?php echo I_WANT_NO_LINK; ?></label><br />
                 <input id="radio_islink_no"  type="radio" name="serendipity[isLink]" /><label for="radio_islink_no"> <?php echo I_WANT_IT_TO_LINK; ?></label>
                     <input type="text"  name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] .'.'. $file['extension']; ?>" onfocus="value='';" /><br />
                 <br />

[php-blog-cvs] serendipity serendipity_functions_installer.inc.php,NONE,1.1 serendipity_admin_installer.inc.php,1.55,1.56

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
Added Files:
	serendipity_functions_installer.inc.php 
Log Message:
Add new functions file for the installer, the idea is to move all the functions to this file, at some point
First we centralize the function which updates serendipity_config_local.inc.php (because I need it in my upgrade script)


--- NEW FILE: serendipity_functions_installer.inc.php ---
<?php
    function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $file='serendipity_config_local.inc.php', $path = null) {
        global $serendipity;
        umask(0000);
        if ( is_null($path) ) {
            $path = $serendipity['serendipityPath'];
        }
        $configfp = fopen($path . $file, 'w');
        if ( !is_resource($configfp) ) {
            $errs[] = sprintf(FILE_WRITE_ERROR, $file);
            $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chown -R www:www', $path) . ' (' . WWW_USER . ')';
            $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chmod 770'       , $path);
            $errs[] = BROWSER_RELOAD;

            return $errs;
        }

        fwrite($configfp, "<?php\n");

        fwrite($configfp, "\t/*\n");
        fwrite($configfp, "\t  Serendipity configuration file\n");
        fwrite($configfp, "\t  Written on ". date('r') ."\n");
        fwrite($configfp, "\t*/\n\n");

        fwrite($configfp, "\t\$serendipity['versionInstalled']  = '{$serendipity['version']}';\n");
        fwrite($configfp, "\t\$serendipity['dbName']            = '{$dbName}';\n");
        fwrite($configfp, "\t\$serendipity['dbPrefix']          = '{$dbPrefix}';\n");
        fwrite($configfp, "\t\$serendipity['dbHost']            = '{$dbHost}';\n");
        fwrite($configfp, "\t\$serendipity['dbUser']            = '{$dbUser}';\n");
        fwrite($configfp, "\t\$serendipity['dbPass']            = '{$dbPass}';\n");
        fwrite($configfp, "\t\$serendipity['dbType']            = '{$dbType}';\n");
        fwrite($configfp, "?>\n");

        fclose($configfp);
        
        @chmod($path . $file, 0700);
        return true;
    }

?>

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_admin_installer.inc.php	18 Feb 2004 11:28:15 -0000	1.55
+++ serendipity_admin_installer.inc.php	29 Feb 2004 19:53:25 -0000	1.56
@@ -3,9 +3,11 @@
 umask(0000);
 $umask = 0770;
 define('IN_installer', true);
-include_once('serendipity_config.inc.php');
-function serendipity_query_default($optname, $default)
-{
+
+require_once('serendipity_config.inc.php');
+require_once('serendipity_functions_installer.inc.php');
+
+function serendipity_query_default($optname, $default) {
     switch ($optname) {
         case 'serendipityPath':
             return dirname(__FILE__) .'/';
@@ -466,35 +468,15 @@
     foreach($p as $key => $entry) {
         serendipity_set_config_var($entry['name'], $_POST[$entry['name']]);
     }
-
-    // Create a basic configuration file which gives enough information to open
-    // the database and get information from the database tables
-    $configfp = fopen('./serendipity_config_local.inc.php', 'w');
-
-    if ( !is_resource($configfp) ) {
-        $errs[] = sprintf(FILE_WRITE_ERROR, './serendipity_config_local.inc.php');
-        $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chown -R www:www', $_POST['serendipityPath']) . '(' . WWW_USER . ')';
-        $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chmod 770'       , $_POST['serendipityPath']);
-        $errs[] = BROWSER_RELOAD;
-
-        return $errs;
-    }
-
-    fwrite($configfp, "<?php\n");
-    fwrite($configfp, "\t\$serendipity['versionInstalled']  = '{$serendipity['version']}';\n\n");
-    fwrite($configfp, "\t\$serendipity['dbName']            = '{$_POST['dbName']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbPrefix']          = '{$_POST['dbPrefix']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbHost']            = '{$_POST['dbHost']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbUser']            = '{$_POST['dbUser']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbPass']            = '{$_POST['dbPass']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbType']            = '{$_POST['dbType']}';\n");
-    fwrite($configfp, "?>\n");
-
-    fclose($configfp);
-
-    @chmod('./serendipity_config_local.inc.php', $umask);
-    return true;
-
+    
+    return serendipity_updateLocalConfig($_POST['dbName'], 
+                                         $_POST['dbPrefix'], 
+                                         $_POST['dbHost'], 
+                                         $_POST['dbUser'], 
+                                         $_POST['dbPass'], 
+                                         $_POST['dbType'], 
+                                         'serendipity_config_local.inc.php', 
+                                         $_POST['serendipityPath']);
 }
 
 if (!isset($_POST['installAction'])) {

[php-blog-cvs] serendipity/sql db.sql,NONE,1.1 db_update_0.2_0.3_mysql.sql,NONE,1.1 db_update_0.2_0.3_pqsql.sql,NONE,1.1 db_update_0.3_0.4_mysql.sql,NONE,1.1 db_update_0.3_0.4_pgsql.sql,NONE,1.1 db_update_0.5_0.5.1_mysql.sql,NONE,1.1 db_update_0.5_0.5.1_pgsql.sql,NONE,1.1

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

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

Added Files:
	db.sql db_update_0.2_0.3_mysql.sql db_update_0.2_0.3_pqsql.sql 
	db_update_0.3_0.4_mysql.sql db_update_0.3_0.4_pgsql.sql 
	db_update_0.5_0.5.1_mysql.sql db_update_0.5_0.5.1_pgsql.sql 
Log Message:
Move SQL files, now seperate files for mysql and pqsql, to their own folder (called "sql")


--- NEW FILE: db.sql ---
#
# Table structure for table '{PREFIX}authors'
#

create table {PREFIX}authors (
  username varchar(20) default null,
  password varchar(32) default null,
  authorid {AUTOINCREMENT} {PRIMARY},
  mail_comments int(1) default '1',
  mail_trackbacks int(1) default '1',
  email varchar(128) not null default ''
);

#
# table structure for table '{PREFIX}comments'
#

create table {PREFIX}comments (
  id {AUTOINCREMENT} {PRIMARY},
  entry_id int(10) {UNSIGNED} not null default '0',
  timestamp int(10) {UNSIGNED} default null,
  title varchar(150) default null,
  author varchar(80) default null,
  email varchar(200) default null,
  url varchar(200) default null,
  ip varchar(15) default null,
  body text,
  type varchar(100) default 'regular',
  subscribed {BOOLEAN}
);

CREATE {FULLTEXT} INDEX body on {PREFIX}comments (body);

#
# table structure for table '{PREFIX}entries'
#

create table {PREFIX}entries (
  id {AUTOINCREMENT} {PRIMARY},
  title varchar(200) default null,
  timestamp int(10) {UNSIGNED} default null,
  body text,
  comments int(4) {UNSIGNED} default '0',
  trackbacks int(4) {UNSIGNED} default '0',
  extended text,
  exflag int(1) default null,
  author varchar(20) default null,
  authorid int(11) default null,
  categoryid int(11) default null,
  isdraft {BOOLEAN},
  allow_comments {BOOLEAN},
  last_modified int(10) {UNSIGNED} default null
);

CREATE {FULLTEXT} INDEX entry on {PREFIX}entries (title,body,extended);

#
# table structure for table '{PREFIX}references'
#

create table {PREFIX}references (
  id {AUTOINCREMENT} {PRIMARY},
  entry_id int(10) {UNSIGNED} not null default '0',
  link text,
  name text
);

#
# Table structure for table '{PREFIX}exits'
#

CREATE TABLE {PREFIX}exits (
  entry_id {AUTOINCREMENT},
  day date NOT NULL,
  count int(11) NOT NULL default '0',
  scheme varchar(5),
  host varchar(128) NOT NULL,
  port varchar(5),
  path varchar(255),
  query varchar(255),
  PRIMARY KEY  (host,day,entry_id)
);

#
# Table structure for table '{PREFIX}referrers'
#

CREATE TABLE {PREFIX}referrers (
  entry_id {AUTOINCREMENT},
  day date NOT NULL,
  count int(11) NOT NULL default '0',
  scheme varchar(5),
  host varchar(128) NOT NULL,
  port varchar(5),
  path varchar(255),
  query varchar(255),
  PRIMARY KEY  (host,day,entry_id)
);

#
# Table structure for table 'serendipity_css'
#

CREATE TABLE {PREFIX}css (
  cssid {AUTOINCREMENT} {PRIMARY},
  name varchar(40) default NULL,
  data text
);

#
# Table structure for table 'serendipity_config'
#

create table {PREFIX}config (
  name varchar(255) not null primary key,
  value text not null
);

CREATE TABLE {PREFIX}suppress (
  ip varchar(15) default NULL,
  scheme varchar(5),
  host varchar(128),
  port varchar(5),
  path varchar(255),
  query varchar(255),
  last timestamp NOT NULL
);

CREATE unique INDEX url on {PREFIX}suppress (host, ip);

CREATE TABLE {PREFIX}plugins (
  name varchar(128) not null,
  placement varchar(6) not null default 'right',
  sort_order int(4) not null default '0',
  PRIMARY KEY(name)
);

CREATE TABLE {PREFIX}category (
  categoryid {AUTOINCREMENT} {PRIMARY},
  category_name varchar(255) default NULL,
  category_description text,
  authorid int(11) default NULL
);

CREATE TABLE {PREFIX}images (
  id {AUTOINCREMENT} {PRIMARY},
  name varchar(255) not null default '',
  extension varchar(5) not null default '',
  mime varchar(15) not null default '',
  size int(11) not null default '0',
  dimensions_width int(11) not null default '0',
  dimensions_height int(11) not null default '0',
  date int(11) not null default '0'
);

--- NEW FILE: db_update_0.2_0.3_mysql.sql ---
ALTER TABLE serendipity_entries ADD COLUMN trackbacks INT(4) DEFAULT 0 AFTER `comments`;

ALTER TABLE serendipity_entries ADD COLUMN isdraft ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER `categoryid`;

ALTER TABLE serendipity_comments ADD COLUMN subscribed ENUM('true', 'false') NOT NULL DEFAULT 'false' AFTER `type`;

INSERT INTO serendipity_config (name, value) VALUES ('allowSubscriptions', 'false');

INSERT INTO serendipity_config (name, value) VALUES ('template', 'default');

INSERT INTO serendipity_config (name, value) VALUES ('embed', 'false');

INSERT INTO serendipity_config (name, value) VALUES ('indexFile', 'index.php');

INSERT INTO serendipity_config (name, value) VALUES ('blockReferer', ';');

INSERT INTO serendipity_config (name, value) VALUES ('XHTML11', 'false'); 

--- NEW FILE: db_update_0.2_0.3_pqsql.sql ---
ALTER TABLE serendipity_entries ADD COLUMN trackbacks INT(4) DEFAULT 0 AFTER `comments`;

ALTER TABLE serendipity_entries ADD COLUMN isdraft BOOLEAN NOT NULL FALSE AFTER `categoryid`;

ALTER TABLE serendipity_comments ADD COLUMN subscribed BOOLEAN NOT NULL AFTER `type`;

INSERT INTO serendipity_config (name, value) VALUES ('allowSubscriptions', 'false');

INSERT INTO serendipity_config (name, value) VALUES ('template', 'default');

INSERT INTO serendipity_config (name, value) VALUES ('embed', 'false');

INSERT INTO serendipity_config (name, value) VALUES ('indexFile', 'index.php');

INSERT INTO serendipity_config (name, value) VALUES ('blockReferer', ';');

INSERT INTO serendipity_config (name, value) VALUES ('XHTML11', 'false'); 

--- NEW FILE: db_update_0.3_0.4_mysql.sql ---
ALTER TABLE serendipity_entries ADD COLUMN allow_comments ENUM('true', 'false') NOT NULL DEFAULT 'true' AFTER isdraft;

--- NEW FILE: db_update_0.3_0.4_pgsql.sql ---
ALTER TABLE serendipity_entries ADD COLUMN allow_comments BOOLEAN NOT NULL TRUE AFTER isdraft;

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


ALTER TABLE s9ytest_entries ADD last_modified INT(10) UNSIGNED default null;
CREATE INDEX timestamp ON s9ytest_entries (timestamp);
CREATE INDEX last_modified ON s9ytest_entries (last_modified);
UPDATE s9ytest_entries SET last_modified = timestamp;

INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
INSERT INTO s9ytest_plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);

--- NEW FILE: db_update_0.5_0.5.1_pgsql.sql ---
CREATE TABLE serendipity_images (
  id SERIAL primary key,
  name varchar(255) NOT NULL default '',
  extension varchar(5) NOT NULL default '',
  mime varchar(15) NOT NULL default '',
  size int NOT NULL default '0',
  dimensions_width int NOT NULL default '0',
  dimensions_height int NOT NULL default '0',
  thumbnail_name varchar(255) NOT NULL default '',
  date int NOT NULL default '0'
);

UPDATE serendipity_plugins
   SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
 WHERE name LIKE '%serendipity_plugin_content_rewrite%';

UPDATE serendipity_config
   SET name = REPLACE(name, 'serendipity_plugin_content_rewrite', 'serendipity_event_contentrewrite')
 WHERE name LIKE '%serendipity_plugin_content_rewrite%';
 
UPDATE serendipity_plugins
   SET placement = 'event'
 WHERE name LIKE '%serendipity_event_contentrewrite%';
 
ALTER TABLE serendipity_entries ADD last_modified INT UNSIGNED default null;

CREATE INDEX timestamp ON serendipity_entries (timestamp);
CREATE INDEX last_modified ON serendipity_entries (last_modified);
UPDATE serendipity_entries SET last_modified = timestamp;

INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);

[php-blog-cvs] serendipity/sql - New directory

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

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

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

[php-blog-cvs] serendipity serendipity_lang.inc.php,1.7,1.8

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

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

Modified Files:
	serendipity_lang.inc.php 
Log Message:
Add danish in auto-detection


Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang.inc.php	21 Jan 2004 18:28:25 -0000	1.7
+++ serendipity_lang.inc.php	29 Feb 2004 01:40:57 -0000	1.8
@@ -10,7 +10,7 @@
     } elseif ( IS_installed === false ) {   /* -- Auto-Guess -- */
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
-        $supported_languages = array('en', 'de', 'es');
+        $supported_languages = array('en', 'da', 'de', 'es');
         $possible_languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
         if (is_array($possible_languages)) {
             foreach($possible_languages as $index => $lang) {

[php-blog-cvs] serendipity db_update-0.5-0.5.1.sql,1.5,1.6

[<jt...@us...>]

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

Modified Files:
	db_update-0.5-0.5.1.sql 
Log Message:
fixed the upgrade script to work with a postgres backend.  This is getting rediculous.

Index: db_update-0.5-0.5.1.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db_update-0.5-0.5.1.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db_update-0.5-0.5.1.sql	26 Feb 2004 11:37:42 -0000	1.5
+++ db_update-0.5-0.5.1.sql	29 Feb 2004 00:01:01 -0000	1.6
@@ -1,3 +1,5 @@
+/* Postgres users comment out the following table creating SQL
+   and uncomment the second */
 CREATE TABLE `serendipity_images` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(255) NOT NULL default '',
@@ -11,6 +13,19 @@
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
+/* Postgres users execute the following
+CREATE TABLE serendipity_images (
+  id SERIAL primary key,
+  name varchar(255) NOT NULL default '',
+  extension varchar(5) NOT NULL default '',
+  mime varchar(15) NOT NULL default '',
+  size int NOT NULL default '0',
+  dimensions_width int NOT NULL default '0',
+  dimensions_height int NOT NULL default '0',
+  thumbnail_name varchar(255) NOT NULL default '',
+  date int NOT NULL default '0'
+); */
+
 /*
  If you were using the content_rewrite plugin, you need to execute:
  
@@ -32,7 +47,11 @@
  anywhere you like on the sidebars.
 */
 
+/* This will fail on postgres: comment it out and use the second */
 ALTER TABLE serendipity_entries ADD last_modified INT(10) UNSIGNED default null;
+/* Postgres users:
+ALTER TABLE serendipity_entries ADD last_modified INT UNSIGNED default null;
+*/
 CREATE INDEX timestamp ON serendipity_entries (timestamp);
 CREATE INDEX last_modified ON serendipity_entries (last_modified);
 UPDATE serendipity_entries SET last_modified = timestamp;
@@ -44,4 +63,4 @@
 INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
 INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
 INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
-INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);
\ No newline at end of file
+INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);

[php-blog-cvs] serendipity NEWS,1.80,1.81

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

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

Modified Files:
	NEWS 
Log Message:
hint users what to do when they have an empty image manager.

Tom, maybe there's some way to automagically do so for 0.5 users?


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- NEWS	27 Feb 2004 19:25:54 -0000	1.80
+++ NEWS	28 Feb 2004 18:18:00 -0000	1.81
@@ -19,8 +19,8 @@
     * HTML Validator event plugin. Can be used to validate your entry upon preview (garvinhicking)
     * Create example events: mailer, weblogping, contentrewrite, eventwrapper (garvinhicking)
     * Created event plugin API to hook on certain serendipity actions (garvinhicking)
-    * Redesigned image manager (tomsommer)
-    * Added image syncronization with database (tomsommer)
+    * Redesigned image manager. (tomsommer)
+    * Added image syncronization with database. IMPORTANT: Click on "rebuild thumbs" to re-import your file-based images! (tomsommer)
     * Now able to use CommentAPI to post entries to an RSS/Atom feed, like from RSS Bandit (garvinhicking)
     * Renamed "sebastian's weblog" theme to "blue" (sebastianbergmann)
 

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.10,1.11 serendipity_lang_de.inc.php,1.19,1.20 serendipity_lang_en.inc.php,1.17,1.18 serendipity_lang_es.inc.php,1.17,1.18

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

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

Modified Files:
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
Log Message:
Yeah, okay... so saturday is day 6, not day 7... gah!


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang_da.inc.php	27 Feb 2004 19:25:56 -0000	1.10
+++ serendipity_lang_da.inc.php	27 Feb 2004 20:15:02 -0000	1.11
@@ -330,7 +330,7 @@
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Forhindre HTTP caching');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis sat til "true" vi dette anbefale linket til dit RSS feed om ikke at tillade klienter at cache dit feed. Det anbefales at sætte dette til "false".'); 
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Starten på ugen');
-@define('CALENDAR_BOW_DESC', 'Et number som beskiver hvilken ugedag ugen starter på, værdierne ligger i intervallet: 0 = søndag, 1 = mandag ... 7 = lørdag (standard: 1)');
+@define('CALENDAR_BOW_DESC', 'Et number som beskiver hvilken ugedag ugen starter på, værdierne ligger i intervallet: 0 = søndag, 1 = mandag ... 6 = lørdag (standard: 1)');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_de.inc.php	27 Feb 2004 19:26:11 -0000	1.19
+++ serendipity_lang_de.inc.php	27 Feb 2004 20:15:02 -0000	1.20
@@ -324,7 +324,7 @@
 @define('APPLY_MARKUP_TO', 'Textformatierung auf %s anwenden');
 
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week'); // TRANSLATE
-@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 7 = saturday (default: 1)'); // TRANSLATE
+@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 6 = saturday (default: 1)'); // TRANSLATE
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_en.inc.php	27 Feb 2004 19:26:11 -0000	1.17
+++ serendipity_lang_en.inc.php	27 Feb 2004 20:15:02 -0000	1.18
@@ -324,7 +324,7 @@
 @define('APPLY_MARKUP_TO', 'Apply markup to %s');
 
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week');
-@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 7 = saturday (default: 1)');
+@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 6 = saturday (default: 1)');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_es.inc.php	27 Feb 2004 19:26:11 -0000	1.17
+++ serendipity_lang_es.inc.php	27 Feb 2004 20:15:03 -0000	1.18
@@ -317,6 +317,6 @@
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".'); // TRANSLATE
 @define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week'); // TRANSLATE
-@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 7 = saturday (default: 1)'); // TRANSLATE
+@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 6 = saturday (default: 1)'); // TRANSLATE
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.220,1.221

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Yeah, okay... so saturday is day 6, not day 7... gah!


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- serendipity_functions.inc.php	27 Feb 2004 20:04:59 -0000	1.220
+++ serendipity_functions.inc.php	27 Feb 2004 20:15:02 -0000	1.221
@@ -319,16 +319,13 @@
     $nrOfDays        = date('t', $ts);
     $firstDayWeekDay = date('w', $ts);
 
-    // Hack if the selected first day is sunday, then we move it to the last day of the week
-    if ( $firstDayWeekDay == 0 ) {
-        $firstDayWeekDay = 6;
-    }
-    
     // Calculate the first day of the week, based on the beginning of the week ($bow) 
     if ( $bow > $firstDayWeekDay ) {
         $firstDayWeekDay = $firstDayWeekDay+7-$bow;
-    } else {
+    } elseif ( $bow < $firstDayWeekDay ) {
         $firstDayWeekDay = $firstDayWeekDay-$bow;
+    } else {
+        $firstDayWeekDay = 0;
     }
 
     // Calculate the number of next/previous month

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.219,1.220

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Forgot empty() returned true if the input was "0"

Took a pen and paper and did some math on this, the new method should seem more logic


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- serendipity_functions.inc.php	27 Feb 2004 19:25:55 -0000	1.219
+++ serendipity_functions.inc.php	27 Feb 2004 20:04:59 -0000	1.220
@@ -301,11 +301,13 @@
 function serendipity_drawCalendar($month, $year, $bow=1) {
     global $serendipity;
 
-    if (empty($bow)) {
+    // Check for faulty input, is so - run the default
+    if (!is_numeric($bow) || (int)$bow>6) {
         $bow = 1;
     }
 
-
+    $bow = (int)$bow;
+    
     // Catch faulty month
     if ($month<1) {
         $month = 1;
@@ -317,15 +319,16 @@
     $nrOfDays        = date('t', $ts);
     $firstDayWeekDay = date('w', $ts);
 
-    // Hack out if firstday is sunday, then we move it to the last day of the week  
+    // Hack if the selected first day is sunday, then we move it to the last day of the week
     if ( $firstDayWeekDay == 0 ) {
         $firstDayWeekDay = 6;
     }
-
-    if ( $bow >= $firstDayWeekDay+1 ) {
-        $firstDayWeekDay += ($bow*2)+1;
+    
+    // Calculate the first day of the week, based on the beginning of the week ($bow) 
+    if ( $bow > $firstDayWeekDay ) {
+        $firstDayWeekDay = $firstDayWeekDay+7-$bow;
     } else {
-        $firstDayWeekDay -= ($bow);
+        $firstDayWeekDay = $firstDayWeekDay-$bow;
     }
 
     // Calculate the number of next/previous month
@@ -417,7 +420,7 @@
     <tr>
 <?php
 for ( $i = 1; $i <= 7; $i++ ) {
-    $date = mktime(0,0,0,3,$i+$bow-1,2004);
+    $date = mktime(0,0,0,3,$bow+$i-1,2004);
 ?>
         <td class="serendipity_weekDayName" align="center"><?php echo substr(strftime("%a", $date),0,2); ?></td>
 <?php

[php-blog-cvs] serendipity NEWS,1.79,1.80 serendipity_admin_plugins.inc.php,1.16,1.17 serendipity_functions.inc.php,1.218,1.219 serendipity_sidebar_items.php,1.46,1.47

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

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

Modified Files:
	NEWS serendipity_admin_plugins.inc.php 
	serendipity_functions.inc.php serendipity_sidebar_items.php 
Log Message:
Redesigned the plugin manager - now it looks more like the installer
Added RFE #827945 - Allow for custom selection of calendar beginning on week
    Please test the latter, it's somewhat of a hack :)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- NEWS	26 Feb 2004 11:37:42 -0000	1.79
+++ NEWS	27 Feb 2004 19:25:54 -0000	1.80
@@ -2,6 +2,8 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Redesigned the plugin manager (tomsommer)
+    * Added RFE #827945 - Allow for custom selection of calendar beginning on week (tomsommer)
     * Markup can be applied individually from a list of available transformations: BBCode, Wiki, Textile, s9y markup, Emoticons, nl2br. Multiple transformations are possible. (Colin Viebrock, garvinhicking)
     * Allow for each language to have its own charset (tomsommer)
     * Now able to preview comments. (garvinhicking)

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_admin_plugins.inc.php	10 Feb 2004 13:36:54 -0000	1.16
+++ serendipity_admin_plugins.inc.php	27 Feb 2004 19:25:55 -0000	1.17
@@ -227,9 +227,9 @@
     }
 ?>
 <form method="post" name="serendipityPluginConfigure">
-    <table cellpadding="5">
+    <table cellpadding="5" style="border: 1px dashed" width="90%" align="center">
         <tr>
-            <th><?php echo NAME; ?></th>
+            <th width="100"><?php echo NAME; ?></th>
             <td><?php echo $name; ?></td>
         </tr>
 
@@ -238,8 +238,8 @@
             <td><?php echo $desc; ?></td>
         </tr>
     </table>
-
-    <table border="0" cellspacing="5" cellpadding="5">
+<br />
+    <table border="0" cellspacing="0" cellpadding="3" width="100%">
 <?php
     foreach ($config_names as $config_item) {
         $cbag = new serendipity_property_bag;
@@ -265,8 +265,14 @@
                 $select = $cbag->get('select_values');
 ?>
         <tr>
-            <td style="vertical-align: top"><?php echo $cname; ?></td>
-            <td style="vertical-align: top">
+            <td style="border-bottom: 1px solid #000000; vertical-align: top"><strong><?php echo $cname; ?></strong>
+<?php
+    if ($cdesc != '') {
+?>
+                <br><span  style="color: #5E7A94; font-size: 8pt;">&nbsp;<?php echo $cdesc; ?></span>
+<?php } ?>
+            </td>
+            <td style="border-bottom: 1px solid #000000; vertical-align: middle" width="250">
                 <div>
                     <select name="serendipity[plugin][<?php echo $config_item; ?>]">
 <?php
@@ -281,13 +287,6 @@
 ?>
                     </select>
                 </div>
-<?php
-                if ($cdesc != '') {
-?>
-                <br /><span style="color: #bbbbbb">//&nbsp;<?php echo $cdesc; ?></span>
-<?php
-                }
-?>
             </td>
         </tr>
 <?php
@@ -311,8 +310,16 @@
                 }
 ?>
         <tr>
-            <td style="vertical-align: top"><?php echo $cname; ?></td>
-            <td style="vertical-align: top">
+            <td style="border-bottom: 1px solid #000000; vertical-align: top"><strong><?php echo $cname; ?></strong>
+<?php
+                if ($cdesc != '') {
+?>
+                <br /><span  style="color: #5E7A94; font-size: 8pt;">&nbsp;<?php echo $cdesc; ?></span>
+<?php
+                }
+?>
+            </td>
+            <td style="border-bottom: 1px solid #000000; vertical-align: middle;" width="250">
 <?php
                 $counter = 0;
                 foreach($radio['value'] AS $radio_index => $radio_value) {
@@ -334,12 +341,6 @@
 <?php
                     }
                 }
-
-                if ($cdesc != '') {
-?>
-                <br /><span style="color: #bbbbbb">//&nbsp;<?php echo $cdesc; ?></span>
-<?php
-                }
 ?>
             </td>
         </tr>
@@ -349,10 +350,13 @@
             case 'string':
 ?>
         <tr>
-            <td><?php echo $cname; ?></td>
-            <td>
+            <td style="border-bottom: 1px solid #000000">
+                    <strong><?php echo $cname; ?></strong>
+                    <br><span style="color: #5E7A94; font-size: 8pt;">&nbsp;<?php echo $cdesc; ?></span>
+            </td>
+            <td style="border-bottom: 1px solid #000000" width="250">
                 <div>
-                    <input type="text" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $hvalue; ?>" />&nbsp;<span style="color: #bbbbbb">//&nbsp;<?php echo $cdesc; ?></span>
+                    <input type="text" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $hvalue; ?>" size="30" />
                 </div>
             </td>
         </tr>
@@ -362,8 +366,8 @@
             case 'html':
 ?>
         <tr>
-            <td colspan="2">
-                <?php echo $cname; ?>&nbsp;<span style="color: #bbbbbb">//&nbsp;<?php echo $cdesc; ?></span>
+            <td colspan="2"><strong><?php echo $cname; ?></strong>
+                &nbsp;<span style="color: #5E7A94; font-size: 8pt;">&nbsp;<?php echo $cdesc; ?></span>
             </td>
         </tr>
 
@@ -381,8 +385,8 @@
     }
 ?>
     </table>
-
-    <div>
+<br />
+    <div style="padding-left: 20px">
         <input type="submit" name="SAVECONF" value="<?php echo SAVE; ?>" />
     </div>
 </form>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- serendipity_functions.inc.php	26 Feb 2004 11:37:42 -0000	1.218
+++ serendipity_functions.inc.php	27 Feb 2004 19:25:55 -0000	1.219
@@ -298,9 +298,14 @@
 }
 
 // Draws a little calendar in HTML
-function serendipity_drawCalendar($month, $year) {
+function serendipity_drawCalendar($month, $year, $bow=1) {
     global $serendipity;
 
+    if (empty($bow)) {
+        $bow = 1;
+    }
+
+
     // Catch faulty month
     if ($month<1) {
         $month = 1;
@@ -312,13 +317,17 @@
     $nrOfDays        = date('t', $ts);
     $firstDayWeekDay = date('w', $ts);
 
-    // Shift the weekday a little, we want monday to be day number 0
-    if ($firstDayWeekDay >0) {
-        $firstDayWeekDay -=1;
-    } else {
+    // Hack out if firstday is sunday, then we move it to the last day of the week  
+    if ( $firstDayWeekDay == 0 ) {
         $firstDayWeekDay = 6;
     }
 
+    if ( $bow >= $firstDayWeekDay+1 ) {
+        $firstDayWeekDay += ($bow*2)+1;
+    } else {
+        $firstDayWeekDay -= ($bow);
+    }
+
     // Calculate the number of next/previous month
     if ($month > 1) {
         $previousMonth = $month-1;
@@ -408,7 +417,7 @@
     <tr>
 <?php
 for ( $i = 1; $i <= 7; $i++ ) {
-    $date = mktime(0,0,0,3,$i,2004);
+    $date = mktime(0,0,0,3,$i+$bow-1,2004);
 ?>
         <td class="serendipity_weekDayName" align="center"><?php echo substr(strftime("%a", $date),0,2); ?></td>
 <?php

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_sidebar_items.php	26 Feb 2004 11:37:42 -0000	1.46
+++ serendipity_sidebar_items.php	27 Feb 2004 19:25:55 -0000	1.47
@@ -5,6 +5,22 @@
     {
         $propbag->add('name',        CALENDAR);
         $propbag->add('description', QUICKJUMP_CALENDAR);
+        $propbag->add('configuration', array('beginningOfWeek'));
+    }
+
+    function introspect_config_item($name, &$propbag)
+    {
+        switch($name) {
+            case 'beginningOfWeek':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        CALENDAR_BEGINNING_OF_WEEK);
+                $propbag->add('description', CALENDAR_BOW_DESC);
+                break;
+
+            default:
+                return false;
+        }
+        return true;
     }
 
     function generate_content(&$title)
@@ -31,7 +47,9 @@
             (isset($serendipity['GET']['calendarZoom']) ? $serendipity['GET']['calendarZoom'] : ''),
             0,
             4
-          )
+          ),
+          $this->get_config('beginningOfWeek')
+        
         );
     }
 }

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.9,1.10 serendipity_lang_de.inc.php,1.18,1.19 serendipity_lang_en.inc.php,1.16,1.17 serendipity_lang_es.inc.php,1.16,1.17

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

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

Modified Files:
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
Log Message:
Redesigned the plugin manager - now it looks more like the installer
Added RFE #827945 - Allow for custom selection of calendar beginning on week
    Please test the latter, it's somewhat of a hack :)


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_lang_da.inc.php	27 Feb 2004 18:12:52 -0000	1.9
+++ serendipity_lang_da.inc.php	27 Feb 2004 19:25:56 -0000	1.10
@@ -329,7 +329,8 @@
 @define('APPLY_MARKUP_TO', 'Formatér %s');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Forhindre HTTP caching');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis sat til "true" vi dette anbefale linket til dit RSS feed om ikke at tillade klienter at cache dit feed. Det anbefales at sætte dette til "false".'); 
-
+@define('CALENDAR_BEGINNING_OF_WEEK', 'Starten på ugen');
+@define('CALENDAR_BOW_DESC', 'Et number som beskiver hvilken ugedag ugen starter på, værdierne ligger i intervallet: 0 = søndag, 1 = mandag ... 7 = lørdag (standard: 1)');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_de.inc.php	26 Feb 2004 11:33:03 -0000	1.18
+++ serendipity_lang_de.inc.php	27 Feb 2004 19:26:11 -0000	1.19
@@ -323,5 +323,8 @@
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Wenn diese Option auf "Ja" gesetzt ist wird der Link zum RSS Feed einem Client vorschlagen, den Feed nicht zu cachen sondern jedesmal erneut vollständig zu laden. Dies ist nicht ressourcensparend, daher wird empfohlen diese Option bei "Nein" zu belassen.');
 @define('APPLY_MARKUP_TO', 'Textformatierung auf %s anwenden');
 
+@define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week'); // TRANSLATE
+@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 7 = saturday (default: 1)'); // TRANSLATE
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_en.inc.php	26 Feb 2004 11:33:03 -0000	1.16
+++ serendipity_lang_en.inc.php	27 Feb 2004 19:26:11 -0000	1.17
@@ -321,6 +321,10 @@
 @define('IMAGES_PER_PAGE', 'images per page');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
-@define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
+@define('APPLY_MARKUP_TO', 'Apply markup to %s');
+
+@define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week');
+@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 7 = saturday (default: 1)');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_es.inc.php	26 Feb 2004 11:33:03 -0000	1.16
+++ serendipity_lang_es.inc.php	27 Feb 2004 19:26:11 -0000	1.17
@@ -316,6 +316,7 @@
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching'); // TRANSLATE
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".'); // TRANSLATE
 @define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
-
+@define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week'); // TRANSLATE
+@define('CALENDAR_BOW_DESC', 'An interger describing which weekday the week starts on, values range from: 0 = sunday, 1 = monday ... 7 = saturday (default: 1)'); // TRANSLATE
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.8,1.9

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

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

Modified Files:
	serendipity_lang_da.inc.php 
Log Message:
Update


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_da.inc.php	26 Feb 2004 11:33:02 -0000	1.8
+++ serendipity_lang_da.inc.php	27 Feb 2004 18:12:52 -0000	1.9
@@ -326,10 +326,9 @@
 @define('THUMBNAIL_SHORT', 'Mini');
 @define('ORIGINAL_SHORT', 'Orig.');
 @define('IMAGES_PER_PAGE', 'billeder per side');
-
-@define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching'); // TRANSLATE
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".'); // TRANSLATE 
+@define('APPLY_MARKUP_TO', 'Formatér %s');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Forhindre HTTP caching');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis sat til "true" vi dette anbefale linket til dit RSS feed om ikke at tillade klienter at cache dit feed. Det anbefales at sætte dette til "false".'); 
 
 
 /* vim: set sts=4 ts=4 expandtab : */

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

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

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

Modified Files:
	serendipity_event_textile.php textile.php 
Log Message:
Had to change the textile function name scope, as this was causing a mess
with (my ;) embedded blog. A textile class would be much better, though.


Index: serendipity_event_textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/serendipity_event_textile.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_textile.php	26 Feb 2004 11:29:11 -0000	1.1
+++ serendipity_event_textile.php	26 Feb 2004 12:57:39 -0000	1.2
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-require_once dirname(__FILE__) . '/textile.php';
+require_once $serentipity['serendipityHTTPPath'] . 'plugins/serendipity_event_textile/textile.php';
 
 switch ($serendipity['lang']) {
     case 'de':

Index: textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/textile.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- textile.php	26 Feb 2004 11:29:11 -0000	1.1
+++ textile.php	26 Feb 2004 12:57:39 -0000	1.2
@@ -185,27 +185,27 @@
         if (get_magic_quotes_gpc()==1)
             $text = stripslashes($text);
 
-        $text = incomingEntities($text);
-        $text = encodeEntities($text);        
-        $text = fixEntities($text);
-        $text = cleanWhiteSpace($text);
+        $text = textile_incomingEntities($text);
+        $text = textile_encodeEntities($text);        
+        $text = textile_fixEntities($text);
+        $text = textile_cleanWhiteSpace($text);
         
-        $text = getRefs($text);
+        $text = textile_getRefs($text);
 
-        $text = noTextile($text);
-        $text = image($text);
-        $text = links($text);
-        $text = code($text); 
-        $text = span($text); 
-        $text = superscript($text); 
-        $text = footnoteRef($text); 
-        $text = glyphs($text);
-        $text = retrieve($text);
+        $text = textile_noTextile($text);
+        $text = textile_image($text);
+        $text = textile_links($text);
+        $text = textile_code($text); 
+        $text = textile_span($text); 
+        $text = textile_superscript($text); 
+        $text = textile_footnoteRef($text); 
+        $text = textile_glyphs($text);
+        $text = textile_retrieve($text);
 
         if ($lite=='') {
-            $text = lists($text);
-            $text = table($text);
-            $text = block($text);
+            $text = textile_lists($text);
+            $text = textile_table($text);
+            $text = textile_block($text);
         }
 
             /* clean up <notextile> */
@@ -220,7 +220,7 @@
     }
     
 // -------------------------------------------------------------
-    function pba($in,$element="") // "parse block attributes"
+    function textile_pba($in,$element="") // "parse block attributes"
     {
         global $hlgn,$vlgn,$clas,$styl,$cspn,$rspn,$a,$s,$c;
         
@@ -283,19 +283,19 @@
     }
 
 // -------------------------------------------------------------
-    function table($text) 
+    function textile_table($text) 
     {
         global $a,$c,$s;
         $text = $text."\n\n";
         return preg_replace_callback("/^(?:table(_?$s$a$c)\. ?\n)?^($a$c\.? ?\|.*\|)\n\n/smU",
-            "fTable",$text);
+            "textile_fTable",$text);
     }
 
 // -------------------------------------------------------------
-    function fTable($matches)
+    function textile_fTable($matches)
     {
         global $s,$a,$c;
-        $tatts = pba($matches[1],'table');
+        $tatts = textile_pba($matches[1],'table');
 
            foreach(preg_split("/\|$/m",$matches[2],-1,PREG_SPLIT_NO_EMPTY) as $row){
             if (preg_match("/^($a$c\. )(.*)/m",$row,$rmtch)) {
@@ -322,14 +322,14 @@
     
 
 // -------------------------------------------------------------
-    function lists($text) 
+    function textile_lists($text) 
     {
         global $a,$c;
-        return preg_replace_callback("/^([#*]+$c .*)$(?![^#*])/smU","fList",$text); 
+        return preg_replace_callback("/^([#*]+$c .*)$(?![^#*])/smU","textile_fList",$text); 
     }
 
 // -------------------------------------------------------------
-    function fList($m) 
+    function textile_fList($m) 
     {
         global $a,$c;
         $text = explode("\n",$m[0]);
@@ -340,8 +340,8 @@
                 $nl = preg_replace("/^([#*]+)\s.*/","$1",$nextline);
                 if(!isset($lists[$tl])){
                     $lists[$tl] = true;
-                    $atts = pba($atts);
-                    $line = "\t<".lT($tl)."l$atts>\n\t<li>".$content;
+                    $atts = textile_pba($atts);
+                    $line = "\t<".textile_lT($tl)."l$atts>\n\t<li>".$content;
                 } else { 
                     $line = "\t\t<li>".$content;
                 }
@@ -365,13 +365,13 @@
     }
 
 // -------------------------------------------------------------
-    function lT($in) 
+    function textile_lT($in) 
     {
         return preg_match("/^#+/",$in) ? 'o' : 'u';
     }
 
 // -------------------------------------------------------------
-    function block($text) 
+    function textile_block($text) 
     {
         global $a,$c;
 
@@ -389,7 +389,7 @@
             foreach($find as $tag){
                 $line = ($pre==false) 
                 ?    preg_replace_callback("/^($tag)($a$c)\.(?::(\S+))? (.*)$/",
-                        "fBlock",$line) 
+                        "textile_fBlock",$line) 
                 :    $line;
             }
             
@@ -404,12 +404,12 @@
     }
     
 // -------------------------------------------------------------
-    function fBlock($m) 
+    function textile_fBlock($m) 
     {
 #        dump($m);
         list(,$tag,$atts,$cite,$content) = $m;
 
-        $atts = pba($atts);
+        $atts = textile_pba($atts);
 
         if(preg_match("/fn(\d+)/",$tag,$fns)){
             $tag = 'p';
@@ -421,7 +421,7 @@
         $end = "</$tag>";
         
         if ($tag=="bq") {
-            $cite = checkRefs($cite);
+            $cite = textile_checkRefs($cite);
             $cite = ($cite!='') ? ' cite="'.$cite.'"' : '';
             $start = "\t<blockquote$cite>\n\t\t<p";
             $end = "</p>\n\t</blockquote>";
@@ -432,7 +432,7 @@
 
 
 // -------------------------------------------------------------
-    function span($text) 
+    function textile_span($text) 
     {
         global $c,$pnct;
         $qtags = array('\*\*','\*','\?\?','-','__','_','%','\+','~');
@@ -447,13 +447,13 @@
                 ([[:punct:]]*)
                 $f
                 (?=[])}]|[[:punct:]]+|\s|$)
-            /xmU","fSpan",$text);
+            /xmU","textile_fSpan",$text);
         }
         return $text;
     }
 
 // -------------------------------------------------------------
-    function fSpan($m) 
+    function textile_fSpan($m) 
     {
 #        dump($m);
         global $c;
@@ -470,14 +470,14 @@
  
             list(,$tag,$atts,$cite,$content,$end) = $m;
             $tag = $qtags[$tag];
-            $atts = pba($atts);
+            $atts = textile_pba($atts);
             $atts.= ($cite!='') ? 'cite="'.$cite.'"' : '';
 
         return "<$tag$atts>$content$end</$tag>";
     }
 
 // -------------------------------------------------------------
-    function links($text) 
+    function textile_links($text) 
     {
         global $c;
         return preg_replace_callback('/
@@ -492,20 +492,20 @@
             (\/)?                      # $slash
             ([^\w\/;]*)                # $post
             (?=\s|$)
-        /Ux',"fLink",$text);
+        /Ux',"textile_fLink",$text);
     }
 
 // -------------------------------------------------------------
-    function fLink($m) 
+    function textile_fLink($m) 
     {
         list(,$pre,$atts,$text,$title,$url,$slash,$post) = $m;
 
-        $url = checkRefs($url);
+        $url = textile_checkRefs($url);
         
-        $atts = pba($atts);
+        $atts = textile_pba($atts);
         $atts.= ($title!='') ? ' title="'.$title.'"' : '';
         
-        $atts = ($atts!='') ? shelve($atts) : '';
+        $atts = ($atts!='') ? textile_shelve($atts) : '';
 
         if ($text=='_') {
             $text = $url;
@@ -520,14 +520,14 @@
     }
 
 // -------------------------------------------------------------
-    function getRefs($text) 
+    function textile_getRefs($text) 
     {
         return preg_replace_callback("/(?<=^|\s)\[(.+)\]((?:http:\/\/|\/)\S+)(?=\s|$)/U",
-            "refs",$text);
+            "textile_refs",$text);
     }
     
 // -------------------------------------------------------------
-    function refs($m) 
+    function textile_refs($m) 
     {
         list(,$flag,$url) = $m;
         $GLOBALS['urlrefs'][$flag] = $url;
@@ -535,14 +535,14 @@
     }
     
 // -------------------------------------------------------------
-    function checkRefs($text) 
+    function textile_checkRefs($text) 
     {
         global $urlrefs;
         return (isset($urlrefs[$text])) ? $urlrefs[$text] : $text;
     }
 
 // -------------------------------------------------------------
-    function image($text) 
+    function textile_image($text) 
     {
         global $c;
         return preg_replace_callback("/
@@ -556,21 +556,21 @@
             \!                   # closing
             (?::(\S+))?          # optional href
             (?=\s|$)             # lookahead: space or end of string
-        /Ux","fImage",$text);
+        /Ux","textile_fImage",$text);
     }
 
 // -------------------------------------------------------------
-    function fImage($m) 
+    function textile_fImage($m) 
     {
         list(,$algn,$atts,$url) = $m;
-        $atts = pba($atts);
-        $atts.= ($algn!='') ? ' align="'.iAlign($algn).'"' : '';
+        $atts = textile_pba($atts);
+        $atts.= ($algn!='') ? ' align="'.textile_iAlign($algn).'"' : '';
         $atts.= (isset($m[4])) ? ' title="'.$m[4].'"' : '';
         $size = @getimagesize($url);
         if($size) $atts.= " $size[3]";
 
-        $href = (isset($m[5])) ? checkRefs($m[5]) : '';
-        $url = checkRefs($url);
+        $href = (isset($m[5])) ? textile_checkRefs($m[5]) : '';
+        $url = textile_checkRefs($url);
 
         $out = '';
         $out.= ($href!='') ? '<a href="'.$href.'">' : '';
@@ -581,7 +581,7 @@
     }
 
 // -------------------------------------------------------------
-    function code($text) 
+    function textile_code($text) 
     {
         global $pnct;
         return preg_replace_callback("/
@@ -593,11 +593,11 @@
             (?:$|([\]}])|
             (?=[[:punct:]]{1,2}|
             \s))                             # 4 closing bracket?
-        /Ux","fCode",$text);
+        /Ux","textile_fCode",$text);
     }
 
 // -------------------------------------------------------------
-    function fCode($m) 
+    function textile_fCode($m) 
     {
         list(,$before,$lang,$code,$after) = $m;
         $lang = ($lang!='') ? ' language="'.$lang.'"' : '';
@@ -605,14 +605,14 @@
     }
 
 // -------------------------------------------------------------
-    function shelve($val) 
+    function textile_shelve($val) 
     {
         $GLOBALS['shelf'][] = $val;
         return ' <'.count($GLOBALS['shelf']).'>';
     }
     
 // -------------------------------------------------------------
-    function retrieve($text) 
+    function textile_retrieve($text) 
     {
         global $shelf;
           $i = 0;
@@ -626,7 +626,7 @@
     }
 
 // -------------------------------------------------------------
-    function incomingEntities($text) 
+    function textile_incomingEntities($text) 
     {
         /*  turn any incoming ampersands into a dummy character for now.
             This uses a negative lookahead for alphanumerics followed by a semicolon,
@@ -636,7 +636,7 @@
     }
 
 // -------------------------------------------------------------
-    function encodeEntities($text) 
+    function textile_encodeEntities($text) 
     {
         /*  Convert high and low ascii to entities. If multibyte string functions are
             available (on by default in php 4.3+), we convert using unicode mapping as 
@@ -644,12 +644,12 @@
             built-in htmlentities() */
         
         return (function_exists('mb_encode_numericentity'))
-        ?    encode_high($text)
+        ?    textile_encode_high($text)
         :    htmlentities($text,ENT_NOQUOTES,"utf-8");
     }
 
 // -------------------------------------------------------------
-    function fixEntities($text)
+    function textile_fixEntities($text)
     {
         /*  de-entify any remaining angle brackets or ampersands */
         return str_replace(array("&gt;", "&lt;", "&amp;"), 
@@ -657,7 +657,7 @@
     }
 
 // -------------------------------------------------------------
-    function cleanWhiteSpace($text) 
+    function textile_cleanWhiteSpace($text) 
     {
         $out = str_replace(array("\r\n","\t"), array("\n",''), $text);
         $out = preg_replace("/\n{3,}/","\n\n",$out);
@@ -667,27 +667,27 @@
     }
 
 // -------------------------------------------------------------
-    function noTextile($text) 
+    function textile_noTextile($text) 
     {
         return preg_replace('/(^|\s)==(.*)==(\s|$)?/msU',
             '$1<notextile>$2</notextile>$3',$text);
     }
 
 // -------------------------------------------------------------
-    function superscript($text) 
+    function textile_superscript($text) 
     {
         return preg_replace('/\^(.*)\^/mU','<sup>$1</sup>',$text);
     }
 
 // -------------------------------------------------------------
-    function footnoteRef($text) 
+    function textile_footnoteRef($text) 
     {
         return preg_replace('/\b\[([0-9]+)\](\s)?/U',
             '<sup><a href="#fn$1">$1</a></sup>$2',$text);
     }
     
 // -------------------------------------------------------------
-    function glyphs($text) 
+    function textile_glyphs($text) 
     {
             // fix: hackish
         $text = preg_replace('/"\z/',"\" ", $text);
@@ -754,7 +754,7 @@
     }
 
 // -------------------------------------------------------------
-    function iAlign($in) 
+    function textile_iAlign($in) 
     {
         $vals = array(
             '<'=>'left',
@@ -764,7 +764,7 @@
     }
 
 // -------------------------------------------------------------
-    function hAlign($in) 
+    function textile_hAlign($in) 
     {
         $vals = array(
             '<'=>'left',
@@ -775,7 +775,7 @@
     }
 
 // -------------------------------------------------------------
-    function vAlign($in) 
+    function textile_vAlign($in) 
     {
         $vals = array(
             '^'=>'top',
@@ -785,21 +785,21 @@
     }
 
 // -------------------------------------------------------------
-    function encode_high($text,$charset="UTF-8") 
+    function textile_encode_high($text,$charset="UTF-8") 
     {
-        $cmap = cmap();
+        $cmap = textile_cmap();
         return mb_encode_numericentity($text, $cmap, $charset);
     }
 
 // -------------------------------------------------------------
-    function decode_high($text,$charset="UTF-8") 
+    function textile_decode_high($text,$charset="UTF-8") 
     {
-        $cmap = cmap();
+        $cmap = textile_cmap();
         return mb_decode_numericentity($text, $cmap, $charset);
     }
 
 // -------------------------------------------------------------
-    function cmap() 
+    function textile_cmap() 
     {
         $f = 0xffff;
         $cmap = array(
@@ -881,7 +881,7 @@
     }
 
 // -------------------------------------------------------------
-    function txtgps($thing) 
+    function textile_txtgps($thing) 
     {
         if (isset($_POST[$thing])){
             if (get_magic_quotes_gpc()==1){
@@ -901,7 +901,7 @@
 
 
 // -------------------------------------------------------------
-    function detextile($text) {
+    function textile_detextile($text) {
     
     $text = preg_replace("/<br \/>\s*/","\n",$text);
 
@@ -910,7 +910,7 @@
     
     foreach($oktags as $tag){
         $text = preg_replace_callback("/\t*<(".$tag.")\s*([^>]*)>(.*)<\/\\1>/Usi",
-        "processTag",$text);
+        "textile_processTag",$text);
     }
 
         $glyphs = array(  
@@ -960,15 +960,15 @@
         
         $text = preg_replace('/^\t* *p\. /m','',$text);
         
-        return decode_high($text);
+        return textile_decode_high($text);
     }
 
 
 // -------------------------------------------------------------
-    function processTag($matches) 
+    function textile_processTag($matches) 
     {
         list($all,$tag,$atts,$content) = $matches;
-        $a = splat($atts);
+        $a = textile_splat($atts);
 #        dump($tag); dump($content); dump($a);
 
         $phr = array(
@@ -986,13 +986,13 @@
         $blk = array('p','h1','h2','h3','h4','h5','h6');
 
         if(isset($phr[$tag])) {
-            return $phr[$tag].sci($a).$content.$phr[$tag];
+            return $phr[$tag].textile_sci($a).$content.$phr[$tag];
         } elseif($tag=='blockquote') {
-            return 'bq.'.sci($a).' '.$content;
+            return 'bq.'.textile_sci($a).' '.$content;
         } elseif(in_array($tag,$blk)) {
-            return $tag.sci($a).'. '.$content;
+            return $tag.textile_sci($a).'. '.$content;
         } elseif ($tag=='a') {
-            $t = filterAtts($a,array('href','title'));
+            $t = textile_filterAtts($a,array('href','title'));
             $out = '"'.$content;
             $out.= (isset($t['title'])) ? ' ('.$t['title'].')' : '';
             $out.= '":'.$t['href'];
@@ -1003,7 +1003,7 @@
     }
 
 // -------------------------------------------------------------
-    function filterAtts($atts,$ok) 
+    function textile_filterAtts($atts,$ok) 
     {
         foreach($atts as $a) {
             if(in_array($a['name'],$ok)) {
@@ -1017,7 +1017,7 @@
     }
 
 // -------------------------------------------------------------
-    function sci($a) 
+    function textile_sci($a) 
     {
         $out = '';
         foreach($a as $t){
@@ -1030,7 +1030,7 @@
     }
 
 // -------------------------------------------------------------
-    function splat($attr)  // returns attributes as an array
+    function textile_splat($attr)  // returns attributes as an array
     {
         $arr = array();
         $atnm = '';

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

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

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

Modified Files:
	serendipity_plugin_comments.php 
Log Message:
Removed s9y markup references and use plugin markup


Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_plugin_comments.php	9 Feb 2004 15:14:39 -0000	1.14
+++ serendipity_plugin_comments.php	26 Feb 2004 11:45:25 -0000	1.15
@@ -159,6 +159,9 @@
                 } else {
                     $user = htmlentities(strip_tags($row['user']));
                 }
+
+                $entry = array('comment' => wordwrap($comment, $wordwrap, "\n"));
+                serendipity_plugin_api::hook_event('frontend_display', $entry);
         
                 printf(
                   $out,
@@ -168,7 +171,7 @@
                       . htmlentities($row['subject'])
                       . '</a><br />' . "\n"
                       . htmlentities(strftime($dateformat, $row['stamp'])) . '<br />' . "\n"
-                      . serendipity_emoticate(serendipity_markup_text(wordwrap(htmlentities($comment), $wordwrap, "<br />\n", 1)))
+                      . $entry['comment']
                       . '<br /><br /><br />' . "\n\n"
                 );
             }

[php-blog-cvs] serendipity NEWS,1.78,1.79 db_update-0.5-0.5.1.sql,1.4,1.5 serendipity_config.inc.php,1.53,1.54 serendipity_config_local.tpl,1.32,1.33 serendipity_functions.inc.php,1.217,1.218 serendipity_plugin_api.php,1.11,1.12 serendipity_sidebar_items.php,1.45,1.46

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

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

Modified Files:
	NEWS db_update-0.5-0.5.1.sql serendipity_config.inc.php 
	serendipity_config_local.tpl serendipity_functions.inc.php 
	serendipity_plugin_api.php serendipity_sidebar_items.php 
Log Message:
We now have markup event plugins, thanks to Colin Viebrock.

BBCode, Textile, Wiki are working as expected.

YOU NEED TO INSERT MARKUP PLUGINS TO GET MARKUP APPLIED! See db-update.sql.

EEXPERIMENTAL and may break things. Please test and report back. :-)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- NEWS	25 Feb 2004 17:42:48 -0000	1.78
+++ NEWS	26 Feb 2004 11:37:42 -0000	1.79
@@ -2,6 +2,7 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Markup can be applied individually from a list of available transformations: BBCode, Wiki, Textile, s9y markup, Emoticons, nl2br. Multiple transformations are possible. (Colin Viebrock, garvinhicking)
     * Allow for each language to have its own charset (tomsommer)
     * Now able to preview comments. (garvinhicking)
     * Fixed bug that removed admin-cookie when you didn't check the "remember comment" box on submitting comments to your own blog (garvinhicking)

Index: db_update-0.5-0.5.1.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db_update-0.5-0.5.1.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db_update-0.5-0.5.1.sql	18 Feb 2004 11:48:23 -0000	1.4
+++ db_update-0.5-0.5.1.sql	26 Feb 2004 11:37:42 -0000	1.5
@@ -36,3 +36,12 @@
 CREATE INDEX timestamp ON serendipity_entries (timestamp);
 CREATE INDEX last_modified ON serendipity_entries (last_modified);
 UPDATE serendipity_entries SET last_modified = timestamp;
+
+/* To restore the usual s9y markup methods, you either need to manually insert those four event plugins:
+   nl2br, s9ymarkup, emoticate, trackexits
+   or use this SQL to insert them automatically:
+*/
+INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_nl2br:39979424fea674e78399659e67edaf12', 'event', 10);
+INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_s9ymarkup:fdd8bf23ff500827cf76d7d31957d3c8', 'event', 11);
+INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_emoticate:e30b433546aa10a632b0d703ebe1aa29', 'event', 12);
+INSERT INTO serendipity_plugins(name, placement, sort_order) VALUES ('serendipity_event_trackexits:25e6d8eb7d662936abb6454956aaa8ab', 'event', 13);
\ No newline at end of file

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- serendipity_config.inc.php	25 Feb 2004 17:42:48 -0000	1.53
+++ serendipity_config.inc.php	26 Feb 2004 11:37:42 -0000	1.54
@@ -106,24 +106,6 @@
     $serendipity['baseURL'] = 'http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];
 }
 
-// A Set of emoticons to rewrite
-$serendipity['smiles'] = array( ":'("  => $serendipity['baseURL'] . 'pixel/cry_smile.gif',
-                                ':-)'  => $serendipity['baseURL'] . 'pixel/regular_smile.gif',
-                                ':-O'  => $serendipity['baseURL'] . 'pixel/embaressed_smile.gif',
-                                ':O'   => $serendipity['baseURL'] . 'pixel/embaressed_smile.gif',
-                                ':-('  => $serendipity['baseURL'] . 'pixel/sad_smile.gif',
-                                ':('   => $serendipity['baseURL'] . 'pixel/sad_smile.gif',
-                                ':)'   => $serendipity['baseURL'] . 'pixel/regular_smile.gif',
-                                '8-)'  => $serendipity['baseURL'] . 'pixel/shades_smile.gif',
-                                ':-D'  => $serendipity['baseURL'] . 'pixel/teeth_smile.gif',
-                                ':D'   => $serendipity['baseURL'] . 'pixel/teeth_smile.gif',
-                                '8)'   => $serendipity['baseURL'] . 'pixel/shades_smile.gif',
-                                ':-P'  => $serendipity['baseURL'] . 'pixel/tounge_smile.gif',
-                                ';-)'  => $serendipity['baseURL'] . 'pixel/wink_smile.gif',
-                                ';)'   => $serendipity['baseURL'] . 'pixel/wink_smile.gif',
-                                ':P'   => $serendipity['baseURL'] . 'pixel/tounge_smile.gif',
-);
-
 // We don't care who tells us what to do
 if (!isset($serendipity['GET']['action'])) {
     $serendipity['GET']['action'] = (isset($serendipity['POST']['action']) ? $serendipity['POST']['action'] : '');
@@ -138,6 +120,9 @@
     $_SESSION['serendipityAuthedUser'] = false;
 }
 
+$old_include = @ini_get('include_path');
+@ini_set('include_path', $serendipity['serendipityPath'] . 'bundled-libs/:' . $old_include);
+
 $serendipity['user']  = isset($_SESSION['serendipityUser'])  ? $_SESSION['serendipityUser']  : '';
 $serendipity['email'] = isset($_SESSION['serendipityEmail']) ? $_SESSION['serendipityEmail'] : '';
 

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_config_local.tpl	14 Feb 2004 18:35:31 -0000	1.32
+++ serendipity_config_local.tpl	26 Feb 2004 11:37:42 -0000	1.33
@@ -36,7 +36,6 @@
 $serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0}';               // Do you want to use the experimental WYSIWYG editor?
 $serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
 $serendipity['embed']                = '{Is serendipity embedded?|embed|bool|0}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the INSTALL file for more information!
-$serendipity['track_exits']          = '{Track exit URLs|track_exits|bool|1}';              // Do you want to track exit targets?
 $serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
 $serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- serendipity_functions.inc.php	25 Feb 2004 13:57:05 -0000	1.217
+++ serendipity_functions.inc.php	26 Feb 2004 11:37:42 -0000	1.218
@@ -224,7 +224,10 @@
 
         <tr>
             <td class="serendipity_commentsLabel"><?php echo COMMENT; ?></td>
-            <td class="serendipity_commentsValue"><textarea rows="10" cols="40" name="serendipity[comment]"><?php echo $serendipity['POST']['comment']; ?></textarea></td>
+            <td class="serendipity_commentsValue">
+                <textarea rows="10" cols="40" name="serendipity[comment]"><?php echo $serendipity['POST']['comment']; ?></textarea><br />
+                <?php serendipity_plugin_api::hook_event('frontend_comment', $nullParam); ?>
+            </td>
         </tr>
         <tr>
             <td>&nbsp;</td>
@@ -805,11 +808,12 @@
 <?php
             foreach ($ents as $x => $entry) {
                 $entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
+                serendipity_plugin_api::hook_event('frontend_display', $entry);
 
                 $html_extended = '';
                 if ($extended && strlen($entry['extended'])) {
                     $html_extended = '<a ' . ($serendipity['XHTML11'] ? 'id' : 'name') . '="extended"></a>';
-                    $html_extended .= nl2br(serendipity_emoticate(serendipity_markup_text($entry['extended'], $entry['id'])));
+                    $html_extended .= $entry['extended'];
                 }
 
                 if ($entry['exflag'] && !$extended) {
@@ -821,9 +825,7 @@
 
         <div class="serendipity_entry">
 <?php
-                $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id']))) . $html_extended;
-                serendipity_plugin_api::hook_event('frontend_display', $article);
-                echo $article;
+                echo $entry['body'] . $html_extended;
 ?>
 
             <div class='serendipity_entryFooter'>
@@ -1059,11 +1061,14 @@
         }
 
         $name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
-        $body = htmlentities(strip_tags($comment['body']));
+        $temp = array('comment' => htmlentities(strip_tags($comment['body'])) );
+        serendipity_plugin_api::hook_event('frontend_display', $temp);
+        $body = $temp['comment'];
+
 ?>
     <div class="serendipity_comment">
             <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="c<?php echo $comment['id']; ?>"></a>
-            <?php echo nl2br(serendipity_markup_text(serendipity_emoticate($body))); ?><br />
+            <?php echo $body; ?><br />
 
             <div class="serendipity_comment_source">
                 <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a> 
@@ -1340,6 +1345,7 @@
             // Do some relative -> absolute URI replacing magic. Replaces all HREF/SRC (<a>, <img>, ...) references to only the serendipitypath with the full baseURL URI
             // garvin: Could impose some problems. Closely watch this one.
             $entry['body'] = preg_replace('@(href|src)=("|\')(' . preg_quote($serendipity['serendipityHTTPPath']) . ')(.*)("|\')(.*)>@imsU', '\1=\2' . $serendipity['baseURL'] . '\4\2\6>', $entry['body']);
+            serendipity_plugin_api::hook_event('frontend_display', $entry);
             
             // extract author information
             if (empty($entry['email'])) {
@@ -1376,9 +1382,7 @@
     <content type="application/xhtml+xml" xml:base="<?php echo $serendipity['baseURL']; ?>">
         <div xmlns="http://www.w3.org/1999/xhtml">
 <?php
-                    $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)));
-                    serendipity_plugin_api::hook_event('frontend_display', $article);
-                    echo utf8_encode($article);
+                    echo utf8_encode($entry['body'].$ext);
 ?>
         </div>
     </content>
@@ -1410,9 +1414,7 @@
     <author><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></author>
     <content:encoded>
 <?php
-                    $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)));
-                    serendipity_plugin_api::hook_event('frontend_display', $article);
-                    echo utf8_encode(htmlspecialchars($article));
+                    echo utf8_encode(htmlspecialchars($entry['body'].$ext));
 ?>
     </content:encoded>
     <pubDate><?php echo date('r', $entry['timestamp']); ?></pubDate>
@@ -1424,7 +1426,7 @@
                     /*********** BEGIN RSS 0.91 FEED EXTRAS *************/
 ?>
     <description>
-        <?php echo utf8_encode(htmlspecialchars(nl2br($entry['body'] . $ext))); ?>
+        <?php echo utf8_encode(htmlspecialchars($entry['body'] . $ext)); ?>
     </description>
 </item>
 <?php
@@ -1437,9 +1439,7 @@
     <link><?php echo $guid; ?></link>
     <description>
 <?php
-                $article = nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'] . $ext)));
-                serendipity_plugin_api::hook_event('frontend_display', $article);
-                echo utf8_encode(htmlspecialchars($article));
+                echo utf8_encode(htmlspecialchars($entry['body'].$ext));
 ?>
     </description>
     <dc:publisher><?php echo utf8_encode(htmlspecialchars($serendipity['blogTitle'])); ?></dc:publisher>
@@ -1462,93 +1462,8 @@
     }
 }
 
-/**
- * Taken from pres2, written by rasmus lerdorf and company
- */
-function serendipity_format_tt($arg) {
-    return('<tt>' . str_replace(' ', '&nbsp;', $arg[1]) . '</tt>');
-}
-
-function serendipity_markup_text($str, $entry_id = 0) {
-    global $serendipity;
-
-    $ret = $str;
-
-    $ret = str_replace('\_', chr(1), $ret);
-    $ret = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$ret);
-    $ret = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$ret);
-    $ret = str_replace(chr(1), '\_', $ret);
-
-    // bold
-    $ret = str_replace('\*',chr(1),$ret);
-    $ret = str_replace('**',chr(2),$ret);
-    $ret = preg_replace('/(\S)\*(\S)/','\1' . chr(1) . '\2',$ret);
-    $ret = preg_replace('/\B\*([^*]+)\*\B/','<strong>\1</strong>',$ret);
-    $ret = str_replace(chr(2),'**',$ret);
-    $ret = str_replace(chr(1),'\*',$ret);
-
-    // italics
-    //$ret = str_replace('\~',chr(1),$ret);
-    //$ret = preg_replace('/~([\S ]+?)~/','<i>\1</i>',$ret);
-    //$ret = str_replace(chr(1),'\~',$ret);
-
-    // monospace font
-    //$ret = str_replace('\%',chr(1),$ret);
-    //$ret = preg_replace_callback('/%([\S ]+?)%/', 'serendipity_format_tt', $ret);
-    //$ret = str_replace(chr(1),'%',$ret);
-
-    $ret = preg_replace('/\|([0-9a-fA-F]+?)\|([\S ]+?)\|/','<font color="\1">\2</font>',$ret);
-    $ret = preg_replace('/\^([[:alnum:]]+?)\^/','<sup>\1</sup>',$ret);
-    $ret = preg_replace('/\@([[:alnum:]]+?)\@/','<sub>\1</sub>',$ret);
-    $ret = preg_replace('/([\\\])([*#_|^@%])/', '\2', $ret);
-
-    if ($serendipity['track_exits']) {
-        $serendipity['encodeExitsCallback_entry_id'] = $entry_id;
-
-        $ret = preg_replace_callback(
-          "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#isUm",
-          'serendipity_encodeExitsCallback',
-          $ret
-        );
-    }
-
-    return $ret;
-}
 
 /**
-* Transforms '<a href="http://url/">' into
-* '<a href="exit.php?url=encurl" ...>'.
-*/
-function serendipity_encodeExitsCallback($buffer) {
-    global $serendipity;
-
-    $entry_id = $serendipity['encodeExitsCallback_entry_id'];
-    $url      = 'http://' . $buffer[3];
-
-    return sprintf(
-        '<a%shref="%sexit.php?url=%s%s" title="%s" onmouseover="window.status=\'%s\';return true;" onmouseout="window.status=\'\';return true;"',
-        $buffer[1],
-        $serendipity['baseURL'],
-        base64_encode($url),
-        ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
-        $url,
-        $url
-    );
-}
-
-/**
-* Transforms emoticons into images
-*/
-function serendipity_emoticate($str) {
-    global $serendipity;
-
-    foreach ($serendipity['smiles'] as $key => $value) {
-        $str = preg_replace("/([\t\ ]?)" . preg_quote($key, '/') . "([\t\ \!\.\)]?)/m", "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" />$2", $str);
-    }
-
-    return $str;
-}
-
 /**
  * purge a statically pregenerated entry
  */

Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_plugin_api.php	10 Feb 2004 15:46:19 -0000	1.11
+++ serendipity_plugin_api.php	26 Feb 2004 11:37:42 -0000	1.12
@@ -35,6 +35,11 @@
                 serendipity_plugin_api::create_plugin_instance($class_name);
             }
         }
+        
+        serendipity_plugin_api::create_plugin_instance('serendipity_event_s9ymarkup', null, 'event');
+        serendipity_plugin_api::create_plugin_instance('serendipity_event_emoticate', null, 'event');
+        serendipity_plugin_api::create_plugin_instance('serendipity_event_nl2br', null, 'event');
+        serendipity_plugin_api::create_plugin_instance('serendipity_event_trackexits', null, 'event');
     }
 
     /* Create an instance of a plugin.
@@ -463,9 +468,10 @@
         // Define event hooks here, if you want you plugin to execute those instead of being a sidebar item.
         // Look at external plugins 'serendipity_event_mailer' or 'serendipity_event_weblogping' for usage.
         // Currently available events:
-        //   backend_publish
-        //   backend_display
-        //   frontend_display
+        //   backend_publish [after insertion of a new article in your s9y-backend]
+        //   backend_display [after displaying an article in your s9y-backend]
+        //   frontend_display [before displaying an article in your s9y-frontend]
+        //   frontend_comment [after displaying the "enter comment" dialog]
         return true;
     }
 }

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_sidebar_items.php	25 Feb 2004 08:41:24 -0000	1.45
+++ serendipity_sidebar_items.php	26 Feb 2004 11:37:42 -0000	1.46
@@ -451,7 +451,9 @@
     {
         $title = $this->get_config('title', $title);
         if ($this->get_config('markup') == 'true' || $this->get_config('markup') == '') {
-            echo serendipity_markup_text($this->get_config('content'));
+            $entry = array('html_nugget' => $this->get_config('content'));
+            serendipity_plugin_api::hook_event('frontend_display', $entry);
+            echo $entry['html_nugget'];
         } else {
             echo $this->get_config('content');
         }

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.7,1.8 serendipity_lang_de.inc.php,1.17,1.18 serendipity_lang_en.inc.php,1.15,1.16 serendipity_lang_es.inc.php,1.15,1.16

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

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

Modified Files:
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
Log Message:
Language strings


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_da.inc.php	25 Feb 2004 17:42:48 -0000	1.7
+++ serendipity_lang_da.inc.php	26 Feb 2004 11:33:02 -0000	1.8
@@ -327,6 +327,7 @@
 @define('ORIGINAL_SHORT', 'Orig.');
 @define('IMAGES_PER_PAGE', 'billeder per side');
 
+@define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching'); // TRANSLATE
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".'); // TRANSLATE 
 

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_de.inc.php	25 Feb 2004 17:42:48 -0000	1.17
+++ serendipity_lang_de.inc.php	26 Feb 2004 11:33:03 -0000	1.18
@@ -321,6 +321,7 @@
 @define('IMAGES_PER_PAGE', 'Bilder pro Seite');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'HTTP-Caching verhindern');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Wenn diese Option auf "Ja" gesetzt ist wird der Link zum RSS Feed einem Client vorschlagen, den Feed nicht zu cachen sondern jedesmal erneut vollständig zu laden. Dies ist nicht ressourcensparend, daher wird empfohlen diese Option bei "Nein" zu belassen.');
+@define('APPLY_MARKUP_TO', 'Textformatierung auf %s anwenden');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_en.inc.php	25 Feb 2004 17:45:56 -0000	1.15
+++ serendipity_lang_en.inc.php	26 Feb 2004 11:33:03 -0000	1.16
@@ -321,6 +321,6 @@
 @define('IMAGES_PER_PAGE', 'images per page');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
-
+@define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_es.inc.php	25 Feb 2004 17:42:48 -0000	1.15
+++ serendipity_lang_es.inc.php	26 Feb 2004 11:33:03 -0000	1.16
@@ -315,6 +315,7 @@
 @define('IMAGES_PER_PAGE', 'images per page'); // TRANSLATE
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching'); // TRANSLATE
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".'); // TRANSLATE
+@define('APPLY_MARKUP_TO', 'Apply markup to %s'); // TRANSLATE
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

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

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

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

Added Files:
	serendipity_event_textile.php textile.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_textile.php ---
<?php # $Id: serendipity_event_textile.php,v 1.1 2004/02/26 11:29:11 garvinhicking Exp $

require_once dirname(__FILE__) . '/textile.php';

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_TEXTILE_NAME',     'Textformatierung: Textile');
        @define('PLUGIN_EVENT_TEXTILE_DESC',     'Textile-Formatierung durchführen');
        @define('PLUGIN_EVENT_TEXTILE_TRANSFORM', '<a href="http://www.textism.com/tools/textile/">Textile</a>-Formatierung erlaubt');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_TEXTILE_NAME', 'Markup: Textile');
        @define('PLUGIN_EVENT_TEXTILE_DESC', 'Parse all output through the Textile converter');
        @define('PLUGIN_EVENT_TEXTILE_TRANSFORM', '<a href="http://www.textism.com/tools/textile/">Textile</a>-formatting allowed');
        break;
}

class serendipity_event_textile extends serendipity_event
{

    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_TEXTILE_NAME);
        $propbag->add('description',   PLUGIN_EVENT_TEXTILE_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));

        $propbag->add('preserve_tags',
          array(
            'php',
            'output',
            'name'
          )
        );
        
        $this->markup_elements = array(
            array(
              'name'     => ENTRY_BODY,
              'element'  => 'body',
            ),
            array(
              'name'     => EXTENDED_BODY,
              'element'  => 'extended',
            ),
            array(
              'name'     => COMMENT,
              'element'  => 'comment',
            ),
            array(
              'name'     => HTML_NUGGET,
              'element'  => 'html_nugget',
            )
        );

        $conf_array = array();
        foreach($this->markup_elements as $element) {
            $conf_array[] = $element['name'];
        }
        $propbag->add('configuration', $conf_array);
    }


    function generate_content(&$title) {
        $title = PLUGIN_EVENT_TEXTILE_NAME;
    }


    function introspect_config_item($name, &$propbag)
    {
        $propbag->add('type',        'boolean');
        $propbag->add('name',        $name);
        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
        return true;
    }    


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

        if (isset($hooks[$event])) {
            switch($event) {
              case 'frontend_display':

                $preserve_tags = &$bag->get('preserve_tags');

                foreach ($this->markup_elements as $temp) {
                    if ($this->get_config($temp['name']) == 'true') {
                        $element = $temp['element'];

        /* find all the tags and store them in $blocks */

                        $blocks = array();
                        foreach($preserve_tags as $tag) {
                            if (preg_match_all('/(<'.$tag.'[^>]?>.*<\/'.$tag.'>)/msU', $eventData[$element], $matches )) {
                                foreach($matches[1] as $match) {
                                    $blocks[] = $match;
                                }
                            }
                        }

        /* replace all the blocks with some code */

                        foreach($blocks as $id=>$block) {
                            $eventData[$element] = str_replace($block, '@BLOCK::'.$id.'@', $eventData[$element]);
                        }

        /* textile it */

                        $eventData[$element] = textile($eventData[$element]);

        /* each block will now be "<code>BLOCK::2</code>"
         * so look for those place holders and replace 
         * them with the original blocks */

                        if (preg_match_all('/<code>BLOCK::(\d+)<\/code>/', $eventData[$element], $matches )) {
                            foreach($matches[1] as $key=>$match) {
                                $eventData[$element] = str_replace($matches[0][$key], $blocks[$match], $eventData[$element]);
                            }
                        }

        /* post-process each block */

                        foreach($preserve_tags as $tag) {
                            $method = '_process_tag_' . $tag;
                            if (method_exists($this,$method)) {
                                if (preg_match_all('/<'.$tag.'[^>]?>(.*)<\/'.$tag.'>/msU', $eventData[$element], $matches )) {
                                    foreach($matches[1] as $key=>$match) {
                                        $eventData[$element] = str_replace($matches[0][$key], $this->$method($match), $eventData[$element]);
                                    }
                                }
                            }
                        }

        /* end textile processing */

                    }
                }
                return true;

                case 'frontend_comment':
                    if ($this->get_config(COMMENT) != 'false') {
                        echo PLUGIN_EVENT_TEXTILE_TRANSFORM . '<br />';
                    }
                    return true;
                    break;

                default:
                  return false;
            }

        } else {

            return false;

        }

    }

    function _process_tag_php($text) {

        $code = "<?php\n" . trim($text) . "\n?>";

        # Using OB, as highlight_string() only supports
        # returning the result from 4.2.0

        ob_start();
        highlight_string($code);
        $highlighted = ob_get_contents();
        ob_end_clean();

        # Fix output to use CSS classes and wrap well

        $highlighted = '<p><div class="phpcode">' . str_replace(
            array(
                '&nbsp;',
                '<br />',
                '<font color="',
                '</font>',
                "\n ",
                'Ê '
            ),
            array(
                ' ',
                "<br />\n",
                '<span class="',
                '</span>',
                "\n&nbsp;",
                '&nbsp; '
            ),
            $highlighted
        ) . '</div></p>';

        return $highlighted; 

    }


    function _process_tag_output($text) {
        return '<p><pre class="output">' . $text . '</pre></p>';
    }

    function _process_tag_name($text) {
        return '<a name="'. $text . '"></a>';
    }

}

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

--- NEW FILE: textile.php ---
<?php

/*

This is Textile
A Humane Web Text Generator

Version 2.0 beta
8 July, 2003

Copyright (c) 2003, Dean Allen, www.textism.com
All rights reserved.

_______
LICENSE

Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:

[...1058 lines suppressed...]
                        $arr[]=
                            array('name'=>$atnm,'whole'=>$atnm.'="'.$match[1].'"',
                                'att'=>$match[1]);
                        $ok = 1; $mode = 0;
                        $attr = preg_replace("/^\w+(\s+|$)/", '', $attr);
                    }
                break;
            }
            if ($ok == 0){
                $attr = preg_replace('/^\S*\s*/', '', $attr);
                $mode = 0;
            }
        }
        if ($mode == 1) $arr[] = 
                array ('name'=>$atnm,'whole'=>$atnm.'="'.$atnm.'"','att'=>$atnm);
      
        return $arr;
    }
?>

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

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

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

Added Files:
	serendipity_event_s9ymarkup.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_s9ymarkup.php ---
<?php # $Id: serendipity_event_s9ymarkup.php,v 1.1 2004/02/26 11:29:10 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_S9YMARKUP_NAME', 'Textformatierung: Serendipity');
        @define('PLUGIN_EVENT_S9YMARKUP_DESC', 'Standard Serendipity Textformatierung durchführen');
        @define('PLUGIN_EVENT_S9YMARKUP_TRANSFORM', 'Umschließende Sterne heben ein Wort hervor (*wort*), per _wort_ kann ein Wort unterstrichen werden.');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_S9YMARKUP_NAME', 'Markup: Serendipity');
        @define('PLUGIN_EVENT_S9YMARKUP_DESC', 'Apply basic serendipity markup to entry text');
        @define('PLUGIN_EVENT_S9YMARKUP_TRANSFORM', 'Enclosing asterisks marks text as bold (*word*), underscore are made via _word_.');
        break;
}

class serendipity_event_s9ymarkup extends serendipity_event
{

    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_S9YMARKUP_NAME);
        $propbag->add('description',   PLUGIN_EVENT_S9YMARKUP_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));

        $this->markup_elements = array(
            array(
              'name'     => ENTRY_BODY,
              'element'  => 'body',
            ),
            array(
              'name'     => EXTENDED_BODY,
              'element'  => 'extended',
            ),
            array(
              'name'     => COMMENT,
              'element'  => 'comment',
            ),
            array(
              'name'     => HTML_NUGGET,
              'element'  => 'html_nugget',
            )
        );

        $conf_array = array();
        foreach($this->markup_elements as $element) {
            $conf_array[] = $element['name'];
        }
        $propbag->add('configuration', $conf_array);
    }


    function generate_content(&$title) {
        $title = PLUGIN_EVENT_S9YMARKUP_NAME;
    }
    

    function introspect_config_item($name, &$propbag)
    {
        $propbag->add('type',        'boolean');
        $propbag->add('name',        $name);
        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
        return true;
    }


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

        if (isset($hooks[$event])) {
            switch($event) {
                case 'frontend_display':

                    foreach ($this->markup_elements as $temp) {
                        if ($this->get_config($temp['name']) != 'false') {
                            $element = $temp['element'];
                            $eventData[$element] = $this->_s9y_markup($eventData[$element], $eventData['entry_id']);
                        }
                    }
                    return true;
                    break;

                case 'frontend_comment':
                    if ($this->get_config(COMMENT) != 'false') {
                        echo PLUGIN_EVENT_S9YMARKUP_TRANSFORM . '<br />';
                    }
                    return true;
                    break;

                default:
                    return false;
            }
        } else {
            return false;
        }
    }


    function _s9y_markup($text, $id) {
        $text = str_replace('\_', chr(1), $text);
        $text = preg_replace('/#([[:alnum:]]+?)#/','&\1;',$text);
        $text = preg_replace('/\b_([\S ]+?)_\b/','<u>\1</u>',$text);
        $text = str_replace(chr(1), '\_', $text);

        // bold
        $text = str_replace('\*',chr(1),$text);
        $text = str_replace('**',chr(2),$text);
        $text = preg_replace('/(\S)\*(\S)/','\1' . chr(1) . '\2',$text);
        $text = preg_replace('/\B\*([^*]+)\*\B/','<strong>\1</strong>',$text);
        $text = str_replace(chr(2),'**',$text);
        $text = str_replace(chr(1),'\*',$text);

        $text = preg_replace('/\|([0-9a-fA-F]+?)\|([\S ]+?)\|/','<font color="\1">\2</font>',$text);
        $text = preg_replace('/\^([[:alnum:]]+?)\^/','<sup>\1</sup>',$text);
        $text = preg_replace('/\@([[:alnum:]]+?)\@/','<sub>\1</sub>',$text);
        $text = preg_replace('/([\\\])([*#_|^@%])/', '\2', $text);

        return $text;

    }
}

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

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

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

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

Added Files:
	serendipity_event_textwiki.php 
Log Message:
Added markup plugins


--- NEW FILE: serendipity_event_textwiki.php ---
<?php # $Id: serendipity_event_textwiki.php,v 1.1 2004/02/26 11:29:11 garvinhicking Exp $

require_once 'Text/Wiki.php';

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_TEXTWIKI_NAME',     'Textformatierung: Wiki');
        @define('PLUGIN_EVENT_TEXTWIKI_DESC',     'Wiki-Formatierung durchführen');
        @define('PLUGIN_EVENT_TEXTWIKI_TRANSFORM', '<a href="http://c2.com/cgi/wiki">Wiki</a>-Formatierung erlaubt');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_TEXTWIKI_NAME',     'Markup: Wiki');
        @define('PLUGIN_EVENT_TEXTWIKI_DESC',     'Markup text using Text_Wiki');
        @define('PLUGIN_EVENT_TEXTWIKI_TRANSFORM', '<a href="http://c2.com/cgi/wiki">Wiki</a> format allowed');
        break;
}

class serendipity_event_textwiki extends serendipity_event
{

    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_TEXTWIKI_NAME);
        $propbag->add('description',   PLUGIN_EVENT_TEXTWIKI_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));

        $this->markup_elements = array(
            array(
              'name'     => ENTRY_BODY,
              'element'  => 'body',
            ),
            array(
              'name'     => EXTENDED_BODY,
              'element'  => 'extended',
            ),
            array(
              'name'     => COMMENT,
              'element'  => 'comment',
            ),
            array(
              'name'     => HTML_NUGGET,
              'element'  => 'html_nugget',
            )
        );

        $conf_array = array();
        foreach($this->markup_elements as $element) {
            $conf_array[] = $element['name'];
        }
        $propbag->add('configuration', $conf_array);
        
        $this->wiki =& new Text_Wiki;
    }


    function generate_content(&$title) {
        $title = PLUGIN_EVENT_TEXTWIKI_NAME;
    }


    function introspect_config_item($name, &$propbag)
    {
        $propbag->add('type',        'boolean');
        $propbag->add('name',        $name);
        $propbag->add('description', sprintf(APPLY_MARKUP_TO, $name));
        return true;
    }
    
    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
 
        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'frontend_display':
                    foreach ($this->markup_elements as $temp) {
                        if ($this->get_config($temp['name']) != 'false') {
                            $element = $temp['element'];
                            $eventData[$element] = $this->wiki->transform($eventData[$element]);
                        } 
                    }
                    return true;
                    break;

                case 'frontend_comment':
                    if ($this->get_config(COMMENT) != 'false') {
                        echo PLUGIN_EVENT_TEXTWIKI_TRANSFORM . '<br />';
                    }
                    return true;
                    break;

                default:
                  return false;
            }
        } else {
            return false;
        }
    }
}

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

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

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

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

Added Files:
	serendipity_event_trackexits.php 
Log Message:
Added markup plugins


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