php-blog-cvs — Serendipity commit list

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

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

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

Modified Files:
	serendipity_admin_upgrader.inc.php 
Log Message:
Added seperating break.
Fxied spleling mstikae ;)


Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_admin_upgrader.inc.php	2 Mar 2004 17:35:24 -0000	1.1
+++ serendipity_admin_upgrader.inc.php	4 Mar 2004 12:46:16 -0000	1.2
@@ -67,7 +67,7 @@
         } elseif ( $serendipity['GET']['action'] == 'upgrade' ) {
             echo sprintf(SERENDIPITY_UPGRADER_NOW_UPGRADED, $serendipity['version']);
         }
-        echo sprintf(SERENDIPITY_UPGARDER_RETURN_HERE, '<a href="'. $serendipity['serendipityHTTPPath'] .'">', '</a>');
+        echo sprintf(SERENDIPITY_UPGRADER_RETURN_HERE, '<a href="'. $serendipity['serendipityHTTPPath'] .'">', '</a>');
     } else {
 
 ?>
@@ -88,7 +88,7 @@
     }
 ?>
 <?php } ?>
-
+<br />
 
 
 <h3><?php echo SERENDIPITY_UPGRADER_VERSION_SPECIFIC ?>:</h3>

[php-blog-cvs] serendipity serendipity_admin.php,1.31,1.32

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
fix


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_admin.php	3 Mar 2004 09:09:31 -0000	1.31
+++ serendipity_admin.php	4 Mar 2004 12:39:17 -0000	1.32
@@ -44,7 +44,7 @@
 if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) {
     if ( IS_installed === false ) {
         $file = 'serendipity_admin_installer.inc.php';
-    } elseif ( IS_up2date === 1 ) {
+    } elseif ( IS_up2date === false ) {
         $file = 'serendipity_admin_upgrader.inc.php';
     } else {
         $file = ''; // For register_global users don't let us be tricked to include a different file somehow

[php-blog-cvs] serendipity NEWS,1.84,1.85 htaccess.rewrite.tpl,1.3,1.4

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

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

Modified Files:
	NEWS htaccess.rewrite.tpl 
Log Message:
Fixed bug for non-embedded blogs using mod_Rewrite. They where not passing
GET-Parameters.

All users out there using mod_rewrite, please test this, as there may be
issues left with this.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- NEWS	3 Mar 2004 14:45:31 -0000	1.84
+++ NEWS	4 Mar 2004 09:50:10 -0000	1.85
@@ -2,6 +2,7 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Bugfix: With mod_rewrite redirection parameters to browse pages/calendar was not working in non-embedded blogs (garvinhicking)
     * Added many new templates (several MoveableType imitations, moz-modern) (sebastianbergmann, tomsommer, garvinhicking)
     * Added backwards-compatible CSS ids to admin panel for better CSS customization (garvinhicking)
     * Moved smilies/xml buttons to template directory (img/) to be customized per-template (garvinhicking)

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- htaccess.rewrite.tpl	29 Jan 2004 12:08:28 -0000	1.3
+++ htaccess.rewrite.tpl	4 Mar 2004 09:50:11 -0000	1.4
@@ -13,8 +13,8 @@
 RewriteRule ^archive {indexFile}?url=/archive [L,QSA]
 RewriteRule ^categories/(.*) {indexFile}?url=categories/$1 [L,QSA]
 RewriteRule ^(atom|index|rss|b2rss|b2rdf)\.(rss|xml|rdf|rss2) rss.php?file=$1&ext=$2
-RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html
-RewriteRule (.*\.html?) {indexFile}?url=/$1
+RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
+RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
 
 <Files *.tpl>
     deny from all

[php-blog-cvs] serendipity/templates/moz-modern layout.php,1.1,1.2

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

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

Modified Files:
	layout.php 
Log Message:


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/layout.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- layout.php	3 Mar 2004 14:45:31 -0000	1.1
+++ layout.php	3 Mar 2004 16:26:52 -0000	1.2
@@ -1,13 +1,5 @@
 <?php # $Id$
 
-##########################################################################
-# serendipity - another blogger...                                       #
-##########################################################################
-#                                                                        #
-# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
-# http://www.jannis.to/programming/serendipity.html                      #
-#                                                                        #
-##########################################################################
 include_once("serendipity_config.inc.php");
 include_once("serendipity_plugin_api.php");
 include_once("serendipity_sidebar_items.php");
@@ -86,6 +78,7 @@
 ?>
     </div>
     <?php echo $right; ?>
+
+    <div id="copyright">Powered by <a href="http://www.s9y.org/">serendipity</a>, Design by <a href="http://supergarv.de/">Garvin Hicking</a>. Smile, you're on the candid credit line!</div>
 </div>
 
-<div id="copyright">Powered by <a href="http://www.s9y.org/">serendipity</a>, Design by <a href="http://supergarv.de/">Garvin Hicking</a>. Smile, you're on candid credit line!</div>
\ No newline at end of file

[php-blog-cvs] serendipity/templates/moz-modern style.css,1.1,1.2

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

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

Modified Files:
	style.css 
Log Message:
I guess nobody's gonna use my path structure then... ;)


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- style.css	3 Mar 2004 14:45:31 -0000	1.1
+++ style.css	3 Mar 2004 16:06:46 -0000	1.2
@@ -1,9 +1,3 @@
-/* Type CSS rules here and they will be applied
-to pages from 'editcss'
-immediately as long as you keep this window open. */
-
-/**** LINK-tag style sheet serendipity.css.php ****/
-
 /*
  *
  * "Mozilla Modern Tribute" for serendipity (http://www.s9y.org/), by Garvin Hicking (http://supergarv.de/)
@@ -51,7 +45,7 @@
   padding-left: 15px;
   border-bottom: 1px solid #8F9FB1;
   border-top: 1px solid #8F9FB1;
-  background-image: url(/cvs/serendipity/serendipity_MARKUP/templates/moz-modern/img/background.png);
+  background-image: url({TEMPLATE_PATH}img/background.png);
   margin-top: 10px;
   padding-top: 5px;
 }

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

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

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

Modified Files:
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
Log Message:
Small typos, german translation


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_da.inc.php	2 Mar 2004 17:35:24 -0000	1.12
+++ serendipity_lang_da.inc.php	3 Mar 2004 15:02:25 -0000	1.13
@@ -333,13 +333,13 @@
 @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_PURPOSE', 'I am here to 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_QUESTION', 'Do you wish 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');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_lang_de.inc.php	2 Mar 2004 17:35:24 -0000	1.21
+++ serendipity_lang_de.inc.php	3 Mar 2004 15:02:25 -0000	1.22
@@ -322,26 +322,24 @@
 @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');
-
-@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');
+@define('CALENDAR_BEGINNING_OF_WEEK', 'Anfang der Woche');
+@define('CALENDAR_BOW_DESC', 'Eine Zahl, die den Anfang der Woche angibt. Werte von 0 = Sonntag, 1 = Montag ... 6 = Samstag (Standard: 1)');
+@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity hat entdeckt, dass derzeit Version %s verwendet wird. Jedoch wurde Version %s installiert, daher müssten Sie die <a href="%s">Installation aktualisieren</a>!');
+@define('SERENDIPITY_UPGRADER_WELCOME', 'Willkommen beim Serendipity Aktualisierungs-Agenten');
+@define('SERENDIPITY_UPGRADER_PURPOSE', 'Ich möchte Ihnen gerne beim aktualisieren der Serendipity Installation helfen.');
+@define('SERENDIPITY_UPGRADER_WHY', 'Diese Seite erscheint, da gerade Serendipity %s installiert wurde, aber die Datenbank noch nicht an diese Version angepasst wurde.');
+@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Datenbank-Aktualisierungen (%s)');
+@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Die folgenden .sql Dateien wurden gefunden und müssen nun ausgeführt werden, bevor Serendipity wieder wie gewohnt funktioniert.');
+@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Versionsabhängige Funktionen');
+@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Keine versionsabhängigen Funktionen gefunden');
+@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Soll ich die aufgeführten Funktionen ausführen?');
+@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Nein, das werde ich manuell erledigen');
+@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Ja, bitte ausführen');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Es müssen keine Aktualisierungen ausgeführt werden');
+@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Serendipity wurde an die neue Version angepasst');
+@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Sie haben den automatischen Aktualisierungsvorgang ignoriert. Bitte stellen Sie sicher, dass die Datenbank anhand der .sql Dateien aktualisiert wird und die geplanten Funktionen aufgerufen werden.');
+@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Ihre Serendipity installation ist nun auf den Stand %s aktualisiert.');
+@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Zurück zum %sblog%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.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_en.inc.php	2 Mar 2004 17:35:24 -0000	1.19
+++ serendipity_lang_en.inc.php	3 Mar 2004 15:02:25 -0000	1.20
@@ -323,16 +323,16 @@
 @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('CALENDAR_BOW_DESC', 'An integer 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_PURPOSE', 'I am here to 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_QUESTION', 'Do you wish 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');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_es.inc.php	2 Mar 2004 17:35:24 -0000	1.19
+++ serendipity_lang_es.inc.php	3 Mar 2004 15:02:25 -0000	1.20
@@ -317,17 +317,17 @@
 @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 ... 6 = saturday (default: 1)'); // TRANSLATE
+@define('CALENDAR_BOW_DESC', 'An integer 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_PURPOSE', 'I am here to 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_QUESTION', 'Do you wish 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');

[php-blog-cvs] serendipity/templates/moz-modern info.txt,NONE,1.1 layout.php,NONE,1.1 preview.png,NONE,1.1 style.css,NONE,1.1

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

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

Added Files:
	info.txt layout.php preview.png style.css 
Log Message:
Added "Mozilla Modern Tribute" template.

I'm specially proud of the dynamic adaption to either left sidebar, right sidebar or both sidebars with "best fit" content width. ;)

Tested in Mozilla 1.6, IE6, Opera7. All considered working in most areas, however not yet thoroughly tested. Please comment. :-)

BTW: I made this using editcss.mozdev.org - and invaluable tool for creating themes IMHO.



--- NEW FILE: info.txt ---
Name: Mozilla Modern Tribute
Author: Garvin Hicking
Date: 2004-03-02

--- NEW FILE: layout.php ---
<?php # $Id: layout.php,v 1.1 2004/03/03 14:45:31 garvinhicking Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################
include_once("serendipity_config.inc.php");
include_once("serendipity_plugin_api.php");
include_once("serendipity_sidebar_items.php");

if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
    ob_start();
    serendipity_plugin_api::generate_plugins('left', 'div');
    $left = ob_get_contents();
    ob_end_clean();

    ob_start();
    serendipity_plugin_api::generate_plugins('right', 'div');
    $right = ob_get_contents();
    ob_end_clean();
}

?>
<div id="serendipity_banner">
    <h1><?php echo htmlentities($serendipity['blogTitle']) ?></h1>
<?php
$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
if (strlen($sub)) {
?>
    <h2><?php echo $sub ?></h2>
<?php
}
?>
</div>

<div id="mainpane">
    <?php echo $left; ?>
    <div id="<?php echo (empty($right) ? 'content_left' : (empty($left) ? 'content_right' : 'content')); ?>">
<?php
if (!is_numeric($serendipity['GET']['range'])) {
    $serendipity['GET']['range'] = date('Ymd');
}

// The main area
switch ($serendipity['GET']['action']) {
    // User wants to read the diary
    case 'read':
        if (isset($serendipity['GET']['id'])) {
            serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
        } else {
            serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, 15));
        }
        break;

    // User searches
    case 'search':
        $r = serendipity_searchEntries($serendipity['GET']['searchTerm']);
        if ( strlen($serendipity['GET']['searchTerm']) <= 3 ) {
            echo SEARCH_TOO_SHORT;
            break;
        }

        if ($r === true) {
            printf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']);
            break;
        }

        printf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity['GET']['searchTerm'], count($r));
        serendipity_printEntries($r);
        break;

    // Show the archive
    case 'archives':
        serendipity_printArchives();
        break;


    // Welcome screen or whatever
    default:
        serendipity_printEntries(serendipity_fetchEntries(null, true, 15));
}
?>
    </div>
    <?php echo $right; ?>
</div>

<div id="copyright">Powered by <a href="http://www.s9y.org/">serendipity</a>, Design by <a href="http://supergarv.de/">Garvin Hicking</a>. Smile, you're on candid credit line!</div>
--- NEW FILE: preview.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: style.css ---
/* Type CSS rules here and they will be applied
to pages from 'editcss'
immediately as long as you keep this window open. */

/**** LINK-tag style sheet serendipity.css.php ****/

/*
 *
 * "Mozilla Modern Tribute" for serendipity (http://www.s9y.org/), by Garvin Hicking (http://supergarv.de/)
 *
 */

/* HTML Elements */

body {
  background-color: #C7D0D9;
  color: #FFFFFF;
  font-family: Trebuchet MS, Tahoma, Verdana;
  margin: 0px;
  padding: 0px;
  top: 0px;
  left: 0px;
}

a,
a:link,
a:visited {
  color: #5D616E;
  text-decoration: underline;
  font-weight: bold;
  font-size: smaller;
  padding-left: 3px;
  padding-right: 3px;
}

a:active,
a:hover {
  color: #C7D0D9;
  text-decoration: none;
  background-color: #5D616E;
}

h3, h4 {
  margin: 0px;
}

/* Banner */

#serendipity_banner {
  font-weight: bold;
  padding-left: 15px;
  border-bottom: 1px solid #8F9FB1;
  border-top: 1px solid #8F9FB1;
  background-image: url(/cvs/serendipity/serendipity_MARKUP/templates/moz-modern/img/background.png);
  margin-top: 10px;
  padding-top: 5px;
}

#serendipity_banner h1 {
  color: #F8FAFE;
  font-size: x-large;
  margin-top: 5px;
  margin-bottom: 1px;
  border-bottom: 1px solid;
  display: inline;
  padding-right: 15px;
  padding-left: 5px;
}

#serendipity_banner h2 {
  color: #494F5D;
  font-size: small;
  margin-top: 2px;
  margin-bottom: 6px;
  padding-left: 5px; 
}

/* Calendar */

table.serendipity_calendar {
  width: 130px;
  margin-left: auto;
  margin-right: auto;
  margin-top: 5px;
  margin-bottom: 5px;
}

table.serendipity_calendar a,
table.serendipity_calendar a:link,
table.serendipity_calendar a:visited,
table.serendipity_calendar a:hover {
  color: #999999;
  font-size: x-small;
}

table.serendipity_calendar td {
  font-size: x-small;
  text-align: center;
}

td.serendipity_weekDayName {
  font-size: x-small;
  font-weight: bold;
}

td.serendipity_calendarHeader a:link,
td.serendipity_calendarHeader a:visited,
td.serendipity_calendarHeader a:hover {
  border: 0;
  text-decoration: none;
}

/* Sidebars */

#mainpane {
  position: absolute;
  margin-top: 3px;
  width: 99%;
}

#content {
  margin-left: 210px;
  margin-right: 210px;
}

#content_left {
  margin-left: 210px;
}

#content_right {
  margin-right: 210px;
}

#serendipityLeftSideBar {
  width: 200px;
  top: 0px;
  position: absolute;
  padding: 5px;
  margin: 3px;
  margin-top: 20px;
  left: 2px;
}

#serendipityRightSideBar {
  width: 200px;
  position: absolute;
  top: 0px;
  right: 2px;
  padding: 5px;
  margin: 3px;
  margin-top: 20px;
}

div.serendipitySideBarItem {
  color: #666666;
  font-size: small;
  font-weight: normal;
  margin-bottom: 12px;
  padding-bottom: 12px;
}

.serendipity_commentsTitle,
#serendipityLeftSideBar .serendipitySideBarTitle {
  border-left: 10px solid #8F9FB1;
  margin: 0;
  font-size: smaller;
  font-weight: bold;
  padding-left: 4px;
  text-transform: uppercase;
  border-top: 1px solid white;
  border-bottom: 1px solid white;
  border-right: 1px solid white;
  background-color: #BAC6D1;
  color: white;
  margin-bottom: 10px;
  letter-spacing: 2px;
  -moz-border-radius-topright: 8px;
  -moz-border-radius-bottomright: 8px;
}

#serendipityLeftSideBar div.serendipitySideBarContent {
  padding: 2px;
  border-right: 5px solid #BAC6D1;
  padding-bottom: 5px;
  border-bottom: 1px solid #BAC6D1;
  margin-right: 5px;
  -moz-border-radius-bottomright: 15px;
}

#serendipityRightSideBar .serendipitySideBarTitle {
  border-right: 10px solid #8F9FB1;
  margin: 0px;
  font-size: smaller;
  font-weight: bold;
  padding-right: 4px;
  text-transform: uppercase;
  text-align: right;
  border-left: 1px solid white;
  border-top: 1px solid white;
  border-bottom: 1px solid white;
  color: white;
  margin-bottom: 10px;
  background-color: #BAC6D1;
  letter-spacing: 2px;
  -moz-border-radius-topleft: 8px;
  -moz-border-radius-bottomleft: 8px;
}

#serendipityRightSideBar div.serendipitySideBarContent {
  padding: 2px;
  border-left: 5px solid #BAC6D1;
  padding-bottom: 5px;
  border-bottom: 1px solid #BAC6D1;
  margin-right: 5px;
  margin-left: 5px;
  padding-left: 10px;
  -moz-border-radius-bottomleft: 15px;
}

/* Entries */

div.serendipity_Entry_Date {
  margin: 10px;
  margin-bottom: 0px;
  padding: 10px;
  width: auto;
}

.serendipity_date {
  color: #ffffff; 
  font-size: smaller; 
  font-weight: bold;
  margin-top: 15px;
  border-left: 5px solid #8F9FB1;
  padding-left: 15px;
  background-color: #BAC6D1;
}

.serendipity_title,
.serendipity_Admin_title {
  border-top: 1px solid #8F9FB1;
  border-left: 5px solid #8F9FB1;
  font-size: large;
  font-weight: bold;
  padding: 10px;
  margin-top: 20px;
  -moz-border-radius-topleft: 16px;
}

.serendipity_entry,
.serendipity_admin {
  background: #BAC6D1;
  margin-top: 10px;
  color: #494F5D;
  font-size: small;
  font-weight: normal;
  padding: 10px;
}

div.serendipity_entryFooter {
  clear: both;
  font-size: x-small;
  margin-top: 15px;
  border-top: 1px solid #8F9FB1;
  border-bottom: 2px solid #8F9FB1;
  background-color: #C7D0D9;
  padding-left: 2px;
  color: #494F5D;
}

/* Comments */

.serendipityCommentForm input,
.serendipityCommentForm textarea {
  background-color: #C7D0D9;
  border: 1px solid #8F9FB1;
  padding: 2px;
  font-family: Trebuchet MS, Tahoma, Verdana;
  -moz-border-radius: 5px;
}

.serendipity_comment {
  background-color: #C7D0D9;
  color: #494F5D;
  font-size: small;
  margin-left: 2px;
  margin-right: 2px;
  padding: 6px;
}

.serendipity_comment a {
  margin: 0px;
  padding: 0px;
}

.serendipity_commentsLabel {
  font-size: small;
  vertical-align: top;
  padding-top: 5px;
}

.serendipity_commentsValue textarea,
.serendipity_commentsValue input {
  width: 99%;
}

.serendipity_commentsTitle {
  margin-top: 20px;
  margin-bottom: 15px;
}

.serendipity_comment_source {
  border-top: 1px solid #8F9FB1;
  border-bottom: 2px solid #8F9FB1;
  background-color: #BAC6D1;
  padding-left: 5px;
  font-size: smaller;
  margin-top: 10px;
}

/* Misc */

#serendipity_comment_page {
}

/* Admin */

.serendipity_admin td {
  color: #494F5D;
}

.serendipity_admin input, 
.serendipity_admin select, 
.serendipity_admin textarea,
.serendipity_admin fieldset{
  background-color: #C7D0D9;
  border: 1px solid #8F9FB1;
  padding: 2px;
  font-family: Trebuchet MS, Tahoma, Verdana;
  -moz-border-radius: 5px;
}

#serendipity_admin_entries_page #content,
#serendipity_admin_image_page #content,
#serendipity_admin_page #content {
  padding-left: 35px;
}

#serendipity_admin_page, #serendipity_admin_image_page, #serendipity_admin_entries_page {
}

#serendipity_admin_entries_page #serendipityLeftSideBar,
#serendipity_admin_page #serendipityLeftSideBar,
#serendipity_admin_image_page #serendipityLeftSideBar
 {
 position: relative;
}

/* Copyright stuff */

#copyright {
  color: #C7D0D8;
  text-align: center;
  margin: 10px;
}

#copyright a {
  color: #C7D0D8;
}

[php-blog-cvs] serendipity NEWS,1.83,1.84

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

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

Modified Files:
	NEWS 
Log Message:
Added "Mozilla Modern Tribute" template.

I'm specially proud of the dynamic adaption to either left sidebar, right sidebar or both sidebars with "best fit" content width. ;)

Tested in Mozilla 1.6, IE6, Opera7. All considered working in most areas, however not yet thoroughly tested. Please comment. :-)

BTW: I made this using editcss.mozdev.org - and invaluable tool for creating themes IMHO.



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- NEWS	3 Mar 2004 09:06:59 -0000	1.83
+++ NEWS	3 Mar 2004 14:45:31 -0000	1.84
@@ -2,6 +2,7 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Added many new templates (several MoveableType imitations, moz-modern) (sebastianbergmann, tomsommer, garvinhicking)
     * Added backwards-compatible CSS ids to admin panel for better CSS customization (garvinhicking)
     * Moved smilies/xml buttons to template directory (img/) to be customized per-template (garvinhicking)
     * Added plugin to switch themes on the frontend (Evan Nemerson, garvinhicking)

[php-blog-cvs] serendipity/templates/moz-modern/img back.png,NONE,1.1 background.png,NONE,1.1 background2.png,NONE,1.1 forward.png,NONE,1.1

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

Update of /cvsroot/php-blog/serendipity/templates/moz-modern/img
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30083/templates/moz-modern/img

Added Files:
	back.png background.png background2.png forward.png 
Log Message:
Added "Mozilla Modern Tribute" template.

I'm specially proud of the dynamic adaption to either left sidebar, right sidebar or both sidebars with "best fit" content width. ;)

Tested in Mozilla 1.6, IE6, Opera7. All considered working in most areas, however not yet thoroughly tested. Please comment. :-)

BTW: I made this using editcss.mozdev.org - and invaluable tool for creating themes IMHO.



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

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

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

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

[php-blog-cvs] serendipity/templates/moz-modern/img - New directory

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

Update of /cvsroot/php-blog/serendipity/templates/moz-modern/img
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29353/img

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/moz-modern/img added to the repository

[php-blog-cvs] serendipity/templates/moz-modern - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/moz-modern added to the repository

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.222,1.223

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Added missing closing fieldset


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- serendipity_functions.inc.php	2 Mar 2004 17:35:24 -0000	1.222
+++ serendipity_functions.inc.php	3 Mar 2004 14:39:07 -0000	1.223
@@ -2050,6 +2050,7 @@
 <?php
     serendipity_plugin_api::hook_event('backend_display', $entry);
 ?>
+                    </fieldset>
                 </td>
             </tr>
         </table>

[php-blog-cvs] serendipity/sql db.sql,1.1,1.2

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

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

Modified Files:
	db.sql 
Log Message:
schema was missing 'thumbnail_name'


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db.sql	29 Feb 2004 19:44:04 -0000	1.1
+++ db.sql	3 Mar 2004 13:55:34 -0000	1.2
@@ -150,5 +150,6 @@
   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'
+  date int(11) not null default '0',
+  thumbnail_name varchar(255) not null default '',
 );

[php-blog-cvs] serendipity README,1.1,1.2

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

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

Modified Files:
	README 
Log Message:
Add upgrade notes.


Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README	25 Feb 2004 08:42:01 -0000	1.1
+++ README	3 Mar 2004 13:39:48 -0000	1.2
@@ -5,6 +5,28 @@
 (Temporary document until a final documentation draft is finished!)
 
 ###############################################################################
+# UPDATING                                                                    #
+###############################################################################
+
+The automatic update script should find and execute any necessary changes to the
+database layout made in different s9y versions. 
+
+However, you are always advised to look at the corresponding
+SQL update file in sql/db_update* to see which changes were made.
+
+###############################################################################
+# NOTES ON UPDATING FROM 0.5 -> 0.5.1                                         #
+###############################################################################
+
+* The structure of the content_rewrite plugin has changed. It will get rewritten
+  automatically by the update script, but if you had output on your sidebar
+  before, you need to do this:
+
+  - Add the 'serendipity_plugin_eventwrapper' to the sidebar plugins.
+  - Configure the 'serendipity_plugin_eventwrapper' and set it to use your
+    existing 'serendpity_event_contentrewrite' plugin.
+
+###############################################################################
 # THE 'embed' CONFIGURATION DIRECTIVE                                         #
 ###############################################################################
 

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

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
Make sure we're not tricked into anything


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_admin.php	3 Mar 2004 09:07:00 -0000	1.30
+++ serendipity_admin.php	3 Mar 2004 09:09:31 -0000	1.31
@@ -46,6 +46,8 @@
         $file = 'serendipity_admin_installer.inc.php';
     } elseif ( IS_up2date === 1 ) {
         $file = 'serendipity_admin_upgrader.inc.php';
+    } else {
+        $file = ''; // For register_global users don't let us be tricked to include a different file somehow
     }
 
 

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.5,1.6

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

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

Modified Files:
	layout.php 
Log Message:
- Added unique identifieres to <body>-Tags for admin panel (allows better CSS customization)
- Moved smilies to template directory
- Moved xml-Button to template directory
- Uniquely use 'img' as image-subdirectory for all templates.



Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- layout.php	1 Oct 2003 15:31:03 -0000	1.5
+++ layout.php	3 Mar 2004 09:07:01 -0000	1.6
@@ -14,11 +14,11 @@
                                           ';                                                               
                                             
 $CLOSESHADOW = '</td>       
-                                                        <td style="width:8px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/pixel/shadowr.png);" valign="top"><img src="'.$serendipity['baseURL'].'/templates/newspaper/pixel/shadowt.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
+                                                        <td style="width:8px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowr.png);" valign="top"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowt.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
                                                         </tr>                                                                                                                                                         
                                                         <tr> 
-                                                        <td style="height:10px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/pixel/shadowb.png);"><img src="'.$serendipity['baseURL'].'/templates/newspaper/pixel/shadowbl.png" border="0" hspace="0" vspace="0" alt="new" /></td>
-                                                        <td style="height:10px; width:8px;"><img src="'.$serendipity['baseURL'].'/templates/newspaper/pixel/shadowbr.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
+                                                        <td style="height:10px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowb.png);"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbl.png" border="0" hspace="0" vspace="0" alt="new" /></td>
+                                                        <td style="height:10px; width:8px;"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbr.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
                                                         </tr>
                                                         </table>
                                                    ';

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

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

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

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
- Added unique identifieres to <body>-Tags for admin panel (allows better CSS customization)
- Moved smilies to template directory
- Moved xml-Button to template directory
- Uniquely use 'img' as image-subdirectory for all templates.



Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_emoticate.php	26 Feb 2004 11:29:10 -0000	1.1
+++ serendipity_event_emoticate.php	3 Mar 2004 09:07:01 -0000	1.2
@@ -52,21 +52,21 @@
 
         // A Set of emoticons to rewrite
         $this->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',
+            ":'("  => serendipity_getTemplateFile('img/cry_smile.gif'),
+            ':-)'  => serendipity_getTemplateFile('img/regular_smile.gif'),
+            ':-O'  => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+            ':O'   => serendipity_getTemplateFile('img/embaressed_smile.gif'),
+            ':-('  => serendipity_getTemplateFile('img/sad_smile.gif'),
+            ':('   => serendipity_getTemplateFile('img/sad_smile.gif'),
+            ':)'   => serendipity_getTemplateFile('img/regular_smile.gif'),
+            '8-)'  => serendipity_getTemplateFile('img/shades_smile.gif'),
+            ':-D'  => serendipity_getTemplateFile('img/teeth_smile.gif'),
+            ':D'   => serendipity_getTemplateFile('img/teeth_smile.gif'),
+            '8)'   => serendipity_getTemplateFile('img/shades_smile.gif'),
+            ':-P'  => serendipity_getTemplateFile('img/tounge_smile.gif'),
+            ';-)'  => serendipity_getTemplateFile('img/wink_smile.gif'),
+            ';)'   => serendipity_getTemplateFile('img/wink_smile.gif'),
+            ':P'   => serendipity_getTemplateFile('img/tounge_smile.gif')
         );
     }
 

[php-blog-cvs] serendipity NEWS,1.82,1.83 serendipity_sidebar_items.php,1.47,1.48 serendipity_entries.php,1.23,1.24 serendipity_admin_image_selector.php,1.17,1.18 serendipity_admin.php,1.29,1.30 comment.php,1.29,1.30

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

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

Modified Files:
	NEWS serendipity_sidebar_items.php serendipity_entries.php 
	serendipity_admin_image_selector.php serendipity_admin.php 
	comment.php 
Log Message:
- Added unique identifieres to <body>-Tags for admin panel (allows better CSS customization)
- Moved smilies to template directory
- Moved xml-Button to template directory
- Uniquely use 'img' as image-subdirectory for all templates.



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- NEWS	3 Mar 2004 08:17:59 -0000	1.82
+++ NEWS	3 Mar 2004 09:06:59 -0000	1.83
@@ -2,6 +2,8 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Added backwards-compatible CSS ids to admin panel for better CSS customization (garvinhicking)
+    * Moved smilies/xml buttons to template directory (img/) to be customized per-template (garvinhicking)
     * Added plugin to switch themes on the frontend (Evan Nemerson, garvinhicking)
     * Allow (multiple) dependencies for plugin API to allow pairing of event/sidebar plugins (garvinhicking)
     * Redesigned the plugin manager (tomsommer)

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_sidebar_items.php	27 Feb 2004 19:25:55 -0000	1.47
+++ serendipity_sidebar_items.php	3 Mar 2004 09:07:00 -0000	1.48
@@ -272,7 +272,7 @@
 
         if ($this->get_config('show_0.91') != 'false') {
 ?>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/xml.gif" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=0.91<?php echo $cache; ?>">RSS 0.91 feed</a>
             <br />
 <?php
@@ -280,7 +280,7 @@
         
         if ($this->get_config('show_1.0') != 'false') {
 ?>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/xml.gif" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=1.0<?php echo $cache; ?>">RSS 1.0 feed</a>
             <br />
 <?php
@@ -288,7 +288,7 @@
 
         if ($this->get_config('show_2.0') != 'false') {
 ?>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/xml.gif" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0<?php echo $cache; ?>">RSS 2.0 feed</a>
             <br />
 <?php
@@ -296,7 +296,7 @@
 
         if ($this->get_config('show_atom0.3') != 'false') {
 ?>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/xml.gif" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="ATOM/XML" /></a>
+            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="ATOM/XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=atom0.3<?php echo $cache; ?>">ATOM 0.3 feed</a>
             <br />
 <?php
@@ -304,7 +304,7 @@
 
         if ($this->get_config('show_2.0c') != 'false') {
 ?>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments<?php echo $cache; ?>"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/xml.gif" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
+            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments<?php echo $cache; ?>"><img src="<?php echo serendipity_getTemplateFile('img/xml.gif'); ?>" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> alt="XML" /></a>
             <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;type=comments<?php echo $cache; ?>"><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?>RSS 2.0 <?php echo COMMENTS; ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></a>
 <?php
         }
@@ -529,7 +529,7 @@
                   $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $category['categoryid'] . '_' . $category_id,
                   htmlentities($category['category_description']),
                   ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
-                  $serendipity['serendipityHTTPPath'] . 'pixel/xml.gif',
+                  serendipity_getTemplateFile('img/xml.gif'),
                   $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $category['categoryid'] . '_' . $category_id,
                   htmlentities($category['category_description']),
                   $category['category_name']

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_entries.php	17 Feb 2004 16:39:55 -0000	1.23
+++ serendipity_entries.php	3 Mar 2004 09:07:00 -0000	1.24
@@ -30,7 +30,7 @@
 
 </head>
 
-<body>
+<body id="serendipity_admin_entries_page">
     <div id="serendipity_banner">
         <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
 <?php

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_admin_image_selector.php	1 Mar 2004 16:57:23 -0000	1.17
+++ serendipity_admin_image_selector.php	3 Mar 2004 09:07:00 -0000	1.18
@@ -26,7 +26,7 @@
         <title><?php echo SELECT_IMAGE; ?></title>
         <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
     </head>
-<body>
+<body id="serendipity_admin_image_page">
 
 <?php
 switch ($serendipity['GET']['step']) {

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_admin.php	2 Mar 2004 17:35:24 -0000	1.29
+++ serendipity_admin.php	3 Mar 2004 09:07:00 -0000	1.30
@@ -26,7 +26,7 @@
 ?>
     </head>
 
-<body>
+<body id="serendipity_admin_page">
     <div id="serendipity_banner">
         <h1><?php echo (isset($serendipity['blogTitle']) ? $serendipity['blogTitle'] : ''); ?></h1>
 <?php

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- comment.php	25 Feb 2004 10:50:41 -0000	1.29
+++ comment.php	3 Mar 2004 09:07:00 -0000	1.30
@@ -54,7 +54,7 @@
     <title>' . COMMENTS . '</title>
     <link rel="stylesheet" type="text/css" href="' .  $serendipity['serendipityHTTPPath'] . 'serendipity.css.php?mode=comments" />
 </head>
-<body>
+<body id="serendipity_comment_page">
 ';
     if (isset($_GET['success']) && $_GET['success'] == 'true') {
         echo $html_header;

[php-blog-cvs] serendipity/templates/default/img cry_smile.gif,NONE,1.1 embaressed_smile.gif,NONE,1.1 omg_smile.gif,NONE,1.1 regular_smile.gif,NONE,1.1 sad_smile.gif,NONE,1.1 shades_smile.gif,NONE,1.1 teeth_smile.gif,NONE,1.1 tounge_smile.gif,NONE,1.1 wink_smile.gif,NONE,1.1 xml.gif,NONE,1.1

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

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

Added Files:
	cry_smile.gif embaressed_smile.gif omg_smile.gif 
	regular_smile.gif sad_smile.gif shades_smile.gif 
	teeth_smile.gif tounge_smile.gif wink_smile.gif xml.gif 
Log Message:
- Added unique identifieres to <body>-Tags for admin panel (allows better CSS customization)
- Moved smilies to template directory
- Moved xml-Button to template directory
- Uniquely use 'img' as image-subdirectory for all templates.



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

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

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

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

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

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

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

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

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

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

[php-blog-cvs] serendipity/pixel cry_smile.gif,1.1.1.1,NONE embaressed_smile.gif,1.1.1.1,NONE omg_smile.gif,1.1.1.1,NONE regular_smile.gif,1.1.1.1,NONE sad_smile.gif,1.1.1.1,NONE shades_smile.gif,1.1.1.1,NONE teeth_smile.gif,1.1.1.1,NONE tounge_smile.gif,1.1.1.1,NONE wink_smile.gif,1.1.1.1,NONE xml.gif,1.1,NONE

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

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

Removed Files:
	cry_smile.gif embaressed_smile.gif omg_smile.gif 
	regular_smile.gif sad_smile.gif shades_smile.gif 
	teeth_smile.gif tounge_smile.gif wink_smile.gif xml.gif 
Log Message:
- Added unique identifieres to <body>-Tags for admin panel (allows better CSS customization)
- Moved smilies to template directory
- Moved xml-Button to template directory
- Uniquely use 'img' as image-subdirectory for all templates.



--- cry_smile.gif DELETED ---

--- embaressed_smile.gif DELETED ---

--- omg_smile.gif DELETED ---

--- regular_smile.gif DELETED ---

--- sad_smile.gif DELETED ---

--- shades_smile.gif DELETED ---

--- teeth_smile.gif DELETED ---

--- tounge_smile.gif DELETED ---

--- wink_smile.gif DELETED ---

--- xml.gif DELETED ---

[php-blog-cvs] serendipity/templates/newspaper/pixel shadowb.png,1.1,NONE shadowbl.png,1.1,NONE shadowbr.png,1.1,NONE shadowr.png,1.1,NONE shadowt.png,1.1,NONE

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

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

Removed Files:
	shadowb.png shadowbl.png shadowbr.png shadowr.png shadowt.png 
Log Message:
- Added unique identifieres to <body>-Tags for admin panel (allows better CSS customization)
- Moved smilies to template directory
- Moved xml-Button to template directory
- Uniquely use 'img' as image-subdirectory for all templates.



--- shadowb.png DELETED ---

--- shadowbl.png DELETED ---

--- shadowbr.png DELETED ---

--- shadowr.png DELETED ---

--- shadowt.png DELETED ---

[php-blog-cvs] serendipity/templates/newspaper/img shadowb.png,NONE,1.1 shadowbl.png,NONE,1.1 shadowbr.png,NONE,1.1 shadowr.png,NONE,1.1 shadowt.png,NONE,1.1

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

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

Added Files:
	shadowb.png shadowbl.png shadowbr.png shadowr.png shadowt.png 
Log Message:
- Added unique identifieres to <body>-Tags for admin panel (allows better CSS customization)
- Moved smilies to template directory
- Moved xml-Button to template directory
- Uniquely use 'img' as image-subdirectory for all templates.



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

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

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

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

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

[php-blog-cvs] serendipity/templates/newspaper/img - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/newspaper/img added to the repository

[php-blog-cvs] serendipity NEWS,1.81,1.82 serendipity_plugin_api.php,1.12,1.13 serendipity.css.php,1.23,1.24 serendipity_config.inc.php,1.55,1.56

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

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

Modified Files:
	NEWS serendipity_plugin_api.php serendipity.css.php 
	serendipity_config.inc.php 
Log Message:
Bundled plugins, Template chooser


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- NEWS	28 Feb 2004 18:18:00 -0000	1.81
+++ NEWS	3 Mar 2004 08:17:59 -0000	1.82
@@ -2,6 +2,8 @@
 
 Version 0.5.1 ()
 ------------------------------------
+    * Added plugin to switch themes on the frontend (Evan Nemerson, garvinhicking)
+    * Allow (multiple) dependencies for plugin API to allow pairing of event/sidebar plugins (garvinhicking)
     * 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)

Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_plugin_api.php	26 Feb 2004 11:37:42 -0000	1.12
+++ serendipity_plugin_api.php	3 Mar 2004 08:17:59 -0000	1.13
@@ -72,13 +72,27 @@
         
         serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order, placement) values ('$key', $nextidx, '$default_placement')");
 
+        /* Check for multiple dependencies */
+        $plugin =& serendipity_plugin_api::load_plugin($key);
+        $bag    = new serendipity_property_bag;
+        $plugin->introspect($bag);
+        $plugin->register_dependencies(false);
+        
         return $key;
     }
 
     function remove_plugin_instance($plugin_instance_id)
     {
         global $serendipity;
+
+        $plugin =& serendipity_plugin_api::load_plugin($plugin_instance_id);
+        $bag    = new serendipity_property_bag;
+        $plugin->introspect($bag);
+
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}plugins where name='$plugin_instance_id'");
+
+        $plugin->register_dependencies(true);
+
         serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config  where name LIKE '$plugin_instance_id/%'");
     }
     
@@ -318,6 +332,22 @@
         
         return true;
     }
+
+    function exists($instance_id) {
+        global $serendipity;
+        
+        if (!strstr($instance_id, ':')) {
+            $instance_id .= ':';
+        }
+        
+        $existing = serendipity_db_query("SELECT name FROM {$serendipity['dbPrefix']}plugins WHERE name LIKE '%$instance_id%'");
+
+        if (is_array($existing) && !empty($existing[0][0])) {
+            return $existing[0][0];
+        }
+
+        return false;
+    }
 }
 
 /* holds a bunch of properties; you can have multiple
@@ -448,6 +478,49 @@
         // serendipity_plugin_api::remove_plugin_value($this->instance, array('title', 'description'));
         return true;
     }
+    
+    function register_dependencies($remove = false)
+    {
+        global $serendipity;
+        
+        if (is_array($this->dependencies)) {
+            
+            if ($remove) {
+                $dependencies = @explode(';', $this->get_config('dependencies'));
+                $modes        = @explode(';', $this->get_config('dependency_modes'));
+                
+                if (!empty($dependencies) && is_array($dependencies)) {
+                    foreach($dependencies AS $idx => $dependency) {
+                        if ($modes[$idx] == 'remove' && serendipity_plugin_api::exists($dependency)) {
+                            serendipity_plugin_api::remove_plugin_instance($dependency);
+                        }
+                    }
+                }
+            } else {
+                $keys  = array();
+                $modes = array();
+                foreach($this->dependencies AS $dependency => $mode) {
+                    $exists = serendipity_plugin_api::exists($dependency);
+                    if (!$exists) {
+                        if (strncmp($dependency, 'serendipity_event_', 19)) {
+                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'event');
+                        } else {
+                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency);
+                        }
+                    } else {
+                        $keys[] = $exists;
+                    }
+
+                    $modes[] = $mode;
+                }
+    
+                $this->set_config('dependencies',     implode(';', $keys));
+                $this->set_config('dependency_modes', implode(';', $modes));
+            }
+        }
+
+        return true;
+    }
 }
 
 class serendipity_event extends serendipity_plugin {

Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity.css.php	2 Mar 2004 17:35:24 -0000	1.23
+++ serendipity.css.php	3 Mar 2004 08:17:59 -0000	1.24
@@ -1,5 +1,6 @@
 <?php # $Id$
 
+session_start();
 include_once('compat.php');
 
 /* This is a small hack to allow CSS display during installations and upgrades */

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_config.inc.php	2 Mar 2004 17:35:24 -0000	1.55
+++ serendipity_config.inc.php	3 Mar 2004 08:17:59 -0000	1.56
@@ -150,5 +150,7 @@
 /* Default mail headers */
 $serendipity['mailheaders'] = 'X-Mailer: Serendipity/'. $serendipity['version'] . "\n"
                             . 'X-Engine: PHP/'. phpversion();
+
+serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

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

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

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

Added Files:
	serendipity_event_templatechooser.php 
Log Message:
Bundled plugins, Template chooser


--- NEW FILE: serendipity_event_templatechooser.php ---
<?php # $Id: serendipity_event_templatechooser.php,v 1.1 2004/03/03 08:18:00 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_TEMPLATECHOOSER_NAME',     'Templateauswahl');
        @define('PLUGIN_EVENT_TEMPLATECHOOSER_DESC',     'Ermöglicht Besuchern das Template zu ändern');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_TEMPLATECHOOSER_NAME',     'Template chooser');
        @define('PLUGIN_EVENT_TEMPLATECHOOSER_DESC',     'Allows users to change the template');
        break;
}

class serendipity_event_templatechooser extends serendipity_event
{
    function introspect(&$propbag)
    {
        global $serendipity;
        
        $propbag->add('name',          PLUGIN_EVENT_TEMPLATECHOOSER_NAME);
        $propbag->add('description',   PLUGIN_EVENT_TEMPLATECHOOSER_DESC);
        $propbag->add('event_hooks', array('frontend_configure' => true));

        // Register (multiple) dependencies. KEY is the name of the depending plugin. VALUE is a mode of either 'remove' or 'keep'.
        // If the mode 'remove' is set, removing the plugin results in a removal of the depending plugin. 'Keep' meens to
        // not touch the depending plugin.
        $this->dependencies = array('serendipity_plugin_templatedropdown' => 'remove'); 
    }
    
    function generate_content(&$title) {
        $title = PLUGIN_EVENT_TEMPLATECHOOSER_NAME;
    }

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

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

                if (isset($_REQUEST['user_template']) && (in_array($_REQUEST['user_template'], serendipity_fetchTemplates())) ) {
                    $_SESSION['serendipityUseTemplate'] = $_REQUEST['user_template'];
                }

                if (isset($_SESSION['serendipityUseTemplate']) ) {
                    $eventData['CONFIG']['template'] = $_SESSION['serendipityUseTemplate'];
                }
                
                return true;
                break;

              default:
                return false;
            }

        } else {
            return false;
        }
    }
}

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