php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.406,1.407

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Don't attempt to show category description, if there isn't one


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -d -r1.406 -r1.407
--- serendipity_functions.inc.php	25 Aug 2004 21:50:04 -0000	1.406
+++ serendipity_functions.inc.php	28 Aug 2004 21:50:59 -0000	1.407
@@ -1204,7 +1204,7 @@
                     $icon_string = '';
                     foreach ($entry['categories'] as $cat) {
                         if ($cat['category_icon'] != '') {
-                            $icon_string .= '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . serendipity_makeFilename($cat['category_name']) . '"><img class="serendipity_entryIcon" title="' . htmlspecialchars($cat['category_name']) . ' : ' . htmlspecialchars($cat['category_description']) . '" alt="' . htmlspecialchars($cat['category_name']) . '" src="' . htmlspecialchars($cat['category_icon']) . '"/></a>';
+                            $icon_string .= '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . serendipity_makeFilename($cat['category_name']) . '"><img class="serendipity_entryIcon" title="' . htmlspecialchars($cat['category_name']) . (!empty($cat['category_description']) ? ': ' . htmlspecialchars($cat['category_description']) : '') . '" alt="' . htmlspecialchars($cat['category_name']) . '" src="' . htmlspecialchars($cat['category_icon']) . '"/></a>';
                         }
                     }
                     if ($icon_string != '') {

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

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

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

Modified Files:
	serendipity_event_searchhighlight.php 
Log Message:
Optimize patterns


Index: serendipity_event_searchhighlight.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_searchhighlight/serendipity_event_searchhighlight.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_searchhighlight.php	28 Aug 2004 15:52:42 -0000	1.3
+++ serendipity_event_searchhighlight.php	28 Aug 2004 15:55:53 -0000	1.4
@@ -97,10 +97,10 @@
         if ( preg_match('@^(www\.)?altavista\.@i', $url['host']) ) {
             return PLUGIN_EVENT_SEARCHHIGHLIGHT_ALTAVISTA;
         }
-        if ( preg_match('@^(suche\.)?aol\.de@i', $url['host']) ) {
+        if ( preg_match('@^suche\.aol\.de@i', $url['host']) ) {
             return PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_DE;
         }
-        if ( preg_match('@^(search\.)?aol\.com@i', $url['host']) ) {
+        if ( preg_match('@^search\.aol\.com@i', $url['host']) ) {
             return PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_COM;
         }
 

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

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

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

Modified Files:
	serendipity_event_searchhighlight.php 
Log Message:
Fix broken preg patterns and undefined constants


Index: serendipity_event_searchhighlight.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_searchhighlight/serendipity_event_searchhighlight.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_searchhighlight.php	28 Aug 2004 15:35:46 -0000	1.2
+++ serendipity_event_searchhighlight.php	28 Aug 2004 15:52:42 -0000	1.3
@@ -74,6 +74,8 @@
         define('PLUGIN_EVENT_SEARCHHIGHLIGHT_LYCOS', 3);
         define('PLUGIN_EVENT_SEARCHHIGHLIGHT_MSN', 4);
         define('PLUGIN_EVENT_SEARCHHIGHLIGHT_ALTAVISTA', 5);
+        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_DE', 6);
+        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_COM', 7);
     }
 
     function getSearchEngine() {
@@ -95,10 +97,10 @@
         if ( preg_match('@^(www\.)?altavista\.@i', $url['host']) ) {
             return PLUGIN_EVENT_SEARCHHIGHLIGHT_ALTAVISTA;
         }
-        if ( preg_match('@^(suche\.)?aol\.de', $url['host']) ) {
+        if ( preg_match('@^(suche\.)?aol\.de@i', $url['host']) ) {
             return PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_DE;
         }
-        if ( preg_match('@^(search\.)?aol\.com', $url['host']) ) {
+        if ( preg_match('@^(search\.)?aol\.com@i', $url['host']) ) {
             return PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_COM;
         }
 

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

[Sebastian N. <no...@us...>]

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

Modified Files:
	serendipity_event_searchhighlight.php 
Log Message:
- Added german language
- Added AOL (.de / .com)

Index: serendipity_event_searchhighlight.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_searchhighlight/serendipity_event_searchhighlight.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_searchhighlight.php	25 Aug 2004 16:29:47 -0000	1.1
+++ serendipity_event_searchhighlight.php	28 Aug 2004 15:35:46 -0000	1.2
@@ -5,6 +5,10 @@
 /**********************************/
 
 switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_EVENT_SEARCHHIGHLIGHT_NAME',     'Hebe Suchwörter hervor');
+        @define('PLUGIN_EVENT_SEARCHHIGHLIGHT_DESC',     'Hebt Suchwörter hervor, die ein User in einer Suchmaschine eingegeben hat');
+   break;
     case 'en':
     default:
         @define('PLUGIN_EVENT_SEARCHHIGHLIGHT_NAME',     'Highlight search queries');
@@ -91,6 +95,13 @@
         if ( preg_match('@^(www\.)?altavista\.@i', $url['host']) ) {
             return PLUGIN_EVENT_SEARCHHIGHLIGHT_ALTAVISTA;
         }
+        if ( preg_match('@^(suche\.)?aol\.de', $url['host']) ) {
+            return PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_DE;
+        }
+        if ( preg_match('@^(search\.)?aol\.com', $url['host']) ) {
+            return PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_COM;
+        }
+
 
 
         return false;
@@ -126,6 +137,14 @@
                 $query = $pStr['q'];
                 break;
 
+            case PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_DE :
+                $query = $pStr['q'];
+                break;
+
+            case PLUGIN_EVENT_SEARCHHIGHLIGHT_AOL_COM :
+                $query = $pStr['query'];
+                break;
+
             default:
                 return false;
         }

[php-blog-cvs] serendipity serendipity_functions_installer.inc.php,1.32,1.33

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

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

Modified Files:
	serendipity_functions_installer.inc.php 
Log Message:
Don't hide default password if we are not installed


Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_functions_installer.inc.php	25 Aug 2004 21:50:05 -0000	1.32
+++ serendipity_functions_installer.inc.php	28 Aug 2004 15:14:52 -0000	1.33
@@ -53,7 +53,7 @@
     global $serendipity;
 
     /* I won't tell you the password, it's MD5 anyway, you can't do anything with it */
-    if ( $type == 'protected' ) {
+    if ( $type == 'protected' && IS_installed === true ) {
         return '';
     }
 

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.74,1.75

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

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

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
Typo


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- serendipity_lang_en.inc.php	14 Aug 2004 23:33:15 -0000	1.74
+++ serendipity_lang_en.inc.php	28 Aug 2004 15:08:05 -0000	1.75
@@ -421,7 +421,7 @@
 @define('INSTALL_XHTML11', 'Force XHTML 1.1 compliance');
 @define('INSTALL_XHTML11_DESC', 'Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)');
 @define('INSTALL_POPUP', 'Enable use of popup windows');
-@define('INSTALL_POPUP_DESC', 'Do you want to use the blog to use popup windows for comments, trackbacks et al?');
+@define('INSTALL_POPUP_DESC', 'Do you want to use popup windows for comments, trackbacks et al?');
 @define('INSTALL_EMBED', 'Is serendipity embedded?');
 @define('INSTALL_EMBED_DESC', '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 README file for more information!');
 @define('INSTALL_TOP_AS_LINKS', 'Show Top Exits/Referrers as links?');

[php-blog-cvs] serendipity README,1.9,1.10

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

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

Modified Files:
	README 
Log Message:
document changes from pixel/


Index: README
===================================================================
RCS file: /cvsroot/php-blog/serendipity/README,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- README	8 May 2004 23:38:16 -0000	1.9
+++ README	26 Aug 2004 11:33:29 -0000	1.10
@@ -2,7 +2,8 @@
 # README                                                               #
 ########################################################################
 
-(Temporary document until a final documentation draft is finished!)
+For the most up-to-date information on documentation, creating styles,
+plugins and so on, please visit our Wiki on http://www.s9y.org/!
 
 ########################################################################
 # UPDATING                                                             #
@@ -13,7 +14,7 @@
 from 0.5. The upgrader will perform its automatic actions, as soon as you
 have copied the new s9y files over your old installation and access the start
 page of your blog.
-You can speed up the process of backing up your data and copying the files by 
+You can speed up the process of backing up your data and copying the files by
 using the supplied "upgrade.sh" script. Be sure to edit the file and change
 the variables to your needs.
 
@@ -78,7 +79,7 @@
   subheader). If you have a custom template, you need to adapt to those
   changes. To make them look like your header previously has, insert
   this in your style.css:
-  
+
   a.homelink1,
   a.homelink1:hover,
   a.homelink1:link,
@@ -133,7 +134,7 @@
    templates, your menu structure and such.
    Now you want this file to be used to include your weblog. A simple
    content.php could look like this:
-   
+
    <?php
    $homepage = new Template_Class;
    $homepage->set_template($_REQUEST['page']);
@@ -142,15 +143,15 @@
    $homepage->output_footer();
    $homepage->track_statistics();
    ?>
-   
+
    So normally your file would be called with 'content.php?page=about'
    to display your 'about' page of your personal homepage.
-   
+
    Now we want this file to be displayed, having the 'page' variable
    being set to 'blog'.
-   
+
    For this, we set up a 'wrapper.php' file:
-   
+
    <?php
    $_REQUEST['page'] = 'blog';
    // Let serendipity generate our content:
@@ -158,34 +159,34 @@
    require 'index.php';
    $blog_data = ob_get_contents();
    ob_end_clean();
-   
+
    // Now we include our normal content building file.
    // This one has to make use of your $blog_data variable to print
    // the content where appropriate!
    require 'content.php';
    ?>
-   
+
    You would then set your 'indexFile' serendipity-option to the
    'wrapper.php' file.
-   
+
   2. Plugin panes & HTML-headers
-  
+
    With the example above, we only get the main blog data printed. One
    of the most visible actions when using the 'embed' option is that the
    plugin panes are not generated. And HTML headers/foooters are also
    not provided by s9y in this case, as this should be done by your
    'content.php' file.
-   
+
    So you have to include them in your 'content.php' file, to have them
    visible in your embedded setup.
-   
+
    You can use this snippet:
-   <?php 
+   <?php
    serendipity_plugin_api::generate_plugins('left','div');
    serendipity_plugin_api::generate_plugins('right','div');
    ?>
    somewhere in your 'content.php' file.
-  
+
 The 'embed' option is therefore only recommended to be used by advanced
 users going for a most flexible setup!
 
@@ -253,17 +254,15 @@
 VirtualHosts. But the directory name 's9y' is significant.
 
 Now copy the subdirectories called
- 
+
  * "/usr/local/lib/php/s9y/deployment/"  [core redirection files]
  * "/usr/local/lib/php/s9y/templates/"   [templates so that users can change them]
- * "/usr/local/lib/php/s9y/pixel/"       [core image files]
  * "/usr/local/lib/php/s9y/htmlarea/"    [htmlarea WYSIWYG-editor]
 
  to each of the user's subdirectories:
 
 $ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/garvin.s9yblogs.org/htdocs/
 $ cp -r /usr/local/lib/php/s9y/templates /home/www/garvin.s9yblogs.org/htdocs/
-$ cp -r /usr/local/lib/php/s9y/pixel /home/www/garvin.s9yblogs.org/htdocs/
 $ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/garvin.s9yblogs.org/htdocs/
 $ chown -R garvin.www /home/www/garvin.s9yblogs.org/htdocs/*
 $ chmod go+rwx /home/www/garvin.s9yblogs.org/htdocs
@@ -271,7 +270,6 @@
 
 $ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/j.s9yblogs.org/htdocs/
 $ cp -r /usr/local/lib/php/s9y/templates /home/www/j.s9yblogs.org/htdocs/
-$ cp -r /usr/local/lib/php/s9y/pixel /home/www/j.s9yblogs.org/htdocs/
 $ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/j.s9yblogs.org/htdocs/
 $ chown -R j.www /home/www/j.s9yblogs.org/htdocs/*
 $ chmod go+rwx /home/www/j.s9yblogs.org/htdocs
@@ -279,7 +277,6 @@
 
 $ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/tom.s9yblogs.org/htdocs/
 $ cp -r /usr/local/lib/php/s9y/templates /home/www/tom.s9yblogs.org/htdocs/
-$ cp -r /usr/local/lib/php/s9y/pixel /home/www/tom.s9yblogs.org/htdocs/
 $ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/tom.s9yblogs.org/htdocs/
 $ chown -R tom.www /home/www/tom.s9yblogs.org/htdocs/*
 $ chmod go+rwx /home/www/tom.s9yblogs.org/htdocs
@@ -292,7 +289,7 @@
 sql> CREATE TABLE my_managed_s9y_blogs (url varchar(255) default null);
 sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://garvin.s9yblogs.org/');
 sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://j.s9yblogs.org/');
-sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://tom.s9yblogs.org/');  
+sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://tom.s9yblogs.org/');
 
 Now you are almost ready for take-off. We assume that every user has
 access to a seperate SQL database where his blog-data is later stored
@@ -314,11 +311,11 @@
 * If you update the core library files from version 0.5 to 0.6 (for
   example) every user of your core library will get the default s9y-
   Upgrader script to see and needs to update his local configuration.
-  
+
   As a provider for s9y blogs to your users, you are advised to migrate
   the user's blogs on your own. To do so, it is best that you always
   have a "spare" testing blog installed just like your user's blogs.
-  
+
   Open that installation and look at the upgrader. Execute it and see
   that it completes without errors. If that happened, you should cycle
   through a list of ALL your s9y-managed blogs like this:
@@ -329,7 +326,7 @@
      $fp = fopen($row['url'] . 'serendipity_admin.php?serendipity[action]=upgrade');
   }
   ?>
-  
+
   So basically all you need to do is call that script for every s9y-
   powered blog you host.
 

[php-blog-cvs] serendipity serendipity_db_mysql.inc.php,1.21,1.22 serendipity_db_mysqli.inc.php,1.3,1.4 serendipity_db_postgres.inc.php,1.16,1.17 serendipity_db_sqlite.inc.php,1.8,1.9

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

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

Modified Files:
	serendipity_db_mysql.inc.php serendipity_db_mysqli.inc.php 
	serendipity_db_postgres.inc.php serendipity_db_sqlite.inc.php 
Log Message:
It's not a bug that your database extension is not installed... It's not our fault, blame someone else.


Index: serendipity_db_mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysqli.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_db_mysqli.inc.php	5 Aug 2004 12:30:58 -0000	1.3
+++ serendipity_db_mysqli.inc.php	26 Aug 2004 10:51:28 -0000	1.4
@@ -112,7 +112,7 @@
     global $serendipity;
 
     if (!function_exists('mysqli_connect')) {
-        $errs[] = 'No mysqli extension found. Please check your webserver installation.';
+        $errs[] = 'No mySQLi extension found. Please check your webserver installation or contact your systems administrator regarding this problem.';
         return false;
     }
 

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_db_mysql.inc.php	5 Aug 2004 12:30:58 -0000	1.21
+++ serendipity_db_mysql.inc.php	26 Aug 2004 10:51:28 -0000	1.22
@@ -112,7 +112,7 @@
     global $serendipity;
 
     if (!function_exists('mysql_connect')) {
-        $errs[] = 'No mysql extension found. Please check your webserver installation.';
+        $errs[] = 'No mySQL extension found. Please check your webserver installation or contact your systems administrator regarding this problem.';
         return false;
     }
 

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_db_sqlite.inc.php	5 Jul 2004 08:25:49 -0000	1.8
+++ serendipity_db_sqlite.inc.php	26 Aug 2004 10:51:28 -0000	1.9
@@ -130,7 +130,7 @@
     $dbName = (isset($hash['sqlitedbName']) ? $hash['sqlitedbName'] : $hash['dbName']);
 
     if (!function_exists('sqlite_open')) {
-        $errs[] = "SQLite extension not installed. Use \"pear install sqlite\" on your webserver.";
+        $errs[] = 'SQLite extension not installed. Run "pear install sqlite" on your webserver or contact your systems administrator regarding this problem.';
         return false;
     }
 

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_db_postgres.inc.php	5 Aug 2004 12:30:58 -0000	1.16
+++ serendipity_db_postgres.inc.php	26 Aug 2004 10:51:28 -0000	1.17
@@ -113,7 +113,7 @@
     global $serendipity;
 
     if (!function_exists('pg_connect')) {
-        $errs[] = 'No PostgreSQL extension found. Please check your webserver installation.';
+        $errs[] = 'No PostgreSQL extension found. Please check your webserver installation or contact your systems administrator regarding this problem.';
         return false;
     }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.11,1.12

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

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
the new path is img/ not pixel/


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_event_creativecommons.php	25 Aug 2004 21:50:05 -0000	1.11
+++ serendipity_event_creativecommons.php	26 Aug 2004 10:25:09 -0000	1.12
@@ -138,7 +138,7 @@
                     }
                 } elseif ($cc_visibility == 'visible') {
                     $eventData['display_dat'] .= '<a href="'.$license_uri.'">';
-                    $eventData['display_dat'] .= '<img style="border: 0px" alt="Creative Commons License - Some Rights Reserved" src="' . serendipity_getTemplateFile('pixel/somerights20.gif') .'" />';
+                    $eventData['display_dat'] .= '<img style="border: 0px" alt="Creative Commons License - Some Rights Reserved" src="' . serendipity_getTemplateFile('img/somerights20.gif') .'" />';
                     $eventData['display_dat'] .= '</a>';
                     if (serendipity_db_bool($this->get_config('txt', true))) {
                         $eventData['display_dat'] .= '<br />' . str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP);

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.75,1.76

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
At least I needed that fix.

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- serendipity_admin_installer.inc.php	18 Aug 2004 10:15:45 -0000	1.75
+++ serendipity_admin_installer.inc.php	26 Aug 2004 09:13:35 -0000	1.76
@@ -5,6 +5,7 @@
 @define('IN_installer', true);
 
 require_once('serendipity_config.inc.php');
+require_once(S9Y_INCLUDE_PATH . 'serendipity_functions.inc.php');
 require_once(S9Y_INCLUDE_PATH . 'serendipity_functions_installer.inc.php');
 
 if (!isset($_POST['installAction'])) {

[php-blog-cvs] serendipity/templates HOWTO,1.4,1.5

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

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

Modified Files:
	HOWTO 
Log Message:
- Emphasize that you should NOT just copy the images from the default folder
- Explain something about /img and /img/emoticons


Index: HOWTO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/HOWTO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HOWTO	2 Apr 2004 08:32:52 -0000	1.4
+++ HOWTO	25 Aug 2004 22:00:44 -0000	1.5
@@ -20,5 +20,17 @@
     If this file exists (no matter what its contents) the template will not
     be available to be chosen. Remove the file to test and work on the template.
 
-Generally you can just copy the default folder and name it something else. 
-Thereby you have a basis for a new theme and can now begin to modify the default theme to your liking.
+* /img
+    This folder contains images unique to the individual theme. 
+    It is NOT advised for a theme to contain images which is not unique to that theme.
+    Images from the default theme are used as fallback if the image cannot be found in the active template.
+
+* /img/emoticons
+    This folder contains the unique emoticons for the individual theme, these images are used by the emoticon plugin.
+    It is NOT advised for a theme to contain emoticons which is not unique to that theme.
+    Emoticons from the default theme are used as fallback if the image for that emoticon cannot be found in the active template.
+
+
+Generally you can just copy the layout.php, style.css and info.css files from the default folder to a newly created folder of your choice -
+Thereby you have a basis for a new theme and can now begin to modify the this theme to your liking and slowly start copying 
+images from the default folder to your new folder as you find the need for them to change to fit your style.

[php-blog-cvs] serendipity/templates/default/img blank.png,NONE,1.1 delete.png,NONE,1.1 graph_bar_horisontal.png,NONE,1.1 img_align_left.png,NONE,1.1 img_align_right.png,NONE,1.1 img_align_top.png,NONE,1.1 minus.png,NONE,1.1 norights.png,NONE,1.1 plus.png,NONE,1.1 rename.png,NONE,1.1 s9y_banner_small.png,NONE,1.1 scale.png,NONE,1.1 somerights20.gif,NONE,1.1 zoom.png,NONE,1.1

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

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

Added Files:
	blank.png delete.png graph_bar_horisontal.png 
	img_align_left.png img_align_right.png img_align_top.png 
	minus.png norights.png plus.png rename.png 
	s9y_banner_small.png scale.png somerights20.gif zoom.png 
Log Message:
- Move images, previously located in the /pixel folder, to the default template folder - thereby allowing a unique image for each theme
- Nuke some old and unused files in the process


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

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

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

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

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

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

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

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

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

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

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

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

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

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

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.10,1.11

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

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
- Move images, previously located in the /pixel folder, to the default template folder - thereby allowing a unique image for each theme
- Nuke some old and unused files in the process


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_event_creativecommons.php	22 Jun 2004 13:45:43 -0000	1.10
+++ serendipity_event_creativecommons.php	25 Aug 2004 21:50:05 -0000	1.11
@@ -130,7 +130,7 @@
                 if ($license_string == '') {
                     if ($cc_visibility == 'visible') {
                         $eventData['display_dat'] .= '<a href="http://creativecommons.org/licenses/publicdomain">';
-                        $eventData['display_dat'] .= '<img style="border: 0px" alt="No Rights Reserved" src="' . $serendipity['serendipityHTTPPath'] . 'pixel/norights.png" />';
+                        $eventData['display_dat'] .= '<img style="border: 0px" alt="No Rights Reserved" src="' . serendipity_getTemplateFile('img/norights.png') .'" />';
                         $eventData['display_dat'] .= '</a>';
                         if (serendipity_db_bool($this->get_config('txt', true))) {
                             $eventData['display_dat'] .= '<br />' . str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP_PD);
@@ -138,7 +138,7 @@
                     }
                 } elseif ($cc_visibility == 'visible') {
                     $eventData['display_dat'] .= '<a href="'.$license_uri.'">';
-                    $eventData['display_dat'] .= '<img style="border: 0px" alt="Creative Commons License - Some Rights Reserved" src="' . $serendipity['serendipityHTTPPath'] . 'pixel/somerights20.gif" />';
+                    $eventData['display_dat'] .= '<img style="border: 0px" alt="Creative Commons License - Some Rights Reserved" src="' . serendipity_getTemplateFile('pixel/somerights20.gif') .'" />';
                     $eventData['display_dat'] .= '</a>';
                     if (serendipity_db_bool($this->get_config('txt', true))) {
                         $eventData['display_dat'] .= '<br />' . str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP);

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.30,1.31 serendipity_functions.inc.php,1.405,1.406 serendipity_functions_images.inc.php,1.33,1.34 serendipity_functions_installer.inc.php,1.31,1.32 serendipity_sidebar_items.php,1.83,1.84

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

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

Modified Files:
	serendipity_admin_image_selector.php 
	serendipity_functions.inc.php 
	serendipity_functions_images.inc.php 
	serendipity_functions_installer.inc.php 
	serendipity_sidebar_items.php 
Log Message:
- Move images, previously located in the /pixel folder, to the default template folder - thereby allowing a unique image for each theme
- Nuke some old and unused files in the process


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- serendipity_sidebar_items.php	14 Aug 2004 11:54:57 -0000	1.83
+++ serendipity_sidebar_items.php	25 Aug 2004 21:50:05 -0000	1.84
@@ -425,7 +425,7 @@
     function generate_rss_fields(&$title, &$description, &$entries) {
         global $serendipity;
         // Check for a logo to use for an RSS feed. Can either be set by configuring the
-        // syndication plugin OR by just placing a rss_banner.png file in the pixel directory.
+        // syndication plugin OR by just placing a rss_banner.png file in the template directory.
         // If both is not set, we will display our happy own branding. :-)
 
         $bag    = new serendipity_property_bag;
@@ -436,13 +436,13 @@
             $img   = $this->get_config('bannerURL');
             $w     = $this->get_config('bannerWidth');
             $h     = $this->get_config('bannerHeight');
-        } elseif (file_exists($serendipity['serendipityPath'] . 'pixel/rss_banner.png')) {
-            $i = getimagesize($serendipity['serendipityPath'] . 'pixel/rss_banner.png');
-            $img = $serendipity['baseURL'] . 'pixel/rss_banner.png';
+        } elseif (($banner = serendipity_getTemplateFile('img/rss_banner.png', 'serendipityPath'))) {
+            $img = serendipity_getTemplateFile('img/rss_banner.png', 'baseURL');
+            $i = getimagesize($banner);
             $w = $i[0];
             $h = $i[1];
         } else {
-            $img = $serendipity['baseURL'] . 'pixel/s9y_banner_tiny.png';
+            $img = serendipity_getTemplateFile('img/s9y_banner_small.png', 'baseURL');
             $w = 100;
             $h = 21;
         }
@@ -582,7 +582,7 @@
 ?>
 <div class="serendipityPlug">
 <?php if ( $this->get_config('image', 'true') == 'true' ) { ?>
-    <a title="<?php echo $title ?> Serendipity" href="http://www.s9y.org/"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/s9y_banner_tiny.png" alt="s9y php blog system" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> /></a>
+    <a title="<?php echo $title ?> Serendipity" href="http://www.s9y.org/"><img src="<?php echo serendipity_getTemplateFile('img/s9y_banner_small.png') ?>" alt="Serendipity PHP Weblog" <?php echo ($serendipity['XHTML11'] ? 'style="border: 0px"' : 'border="0"'); ?> /></a>
 <?php } ?>
 <?php if ( $this->get_config('text', 'false') == 'true' ) { ?>
     <div>

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_functions_installer.inc.php	18 Aug 2004 10:15:45 -0000	1.31
+++ serendipity_functions_installer.inc.php	25 Aug 2004 21:50:05 -0000	1.32
@@ -320,10 +320,10 @@
     if (document.getElementById) {
         el = document.getElementById(id);
         if (el.style.display == 'none') {
-            document.getElementById('option' + id).src = 'pixel/minus.png';
+            document.getElementById('option' + id).src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>';
             el.style.display = '';
         } else {
-            document.getElementById('option' + id).src = 'pixel/plus.png';
+            document.getElementById('option' + id).src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>';
             el.style.display = 'none';
         }
     }
@@ -334,14 +334,14 @@
     if (document.getElementById) {
         for (i = 1; i <= count; i++) {
             document.getElementById('el' + i).style.display = state;
-            document.getElementById('optionel' + i).src = 'pixel/' + (state == '' ? 'minus.png' : 'plus.png');
+            document.getElementById('optionel' + i).src = (state == '' ? '<?php echo serendipity_getTemplateFile('img/minus.png') ?>' : '<?php echo serendipity_getTemplateFile('img/plus.png') ?>');
         }
 
         if (state == '') {
-            document.getElementById('optionall').src = 'pixel/minus.png';
+            document.getElementById('optionall').src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>';
             state = 'none';
         } else {
-            document.getElementById('optionall').src = 'pixel/plus.png';
+            document.getElementById('optionall').src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>';
             state = '';
         }
     }
@@ -359,7 +359,7 @@
 <?php   }
         if ( sizeof($t['categories']) > 1 ) { ?>
         <div align="right">
-            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/<?php echo ($folding === true ? 'plus' : 'minus'); ?>.png" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
+            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
         }
@@ -373,7 +373,7 @@
 ?>
             <tr>
                 <th align="left" colspan="2" style="padding-left: 15px;">
-                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/<?php echo ($folding === true ? 'plus' : 'minus'); ?>.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $key; ?></a></th>
+                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $key; ?></a></th>
             </tr>
 <?php   } ?>
             <tr>
@@ -766,4 +766,4 @@
 
     return $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/';
 }
-?>
\ No newline at end of file
+?>

Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_functions_images.inc.php	18 Aug 2004 10:15:45 -0000	1.33
+++ serendipity_functions_images.inc.php	25 Aug 2004 21:50:05 -0000	1.34
@@ -825,10 +825,10 @@
                     $popupWidth = ($is_image ? ($file['dimensions_width'] + 20) : 600);
                     $popupHeight = ($is_image ? ($file['dimensions_height'] + 20) : 500);
 ?>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>"   alt="<?php echo MEDIA_RENAME; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
-        <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png"  border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/zoom.png') ?>"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>"   alt="<?php echo MEDIA_RENAME; ?>"   src="<?php echo serendipity_getTemplateFile('img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
+        <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo serendipity_getTemplateFile('img/scale.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo serendipity_getTemplateFile('img/delete.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
 <?php
                 }
 ?>
@@ -1031,4 +1031,4 @@
 
     return $fdim;
 }
-?>
\ No newline at end of file
+?>

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_admin_image_selector.php	9 Aug 2004 10:20:35 -0000	1.30
+++ serendipity_admin_image_selector.php	25 Aug 2004 21:50:04 -0000	1.31
@@ -74,9 +74,9 @@
                 <?php if (empty($serendipity['GET']['filename_only']) || $serendipity['GET']['filename_only'] != 'true') { ?>
                 <b><?php echo IMAGE_ALIGNMENT; ?>:</b>
                 <br />
-                <input type="radio" name="serendipity[align]" value="" />                       <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_top.png"   vspace="5"><br />
-                <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_left.png"  vspace="5"><br />
-                <input type="radio" name="serendipity[align]" value="right" />                  <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_right.png" vspace="5"><br />
+                <input type="radio" name="serendipity[align]" value="" />                       <img src="<?php echo serendipity_getTemplateFile('img/img_align_top.png') ?>"   vspace="5"><br />
+                <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_left.png') ?>"  vspace="5"><br />
+                <input type="radio" name="serendipity[align]" value="right" />                  <img src="<?php echo serendipity_getTemplateFile('img/img_align_right.png') ?>" vspace="5"><br />
                 <br />
 
                 <b><?php echo IMAGE_AS_A_LINK; ?>:</b>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -d -r1.405 -r1.406
--- serendipity_functions.inc.php	25 Aug 2004 06:44:00 -0000	1.405
+++ serendipity_functions.inc.php	25 Aug 2004 21:50:04 -0000	1.406
@@ -2850,7 +2850,7 @@
 <?php
         }
 ?>
-                    <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="option_categoryselector" alt="+/-" border="0" /></a> <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?>
+                    <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/plus.png') ?>" id="option_categoryselector" alt="+/-" border="0" /></a> <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?>
                     <script type="text/javascript" language="JavaScript">
 
                     function toggle_extended(setCookie) {
@@ -2860,14 +2860,14 @@
                         if ( textarea.style.display == 'none' ) {
                             textarea.style.display = '';
                             tools.style.display = '';
-                            button.src = 'pixel/minus.png';
+                            button.src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>';
                             if (setCookie == true) {
                                 document.cookie = 'serendipity[toggle_extended]=true;';
                             }
                         } else {
                             textarea.style.display = 'none';
                             tools.style.display = 'none';
-                            button.src = 'pixel/plus.png';
+                            button.src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>';
                             if (setCookie == true) {
                                 document.cookie = 'serendipity[toggle_extended]=;';
                             }
@@ -2923,7 +2923,7 @@
 
                                 if (el.selectedIndex == -1) el.selectedIndex = 0;
 
-                                document.getElementById('option_' + id).src = 'pixel/plus.png';
+                                document.getElementById('option_' + id).src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>';
                             } else {
                                 selector_store[id] = el.size;
                                 el.size = <?php echo count($cats)+1; ?>;
@@ -2944,7 +2944,7 @@
                                     }
                                 }
 
-                                document.getElementById('option_' + id).src = 'pixel/minus.png';
+                                document.getElementById('option_' + id).src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>';
                             }
                         }
                     }
@@ -3019,7 +3019,7 @@
             <tr>
                 <td colspan="2">
 <?php if (!$serendipity['wysiwyg']) { ?>
-                    <a style="border:0; text-decoration: none" href="#" onclick="toggle_extended(true); return false;" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="option_extended" alt="+/-" border="0" /></a>
+                    <a style="border:0; text-decoration: none" href="#" onclick="toggle_extended(true); return false;" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/plus.png') ?>" id="option_extended" alt="+/-" border="0" /></a>
 <?php } ?> <b><?php echo EXTENDED_BODY; ?></b></td>
                 <td align="right">
                 <?php
@@ -3492,7 +3492,7 @@
 ?>
     <tr>
         <td>
-            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/bar1.png"  height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>"             hspace="0" vspace="0" alt="" /><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" />
+            <img src="<?php echo serendipity_getTemplateFile('img/graph_bar_horisontal.png') ?>"  height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>"             hspace="0" vspace="0" alt="" /><img src="<?php echo serendipity_getTemplateFile('img/blank.png') ?>" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" />
         </td>
         <td>
             <?php echo $months[$y][1] . serendipity_formatTime('%B', $time) . $months[$y][2]; ?>

[php-blog-cvs] serendipity/pixel bar1.png,1.1,NONE blank.png,1.2,NONE delete.png,1.1,NONE frame.xcf,1.1.1.1,NONE img_align_left.png,1.1.1.1,NONE img_align_right.png,1.1.1.1,NONE img_align_top.png,1.1.1.1,NONE minus.png,1.2,NONE norights.png,1.1,NONE plus.png,1.2,NONE rename.png,1.1.1.1,NONE s9y_banner_tiny.png,1.2,NONE scale.png,1.1.1.1,NONE somerights20.gif,1.1,NONE tmp,1.1.1.1,NONE zoom.png,1.1.1.1,NONE

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

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

Removed Files:
	bar1.png blank.png delete.png frame.xcf img_align_left.png 
	img_align_right.png img_align_top.png minus.png norights.png 
	plus.png rename.png s9y_banner_tiny.png scale.png 
	somerights20.gif tmp zoom.png 
Log Message:
- Move images, previously located in the /pixel folder, to the default template folder - thereby allowing a unique image for each theme
- Nuke some old and unused files in the process


--- tmp DELETED ---

--- img_align_right.png DELETED ---

--- norights.png DELETED ---

--- img_align_left.png DELETED ---

--- zoom.png DELETED ---

--- scale.png DELETED ---

--- bar1.png DELETED ---

--- rename.png DELETED ---

--- img_align_top.png DELETED ---

--- somerights20.gif DELETED ---

--- delete.png DELETED ---

--- minus.png DELETED ---

--- s9y_banner_tiny.png DELETED ---

--- frame.xcf DELETED ---

--- blank.png DELETED ---

--- plus.png DELETED ---

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

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

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

Added Files:
	serendipity_event_searchhighlight.php 
Log Message:
Add Search Engine Highlight plugin. 
It will highlight the words used in a search engine to locate your blog.


--- NEW FILE: serendipity_event_searchhighlight.php ---
<?php # $Id: serendipity_event_searchhighlight.php,v 1.1 2004/08/25 16:29:47 tomsommer Exp $

/**********************************/
/*  Authored by Tom Sommer, 2004  */
/**********************************/

switch ($serendipity['lang']) {
    case 'en':
    default:
        @define('PLUGIN_EVENT_SEARCHHIGHLIGHT_NAME',     'Highlight search queries');
        @define('PLUGIN_EVENT_SEARCHHIGHLIGHT_DESC',     'Highlights queries used to locate your page in a search engine');
        break;
}

class serendipity_event_searchhighlight extends serendipity_event
{
    function introspect(&$propbag)
    {
        global $serendipity;

        $propbag->add('name',          PLUGIN_EVENT_SEARCHHIGHLIGHT_NAME);
        $propbag->add('description',   PLUGIN_EVENT_SEARCHHIGHLIGHT_DESC);
        $propbag->add('event_hooks', array('frontend_display' => true, 'css' => 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_SEARCHHIGHLIGHT_NAME;
    }


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

    function loadConstants() {
        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_NONE', 0);
        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_GOOGLE', 1);
        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_YAHOO', 2);
        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_LYCOS', 3);
        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_MSN', 4);
        define('PLUGIN_EVENT_SEARCHHIGHLIGHT_ALTAVISTA', 5);
    }

    function getSearchEngine() {
        $url = parse_url($this->uri);

        /* Patterns should be placed in the order in which they are most likely to occur */
        if ( preg_match('@^(www\.)?google\.@i', $url['host']) ) {
            return PLUGIN_EVENT_SEARCHHIGHLIGHT_GOOGLE;
        }
        if ( preg_match('@^search\.yahoo\.@i', $url['host']) ) {
            return PLUGIN_EVENT_SEARCHHIGHLIGHT_YAHOO;
        }
        if ( preg_match('@^search\.lycos\.@i', $url['host']) ) {
            return PLUGIN_EVENT_SEARCHHIGHLIGHT_LYCOS;
        }
        if ( preg_match('@^search\.msn\.@i', $url['host']) ) {
            return PLUGIN_EVENT_SEARCHHIGHLIGHT_MSN;
        }
        if ( preg_match('@^(www\.)?altavista\.@i', $url['host']) ) {
            return PLUGIN_EVENT_SEARCHHIGHLIGHT_ALTAVISTA;
        }


        return false;
    }

    function getQuery() {
        if ( empty($this->uri) ) {
            return false;
        }

        $this->loadConstants();
        $url = parse_url($this->uri);
        parse_str($url['query'], $pStr);

        switch ( $this->getSearchEngine() ) {
            case PLUGIN_EVENT_SEARCHHIGHLIGHT_GOOGLE :
                $query = $pStr['q'];
                break;

            case PLUGIN_EVENT_SEARCHHIGHLIGHT_YAHOO :
                $query = $pStr['p'];
                break;

            case PLUGIN_EVENT_SEARCHHIGHLIGHT_LYCOS :
                $query = $pStr['query'];
                break;

            case PLUGIN_EVENT_SEARCHHIGHLIGHT_MSN :
                $query = $pStr['q'];
                break;

            case PLUGIN_EVENT_SEARCHHIGHLIGHT_ALTAVISTA :
                $query = $pStr['q'];
                break;

            default:
                return false;
        }

        /* Clean the query */
        $query = trim($query);
        $query = preg_replace('/(\"|\')/i', '', $query);

        /* Split by search engine chars or spaces */
        $words = preg_split('/[\s\,\+\.\-\/\=]+/', $query);

        /* Strip search engine keywords or common words we don't bother to highlight */
        $words = array_diff($words, array('AND', 'OR', 'FROM', 'IN'));

        return $words;
    }


    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;

        $this->uri = $_SERVER['HTTP_REFERER'];
        $hooks = &$bag->get('event_hooks');
        
        if (!isset($hooks[$event])) {
            return false;
        }
        
        if ( $event == 'frontend_display' ) {
            if ( ($queries = $this->getQuery()) === false ) {
                return;
            }

            foreach ($this->markup_elements as $temp) {
                if ( ! (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) ) {
                    continue;
                }
                
                $element = &$eventData[$temp['element']];
                      
                foreach ( $queries as $word ) {
                    /* If the data contains HTML tags, we have to be careful not to break URIs and use a more complex preg */
                    if ( preg_match('/\<.+\>/', $element) ) {
                        $_pattern =  '/(?!<.*?)(\b'. preg_quote($word, '/') .'\b)(?![^<>]*?>)/im';
                    } else {
                        $_pattern = '/(\b'. preg_quote($word, '/') .'\b)/im';
                    }
                    $element = preg_replace($_pattern, '<span class="serendipity_searchQuery">$1</span>', $element);
                } // end foreach
            } // end foreach
            return;
        } // end if


        if ( $event == 'css' ) {
            /* If the user hasn't added a CSS Class called serendipity_searchQuery, we add a pretty one for him */
            if ( strstr($eventData, '.serendipity_searchQuery') === false ) {
                $eventData .= "\n";
                $eventData .= '.serendipity_searchQuery {' . "\n";
                $eventData .= '    background-color: #D81F2A;' . "\n";
                $eventData .= '    color: #FFFFFF;' . "\n";
                $eventData .= '}' . "\n";
            }
            return;
        }

    } // end function
}

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

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

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

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

Modified Files:
	serendipity.css.php 
Log Message:
Allow people to modify the stylesheet by reference


Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity.css.php	30 Jul 2004 15:29:19 -0000	1.31
+++ serendipity.css.php	25 Aug 2004 16:25:24 -0000	1.32
@@ -23,9 +23,9 @@
 
 $out = serendipity_printStylesheet(serendipity_getTemplateFile('style.css', ''));
 
-echo $out;
-
 serendipity_plugin_api::hook_event('css', $out);
 
+echo $out;
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.9,1.10

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

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

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
Use 'emoticons.inc.php' instead of an array inside layout.php, so that the
emoticons can be fetched template-wise from there in the RSS feed as well
(which didn't include layout.php).


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_emoticate.php	23 Aug 2004 18:15:58 -0000	1.9
+++ serendipity_event_emoticate.php	25 Aug 2004 08:58:19 -0000	1.10
@@ -49,22 +49,28 @@
             $conf_array[] = $element['name'];
         }
         $propbag->add('configuration', $conf_array);
-        
+
     }
 
     function getEmoticons() {
         global $serendipity;
 
-        /* Avoid multiple runs of serendipity_getTemplateFile(), 
+        /* Avoid multiple runs of serendipity_getTemplateFile(),
            in other words - if we already have a list of smilies, don't bother looking for another */
-        if ( sizeof($this->smilies) != 0 ) {
+        if (isset($this->smilies) && sizeof($this->smilies) != 0) {
             return $this->smilies;
         }
 
         /* Hijack global variable $serendipity['custom_emoticons'] if it exists */
-        if ( isset($serendipity['custom_emoticons']) && is_array($serendipity['custom_emoticons']) ) {
-            $this->smilies = $serendipity['custom_emoticons'];
-        } else {
+        $hijack_file = serendipity_getTemplateFile('emoticons.inc.php', 'serendipityPath');
+        if (file_exists($hijack_file)) {
+            @include $hijack_file;
+            if (isset($serendipity['custom_emoticons']) && is_array($serendipity['custom_emoticons'])) {
+                $this->smilies = $serendipity['custom_emoticons'];
+            }
+        }
+
+        if (!isset($this->smilies)) {
             $this->smilies = array(
                 ":'("  => serendipity_getTemplateFile('img/emoticons/cry.png'),
 

[php-blog-cvs] serendipity/templates/moz-modern layout.php,1.6,1.7

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

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

Modified Files:
	layout.php 
Log Message:
Use 'emoticons.inc.php' instead of an array inside layout.php, so that the
emoticons can be fetched template-wise from there in the RSS feed as well
(which didn't include layout.php).


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/layout.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- layout.php	24 Aug 2004 07:59:50 -0000	1.6
+++ layout.php	25 Aug 2004 08:58:18 -0000	1.7
@@ -4,20 +4,6 @@
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
-/* To customize smilies with individual images from a theme, you can
-   use an array like this:
-   $serendipity['custom_emoticons'] = array(
-     ":'("  => 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'),
-     ...
-    );
-
-    This will override the default list of emoticons set inside the file
-    plugins/serendipity_event_emoticate/serendipity_event_emoticate.php
-*/
-
 if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
     ob_start();
     serendipity_plugin_api::generate_plugins('left', 'div');

[php-blog-cvs] serendipity/templates/default layout.php,1.19,1.20

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

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

Modified Files:
	layout.php 
Log Message:
Use 'emoticons.inc.php' instead of an array inside layout.php, so that the
emoticons can be fetched template-wise from there in the RSS feed as well
(which didn't include layout.php).


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/layout.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- layout.php	24 Aug 2004 07:59:49 -0000	1.19
+++ layout.php	25 Aug 2004 08:58:18 -0000	1.20
@@ -12,19 +12,6 @@
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
 
-/* To customize smilies with individual images from a theme, you can
-   use an array like this:
-   $serendipity['custom_emoticons'] = array(
-     ":'("  => 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'),
-     ...
-    );
-
-    This will override the default list of emoticons set inside the file
-    plugins/serendipity_event_emoticate/serendipity_event_emoticate.php
-*/
 ?>
 <div id="serendipity_banner">
     <h1><a class="homelink1" href="<?php echo $serendipity['baseURL']; ?>"><?php echo htmlspecialchars($serendipity['blogTitle']) ?></a></h1>

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.12,1.13

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

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

Modified Files:
	layout.php 
Log Message:
Use 'emoticons.inc.php' instead of an array inside layout.php, so that the
emoticons can be fetched template-wise from there in the RSS feed as well
(which didn't include layout.php).


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- layout.php	24 Aug 2004 07:59:50 -0000	1.12
+++ layout.php	25 Aug 2004 08:58:19 -0000	1.13
@@ -9,20 +9,6 @@
 #                                                                        #
 ##########################################################################
 
-/* To customize smilies with individual images from a theme, you can
-   use an array like this:
-   $serendipity['custom_emoticons'] = array(
-     ":'("  => 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'),
-     ...
-    );
-
-    This will override the default list of emoticons set inside the file
-    plugins/serendipity_event_emoticate/serendipity_event_emoticate.php
-*/
-
 $OPENSHADOW = '<table  cellspacing="0" width="100%" cellpadding="0" style="padding:0px">
                  <tr>
                    <td valign="top" align="left" style="padding:10px;border-top:1px solid #cdcdcd; border-left: 1px solid #cdcdcd;">

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.40,1.41

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
allow plugin config type 'text' which will not make use of the
WYSIWYG-editor, can be used for special markup which shall not transfered to
HTML.


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_admin_plugins.inc.php	28 Jul 2004 19:06:54 -0000	1.40
+++ serendipity_admin_plugins.inc.php	25 Aug 2004 07:47:31 -0000	1.41
@@ -480,6 +480,7 @@
                 break;
 
             case 'html':
+            case 'text':
 ?>
         <tr>
             <td colspan="2"><strong><?php echo $cname; ?></strong>
@@ -495,8 +496,11 @@
             </td>
         </tr>
 <?php
-                serendipity_emit_htmlarea_code('nugget', 'nugget');
+                if ($cbag->get('type') == 'html') {
+                    serendipity_emit_htmlarea_code('nugget', 'nugget');
+                }
                 break;
+
             case 'hidden':
                 ?><tr><td colspan="2"><input type="hidden" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $cbag->get('value'); ?>" /></td></tr><?php
                 break;

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments serendipity_plugin_comments.php,1.23,1.24

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

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

Modified Files:
	serendipity_plugin_comments.php 
Log Message:
strip tags from comment plugin; bbcode may get transfered to a link and may
be split because of the wordwrapping and leave unvalidatable HTML. So we
strip every markup apart from linebreaks and img's here.



Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_plugin_comments.php	24 Aug 2004 17:33:04 -0000	1.23
+++ serendipity_plugin_comments.php	25 Aug 2004 07:45:55 -0000	1.24
@@ -143,7 +143,6 @@
 
                 $entry = array('comment' => wordwrap($comment, $wordwrap, "\n", 1));
                 serendipity_plugin_api::hook_event('frontend_display', $entry);
-
                 printf(
                   PLUGIN_COMMENTS_ABOUT,
 
@@ -152,7 +151,7 @@
                       . htmlspecialchars($row['subject'])
                       . '</a><br />' . "\n"
                       . htmlspecialchars(strftime($dateformat, $row['stamp'])) . '<br />' . "\n"
-                      . $entry['comment']
+                      . strip_tags($entry['comment'], '<br><img>')
                       . '<br /><br /><br />' . "\n\n"
                 );
             }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.404,1.405

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Remove superfluous quote characters from comment and trackback links which were preventing validation.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -d -r1.404 -r1.405
--- serendipity_functions.inc.php	24 Aug 2004 17:32:46 -0000	1.404
+++ serendipity_functions.inc.php	25 Aug 2004 06:44:00 -0000	1.405
@@ -1234,7 +1234,7 @@
                         $label = $entry['comments'] == 1 ? COMMENT : COMMENTS;
                         if ($serendipity['enablePopup']) {
                             $uriExtra = ' onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;"';
-                            $commentUri = $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=comments"';
+                            $commentUri = $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=comments';
                         } else {
                             $uriExtra = '';
                             $commentUri = $entryLink .'#comments';
@@ -1248,7 +1248,7 @@
                         $label = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS;
                         if ($serendipity['enablePopup']) {
                             $uriExtra = ' onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;"';
-                            $trackbackUri = $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=trackbacks"';
+                            $trackbackUri = $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=trackbacks';
                         } else {
                             $uriExtra = '';
                             $trackbackUri = $entryLink .'#trackbacks';

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

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

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

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