php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/sql db.sql,1.24,1.25

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

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

Modified Files:
	db.sql 
Log Message:
Rewrote how s9y fetches external plugins: The path setting is now irrelevant,
only filenames count. They can be placed in any subdirectory as long as their
name matches *_(plugin|event)_*.php. This allows plugin authors to put one
ore more event/sidebar plugin into one bundled directory and reduces swamping
the plugins directory.
Needed to adjust several calls, but it seems to work well.
Requires DB scheme update.


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- db.sql	3 Dec 2004 10:07:43 -0000	1.24
+++ db.sql	6 Dec 2004 10:46:32 -0000	1.25
@@ -143,6 +143,7 @@
   placement varchar(6) not null default 'right',
   sort_order int(4) not null default '0',
   authorid int(11) default '0',
+  path varchar(255) default null
   PRIMARY KEY(name)
 );
 

[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.5,1.6

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

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

Modified Files:
	plugins.inc.php 
Log Message:
Rewrote how s9y fetches external plugins: The path setting is now irrelevant,
only filenames count. They can be placed in any subdirectory as long as their
name matches *_(plugin|event)_*.php. This allows plugin authors to put one
ore more event/sidebar plugin into one bundled directory and reduces swamping
the plugins directory.
Needed to adjust several calls, but it seems to work well.
Requires DB scheme update.


Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- plugins.inc.php	3 Dec 2004 14:46:50 -0000	1.5
+++ plugins.inc.php	6 Dec 2004 10:46:32 -0000	1.6
@@ -499,21 +499,22 @@
 
     $errorstack = $pluginstack = array();
     $classes = serendipity_plugin_api::enum_plugin_classes(($serendipity['GET']['type'] == 'event'));
-    foreach ($classes as $class_name) {
-        $plugin =& serendipity_plugin_api::load_plugin($class_name);
+    foreach ($classes as $class_data) {
+        $plugin =& serendipity_plugin_api::load_plugin($class_data['name'], null, $class_data['pluginPath']);
         if (is_object($plugin)) {
             $bag = new serendipity_property_bag;
             $plugin->introspect($bag);
-            $pluginstack[] = array('plugin_class'   => $class_name,
+            $pluginstack[] = array('plugin_class'   => $class_data['name'],
                                    'class_name'     => get_class($plugin),
                                    'name'           => $bag->get('name'),
                                    'desc'           => $bag->get('description'),
-                                   'installable'    => !($bag->get('stackable') === false && in_array($class_name, $plugins)),
+                                   'installable'    => !($bag->get('stackable') === false && in_array($class_data['name'], $plugins)),
                                    'author'         => $bag->get('author'),
                                    'version'        => $bag->get('version'),
-                                   'website'        => $bag->get('website'));
+                                   'website'        => $bag->get('website'),
+                                   'pluginPath'     => $class_data['pluginPath']);
         } else {
-            $errorstack[] = $class_name;
+            $errorstack[] = $class_data['name'];
         }
     }
     usort($pluginstack, 'serendipity_pluginListSort');
@@ -542,7 +543,7 @@
                     <td><strong><?php echo $plug['name'] ?></strong></td>
                     <td width="100" align="center" valign="middle" rowspan="3">
                         <?php if ( $plug['installable'] == true ) { ?>
-                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] ?>"><?php echo INSTALL ?></a>
+                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] ?>"><?php echo INSTALL ?></a>
                         <?php } else { ?>
                             <span style="color: #cccccc"><?php echo ALREADY_INSTALLED ?></span>
                         <?php } ?>
@@ -588,7 +589,7 @@
             $authorid = '0';
         }
 
-        $inst = serendipity_plugin_api::create_plugin_instance($serendipity['GET']['install_plugin'], null, (serendipity_plugin_api::is_event_plugin($serendipity['GET']['install_plugin']) ? 'event': 'right'), $authorid);
+        $inst = serendipity_plugin_api::create_plugin_instance($serendipity['GET']['install_plugin'], null, (serendipity_plugin_api::is_event_plugin($serendipity['GET']['install_plugin']) ? 'event': 'right'), $authorid, serendipity_db_escape_string($serendipity['GET']['pluginPath']));
 
         /* Load the new plugin */
         $plugin = &serendipity_plugin_api::load_plugin($inst);

[php-blog-cvs] serendipity/include plugin_api.inc.php,1.6,1.7

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

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

Modified Files:
	plugin_api.inc.php 
Log Message:
Rewrote how s9y fetches external plugins: The path setting is now irrelevant,
only filenames count. They can be placed in any subdirectory as long as their
name matches *_(plugin|event)_*.php. This allows plugin authors to put one
ore more event/sidebar plugin into one bundled directory and reduces swamping
the plugins directory.
Needed to adjust several calls, but it seems to work well.
Requires DB scheme update.


Index: plugin_api.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plugin_api.inc.php	27 Nov 2004 22:14:14 -0000	1.6
+++ plugin_api.inc.php	6 Dec 2004 10:46:32 -0000	1.7
@@ -57,7 +57,7 @@
      * of the same class, then the persistent state will be copied.
      * This allows the user to clone a plugin.
      */
-    function create_plugin_instance($plugin_class_id, $copy_from_instance = null, $default_placement = 'right', $authorid = '0')
+    function create_plugin_instance($plugin_class_id, $copy_from_instance = null, $default_placement = 'right', $authorid = '0', $pluginPath = '')
     {
         global $serendipity;
 
@@ -65,6 +65,9 @@
 
         $key = $plugin_class_id . ':' . $id;
 
+        // Secure Plugin path. Only one directory level allowed.
+        $pluginPath = str_replace('/', '', serendipity_db_escape_string($pluginPath));
+
         $rs = serendipity_db_query("SELECT MAX(sort_order) as sort_order_max FROM {$serendipity['dbPrefix']}plugins WHERE placement = '$default_placement'", true, 'num');
 
         if (is_array($rs)) {
@@ -73,15 +76,19 @@
             $nextidx = 0;
         }
 
-        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order, placement, authorid) values ('$key', $nextidx, '$default_placement', '$authorid')");
+        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}plugins (name, sort_order, placement, authorid, path) values ('$key', $nextidx, '$default_placement', '$authorid', '$pluginPath')");
 
         /* Check for multiple dependencies */
-        $plugin =& serendipity_plugin_api::load_plugin($key, $authorid);
-        $bag    = new serendipity_property_bag;
-        $plugin->introspect($bag);
-        serendipity_plugin_api::get_event_plugins(false, true); // Refresh static list of plugins to allow execution of added plugin
-        $plugin->register_dependencies(false, $authorid);
-        $plugin->install();
+        $plugin =& serendipity_plugin_api::load_plugin($key, $authorid, $pluginPath);
+        if (is_object($plugin)) {
+            $bag    = new serendipity_property_bag;
+            $plugin->introspect($bag);
+            serendipity_plugin_api::get_event_plugins(false, true); // Refresh static list of plugins to allow execution of added plugin
+            $plugin->register_dependencies(false, $authorid);
+            $plugin->install();
+        } else {
+            echo ERROR . ': ' . $key . ' (' . $pluginPath . ')<br />';
+        }
 
         return $key;
     }
@@ -117,7 +124,7 @@
     }
 
     /* Retrieves a list of available plugins */
-    function enum_plugin_classes($event_only = false)
+    function &enum_plugin_classes($event_only = false)
     {
         global $serendipity;
 
@@ -135,80 +142,71 @@
                 $p = get_parent_class($p);
             }
 
-            if ($p == 'serendipity_plugin' && $class_name != 'serendipity_event' && !$event_only ) {
-                $classes[] = '@' . $class_name;
-            } elseif ($p == 'serendipity_event' && $class_name != 'serendipity_event' && $event_only) {
-                $classes[] = '@' . $class_name;
+            if ($p == 'serendipity_plugin' && $class_name != 'serendipity_event' && (!$event_only || is_null($event_only))) {
+                $classes[$class_name] = array('name'       => '@' . $class_name,
+                                              'pluginPath' => '');
+            } elseif ($p == 'serendipity_event' && $class_name != 'serendipity_event' && ($event_only || is_null($event_only))) {
+                $classes[$class_name] = array('name'       => '@' . $class_name,
+                                              'pluginPath' => '');
             }
         }
 
         /* GLOBAL third-party classes next */
         $ppath = serendipity_getRealDir(__FILE__) . 'plugins';
-        $d = opendir($ppath);
+        serendipity_plugin_api::traverse_plugin_dir($ppath, $classes, $event_only);
+
+        /* LOCAL third-party classes next */
+        $local_ppath = $serendipity['serendipityPath'] . 'plugins';
+        if ($ppath != $local_ppath) {
+            serendipity_plugin_api::traverse_plugin_dir($local_path, $classes, $event_only);
+        }
+
+        return $classes;
+    }
+
+    function traverse_plugin_dir($ppath, &$classes, $event_only) {
+        $d = @opendir($ppath);
         if ($d) {
             while (($f = readdir($d)) !== false) {
-                if ($f{0} == '.' || $f == 'CVS') {
-                    continue;
-                }
-
-                if ($event_only && !serendipity_plugin_api::is_event_plugin($f)) {
+                if ($f{0} == '.' || $f == 'CVS' || !is_dir($ppath . '/' . $f)) {
                     continue;
                 }
 
-                if (!$event_only && serendipity_plugin_api::is_event_plugin($f)) {
+                $subd = opendir($ppath . '/' . $f);
+                if (!$subd) {
                     continue;
                 }
 
-                $existing = array_search('@' . $f, $classes);
-                if ($existing !== null && $existing !== false) {
-                    // If an external plugin/event already exists as internal, remove the internal reference because its redundant
-                    unset($classes[$existing]);
-                }
-
-                if (file_exists($ppath . '/' . $f . '/' . $f . '.php')) {
-                    $classes[] = $f;
-                }
-            }
-        }
-
-        /* LOCAL third-party classes next */
-        $local_ppath = $serendipity['serendipityPath'] . 'plugins';
-        if ($ppath != $local_ppath) {
-            $d = @opendir($local_ppath);
-            if ($d) {
-                while (($f = readdir($d)) !== false) {
-                    if ($f{0} == '.' || $f == 'CVS') {
+                // Instead of only looking for directories, search for whiles within subdirectories
+                while (($subf = readdir($subd)) !== false) {
+                    if (!preg_match('@^[^_]+_(event|plugin)_.+\.php$@i', $subf)) {
                         continue;
                     }
 
-                    if ($event_only && !serendipity_plugin_api::is_event_plugin($f)) {
-                        continue;
+                    // If an external plugin/event already exists as internal, remove the internal reference because its redundant
+                    if (isset($classes['@' . $subf])) {
+                        unset($classes['@' . $subf]);
                     }
 
-                    if (!$event_only && serendipity_plugin_api::is_event_plugin($f)) {
-                        continue;
+                    // A local plugin will be preferred over general plugins [used when calling this function the second time]
+                    if (isset($classes[$subf])) {
+                        unset($classes[$subf]);
                     }
 
-                    $existing = array_search('@' . $f, $classes);
-                    if ($existing !== null && $existing !== false) {
-                        // If an external plugin/event already exists as internal, remove the internal reference because its redundant
-                        unset($classes[$existing]);
+                    if (!is_null($event_only) && $event_only && !serendipity_plugin_api::is_event_plugin($subf)) {
+                        continue;
                     }
 
-                    $existing = array_search($f, $classes);
-                    if ($existing !== null && $existing !== false) {
-                        // A local plugin will be preferred over general plugins
-                        unset($classes[$existing]);
+                    if (!is_null($event_only) && !$event_only && serendipity_plugin_api::is_event_plugin($subf)) {
+                        continue;
                     }
 
-                    if (file_exists($local_ppath . '/' . $f . '/' . $f . '.php')) {
-                        $classes[] = $f;
-                    }
+                    $class_name = str_replace('.php', '', $subf);
+                    $classes[$class_name] = array('name'       => $class_name,
+                                                  'pluginPath' => $f);
                 }
             }
         }
-
-        return $classes;
     }
 
     function get_installed_plugins($filter = '*') {
@@ -268,7 +266,7 @@
     }
 
     /* Creates an instance of a named plugin */
-    function &load_plugin($instance_id, $authorid = null)
+    function &load_plugin($instance_id, $authorid = null, $pluginPath = '')
     {
         global $serendipity;
 
@@ -280,11 +278,23 @@
         } else {
             /* plugin from the plugins/ dir */
             if (!class_exists($name)) {
+                if (empty($pluginPath)) {
+                    $sql = "SELECT path from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'";
+                    $plugdata = serendipity_db_query($sql, true);
+                    if (is_array($plugdata) && isset($plugdata[0])) {
+                        $pluginPath = $plugdata[0];
+                    }
+
+                    if (empty($pluginPath)) {
+                        $pluginPath = $name;
+                    }
+                }
+
                 // First try the local path, and then (if existing) a shared library repository ...
-                if (file_exists($serendipity['serendipityPath'] . 'plugins/' . $name . '/' . $name . '.php')) {
-                    include $serendipity['serendipityPath'] . 'plugins/' . $name . '/' . $name . '.php';
-                } elseif (file_exists(S9Y_INCLUDE_PATH . 'plugins/' . $name . '/' . $name . '.php')) {
-                    include S9Y_INCLUDE_PATH . 'plugins/' . $name . '/' . $name . '.php';
+                if (file_exists($serendipity['serendipityPath'] . 'plugins/' . $pluginPath . '/' . $name . '.php')) {
+                    include $serendipity['serendipityPath'] . 'plugins/' . $pluginPath . '/' . $name . '.php';
+                } elseif (file_exists(S9Y_INCLUDE_PATH . 'plugins/' . $pluginPath . '/' . $name . '.php')) {
+                    include S9Y_INCLUDE_PATH . 'plugins/' . $pluginPath . '/' . $name . '.php';
                 }
 
                 if (!class_exists($name)) {
@@ -301,7 +311,9 @@
         } else {
             $sql = "SELECT authorid from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'";
             $owner = serendipity_db_query($sql, true);
-            $p->serendipity_owner = $owner[0];
+            if (is_array($owner) && isset($owner[0])) {
+                $p->serendipity_owner = $owner[0];
+            }
         }
 
         return $p;
@@ -352,7 +364,7 @@
 
         $pluginData = array();
         foreach ($plugins as $plugin_data) {
-            $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']);
+            $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid'], $plugin_data['path']);
             $class  = get_class($plugin);
             $title  = '';
 
@@ -438,7 +450,7 @@
 
         $event_plugins = array();
         foreach($plugins AS $plugin_data) {
-            if ($event_plugins[$plugin_data['name']]['p'] = &serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid'])) {
+            if ($event_plugins[$plugin_data['name']]['p'] = &serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid'], $plugin_data['path'])) {
                 /* query for its name, description and configuration data */
                 $event_plugins[$plugin_data['name']]['b'] = new serendipity_property_bag;
                 $event_plugins[$plugin_data['name']]['p']->introspect($event_plugins[$plugin_data['name']]['b']);
@@ -502,6 +514,21 @@
 
         return false;
     }
+
+    function &autodetect_instance($plugin_name, $authorid, $is_event_plugin = false) {
+        if ($is_event_plugin) {
+            $side = 'event';
+        } else {
+            $side = 'right';
+        }
+
+        $classes = serendipity_plugin_api::enum_plugin_classes(null);
+        if (isset($classes[$plugin_name])) {
+            return serendipity_plugin_api::create_plugin_instance($plugin_name, null, $side, $authorid, $classes[$plugin_name]['pluginPath']);
+        } else {
+            return false;
+        }
+    }
 }
 
 /* holds a bunch of properties; since serendipity 0.8 only one value per key is allowed [was never really useful] */
@@ -668,9 +695,9 @@
                     $exists = serendipity_plugin_api::exists($dependency);
                     if (!$exists) {
                         if (serendipity_plugin_api::is_event_plugin($dependency)) {
-                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'event', $authorid);
+                            $keys[] = serendipity_plugin_api::autodetect_instance($dependency, $authorid, true);
                         } else {
-                            $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'right', $authorid);
+                            $keys[] = serendipity_plugin_api::autodetect_instance($dependency, $authorid, false);
                         }
                     } else {
                         $keys[] = $exists;

[php-blog-cvs] serendipity/docs NEWS,1.22,1.23

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

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

Modified Files:
	NEWS 
Log Message:
Rewrote how s9y fetches external plugins: The path setting is now irrelevant,
only filenames count. They can be placed in any subdirectory as long as their
name matches *_(plugin|event)_*.php. This allows plugin authors to put one
ore more event/sidebar plugin into one bundled directory and reduces swamping
the plugins directory.
Needed to adjust several calls, but it seems to work well.
Requires DB scheme update.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- NEWS	3 Dec 2004 10:07:41 -0000	1.22
+++ NEWS	6 Dec 2004 10:46:31 -0000	1.23
@@ -3,6 +3,11 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * More than one plugin cannow be saved per plugin/ subdirectory,
+      event + sidebar plugins can be put together in one directory.
+      Names of subdirectores are irrelevant now, but the filenames
+      need to match 'serendipity_(event|plugin)_*.php'. (garvinhicking)
+
     * When entering a comment, the referring URL to the blog is saved
       (garvinhicking)
 

[php-blog-cvs] serendipity serendipity_config.inc.php,1.108,1.109

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Rewrote how s9y fetches external plugins: The path setting is now irrelevant,
only filenames count. They can be placed in any subdirectory as long as their
name matches *_(plugin|event)_*.php. This allows plugin authors to put one
ore more event/sidebar plugin into one bundled directory and reduces swamping
the plugins directory.
Needed to adjust several calls, but it seems to work well.
Requires DB scheme update.


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- serendipity_config.inc.php	3 Dec 2004 10:07:37 -0000	1.108
+++ serendipity_config.inc.php	6 Dec 2004 10:46:30 -0000	1.109
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
-$serendipity['version']         = '0.8-alpha5';
+$serendipity['version']         = '0.8-alpha6';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = true; // Setting this to 'false' will enable debugging output
 $serendipity['rewrite']         = 'none';

[php-blog-cvs] serendipity/plugins/serendipity_event_entryproperties serendipity_event_entryproperties.php,1.5,1.6

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

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

Modified Files:
	serendipity_event_entryproperties.php 
Log Message:
new item list style


Index: serendipity_event_entryproperties.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_event_entryproperties.php	2 Dec 2004 10:55:01 -0000	1.5
+++ serendipity_event_entryproperties.php	6 Dec 2004 10:08:59 -0000	1.6
@@ -158,7 +158,7 @@
                 case 'backend_sidebar_entries':
                     if ($is_cache) {
 ?>
-                        &bull; <a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=buildcache"><?php echo PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE; ?></a><br />
+                        <li><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=buildcache"><?php echo PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE; ?></a></li>
 <?php
                     }
                     return true;

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.16,1.17

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

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

Modified Files:
	serendipity_event_statistics.php 
Log Message:
new item list style


Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_event_statistics.php	2 Dec 2004 10:55:04 -0000	1.16
+++ serendipity_event_statistics.php	6 Dec 2004 10:09:01 -0000	1.17
@@ -160,7 +160,7 @@
                 case 'backend_sidebar_entries':
                     // if ($serendipity['serendipityUserlevel'] >= USERLEVEL_EDITOR) {
 ?>
-                        &bull; <a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=statistics"><?php echo PLUGIN_EVENT_STATISTICS_NAME; ?></a><br />
+                        <li><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=statistics"><?php echo PLUGIN_EVENT_STATISTICS_NAME; ?></a></li>
 <?php
                     // }
 

Re: [php-blog-cvs] serendipity/templates/default/admin style.css, 1.6,1.7

[Garvin H. <squ...@su...>]

Hi Sebastian!

> improved accessibility and layout (no more silly text floating around bullets)

This breaks any plugin using hooks to embed additional menu items, like
entryproperties or statistics. Those menuitems look different to the li items
then.

I'm going to fix this for our bundled plugins, but I would kindly ask you to
think about such things first.

Regards,
Garvin.

-- 
++ Garvin Hicking | Web-Entwickler [PHP]    | www.supergarv.de | ICQ 21392242
++ Developer of   | www.phpMyAdmin.net      | www.s9y.org

++ Make me happy  | http://wishes.garv.info

[php-blog-cvs] serendipity/include/admin images.inc.php,1.3,1.4

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

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

Modified Files:
	images.inc.php 
Log Message:
now that we have the needed pear classes anyway, we could use http_request and make it possible to fetch remote images even if allow_furl_open is disabled.

Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- images.inc.php	27 Nov 2004 22:14:15 -0000	1.3
+++ images.inc.php	6 Dec 2004 09:28:36 -0000	1.4
@@ -122,10 +122,15 @@
         if (file_exists($target)) {
             echo '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY;
         } else {
-            // Fetch file
-            if (!$fContent = @file_get_contents($serendipity['POST']['imageurl']) ) {
+            require_once "HTTP/Request.php";
+            $req = &new HTTP_Request($serendipity['POST']['imageurl']);
+            // Try to get the URL
+
+            if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
                 printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['imageurl']);
             } else {
+                // Fetch file
+                $fContent = $req->getResponseBody();
                 $fp = fopen($target, 'w');
                 fwrite($fp, $fContent);
                 fclose($fp);

[php-blog-cvs] serendipity/bundled-libs/HTTP Request.php,NONE,1.1

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/HTTP
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24895/bundled-libs/HTTP

Added Files:
	Request.php 
Log Message:
added dependencies for Net_DNSBL_SURBL

--- NEW FILE: Request.php ---
<?php
// +-----------------------------------------------------------------------+
// | Copyright (c) 2002-2003, Richard Heyes                                |
// | All rights reserved.                                                  |
// |                                                                       |
// | Redistribution and use in source and binary forms, with or without    |
// | modification, are permitted provided that the following conditions    |
// | are met:                                                              |
// |                                                                       |
// | o Redistributions of source code must retain the above copyright      |
// |   notice, this list of conditions and the following disclaimer.       |
// | o Redistributions in binary form must reproduce the above copyright   |
// |   notice, this list of conditions and the following disclaimer in the |
// |   documentation and/or other materials provided with the distribution.|
// | o The names of the authors may not be used to endorse or promote      |
// |   products derived from this software without specific prior written  |
// |   permission.                                                         |
// |                                                                       |
// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
[...1093 lines suppressed...]
        return $data;
    }


   /**
    * Notifies all registered listeners of an event.
    * 
    * @param    string  Event name
    * @param    mixed   Additional data
    * @access   private
    * @see HTTP_Request::_notify()
    */
    function _notify($event, $data = null)
    {
        foreach (array_keys($this->_listeners) as $id) {
            $this->_listeners[$id]->update($this, $event, $data);
        }
    }
} // End class HTTP_Response
?>

[php-blog-cvs] serendipity/bundled-libs/Net Socket.php,NONE,1.1 URL.php,NONE,1.1

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/Net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24895/bundled-libs/Net

Added Files:
	Socket.php URL.php 
Log Message:
added dependencies for Net_DNSBL_SURBL

--- NEW FILE: URL.php ---
<?php
// +-----------------------------------------------------------------------+
// | Copyright (c) 2002-2004, Richard Heyes                                |
// | All rights reserved.                                                  |
// |                                                                       |
// | Redistribution and use in source and binary forms, with or without    |
// | modification, are permitted provided that the following conditions    |
// | are met:                                                              |
// |                                                                       |
// | o Redistributions of source code must retain the above copyright      |
// |   notice, this list of conditions and the following disclaimer.       |
// | o Redistributions in binary form must reproduce the above copyright   |
// |   notice, this list of conditions and the following disclaimer in the |
// |   documentation and/or other materials provided with the distribution.|
// | o The names of the authors may not be used to endorse or promote      |
// |   products derived from this software without specific prior written  |
// |   permission.                                                         |
// |                                                                       |
// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
// |                                                                       |
// +-----------------------------------------------------------------------+
// | Author: Richard Heyes <richard at php net>                            |
// +-----------------------------------------------------------------------+
//
// $Id: URL.php,v 1.1 2004/12/06 09:18:23 nohn Exp $
//
// Net_URL Class

class Net_URL
{
    /**
    * Full url
    * @var string
    */
    var $url;

    /**
    * Protocol
    * @var string
    */
    var $protocol;

    /**
    * Username
    * @var string
    */
    var $username;

    /**
    * Password
    * @var string
    */
    var $password;

    /**
    * Host
    * @var string
    */
    var $host;

    /**
    * Port
    * @var integer
    */
    var $port;

    /**
    * Path
    * @var string
    */
    var $path;

    /**
    * Query string
    * @var array
    */
    var $querystring;

    /**
    * Anchor
    * @var string
    */
    var $anchor;

    /**
    * Whether to use []
    * @var bool
    */
    var $useBrackets;

    /**
    * PHP4 Constructor
    *
    * @see __construct()
    */
    function Net_URL($url = null, $useBrackets = true)
    {
        $this->__construct($url, $useBrackets);
    }

    /**
    * PHP5 Constructor
    *
    * Parses the given url and stores the various parts
    * Defaults are used in certain cases
    *
    * @param string $url         Optional URL
    * @param bool   $useBrackets Whether to use square brackets when
    *                            multiple querystrings with the same name
    *                            exist
    */
    function __construct($url = null, $useBrackets = true)
    {
        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];

        $this->useBrackets = $useBrackets;
        $this->url         = $url;
        $this->user        = '';
        $this->pass        = '';
        $this->host        = '';
        $this->port        = 80;
        $this->path        = '';
        $this->querystring = array();
        $this->anchor      = '';

        // Only use defaults if not an absolute URL given
        if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {

            $this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');

            /**
            * Figure out host/port
            */
            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
                $host = $matches[1];
                if (!empty($matches[3])) {
                    $port = $matches[3];
                } else {
                    $port = $this->getStandardPort($this->protocol);
                }
            }

            $this->user        = '';
            $this->pass        = '';
            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
            $this->anchor      = '';
        }

        // Parse the url and store the various parts
        if (!empty($url)) {
            $urlinfo = parse_url($url);

            // Default querystring
            $this->querystring = array();

            foreach ($urlinfo as $key => $value) {
                switch ($key) {
                    case 'scheme':
                        $this->protocol = $value;
                        $this->port     = $this->getStandardPort($value);
                        break;

                    case 'user':
                    case 'pass':
                    case 'host':
                    case 'port':
                        $this->$key = $value;
                        break;

                    case 'path':
                        if ($value{0} == '/') {
                            $this->path = $value;
                        } else {
                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
                            $this->path = sprintf('%s/%s', $path, $value);
                        }
                        break;

                    case 'query':
                        $this->querystring = $this->_parseRawQueryString($value);
                        break;

                    case 'fragment':
                        $this->anchor = $value;
                        break;
                }
            }
        }
    }

    /**
    * Returns full url
    *
    * @return string Full url
    * @access public
    */
    function getURL()
    {
        $querystring = $this->getQueryString();

        $this->url = $this->protocol . '://'
                   . $this->user . (!empty($this->pass) ? ':' : '')
                   . $this->pass . (!empty($this->user) ? '@' : '')
                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
                   . $this->path
                   . (!empty($querystring) ? '?' . $querystring : '')
                   . (!empty($this->anchor) ? '#' . $this->anchor : '');

        return $this->url;
    }

    /**
    * Adds a querystring item
    *
    * @param  string $name       Name of item
    * @param  string $value      Value of item
    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
    * @access public
    */
    function addQueryString($name, $value, $preencoded = false)
    {
        if ($preencoded) {
            $this->querystring[$name] = $value;
        } else {
            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
        }
    }

    /**
    * Removes a querystring item
    *
    * @param  string $name Name of item
    * @access public
    */
    function removeQueryString($name)
    {
        if (isset($this->querystring[$name])) {
            unset($this->querystring[$name]);
        }
    }

    /**
    * Sets the querystring to literally what you supply
    *
    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
    * @access public
    */
    function addRawQueryString($querystring)
    {
        $this->querystring = $this->_parseRawQueryString($querystring);
    }

    /**
    * Returns flat querystring
    *
    * @return string Querystring
    * @access public
    */
    function getQueryString()
    {
        if (!empty($this->querystring)) {
            foreach ($this->querystring as $name => $value) {
                if (is_array($value)) {
                    foreach ($value as $k => $v) {
                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
                    }
                } elseif (!is_null($value)) {
                    $querystring[] = $name . '=' . $value;
                } else {
                    $querystring[] = $name;
                }
            }
            $querystring = implode(ini_get('arg_separator.output'), $querystring);
        } else {
            $querystring = '';
        }

        return $querystring;
    }

    /**
    * Parses raw querystring and returns an array of it
    *
    * @param  string  $querystring The querystring to parse
    * @return array                An array of the querystring data
    * @access private
    */
    function _parseRawQuerystring($querystring)
    {
        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
        $return = array();

        foreach ($parts as $part) {
            if (strpos($part, '=') !== false) {
                $value = substr($part, strpos($part, '=') + 1);
                $key   = substr($part, 0, strpos($part, '='));
            } else {
                $value = null;
                $key   = $part;
            }
            if (substr($key, -2) == '[]') {
                $key = substr($key, 0, -2);
                if (@!is_array($return[$key])) {
                    $return[$key]   = array();
                    $return[$key][] = $value;
                } else {
                    $return[$key][] = $value;
                }
            } elseif (!$this->useBrackets AND !empty($return[$key])) {
                $return[$key]   = (array)$return[$key];
                $return[$key][] = $value;
            } else {
                $return[$key] = $value;
            }
        }

        return $return;
    }

    /**
    * Resolves //, ../ and ./ from a path and returns
    * the result. Eg:
    *
    * /foo/bar/../boo.php    => /foo/boo.php
    * /foo/bar/../../boo.php => /boo.php
    * /foo/bar/.././/boo.php => /foo/boo.php
    *
    * This method can also be called statically.
    *
    * @param  string $url URL path to resolve
    * @return string      The result
    */
    function resolvePath($path)
    {
        $path = explode('/', str_replace('//', '/', $path));

        for ($i=0; $i<count($path); $i++) {
            if ($path[$i] == '.') {
                unset($path[$i]);
                $path = array_values($path);
                $i--;

            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
                unset($path[$i]);
                unset($path[$i-1]);
                $path = array_values($path);
                $i -= 2;

            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
                unset($path[$i]);
                $path = array_values($path);
                $i--;

            } else {
                continue;
            }
        }

        return implode('/', $path);
    }

    /**
    * Returns the standard port number for a protocol
    *
    * @param  string  $scheme The protocol to lookup
    * @return integer         Port number or NULL if no scheme matches
    *
    * @author Philippe Jausions <Phi...@11...>
    */
    function getStandardPort($scheme)
    {
        switch (strtolower($scheme)) {
            case 'http':    return 80;
            case 'https':   return 443;
            case 'ftp':     return 21;
            case 'imap':    return 143;
            case 'imaps':   return 993;
            case 'pop3':    return 110;
            case 'pop3s':   return 995;
            default:        return null;
       }
    }

    /**
    * Forces the URL to a particular protocol
    *
    * @param string  $protocol Protocol to force the URL to
    * @param integer $port     Optional port (standard port is used by default)
    */
    function setProtocol($protocol, $port = null)
    {
        $this->protocol = $protocol;
        $this->port = is_null($port) ? $this->getStandardPort() : $port;
    }

}
?>

--- NEW FILE: Socket.php ---
<?php
//
// +----------------------------------------------------------------------+
// | PHP Version 4                                                        |
// +----------------------------------------------------------------------+
// | Copyright (c) 1997-2003 The PHP Group                                |
// +----------------------------------------------------------------------+
// | This source file is subject to version 2.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available at through the world-wide-web at                           |
// | http://www.php.net/license/2_02.txt.                                 |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Stig Bakken <ss...@ph...>                                   |
// |          Chuck Hagenbuch <ch...@ho...>                           |
// +----------------------------------------------------------------------+
//
// $Id: Socket.php,v 1.1 2004/12/06 09:18:23 nohn Exp $
//

require_once 'PEAR.php';

/**
 * Generalized Socket class. More docs to be written.
 *
 * @version 1.0
 * @author Stig Bakken <ss...@ph...>
 * @author Chuck Hagenbuch <ch...@ho...>
 */
class Net_Socket extends PEAR {
    // {{{ properties

    /** Socket file pointer. */
    var $fp = null;

    /** Whether the socket is blocking. */
    var $blocking = true;

    /** Whether the socket is persistent. */
    var $persistent = false;

    /** The IP address to connect to. */
    var $addr = '';

    /** The port number to connect to. */
    var $port = 0;

    /** Number of seconds to wait on socket connections before
        assuming there's no more data. */
    var $timeout = false;

    /** Number of bytes to read at a time in readLine() and
        readAll(). */
    var $lineLength = 2048;
    // }}}

    // {{{ constructor
    /**
     * Constructs a new Net_Socket object.
     *
     * @access public
     */
    function Net_Socket()
    {
        $this->PEAR();
    }
    // }}}

    // {{{ connect()
    /**
     * Connect to the specified port. If called when the socket is
     * already connected, it disconnects and connects again.
     *
     * @param $addr string IP address or host name
     * @param $port int TCP port number
     * @param $persistent bool (optional) whether the connection is
     *        persistent (kept open between requests by the web server)
     * @param $timeout int (optional) how long to wait for data
     * @param $options array see options for stream_context_create
     * @access public
     * @return mixed true on success or error object
     */
    function connect($addr, $port, $persistent = null, $timeout = null, $options = null)
    {
        if (is_resource($this->fp)) {
            @fclose($this->fp);
            $this->fp = null;
        }

        if (strspn($addr, '.0123456789') == strlen($addr)) {
            $this->addr = $addr;
        } else {
            $this->addr = gethostbyname($addr);
        }
        $this->port = $port % 65536;
        if ($persistent !== null) {
            $this->persistent = $persistent;
        }
        if ($timeout !== null) {
            $this->timeout = $timeout;
        }
        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
        $errno = 0;
        $errstr = '';
        if ($options && function_exists('stream_context_create')) {
            if ($this->timeout) {
                $timeout = $this->timeout;
            } else {
                $timeout = 0;
            }
            $context = stream_context_create($options);
            $fp = $openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
        } else {
            if ($this->timeout) {
                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
            } else {
                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
            }
        }

        if (!$fp) {
            return $this->raiseError($errstr, $errno);
        }

        $this->fp = $fp;

        return $this->setBlocking($this->blocking);
    }
    // }}}

    // {{{ disconnect()
    /**
     * Disconnects from the peer, closes the socket.
     *
     * @access public
     * @return mixed true on success or an error object otherwise
     */
    function disconnect()
    {
        if (is_resource($this->fp)) {
            fclose($this->fp);
            $this->fp = null;
            return true;
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ isBlocking()
    /**
     * Find out if the socket is in blocking mode.
     *
     * @access public
     * @return bool the current blocking mode.
     */
    function isBlocking()
    {
        return $this->blocking;
    }
    // }}}

    // {{{ setBlocking()
    /**
     * Sets whether the socket connection should be blocking or
     * not. A read call to a non-blocking socket will return immediately
     * if there is no data available, whereas it will block until there
     * is data for blocking sockets.
     *
     * @param $mode bool true for blocking sockets, false for nonblocking
     * @access public
     * @return mixed true on success or an error object otherwise
     */
    function setBlocking($mode)
    {
        if (is_resource($this->fp)) {
            $this->blocking = $mode;
            socket_set_blocking($this->fp, $this->blocking);
            return true;
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ setTimeout()
    /**
     * Sets the timeout value on socket descriptor,
     * expressed in the sum of seconds and microseconds
     *
     * @param $seconds int seconds
     * @param $microseconds int microseconds
     * @access public
     * @return mixed true on success or an error object otherwise
     */
    function setTimeout($seconds, $microseconds)
    {
        if (is_resource($this->fp)) {
            socket_set_timeout($this->fp, $seconds, $microseconds);
            return true;
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ getStatus()
    /**
     * Returns information about an existing socket resource.
     * Currently returns four entries in the result array:
     *
     * <p>
     * timed_out (bool) - The socket timed out waiting for data<br>
     * blocked (bool) - The socket was blocked<br>
     * eof (bool) - Indicates EOF event<br>
     * unread_bytes (int) - Number of bytes left in the socket buffer<br>
     * </p>
     *
     * @access public
     * @return mixed Array containing information about existing socket resource or an error object otherwise
     */
    function getStatus()
    {
        if (is_resource($this->fp)) {
            return socket_get_status($this->fp);
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ gets()
    /**
     * Get a specified line of data
     *
     * @access public
     * @return $size bytes of data from the socket, or a PEAR_Error if
     *         not connected.
     */
    function gets($size)
    {
        if (is_resource($this->fp)) {
            return fgets($this->fp, $size);
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ read()
    /**
     * Read a specified amount of data. This is guaranteed to return,
     * and has the added benefit of getting everything in one fread()
     * chunk; if you know the size of the data you're getting
     * beforehand, this is definitely the way to go.
     *
     * @param $size The number of bytes to read from the socket.
     * @access public
     * @return $size bytes of data from the socket, or a PEAR_Error if
     *         not connected.
     */
    function read($size)
    {
        if (is_resource($this->fp)) {
            return fread($this->fp, $size);
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ write()
    /**
     * Write a specified amount of data.
     *
     * @access public
     * @return mixed true on success or an error object otherwise
     */
    function write($data)
    {
        if (is_resource($this->fp)) {
            return fwrite($this->fp, $data);
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ writeLine()
    /**
     * Write a line of data to the socket, followed by a trailing "\r\n".
     *
     * @access public
     * @return mixed fputs result, or an error
     */
    function writeLine ($data)
    {
        if (is_resource($this->fp)) {
            return $this->write($data . "\r\n");
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ eof()
    /**
     * Tests for end-of-file on a socket descriptor
     *
     * @access public
     * @return bool
     */
    function eof()
    {
        return (is_resource($this->fp) && feof($this->fp));
    }
    // }}}

    // {{{ readByte()
    /**
     * Reads a byte of data
     *
     * @access public
     * @return 1 byte of data from the socket, or a PEAR_Error if
     *         not connected.
     */
    function readByte()
    {
        if (is_resource($this->fp)) {
            return ord($this->read(1));
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ readWord()
    /**
     * Reads a word of data
     *
     * @access public
     * @return 1 word of data from the socket, or a PEAR_Error if
     *         not connected.
     */
    function readWord()
    {
        if (is_resource($this->fp)) {
            $buf = $this->read(2);
            return (ord($buf[0]) + (ord($buf[1]) << 8));
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ readInt()
    /**
     * Reads an int of data
     *
     * @access public
     * @return 1 int of data from the socket, or a PEAR_Error if
     *         not connected.
     */
    function readInt()
    {
        if (is_resource($this->fp)) {
            $buf = $this->read(4);
            return (ord($buf[0]) + (ord($buf[1]) << 8) +
                    (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ readString()
    /**
     * Reads a zeroterminated string of data
     *
     * @access public
     * @return string, or a PEAR_Error if
     *         not connected.
     */
    function readString()
    {
        if (is_resource($this->fp)) {
            $string = '';
            while (($char = $this->read(1)) != "\x00")  {
                $string .= $char;
            }
            return $string;
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ readIPAddress()
    /**
     * Reads an IP Address and returns it in a dot formated string
     *
     * @access public
     * @return Dot formated string, or a PEAR_Error if
     *         not connected.
     */
    function readIPAddress()
    {
        if (is_resource($this->fp)) {
            $buf = $this->read(4);
            return sprintf("%s.%s.%s.%s", ord($buf[0]), ord($buf[1]),
                           ord($buf[2]), ord($buf[3]));
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ readLine()
    /**
     * Read until either the end of the socket or a newline, whichever
     * comes first. Strips the trailing newline from the returned data.
     *
     * @access public
     * @return All available data up to a newline, without that
     *         newline, or until the end of the socket, or a PEAR_Error if
     *         not connected.
     */
    function readLine()
    {
        if (is_resource($this->fp)) {
            $line = '';
            $timeout = time() + $this->timeout;
            while (!$this->eof() && (!$this->timeout || time() < $timeout)) {
                $line .= $this->gets($this->lineLength);
                if (substr($line, -2) == "\r\n" ||
                    substr($line, -1) == "\n") {
                    return rtrim($line, "\r\n");
                }
            }
            return $line;
        }
        return $this->raiseError("not connected");
    }
    // }}}

    // {{{ readAll()
    /**
     * Read until the socket closes. THIS FUNCTION WILL NOT EXIT if the
     * socket is in blocking mode until the socket closes.
     *
     * @access public
     * @return All data until the socket closes, or a PEAR_Error if
     *         not connected.
     */
    function readAll()
    {
        if (is_resource($this->fp)) {
            $data = '';
            while (!$this->eof())
                $data .= $this->read($this->lineLength);
            return $data;
        }
        return $this->raiseError("not connected");
    }
    // }}}

}

[php-blog-cvs] serendipity/bundled-libs/HTTP/Request Listener.php,NONE,1.1

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/HTTP/Request
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24895/bundled-libs/HTTP/Request

Added Files:
	Listener.php 
Log Message:
added dependencies for Net_DNSBL_SURBL

--- NEW FILE: Listener.php ---
<?php
// +-----------------------------------------------------------------------+
// | Copyright (c) 2002-2003, Richard Heyes                                |
// | All rights reserved.                                                  |
// |                                                                       |
// | Redistribution and use in source and binary forms, with or without    |
// | modification, are permitted provided that the following conditions    |
// | are met:                                                              |
// |                                                                       |
// | o Redistributions of source code must retain the above copyright      |
// |   notice, this list of conditions and the following disclaimer.       |
// | o Redistributions in binary form must reproduce the above copyright   |
// |   notice, this list of conditions and the following disclaimer in the |
// |   documentation and/or other materials provided with the distribution.|
// | o The names of the authors may not be used to endorse or promote      |
// |   products derived from this software without specific prior written  |
// |   permission.                                                         |
// |                                                                       |
// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
// |                                                                       |
// +-----------------------------------------------------------------------+
// | Author: Alexey Borzov <av...@ph...>                                  |
// +-----------------------------------------------------------------------+
//
// $Id: Listener.php,v 1.1 2004/12/06 09:18:23 nohn Exp $
//

/**
 * This class implements the Observer part of a Subject-Observer
 * design pattern. It listens to the events sent by a 
 * HTTP_Request or HTTP_Response instance.
 *
 * @package HTTP_Request
 * @author  Alexey Borzov <av...@ph...>
 * @version $Revision: 1.1 $
 */
class HTTP_Request_Listener 
{
   /**
    * A listener's identifier
    * @var string
    */
    var $_id;

   /**
    * Constructor, sets the object's identifier
    *
    * @access public
    */
    function HTTP_Request_Listener()
    {
        $this->_id = md5(uniqid('http_request_', 1));
    }


   /**
    * Returns the listener's identifier
    *
    * @access public
    * @return string
    */
    function getId()
    {
        return $this->_id;
    }


   /**
    * This method is called when Listener is notified of an event
    *
    * @access   public
    * @param    object  an object the listener is attached to
    * @param    string  Event name
    * @param    mixed   Additional data
    * @abstract
    */
    function update(&$subject, $event, $data = null)
    {
        echo "Notified of event: '$event'\n";
        if (null !== $data) {
            echo "Additional data: ";
            var_dump($data);
        }
    }
}
?>

[php-blog-cvs] serendipity/bundled-libs/HTTP/Request - New directory

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/HTTP/Request
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24676/Request

Log Message:
Directory /cvsroot/php-blog/serendipity/bundled-libs/HTTP/Request added to the repository

[php-blog-cvs] serendipity/bundled-libs/HTTP - New directory

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

Update of /cvsroot/php-blog/serendipity/bundled-libs/HTTP
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24599/HTTP

Log Message:
Directory /cvsroot/php-blog/serendipity/bundled-libs/HTTP added to the repository

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.34,1.35

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

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

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
generate thumbnails from pdf files

the implementation shows some flaws in serendipitys image handling. thumb mimetype != file mime type.

this one has a little bug: -flatten takes the last page of the pdf, the first would be much nicer. some imagemagick freaks out there who can solve that?

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_admin_image_selector.php	30 Nov 2004 16:02:25 -0000	1.34
+++ serendipity_admin_image_selector.php	5 Dec 2004 15:05:50 -0000	1.35
@@ -91,7 +91,7 @@
 
 <div>
 <?php
-        if ($is_image) {
+        if (!file_exists($imgsrc)) {
 ?>
     <img align="right" src="<?php echo $imgsrc; ?>">
     <h1><?php printf(YOU_CHOSE, $file['name']); ?></h1>

[php-blog-cvs] serendipity/include functions_images.inc.php,1.5,1.6

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
generate thumbnails from pdf files

the implementation shows some flaws in serendipitys image handling. thumb mimetype != file mime type.

this one has a little bug: -flatten takes the last page of the pdf, the first would be much nicer. some imagemagick freaks out there who can solve that?

Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions_images.inc.php	5 Dec 2004 14:00:57 -0000	1.5
+++ functions_images.inc.php	5 Dec 2004 15:05:48 -0000	1.6
@@ -212,9 +212,14 @@
         } else {
                 /*if ($serendipity["dim"] == "height") $newSize = "*x".$serendipity["thumbSize"];
                 else $newSize = $serendipity["thumbSize"]."x*"; */
-            $newSize = $size . 'x' . $size;
-            $r = array($size, $size);
-            $cmd     = $serendipity['convert'] . " -antialias -scale $newSize \"$infile\" \"$outfile\"  2>&1";
+            if ($ft_mime != 'application/pdf') {
+               $newSize = $size . 'x' . $size;
+               $r = array($size, $size);
+               $cmd     = $serendipity['convert'] . " -antialias -scale $newSize \"$infile\" \"$outfile\"  2>&1";
+            } else {
+               $newSize = $size . 'x' . $size;
+               $cmd     = $serendipity['convert'] . " -antialias -flatten -scale $newSize \"$infile\" \"$outfile.png\" 2>&1";
+            }
             $res     = `$cmd`;
         }
     }
@@ -806,6 +811,10 @@
             ++$x; $preview = '';
             $i      = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
             $imgsrc = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+	    if ($file['mime'] == 'application/pdf') {
+	       // File is PDF -> Thumb is PNG
+	       $imgsrc .= '.png';
+	    }
             $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
 
             if (file_exists($imgsrc)) {
@@ -813,7 +822,7 @@
                 if ($url) { $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
             }
 
-            if (!$is_image) {
+            if (!file_exists($imgsrc)) {
                 $preview .= '<div class="serendipity_admin_mimetype" style="width: ' . $serendipity['thumbSize'] . 'px; height: ' . $serendipity['thumbSize'] . 'px; border: 1px solid; text-align: center;"><br /><br /><br />' . $file['mime'];
                 if ($url) { $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>'; }
                 $preview .= '</div>';
@@ -1028,6 +1037,10 @@
 
     $fdim = @getimagesize($file);
 
+    if ($ft_mime == 'application/pdf') {
+       $fdim = array(1000,1000,24, '', 'bits'=> 24, channels => '3', 'mime' => 'application/pdf');
+    }
+
     if (is_array($fdim)) {
         if (empty($fdim['mime'])) {
             $fdim['mime'] = $ft_mime;

[php-blog-cvs] serendipity/include functions_images.inc.php,1.4,1.5

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
fixing bug; make this work under windows. should be no harm to unix systems

Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- functions_images.inc.php	30 Nov 2004 15:53:56 -0000	1.4
+++ functions_images.inc.php	5 Dec 2004 14:00:57 -0000	1.5
@@ -214,7 +214,7 @@
                 else $newSize = $serendipity["thumbSize"]."x*"; */
             $newSize = $size . 'x' . $size;
             $r = array($size, $size);
-            $cmd     = $serendipity['convert'] . " -antialias -scale $newSize $infile $outfile  2>&1";
+            $cmd     = $serendipity['convert'] . " -antialias -scale $newSize \"$infile\" \"$outfile\"  2>&1";
             $res     = `$cmd`;
         }
     }

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.37,1.38

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
fixing bug

Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_event_spamblock.php	2 Dec 2004 10:25:52 -0000	1.37
+++ serendipity_event_spamblock.php	5 Dec 2004 10:53:51 -0000	1.38
@@ -331,14 +331,13 @@
                         }
 
                         // Check for IP listed in RBL
-                        // Partly based on work done by James Seward (ja...@ja...)
                         if (serendipity_db_bool($this->get_config('rbl_enabled', false))) {
                             require_once 'bundled-libs/Net/DNSBL.php';
                             $dnsbl = new Net_DNSBL();
                             $remoteIP = $_SERVER['REMOTE_ADDR'];
-                        #    $remoteIP = '81.70.69.193';
+                            # $remoteIP = '81.70.69.193';
 
-                            $dnsbl->setRBL(explode(',', $this->get_config('rbllist')));
+                            $dnsbl->setBlacklists(explode(',', $this->get_config('rbllist')));
                             if ($dnsbl->isListed($remoteIP)) {
                                 $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_RBL, $addData);
                                 $eventData = array('allow_comments' => false);

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.13,1.14

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
fixed win32 problem

Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- functions_installer.inc.php	4 Dec 2004 14:43:38 -0000	1.13
+++ functions_installer.inc.php	5 Dec 2004 09:54:33 -0000	1.14
@@ -762,7 +762,9 @@
 }
 
 function serendipity_getRealDir($file) {
-    return preg_replace('@/include$@', '', dirname($file)) . '/';
+    $dir = str_replace( "\\", "/", dirname($file));
+    $base = preg_replace('@/include$@', '', $dir) . '/';
+    return $base;
 }
 
 function serendipity_check_rewrite($default) {

[php-blog-cvs] serendipity/templates/default/admin style.css,1.6,1.7

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

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

Modified Files:
	style.css 
Log Message:
improved accessibility and layout (no more silly text floating around bullets)

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.css	4 Dec 2004 14:43:38 -0000	1.6
+++ style.css	5 Dec 2004 09:38:40 -0000	1.7
@@ -172,4 +172,18 @@
     padding-left:     0.3em;
     padding-right:    0.3em;
     text-decoration:  none;
+}
+
+ul.serendipitySideBarMenu {
+    padding-left:     0px;
+}
+
+ul.serendipitySideBarMenu lh {
+    font-size:        small; 
+    font-weight:      bold;
+}
+
+ul.serendipitySideBarMenu li {
+    font-size:        x-small;
+    margin-left:      1.5em; 
 }
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin.php,1.52,1.53

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
improved accessibility and layout (no more silly text floating around bullets)

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_admin.php	3 Dec 2004 16:16:44 -0000	1.52
+++ serendipity_admin.php	5 Dec 2004 09:38:39 -0000	1.53
@@ -127,70 +127,59 @@
                             <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br />
                         </div>
                     </div>
+                    
+		    <ul class="serendipitySideBarMenu">
+		      <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
+		      <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>
+		      <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
+		    </ul>
 
+		    <ul class="serendipitySideBarMenu">
+		      <lh><?php echo CATEGORIES; ?></lh>
+		      <li><a href="serendipity_admin.php?serendipity[adminModule]=category&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_CATEGORIES; ?></a></li>
+		      <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_categories', $serendipity); ?>
+                    </ul>
 
-                    <div class="serendipitySideBarItem">
-                        <div class="serendipitySideBarTitle"><?php echo serendipity_mb('ucfirst', ENTRIES); ?></div>
-                        <div class="serendipitySideBarContent">
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a><br />
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a><br />
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a><br />
-                            <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
-                        </div>
-                    </div>
-
-                    <div class="serendipitySideBarItem">
-                        <div class="serendipitySideBarTitle"><?php echo CATEGORIES; ?></div>
-                        <div class="serendipitySideBarContent">
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=category&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_CATEGORIES; ?></a><br />
-                            <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_categories', $serendipity); ?>
-                        </div>
-                    </div>
-
-                    <div class="serendipitySideBarItem">
-                        <div class="serendipitySideBarTitle"><?php echo MEDIA; ?></div>
-                        <div class="serendipitySideBarContent">
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a><br />
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a><br />
+		    <ul class="serendipitySideBarMenu">
+		      <lh><?php echo MEDIA; ?></lh>
+		      <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li>
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a><br />
+                            <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li>
 <?php } ?>
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br />
-                            <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
-                        </div>
-                    </div>
+                       <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li>
+                       <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
+		    </ul>
 
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-                    <div class="serendipitySideBarItem">
-                        <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?></div>
-                        <div class="serendipitySideBarContent">
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a><br />
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a><br />
-                            <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?>
-                        </div>
-                    </div>
+		    <ul class="serendipitySideBarMenu">
+                      <lh><?php echo APPEARANCE; ?></lh>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li>
+                      <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?>
+		    </ul>
 <?php } ?>
-                    <div class="serendipitySideBarItem">
-                        <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
-                        <div class="serendipitySideBarContent">
+
+		    <ul class="serendipitySideBarMenu">
+		      <lh><?php echo ADMIN; ?></lh>
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a><br />
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li>
 <?php } ?>
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a><br />
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li>
 <?php } ?>
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a><br />
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a><br />
-                            <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?>
-                        </div>
-                    </div>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li>
+                      <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?>
+		    </ul>
+
+		    <ul class="serendipitySideBarMenu">
+		      <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>
+                      <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li>
+                    </ul>
 
-                    <div class="serendipitySideBarItem">
-                        <div class="serendipitySideBarContent">
-                            &bull; <a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a><br />
-                            &bull; <a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br />
-                        </div>
-                    </div>
                 </td>
                 <td id="content">
                     <div class="serendipityAdminContent">

[php-blog-cvs] serendipity/templates/default style.css,1.38,1.39

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

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

Modified Files:
	style.css 
Log Message:
- Remove horizontal scrollbar
- Remove administration CSS stuff from default theme

TODO: Remove Admin CSS from all themes


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- style.css	2 Dec 2004 10:55:13 -0000	1.38
+++ style.css	4 Dec 2004 21:03:48 -0000	1.39
@@ -7,8 +7,6 @@
 }
 
 #mainpane {
-    border-left: 2px solid #AAAAAA;
-    border-right: 2px solid #AAAAAA;
     border-bottom: 1px solid #000000;
     margin: auto;
     width: 100%;
@@ -60,8 +58,6 @@
 }
 
 #serendipity_banner {
-    border-left: 1px solid #000000;
-    border-right: 1px solid #000000;
     margin: auto;
     width: 100%;
     height: 72px;
@@ -215,10 +211,6 @@
     border-bottom: 2px solid #36558C;
 }
 
-td.serendipity_admin {
-    padding: 10px;
-}
-
 a:link,
 a:visited,
 a:active {
@@ -287,30 +279,6 @@
 .serendipityImageButton {
     cursor: pointer;
 }
-
-td.serendipitySideBar {
-    font-size: 12px;
-    width: 180px;
-    padding: 10px;
-    border-right: 1px dashed #4068ab;
-}
-
-div.serendipity_admin_title {
-    font-size: 22px;
-    font-weight: bold;
-    margin-bottom: 12px;
-}
-
-div.serendipity_admin_list_title {
-    font-size: 12px;
-    font-weight: bold;
-    margin-bottom: 8px;
-}
-
-td.serendipity_admin_list_item {
-    border: dashed 1px #000000;
-}
-
 .serendipity_entry p {
     margin: 0px;
     padding-bottom: 0px;
@@ -355,37 +323,6 @@
     text-align: center;
 }
 
-.serendipity_admin_list_item_even {
-    background-color: #ffffff;
-}
-
-.serendipity_admin_list_item_uneven {
-    background-color: #E0E0E0;
-}
-.serendipity_admin_filters {
-    border: 1px dashed;
-    background-color: #FFFFFF;
-    font-size: 10px;
-    margin-bottom: 10px;
-    padding: 2px;
-}
-
-.serendipity_admin_filters_headline {
-    border-bottom: 1px solid;
-}
-
-.serendipity_admin_sortorder {
-    font-size: 10px;
-    text-align: center;
-}
-
-.serendipity_admin_sortorder input,
-.serendipity_admin_sortorder select,
-.serendipity_admin_filters input,
-.serendipity_admin_filters select {
-    font-size: 10px;
-}
-
 .serendipity_comments {
 }
 

[php-blog-cvs] serendipity/templates/default/admin style.css,1.5,1.6

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

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

Modified Files:
	style.css 
Log Message:
removed/marked the (so far discovered) most disturbing javascript-dependencies in s9y

Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	30 Nov 2004 16:02:26 -0000	1.5
+++ style.css	4 Dec 2004 14:43:38 -0000	1.6
@@ -151,3 +151,25 @@
     text-align: center;
     margin: auto;
 }
+
+a.button { 
+    background-color: #F8F9FA;
+    border:	      1px solid #294366;
+    color:	      black;
+    font-family:      verdana;
+    font-size:	      small;
+    padding-left:     0.3em;
+    padding-right:    0.3em;
+    text-decoration:  none;
+}
+
+a.button_disabled { 
+    background-color: #F8F9FA;
+    border:	      1px solid #294366;
+    color:	      grey;
+    font-family:      verdana;
+    font-size:	      small;
+    padding-left:     0.3em;
+    padding-right:    0.3em;
+    text-decoration:  none;
+}
\ No newline at end of file

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.18,1.19 functions_installer.inc.php,1.12,1.13

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

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

Modified Files:
	functions_entries.inc.php functions_installer.inc.php 
Log Message:
removed/marked the (so far discovered) most disturbing javascript-dependencies in s9y

Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- functions_installer.inc.php	3 Dec 2004 16:13:35 -0000	1.12
+++ functions_installer.inc.php	4 Dec 2004 14:43:38 -0000	1.13
@@ -219,7 +219,7 @@
     }
 }
 
-function serendipity_printConfigTemplate($config, $from = false, $noForm = false, $folding = true) {
+function serendipity_printConfigTemplate($config, $from = false, $noForm = false, $folding = false) {
     global $serendipity;
     if (!isset($serendipity['XHTML11'])) {
         $serendipity['XHTML11'] = FALSE;

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- functions_entries.inc.php	3 Dec 2004 12:02:25 -0000	1.18
+++ functions_entries.inc.php	4 Dec 2004 14:43:38 -0000	1.19
@@ -1307,6 +1307,7 @@
         /* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
         if (!$serendipity['wysiwyg'] && eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
 ?>
+<?php // FIXXME: This is JS only and should'nt be displayed in non-JS enviroments ?>
                         <input type="button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<i>','</i>')" />
                         <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
                         <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
@@ -1364,6 +1365,7 @@
                 <?php
 if (!$serendipity['wysiwyg']) {
 ?>
+<?php // FIXXME: Can only be made visible in JS enviroments. ?>
                     <div id="tools_extended" style="display: none">
 <?php
         /* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
@@ -1394,6 +1396,7 @@
 
             <tr>
                 <td colspan="3">
+<?php // FIXXME: Can only be made visible in JS enviroments. ?>
                     <textarea style="width: 100%;<?php echo (!$serendipity['wysiwyg']) ? 'display: none;' : '' ?>" name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo isset($entry['extended']) ? htmlspecialchars($entry['extended']) : ''; ?></textarea>
                 </td>
             </tr>

[php-blog-cvs] serendipity/include/admin configuration.inc.php,1.1,1.2 entries.inc.php,1.7,1.8

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

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

Modified Files:
	configuration.inc.php entries.inc.php 
Log Message:
removed/marked the (so far discovered) most disturbing javascript-dependencies in s9y

Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- entries.inc.php	3 Dec 2004 12:02:27 -0000	1.7
+++ entries.inc.php	4 Dec 2004 14:43:38 -0000	1.8
@@ -160,10 +160,18 @@
 ?>
         <tr>
             <td>
-                <input type="button" name="serendipity[prevpage]" value="&lt;&lt;&lt;" onclick="location.href='<?php echo $linkPrevious ?>'" <?php if ($offSet <= 0) echo ' disabled="disabled"' ?> />
+                <?php if ($offSet <= 0) { ?>
+                    <a name="dummy_linkPrevious" class="button_disabled">&lt;&lt;&lt;</a>
+                <?php } else { ?>
+                    <a href="<?php echo $linkPrevious ?>" class="button">&lt;&lt;&lt;</a>
+                <?php } ?>
             </td>
             <td align="right">
-                <input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href='<?php echo $linkNext ?>'" <?php if ($count != $perPage) echo ' disabled="disabled"'; ?> />
+                <?php if ($count != $perPage) { ?>
+                    <a name="dummy_linkNext" class="button_disabled">&gt;&gt;&gt;</a>
+                <?php } else { ?>
+                    <a href="<?php echo $linkNext ?>" class="button">&gt;&gt;&gt;</a>
+                <?php } ?>
             </td>
         </tr>
     </table>
@@ -373,9 +381,9 @@
 ?>
 <br />
 <div>
-    <input type="button" value="<?php echo NOT_REALLY; ?>" onclick="history.go(-1);" />
+    <a href="<?php echo $_SERVER["HTTP_REFERER"]; ?>" class="button"><?php echo NOT_REALLY; ?></a>
     <span style="width: 50px;"></span>
-    <input type="button" value="<?php echo DUMP_IT; ?>" onclick="location.href='<?php echo $newLoc; ?>'" />
+    <a href="<?php echo $newLoc; ?>" class="button"><?php echo DUMP_IT; ?></a>
 </div>
 <?php
         break;

Index: configuration.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/configuration.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configuration.inc.php	3 Dec 2004 16:16:44 -0000	1.1
+++ configuration.inc.php	4 Dec 2004 14:43:37 -0000	1.2
@@ -29,7 +29,7 @@
             if (is_array($res)) {
                 echo DIAGNOSTIC_ERROR . '<br /><br />';
                 echo '<span class="serendipityAdminMsgError">- ' . implode('<br />', $res) . '</span><br /><br />';
-                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST, false, true);
+                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST, false, false);
                 die();
             }
 
@@ -124,7 +124,7 @@
 
         $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
 
-        serendipity_printConfigTemplate($t, $from, false, true);
+        serendipity_printConfigTemplate($t, $from, false, false);
 }
 
 /* vim: set sts=4 ts=4 expandtab : */