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

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv20046

Modified Files:
	serendipity.css.php 
Log Message:
Basically we first have a section which deals with the CSS during the installation

After that we include the configuration and use the selected template

We have a function which replaces the TEMPLATE_PATH in the stylesheets, and prints the output


Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity.css.php	13 Jul 2003 12:41:51 -0000	1.16
+++ serendipity.css.php	13 Jul 2003 12:54:15 -0000	1.17
@@ -1,19 +1,26 @@
 <?php # $Id$
 
 header('Content-type: text/css');
-include_once('serendipity_config.inc.php');
-if ( !@file_exists('serendipity_config_local.inc.php') ) {
+function serendipity_printStylesheet($file) {
+     global $serendipity;
+     echo str_replace('{TEMPLATE_PATH}', dirname($file) .'/',  file_get_contents($file));
+
+}
+if ( !file_exists('serendippity_config_local.inc.php') ) {
     if ( file_exists('templates/default/style.css') ) {
-        readfile('templates/default/style.css');
+        serendipity_printStylesheet('templates/default/style.css');
     } else {
         readfile('serendipity.css');
     }
-} else if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css') ) {
-    echo str_replace('{TEMPLATE_PATH}', $serendipity['baseURL'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default'). '/', file_get_contents($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css'));
+    die();
+}
+
+include_once('serendipity_config.inc.php');
+if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css') ) {
+    serendipity_printStylesheet($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/style.css');
 } else if (file_exists($serendipity['templatePath'] . 'default/style.css')) {
     readfile ($serendipity['templatePath'] . 'default/style.css');
 } else {
-    include_once('serendipity_config.inc.php');
     $css = serendipity_getCSS($_REQUEST['style']);
     echo $css['data'];
 }