php-blog-cvs — Serendipity commit list

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

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

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

Modified Files:
	serendipity_plugin_creativecommons.php 
Log Message:
Flush.

Index: serendipity_plugin_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_creativecommons/serendipity_plugin_creativecommons.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_plugin_creativecommons.php	2 Apr 2004 11:03:21 -0000	1.2
+++ serendipity_plugin_creativecommons.php	4 Apr 2004 08:04:57 -0000	1.3
@@ -1,23 +1,25 @@
 <?php # $Id$
 
 switch ($serendipity['lang']) {
-    case 'en':
-        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons');
-        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Zeigt einen Creative Commons Hinweis an');
-        break;
+    case 'de': {
+        @define('PLUGIN_CREATIVECOMMONS_NAME', 'Creative Commons');
+        @define('PLUGIN_CREATIVECOMMONS_DESC', 'Zeigt einen Creative Commons Hinweis an');
+    }
+    break;
 
     case 'en':
-    default:
-        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons');
-        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Display a creative commons notification in the sidebar.');
-        break;
+    default: {
+        @define('PLUGIN_CREATIVECOMMONS_NAME', 'Creative Commons');
+        @define('PLUGIN_CREATIVECOMMONS_DESC', 'Display a creative commons notification in the sidebar.');
+    }
+    break;
 }
 
 class serendipity_plugin_creativecommons extends serendipity_plugin {
     function introspect(&$propbag)
     {
-        $propbag->add('name',        PLUGIN_CREATIVECOMMONS_NAME);
-        $propbag->add('description', PLUGIN_CREATIVECOMMONS_DESC);
+        $propbag->add('name',        PLUGIN_SIDEBAR_CREATIVECOMMONS_NAME);
+        $propbag->add('description', PLUGIN_SIDEBAR_CREATIVECOMMONS_DESC);
         $propbag->add('configuration', array('title'));
 
         $this->dependencies = array('serendipity_event_creativecommons' => 'remove');

[php-blog-cvs] serendipity/bundled-libs/Onyx RSS.php,1.1.1.1,1.2

[Kristian K?h. <is...@us...>]

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

Modified Files:
	RSS.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: RSS.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Onyx/RSS.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RSS.php	28 Mar 2003 20:05:27 -0000	1.1.1.1
+++ RSS.php	3 Apr 2004 17:36:16 -0000	1.2
@@ -1,376 +1,376 @@
-<?php
-
-/* Copyright 2002-2003 Edward Swindelles (ed...@re...)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-if (!defined('ONYX_RSS_VERS'))
-{
-   define('ONYX_RSS_VERS', '1.0');
-   define('ONYX_ERR_NO_PARSER', '<a href="http://www.php.net/manual/en/ref.xml.php">PHP\'s XML Extension</a> is not loaded or available.');
-   define('ONYX_ERR_NOT_WRITEABLE', 'The specified cache directory is not writeable.');
-   define('ONYX_ERR_INVALID_URI', 'The specified file could not be opened.');
-   define('ONYX_ERR_INVALID_ITEM', 'Invalid item index specified.');
-   define('ONYX_ERR_NO_STREAM', 'Could not open the specified file.  Check the path, and make sure that you have write permissions to this file.');
-   define('ONYX_META', 'meta');
-   define('ONYX_ITEMS', 'items');
-   define('ONYX_IMAGE', 'image');
-   define('ONYX_TEXTINPUT', 'textinput');
-   define('ONYX_NAMESPACES', 'namespaces');
-   define('ONYX_CACHE_AGE', 'cache_age');
-   define('ONYX_FETCH_ASSOC', 1);
-   define('ONYX_FETCH_OBJECT', 2);
-}
-
-class ONYX_RSS
-{
-   var $parser;
-   var $conf;
-   var $rss;
-   var $data;
-   var $type;
-   /* For when PHP v.5 is released
-    * http://www.phpvolcano.com/eide/php5.php?page=variables
-    * private $parser;
-    * private $conf;
-    * private $rss;
-    * private $data;
-    * private $type;
-   */
-
-   function ONYX_RSS()
-   {
-      $this->__construct();
-   }
-
-   // Forward compatibility with PHP v.5
-   // http://www.phpvolcano.com/eide/php5.php?page=start
-   function __construct()
-   {
-      $this->conf = array();
-      $this->conf['error'] = '<br /><strong>Error on line %s of '.__FILE__.'</strong>: %s<br />';
-      $this->conf['cache_path'] = dirname(__FILE__);
-      $this->conf['cache_time'] = 180;
-      $this->conf['debug_mode'] = true;
-      $this->conf['fetch_mode'] = ONYX_FETCH_ASSOC;
-
-      if (!function_exists('xml_parser_create'))
-      {
-         $this->raiseError((__LINE__-2), ONYX_ERR_NO_PARSER);
-         return false;
-      }
-
-      $this->parser = @xml_parser_create();
-      if (!is_resource($this->parser))
-      {
-         $this->raiseError((__LINE__-3), ONYX_ERR_NO_PARSER);
-         return false;
-      }
-      xml_set_object($this->parser, $this);
-      xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, false);
-      xml_set_element_handler($this->parser, 'tag_open', 'tag_close');
-      xml_set_character_data_handler($this->parser, 'cdata');
-   }
-
-   function parse($uri, $file=false, $time=false, $local=false)
-   {
-      $this->rss = array();
-      $this->rss['cache_age'] = 0;
-      $this->rss['current_tag'] = '';
-      $this->rss['index'] = 0;
-      $this->rss['output_index'] = -1;
-      $this->data = array();
-
-      if ($file)
-      {
-         if (!is_writeable($this->conf['cache_path']))
-         {
-            $this->raiseError((__LINE__-2), ONYX_ERR_NOT_WRITEABLE);
-            return false;
-         }
-         $file = str_replace('//', '/', $this->conf['cache_path'].'/'.$file);
-         if (!$time)
-            $time = $this->conf['cache_time'];
-         $this->rss['cache_age'] = file_exists($file) ? ceil((time() - filemtime($file)) / 60) : 0;
-
-         clearstatcache();
-         if (!$local && file_exists($file))
-            if (($mod = $this->mod_time($uri)) === false)
-            {
-               $this->raiseError((__LINE__-2), ONYX_ERR_INVALID_URI);
-               return false;
-            }
-            else
-               $mod = ($mod !== 0) ? strtotime($mod) : (time()+3600);
-         elseif ($local)
-            $mod = (file_exists($file) && ($m = filemtime($uri))) ? $m : time()+3600;
-      }
-      if ( !$file ||
-           ($file && !file_exists($file)) ||
-           ($file && file_exists($file) && $time <= $this->rss['cache_age'] && $mod >= (time() - ($this->rss['cache_age'] * 60))))
-      {
-         clearstatcache();
-         if (!($fp = @fopen($uri, 'r')))
-         {
-            $this->raiseError((__LINE__-2), ONYX_ERR_INVALID_URI);
-            return false;
-         }
-         while ($chunk = fread($fp, 4096))
-         {
-            $parsedOkay = xml_parse($this->parser, $chunk, feof($fp));
-            if (!$parsedOkay && xml_get_error_code($this->parser) != XML_ERROR_NONE)
-            {
-               $this->raiseError((__LINE__-3), 'File has an XML error (<em>'.xml_error_string(xml_get_error_code($this->parser)).'</em> at line <em>'.xml_get_current_line_number($this->parser).'</em>).');
-               return false;
-            }
-         }
-         fclose($fp);
-         clearstatcache();
-         if ($file)
-         {
-            if (!($cache = @fopen($file, 'w')))
-            {
-               $this->raiseError((__LINE__-2), 'Could not write to cache file (<em>'.$file.'</em>).  The path may be invalid or you may not have write permissions.');
-               return false;
-            }
-            fwrite($cache, serialize($this->data));
-            fclose($cache);
-            $this->rss['cache_age'] = 0;
-         }
-      }
-      else
-      {
-         clearstatcache();
-         if (!($fp = @fopen($file, 'r')))
-         {
-            $this->raiseError((__LINE__-2), 'Could not read contents of cache file (<em>'.$cache_file.'</em>).');
-            return false;
-         }
-         $this->data = unserialize(fread($fp, filesize($file)));
-         fclose($fp);
-      }
-      return true;
-   }
-
-   function parseLocal($uri, $file=false, $time=false)
-   {
-      return $this->parse($uri, $file, $time, true);
-   }
-
-   //private function tag_open($parser, $tag, $attrs)
-   function tag_open($parser, $tag, $attrs)
-   {
-      $this->rss['current_tag'] = $tag = strtolower($tag);
-      switch ($tag)
-      {
-         case 'channel':
-         case 'image':
-         case 'textinput':
-            $this->type = $tag;
-            break;
-         case 'item':
-            $this->type = $tag;
-            $this->rss['index']++;
-            break;
-         default:
-            break;
-      }
-      if (sizeof($attrs))
-         foreach ($attrs as $k => $v)
-            if (strpos($k, 'xmlns') !== false)
-               $this->data['namespaces'][$k] = $v;
-   }
-
-   //private function tag_close($parser, $tag){}
-   function tag_close($parser, $tag){}
-
-   //private function cdata($parser, $cdata)
-   function cdata($parser, $cdata)
-   {
-      if (strlen(trim($cdata)) && $cdata != "\n")
-         switch ($this->type)
-         {
-            case 'channel':
-            case 'image':
-            case 'textinput':
-               (!isset($this->data[$this->type][$this->rss['current_tag']]) ||
-                !strlen($this->data[$this->type][$this->rss['current_tag']])) ?
-                  $this->data[$this->type][$this->rss['current_tag']] = $cdata :
-                  $this->data[$this->type][$this->rss['current_tag']].= $cdata;
-               break;
-            case 'item':
-               (!isset($this->data['items'][$this->rss['index']-1][$this->rss['current_tag']]) ||
-                !strlen($this->data['items'][$this->rss['index']-1][$this->rss['current_tag']])) ? 
-                  $this->data['items'][$this->rss['index']-1][$this->rss['current_tag']] = $cdata :
-                  $this->data['items'][$this->rss['index']-1][$this->rss['current_tag']].= $cdata;
-               break;
-         }
-   }
-
-   function getData($type)
-   {
-      if ($type == ONYX_META)
-         return $this->conf['fetch_mode'] == 1 ? $this->data['channel'] : (object)$this->data['channel'];
-      if ($type == ONYX_IMAGE)
-         return $this->conf['fetch_mode'] == 1 ? $this->data['image'] : (object)$this->data['image'];
-      if ($type == ONYX_TEXTINPUT)
-         return $this->conf['fetch_mode'] == 1 ? $this->data['textinput'] : (object)$this->data['textinput'];
-      if ($type == ONYX_ITEMS)
-      {
-         if ($this->conf['fetch_mode'] == 1)
-            return $this->data['items'];
-
-         $temp = array();
-         for ($i=0; $i < sizeof($this->data['items']); $i++)
-            $temp[] = (object)$this->data['items'][$i];
-
-         return $temp;
-      }
-      if ($type == ONYX_NAMESPACES)
-         return $this->conf['fetch_mode'] == 1 ? $this->data['namespaces'] : (object)$this->data['namespaces'];
-      if ($type == ONYX_CACHE_AGE)
-         return $this->rss['cache_age'];
-
-      return false;
-   }
-
-   function numItems()
-   {
-      return sizeof($this->data['items']);
-   }
-
-   function getNextItem($max=false)
-   {
-      $type = $this->conf['fetch_mode'];
-      $this->rss['output_index']++;
-      if (($max && $this->rss['output_index'] > $max) || !isset($this->data['items'][$this->rss['output_index']]))
-         return false;
-
-      return ($type == ONYX_FETCH_ASSOC) ? $this->data['items'][$this->rss['output_index']] :
-             (($type == ONYX_FETCH_OBJECT) ? (object)$this->data['items'][$this->rss['output_index']] : false);
-   }
-
-   function itemAt($num)
-   {
-      if (!isset($this->data['items'][$num]))
-      {
-         $this->raiseError((__LINE__-3), ONYX_ERR_INVALID_ITEM);
-         return false;
-      }
-
-      $type = $this->conf['fetch_mode'];
-      return ($type == ONYX_FETCH_ASSOC) ? $this->data['items'][$num] :
-             (($type == ONYX_FETCH_OBJECT) ? (object)$this->data['items'][$num] : false);
-   }
-
-   function startBuffer($file=false)
-   {
-      $this->conf['output_file'] = $file;
-      ob_start();
-   }
-
-   function endBuffer()
-   {
-      if (!$this->conf['output_file'])
-         ob_end_flush();
-      else
-      {
-         if (!($fp = @fopen($this->conf['output_file'], 'w')))
-         {
-            $this->raiseError((__LINE__-2), ONYX_ERR_NO_STREAM);
-            ob_end_flush();
-            return;
-         }
-         fwrite($fp, ob_get_contents());
-         fclose($fp);
-         ob_end_clean();
-      }
-   }
-
-   //private function raiseError($line, $err)
-   function raiseError($line, $err)
-   {
-      if ($this->conf['debug_mode'])
-         printf($this->conf['error'], $line, $err);
-   }
-
-   function setCachePath($path)
-   {
-      $this->conf['cache_path'] = $path;
-   }
-
-   function setExpiryTime($time)
-   {
-      $this->conf['cache_time'] = $time;
-   }
-
-   function setDebugMode($state)
-   {
-      $this->conf['debug_mode'] = (bool)$state;
-   }
-
-   function setFetchMode($mode)
-   {
-      $this->conf['fetch_mode'] = $mode;
-   }
-
-   //private function mod_time($uri)
-   function mod_time($uri)
-   {
-      if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') >= 0)
-      {
-         if (!($fp = @fopen($uri, 'r')))
-            return false;
-
-         $meta = stream_get_meta_data($fp);
-         for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-            if (strpos(strtolower($meta['wrapper_data'][$j]), 'last-modified') !== false)
-            {
-               $modtime = substr($meta['wrapper_data'][$j], 15);
-               break;
-            }
-         fclose($fp);
-      }
-      else
-      {
-         $parts = parse_url($uri);
-         $host  = $parts['host'];
-         $path  = $parts['path'];
-
-         if (!($fp = @fsockopen($host, 80)))
-            return false;
-
-         $req = "HEAD $path HTTP/1.1\r\nUser-Agent: PHP/".phpversion();
-         $req.= "\r\nHost: $host\r\nAccept: */*\r\n\r\n";
-         fputs($fp, $req);
-
-         while (!feof($fp))
-         {
-            $str = fgets($fp, 4096);
-            if (strpos(strtolower($str), 'last-modified') !== false)
-            {
-               $modtime = substr($str, 15);
-               break;
-            }
-         }
-         fclose($fp);
-      }
-      return (isset($modtime)) ? $modtime : 0;
-   }
-}
-
-
+<?php
+
+/* Copyright 2002-2003 Edward Swindelles (ed...@re...)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+if (!defined('ONYX_RSS_VERS'))
+{
+   define('ONYX_RSS_VERS', '1.0');
+   define('ONYX_ERR_NO_PARSER', '<a href="http://www.php.net/manual/en/ref.xml.php">PHP\'s XML Extension</a> is not loaded or available.');
+   define('ONYX_ERR_NOT_WRITEABLE', 'The specified cache directory is not writeable.');
+   define('ONYX_ERR_INVALID_URI', 'The specified file could not be opened.');
+   define('ONYX_ERR_INVALID_ITEM', 'Invalid item index specified.');
+   define('ONYX_ERR_NO_STREAM', 'Could not open the specified file.  Check the path, and make sure that you have write permissions to this file.');
+   define('ONYX_META', 'meta');
+   define('ONYX_ITEMS', 'items');
+   define('ONYX_IMAGE', 'image');
+   define('ONYX_TEXTINPUT', 'textinput');
+   define('ONYX_NAMESPACES', 'namespaces');
+   define('ONYX_CACHE_AGE', 'cache_age');
+   define('ONYX_FETCH_ASSOC', 1);
+   define('ONYX_FETCH_OBJECT', 2);
+}
+
+class ONYX_RSS
+{
+   var $parser;
+   var $conf;
+   var $rss;
+   var $data;
+   var $type;
+   /* For when PHP v.5 is released
+    * http://www.phpvolcano.com/eide/php5.php?page=variables
+    * private $parser;
+    * private $conf;
+    * private $rss;
+    * private $data;
+    * private $type;
+   */
+
+   function ONYX_RSS()
+   {
+      $this->__construct();
+   }
+
+   // Forward compatibility with PHP v.5
+   // http://www.phpvolcano.com/eide/php5.php?page=start
+   function __construct()
+   {
+      $this->conf = array();
+      $this->conf['error'] = '<br /><strong>Error on line %s of '.__FILE__.'</strong>: %s<br />';
+      $this->conf['cache_path'] = dirname(__FILE__);
+      $this->conf['cache_time'] = 180;
+      $this->conf['debug_mode'] = true;
+      $this->conf['fetch_mode'] = ONYX_FETCH_ASSOC;
+
+      if (!function_exists('xml_parser_create'))
+      {
+         $this->raiseError((__LINE__-2), ONYX_ERR_NO_PARSER);
+         return false;
+      }
+
+      $this->parser = @xml_parser_create();
+      if (!is_resource($this->parser))
+      {
+         $this->raiseError((__LINE__-3), ONYX_ERR_NO_PARSER);
+         return false;
+      }
+      xml_set_object($this->parser, $this);
+      xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, false);
+      xml_set_element_handler($this->parser, 'tag_open', 'tag_close');
+      xml_set_character_data_handler($this->parser, 'cdata');
+   }
+
+   function parse($uri, $file=false, $time=false, $local=false)
+   {
+      $this->rss = array();
+      $this->rss['cache_age'] = 0;
+      $this->rss['current_tag'] = '';
+      $this->rss['index'] = 0;
+      $this->rss['output_index'] = -1;
+      $this->data = array();
+
+      if ($file)
+      {
+         if (!is_writeable($this->conf['cache_path']))
+         {
+            $this->raiseError((__LINE__-2), ONYX_ERR_NOT_WRITEABLE);
+            return false;
+         }
+         $file = str_replace('//', '/', $this->conf['cache_path'].'/'.$file);
+         if (!$time)
+            $time = $this->conf['cache_time'];
+         $this->rss['cache_age'] = file_exists($file) ? ceil((time() - filemtime($file)) / 60) : 0;
+
+         clearstatcache();
+         if (!$local && file_exists($file))
+            if (($mod = $this->mod_time($uri)) === false)
+            {
+               $this->raiseError((__LINE__-2), ONYX_ERR_INVALID_URI);
+               return false;
+            }
+            else
+               $mod = ($mod !== 0) ? strtotime($mod) : (time()+3600);
+         elseif ($local)
+            $mod = (file_exists($file) && ($m = filemtime($uri))) ? $m : time()+3600;
+      }
+      if ( !$file ||
+           ($file && !file_exists($file)) ||
+           ($file && file_exists($file) && $time <= $this->rss['cache_age'] && $mod >= (time() - ($this->rss['cache_age'] * 60))))
+      {
+         clearstatcache();
+         if (!($fp = @fopen($uri, 'r')))
+         {
+            $this->raiseError((__LINE__-2), ONYX_ERR_INVALID_URI);
+            return false;
+         }
+         while ($chunk = fread($fp, 4096))
+         {
+            $parsedOkay = xml_parse($this->parser, $chunk, feof($fp));
+            if (!$parsedOkay && xml_get_error_code($this->parser) != XML_ERROR_NONE)
+            {
+               $this->raiseError((__LINE__-3), 'File has an XML error (<em>'.xml_error_string(xml_get_error_code($this->parser)).'</em> at line <em>'.xml_get_current_line_number($this->parser).'</em>).');
+               return false;
+            }
+         }
+         fclose($fp);
+         clearstatcache();
+         if ($file)
+         {
+            if (!($cache = @fopen($file, 'w')))
+            {
+               $this->raiseError((__LINE__-2), 'Could not write to cache file (<em>'.$file.'</em>).  The path may be invalid or you may not have write permissions.');
+               return false;
+            }
+            fwrite($cache, serialize($this->data));
+            fclose($cache);
+            $this->rss['cache_age'] = 0;
+         }
+      }
+      else
+      {
+         clearstatcache();
+         if (!($fp = @fopen($file, 'r')))
+         {
+            $this->raiseError((__LINE__-2), 'Could not read contents of cache file (<em>'.$cache_file.'</em>).');
+            return false;
+         }
+         $this->data = unserialize(fread($fp, filesize($file)));
+         fclose($fp);
+      }
+      return true;
+   }
+
+   function parseLocal($uri, $file=false, $time=false)
+   {
+      return $this->parse($uri, $file, $time, true);
+   }
+
+   //private function tag_open($parser, $tag, $attrs)
+   function tag_open($parser, $tag, $attrs)
+   {
+      $this->rss['current_tag'] = $tag = strtolower($tag);
+      switch ($tag)
+      {
+         case 'channel':
+         case 'image':
+         case 'textinput':
+            $this->type = $tag;
+            break;
+         case 'item':
+            $this->type = $tag;
+            $this->rss['index']++;
+            break;
+         default:
+            break;
+      }
+      if (sizeof($attrs))
+         foreach ($attrs as $k => $v)
+            if (strpos($k, 'xmlns') !== false)
+               $this->data['namespaces'][$k] = $v;
+   }
+
+   //private function tag_close($parser, $tag){}
+   function tag_close($parser, $tag){}
+
+   //private function cdata($parser, $cdata)
+   function cdata($parser, $cdata)
+   {
+      if (strlen(trim($cdata)) && $cdata != "\n")
+         switch ($this->type)
+         {
+            case 'channel':
+            case 'image':
+            case 'textinput':
+               (!isset($this->data[$this->type][$this->rss['current_tag']]) ||
+                !strlen($this->data[$this->type][$this->rss['current_tag']])) ?
+                  $this->data[$this->type][$this->rss['current_tag']] = $cdata :
+                  $this->data[$this->type][$this->rss['current_tag']].= $cdata;
+               break;
+            case 'item':
+               (!isset($this->data['items'][$this->rss['index']-1][$this->rss['current_tag']]) ||
+                !strlen($this->data['items'][$this->rss['index']-1][$this->rss['current_tag']])) ? 
+                  $this->data['items'][$this->rss['index']-1][$this->rss['current_tag']] = $cdata :
+                  $this->data['items'][$this->rss['index']-1][$this->rss['current_tag']].= $cdata;
+               break;
+         }
+   }
+
+   function getData($type)
+   {
+      if ($type == ONYX_META)
+         return $this->conf['fetch_mode'] == 1 ? $this->data['channel'] : (object)$this->data['channel'];
+      if ($type == ONYX_IMAGE)
+         return $this->conf['fetch_mode'] == 1 ? $this->data['image'] : (object)$this->data['image'];
+      if ($type == ONYX_TEXTINPUT)
+         return $this->conf['fetch_mode'] == 1 ? $this->data['textinput'] : (object)$this->data['textinput'];
+      if ($type == ONYX_ITEMS)
+      {
+         if ($this->conf['fetch_mode'] == 1)
+            return $this->data['items'];
+
+         $temp = array();
+         for ($i=0; $i < sizeof($this->data['items']); $i++)
+            $temp[] = (object)$this->data['items'][$i];
+
+         return $temp;
+      }
+      if ($type == ONYX_NAMESPACES)
+         return $this->conf['fetch_mode'] == 1 ? $this->data['namespaces'] : (object)$this->data['namespaces'];
+      if ($type == ONYX_CACHE_AGE)
+         return $this->rss['cache_age'];
+
+      return false;
+   }
+
+   function numItems()
+   {
+      return sizeof($this->data['items']);
+   }
+
+   function getNextItem($max=false)
+   {
+      $type = $this->conf['fetch_mode'];
+      $this->rss['output_index']++;
+      if (($max && $this->rss['output_index'] > $max) || !isset($this->data['items'][$this->rss['output_index']]))
+         return false;
+
+      return ($type == ONYX_FETCH_ASSOC) ? $this->data['items'][$this->rss['output_index']] :
+             (($type == ONYX_FETCH_OBJECT) ? (object)$this->data['items'][$this->rss['output_index']] : false);
+   }
+
+   function itemAt($num)
+   {
+      if (!isset($this->data['items'][$num]))
+      {
+         $this->raiseError((__LINE__-3), ONYX_ERR_INVALID_ITEM);
+         return false;
+      }
+
+      $type = $this->conf['fetch_mode'];
+      return ($type == ONYX_FETCH_ASSOC) ? $this->data['items'][$num] :
+             (($type == ONYX_FETCH_OBJECT) ? (object)$this->data['items'][$num] : false);
+   }
+
+   function startBuffer($file=false)
+   {
+      $this->conf['output_file'] = $file;
+      ob_start();
+   }
+
+   function endBuffer()
+   {
+      if (!$this->conf['output_file'])
+         ob_end_flush();
+      else
+      {
+         if (!($fp = @fopen($this->conf['output_file'], 'w')))
+         {
+            $this->raiseError((__LINE__-2), ONYX_ERR_NO_STREAM);
+            ob_end_flush();
+            return;
+         }
+         fwrite($fp, ob_get_contents());
+         fclose($fp);
+         ob_end_clean();
+      }
+   }
+
+   //private function raiseError($line, $err)
+   function raiseError($line, $err)
+   {
+      if ($this->conf['debug_mode'])
+         printf($this->conf['error'], $line, $err);
+   }
+
+   function setCachePath($path)
+   {
+      $this->conf['cache_path'] = $path;
+   }
+
+   function setExpiryTime($time)
+   {
+      $this->conf['cache_time'] = $time;
+   }
+
+   function setDebugMode($state)
+   {
+      $this->conf['debug_mode'] = (bool)$state;
+   }
+
+   function setFetchMode($mode)
+   {
+      $this->conf['fetch_mode'] = $mode;
+   }
+
+   //private function mod_time($uri)
+   function mod_time($uri)
+   {
+      if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') >= 0)
+      {
+         if (!($fp = @fopen($uri, 'r')))
+            return false;
+
+         $meta = stream_get_meta_data($fp);
+         for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
+            if (strpos(strtolower($meta['wrapper_data'][$j]), 'last-modified') !== false)
+            {
+               $modtime = substr($meta['wrapper_data'][$j], 15);
+               break;
+            }
+         fclose($fp);
+      }
+      else
+      {
+         $parts = parse_url($uri);
+         $host  = $parts['host'];
+         $path  = $parts['path'];
+
+         if (!($fp = @fsockopen($host, 80)))
+            return false;
+
+         $req = "HEAD $path HTTP/1.1\r\nUser-Agent: PHP/".phpversion();
+         $req.= "\r\nHost: $host\r\nAccept: */*\r\n\r\n";
+         fputs($fp, $req);
+
+         while (!feof($fp))
+         {
+            $str = fgets($fp, 4096);
+            if (strpos(strtolower($str), 'last-modified') !== false)
+            {
+               $modtime = substr($str, 15);
+               break;
+            }
+         }
+         fclose($fp);
+      }
+      return (isset($modtime)) ? $modtime : 0;
+   }
+}
+
+
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/htmlarea license.txt,1.2,1.3

[Kristian K?h. <is...@us...>]

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

Modified Files:
	license.txt 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: license.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/license.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- license.txt	23 Mar 2004 15:41:04 -0000	1.2
+++ license.txt	3 Apr 2004 17:36:16 -0000	1.3
@@ -1,30 +1,30 @@
-htmlArea License (based on BSD license)
-Copyright (c) 2002-2004, interactivetools.com, inc.
-Copyright (c) 2003-2004 dynarch.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1) Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2) 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.
-
-3) Neither the name of interactivetools.com, inc. nor the names of its
-   contributors may 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.
+htmlArea License (based on BSD license)
+Copyright (c) 2002-2004, interactivetools.com, inc.
+Copyright (c) 2003-2004 dynarch.com
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1) Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2) 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.
+
+3) Neither the name of interactivetools.com, inc. nor the names of its
+   contributors may 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.

[php-blog-cvs] serendipity compat.php,1.13,1.14 serendipity_admin_images.inc.php,1.19,1.20 serendipity_config.inc.php,1.60,1.61 serendipity_functions_images.inc.php,1.7,1.8

[Kristian K?h. <is...@us...>]

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

Modified Files:
	compat.php serendipity_admin_images.inc.php 
	serendipity_config.inc.php 
	serendipity_functions_images.inc.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_config.inc.php	22 Mar 2004 07:52:14 -0000	1.60
+++ serendipity_config.inc.php	3 Apr 2004 17:36:16 -0000	1.61
@@ -81,12 +81,12 @@
  *   Make sure that the file included is in the current directory and not any possible
  *   include path
  */
-if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
-    include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
-} elseif (file_exists($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php')) {
-    include_once($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php');
-} else {
-    include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
+if (file_exists($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php')) {
+    include_once($_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/serendipity_config_local.inc.php');
+} elseif (file_exists($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php')) {
+    include_once($serendipity['serendipityPath'] . '/serendipity_config_local.inc.php');
+} else {
+    include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
 }
 
 /*

Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_functions_images.inc.php	21 Mar 2004 16:35:32 -0000	1.7
+++ serendipity_functions_images.inc.php	3 Apr 2004 17:36:16 -0000	1.8
@@ -305,21 +305,21 @@
     
     if (is_null($newheight)) {
         // calculate aspect ratio
-        $div_width  = $width  / $newwidth;
-        $div_height = $height / $newwidth;
+        $div_width  = $width  / $newwidth;
+        $div_height = $height / $newwidth;
 
-        if ($div_width <= 1 && $div_height <= 1) {
-            // do not scale small images
-            $newheight = $width;
-            $newwidth  = $height;
-        } elseif ($div_width >= $div_height) {
-            // max width - calculate height, keep width as scaling base
-            $newheight = round($height / $div_width);
-        } else {
-            // max height - calculate width, keep height as scaling base
-            $newheight = $newwidth;
-            $newwidth  = round($width / $div_height);
-        }
+        if ($div_width <= 1 && $div_height <= 1) {
+            // do not scale small images
+            $newheight = $width;
+            $newwidth  = $height;
+        } elseif ($div_width >= $div_height) {
+            // max width - calculate height, keep width as scaling base
+            $newheight = round($height / $div_width);
+        } else {
+            // max height - calculate width, keep height as scaling base
+            $newheight = $newwidth;
+            $newwidth  = round($width / $div_height);
+        }
     }
 
     $out = imagecreatetruecolor($newwidth, $newheight);

Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/compat.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- compat.php	21 Mar 2004 16:35:31 -0000	1.13
+++ compat.php	3 Apr 2004 17:36:16 -0000	1.14
@@ -1,17 +1,17 @@
 <?php # $Id$
 
 if (!function_exists('file_get_contents')) {
-    function file_get_contents($filename, $use_include_path = 0) {
+    function file_get_contents($filename, $use_include_path = 0) {
         $file = fopen($filename, 'rb', $use_include_path);
-        $data = '';
-        if ($file) {
-            while (!feof($file)) {
-                $data .= fread($file, 4096);
-            }
-            fclose($file);
-        }
+        $data = '';
+        if ($file) {
+            while (!feof($file)) {
+                $data .= fread($file, 4096);
+            }
+            fclose($file);
+        }
 
-        return $data;
+        return $data;
     } 
 }
 

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_admin_images.inc.php	22 Mar 2004 15:19:25 -0000	1.19
+++ serendipity_admin_images.inc.php	3 Apr 2004 17:36:16 -0000	1.20
@@ -157,7 +157,7 @@
 
     <script type="text/javascript">
     function getfilename(field, value) {
-        re = /^.+[\/\\]+?(.+)$/;
+        re = /^.+[\/\\]+?(.+)$/;
         document.getElementById(field).value = value.replace(re, "$1");
     }
     </script>

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

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_plugin_recententries.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_plugin_recententries.php	27 Mar 2004 12:10:23 -0000	1.3
+++ serendipity_plugin_recententries.php	3 Apr 2004 17:36:19 -0000	1.4
@@ -21,14 +21,14 @@
         break;
 }
 
-class serendipity_plugin_recententries extends serendipity_plugin {
+class serendipity_plugin_recententries extends serendipity_plugin {
 
     function introspect(&$propbag) {
-        $propbag->add('name',        PLUGIN_RECENTENTRIES_TITLE);
-        $propbag->add('description', PLUGIN_RECENTENTRIES_BLAHBLAH);
+        $propbag->add('name',        PLUGIN_RECENTENTRIES_TITLE);
+        $propbag->add('description', PLUGIN_RECENTENTRIES_BLAHBLAH);
         $propbag->add('configuration', array('number', 'dateformat'));
-    }
-
+    }
+
     function introspect_config_item($name, &$propbag) {
         switch($name) {
             case 'number':
@@ -49,9 +49,9 @@
         return true;
     }
 
-    function generate_content(&$title) {
-        global $serendipity;
-
+    function generate_content(&$title) {
+        global $serendipity;
+
         $number     = $this->get_config('number');
         $dateformat = $this->get_config('dateformat');
 
@@ -63,19 +63,19 @@
             $dateformat = '%A, %B %e %Y';
         }
 
-        $title = PLUGIN_RECENTENTRIES_TITLE;
+        $title = PLUGIN_RECENTENTRIES_TITLE;
 
         $entries = serendipity_db_query("SELECT id,
                                                 title,
-                                                timestamp
+                                                timestamp
                                            FROM {$serendipity['dbPrefix']}entries
                                           WHERE isdraft = 'false'
                                        ORDER BY timestamp DESC
-                                          LIMIT $number");
-
-        foreach ($entries as $k => $entry) {
+                                          LIMIT $number");
+
+        foreach ($entries as $k => $entry) {
             $entryLink = serendipity_archiveURL(
-                           $entry['id'],
+                           $entry['id'],
                            $entry['title'],
                            'serendipityHTTPPath'
                         );
@@ -83,9 +83,9 @@
             echo '<a href="' . $entryLink . '" title="' . htmlentities($entry['title']) . '">' . $entry['title'] . '</a><br />'
                  . '<div class="serendipitySideBarDate">'
                  . htmlentities(strftime($dateformat, $entry['timestamp']))
-                 . '</div><br />';
-        }
-    }
+                 . '</div><br />';
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

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

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_event_htmlvalidator.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_event_htmlvalidator.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_htmlvalidator/serendipity_event_htmlvalidator.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_htmlvalidator.php	10 Feb 2004 16:04:27 -0000	1.2
+++ serendipity_event_htmlvalidator.php	3 Apr 2004 17:36:17 -0000	1.3
@@ -1,5 +1,5 @@
 <?php # $Id$
-
+
 switch ($serendipity['lang']) {
     case 'de':
         @define('PLUGIN_EVENT_HTMLVALIDATOR_NAME', 'HTML Validator');
@@ -16,7 +16,7 @@
     case 'es':
     default:
         @define('PLUGIN_EVENT_HTMLVALIDATOR_NAME', 'HTML Validator');
-        @define('PLUGIN_EVENT_HTMLVALIDATOR_DESC', 'Validates entries on their XML-conformity');
+        @define('PLUGIN_EVENT_HTMLVALIDATOR_DESC', 'Validates entries on their XML-conformity');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSET', 'Charset');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_CHARSETDESC', 'The usual charset of your articles');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE', 'Doctype');
@@ -33,18 +33,18 @@
         global $serendipity;
         
         $propbag->add('name',          PLUGIN_EVENT_HTMLVALIDATOR_NAME);
-        $propbag->add('description',   PLUGIN_EVENT_HTMLVALIDATOR_DESC);
-        $propbag->add('event_hooks',    array(
+        $propbag->add('description',   PLUGIN_EVENT_HTMLVALIDATOR_DESC);
+        $propbag->add('event_hooks',    array(
             'backend_preview' => true,
-            'backend_display' => true,
-        ));
-        
-        $propbag->add('configuration', array('charset', 'doctype', 'default_validate'));
-        
+            'backend_display' => true,
+        ));
+        
+        $propbag->add('configuration', array('charset', 'doctype', 'default_validate'));
+        
     }
 
     function introspect_config_item($name, &$propbag)
-    {
+    {
         switch($name) {
             case 'default_validate':
                 $propbag->add('type',        'boolean');
@@ -53,68 +53,68 @@
                 break;
 
             case 'charset':
-                $propbag->add('type',        'select');
+                $propbag->add('type',        'select');
                 $propbag->add('name',        PLUGIN_EVENT_HTMLVALIDATOR_CHARSET);
                 $propbag->add('description', PLUGIN_EVENT_HTMLVALIDATOR_CHARSETDESC);
-                $propbag->add('select_values', array(
-                    '(detect automatically)' => '(detect automatically)',
-                    'utf-8 (Unicode, worldwide)' => 'utf-8 (Unicode, worldwide)',
-                    'utf-16 (Unicode, worldwide)' => 'utf-16 (Unicode, worldwide)',
-                    'iso-8859-1 (Western Europe)' => 'iso-8859-1 (Western Europe)',
-                    'iso-8859-2 (Central Europe)' => 'iso-8859-2 (Central Europe)',
-                    'iso-8859-3 (Southern Europe)' => 'iso-8859-3 (Southern Europe)',
-                    'iso-8859-4 (Baltic Rim)' => 'iso-8859-4 (Baltic Rim)',
-                    'iso-8859-5 (Cyrillic)' => 'iso-8859-5 (Cyrillic)',
-                    'iso-8859-6-i (Arabic)' => 'iso-8859-6-i (Arabic)',
-                    'iso-8859-7 (Greek)' => 'iso-8859-7 (Greek)',
-                    'iso-8859-8-i (Hebrew)' => 'so-8859-8-i (Hebrew)',
-                    'iso-8859-9 (Turkish)' => 'iso-8859-9 (Turkish)',
-                    'iso-8859-10 (Latin 6)' => 'iso-8859-10 (Latin 6)',
-                    'iso-8859-13 (Latin 7)' => 'iso-8859-13 (Latin 7)',
-                    'iso-8859-14 (Celtic)' => 'iso-8859-14 (Celtic)',
-                    'iso-8859-15 (Latin 9)' => 'iso-8859-15 (Latin 9)',
-                    'us-ascii (basic English)' => 'us-ascii (basic English)',
-                    'euc-jp (Japanese, Unix)' => 'euc-jp (Japanese, Unix)',
-                    'shift_jis (Japanese, Win/Mac)' => 'shift_jis (Japanese, Win/Mac)',
-                    'iso-2022-jp (Japanese, email)' => 'iso-2022-jp (Japanese, email)',
-                    'euc-kr (Korean)' => 'euc-kr (Korean)',
-                    'gb2312 (Chinese, simplified)' => 'gb2312 (Chinese, simplified)',
-                    'gb18030 (Chinese, simplified)' => 'gb18030 (Chinese, simplified)',
-                    'big5 (Chinese, traditional)' => 'big5 (Chinese, traditional)',
-                    'tis-620 (Thai)' => 'tis-620 (Thai)',
-                    'koi8-r (Russian)' => 'koi8-r (Russian)',
-                    'koi8-u (Ukrainian)' => 'koi8-u (Ukrainian)',
-                    'macintosh (MacRoman)' => 'macintosh (MacRoman)',
-                    'windows-1250 (Central Europe)' => 'windows-1250 (Central Europe)',
-                    'windows-1251 (Cyrillic)' => 'windows-1251 (Cyrillic)',
-                    'windows-1252 (Western Europe)' => 'windows-1252 (Western Europe)',
-                    'windows-1253 (Greek)' => 'windows-1253 (Greek)',
-                    'windows-1254 (Turkish)' => 'windows-1254 (Turkish)',
-                    'windows-1255 (Hebrew)' => 'windows-1255 (Hebrew)',
-                    'windows-1256 (Arabic)' => 'windows-1256 (Arabic)',
-                    'windows-1257 (Baltic Rim)' => 'windows-1257 (Baltic Rim)'
+                $propbag->add('select_values', array(
+                    '(detect automatically)' => '(detect automatically)',
+                    'utf-8 (Unicode, worldwide)' => 'utf-8 (Unicode, worldwide)',
+                    'utf-16 (Unicode, worldwide)' => 'utf-16 (Unicode, worldwide)',
+                    'iso-8859-1 (Western Europe)' => 'iso-8859-1 (Western Europe)',
+                    'iso-8859-2 (Central Europe)' => 'iso-8859-2 (Central Europe)',
+                    'iso-8859-3 (Southern Europe)' => 'iso-8859-3 (Southern Europe)',
+                    'iso-8859-4 (Baltic Rim)' => 'iso-8859-4 (Baltic Rim)',
+                    'iso-8859-5 (Cyrillic)' => 'iso-8859-5 (Cyrillic)',
+                    'iso-8859-6-i (Arabic)' => 'iso-8859-6-i (Arabic)',
+                    'iso-8859-7 (Greek)' => 'iso-8859-7 (Greek)',
+                    'iso-8859-8-i (Hebrew)' => 'so-8859-8-i (Hebrew)',
+                    'iso-8859-9 (Turkish)' => 'iso-8859-9 (Turkish)',
+                    'iso-8859-10 (Latin 6)' => 'iso-8859-10 (Latin 6)',
+                    'iso-8859-13 (Latin 7)' => 'iso-8859-13 (Latin 7)',
+                    'iso-8859-14 (Celtic)' => 'iso-8859-14 (Celtic)',
+                    'iso-8859-15 (Latin 9)' => 'iso-8859-15 (Latin 9)',
+                    'us-ascii (basic English)' => 'us-ascii (basic English)',
+                    'euc-jp (Japanese, Unix)' => 'euc-jp (Japanese, Unix)',
+                    'shift_jis (Japanese, Win/Mac)' => 'shift_jis (Japanese, Win/Mac)',
+                    'iso-2022-jp (Japanese, email)' => 'iso-2022-jp (Japanese, email)',
+                    'euc-kr (Korean)' => 'euc-kr (Korean)',
+                    'gb2312 (Chinese, simplified)' => 'gb2312 (Chinese, simplified)',
+                    'gb18030 (Chinese, simplified)' => 'gb18030 (Chinese, simplified)',
+                    'big5 (Chinese, traditional)' => 'big5 (Chinese, traditional)',
+                    'tis-620 (Thai)' => 'tis-620 (Thai)',
+                    'koi8-r (Russian)' => 'koi8-r (Russian)',
+                    'koi8-u (Ukrainian)' => 'koi8-u (Ukrainian)',
+                    'macintosh (MacRoman)' => 'macintosh (MacRoman)',
+                    'windows-1250 (Central Europe)' => 'windows-1250 (Central Europe)',
+                    'windows-1251 (Cyrillic)' => 'windows-1251 (Cyrillic)',
+                    'windows-1252 (Western Europe)' => 'windows-1252 (Western Europe)',
+                    'windows-1253 (Greek)' => 'windows-1253 (Greek)',
+                    'windows-1254 (Turkish)' => 'windows-1254 (Turkish)',
+                    'windows-1255 (Hebrew)' => 'windows-1255 (Hebrew)',
+                    'windows-1256 (Arabic)' => 'windows-1256 (Arabic)',
+                    'windows-1257 (Baltic Rim)' => 'windows-1257 (Baltic Rim)'
                 ));
                 break;
 
             case 'doctype':
                 $propbag->add('type',        'select');
                 $propbag->add('name',        PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE);
-                $propbag->add('description', PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC);
-                $propbag->add('select_values', array(
-                    'Inline'                 => '(detect automatically)',
-                    'XHTML 1.1'              => 'XHTML 1.1',
-                    'XHTML Basic 1.0'        => 'XHTML Basic 1.0',
-                    'XHTML 1.0 Strict'       => 'XHTML 1.0 Strict',
-                    'XHTML 1.0 Transitional' => 'XHTML 1.0 Transitional',
-                    'XHTML 1.0 Frameset'     => 'XHTML 1.0 Frameset',
-                    'HTML 4.01 Strict'       => 'HTML 4.01 Strict',
-                    'HTML 4.01 Transitional' => 'HTML 4.01 Transitional',
-                    'HTML 4.01 Frameset'     => 'HTML 4.01 Frameset',
-                    'HTML 3.2'               => 'HTML 3.2',
-                    'HTML 2.0'               => 'HTML 2.0'
+                $propbag->add('description', PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC);
+                $propbag->add('select_values', array(
+                    'Inline'                 => '(detect automatically)',
+                    'XHTML 1.1'              => 'XHTML 1.1',
+                    'XHTML Basic 1.0'        => 'XHTML Basic 1.0',
+                    'XHTML 1.0 Strict'       => 'XHTML 1.0 Strict',
+                    'XHTML 1.0 Transitional' => 'XHTML 1.0 Transitional',
+                    'XHTML 1.0 Frameset'     => 'XHTML 1.0 Frameset',
+                    'HTML 4.01 Strict'       => 'HTML 4.01 Strict',
+                    'HTML 4.01 Transitional' => 'HTML 4.01 Transitional',
+                    'HTML 4.01 Frameset'     => 'HTML 4.01 Frameset',
+                    'HTML 3.2'               => 'HTML 3.2',
+                    'HTML 2.0'               => 'HTML 2.0'
                 ));
                 break;
-
+
             default:
                     return false;
         }
@@ -130,7 +130,7 @@
         
         $hooks = &$bag->get('event_hooks');
 
-        if (isset($hooks[$event])) {
+        if (isset($hooks[$event])) {
             switch($event) {
                 case 'backend_display':
 ?>
@@ -142,111 +142,111 @@
                             <input style="margin: 0px; padding: 0px; vertical-align: bottom;" type="checkbox" name="serendipity[default_validate]" id="serendipity[default_validate]" value="true" <?php echo $selected; ?> />
                                 <label style="vertical-align: bottom; margin: 0px; padding: 0px;" for="serendipity[default_validate]">&nbsp;<?php echo PLUGIN_EVENT_HTMLVALIDATOR_GOVALIDATE; ?>&nbsp;&nbsp;</label>
                     </fieldset>
-<?php
+<?php
                     break;
-                
+                
                 case 'backend_preview':
                     if (!$serendipity['POST']['default_validate']) {
                         return true;
                     }
-                    
-                    $url = 'validator.w3.org';
-                    $path = '/check';
-                    $fp = fsockopen($url, 80, $errno, $errstr, 30);
-
-                    $doctype = $this->get_config('doctype');
-                    $charset = $this->get_config('charset');
-
-                    if (empty($doctype)) {
-                        $doctype = 'XHTML 1.1';
-                    }
-                    
-                    if (empty($charset)) {
-                        $charset = 'iso-8859-1 (Western Europe)';
-                    }
-                    
-                    $data = '<html><head><title>s9y</title></head><body><div>'
-                          . $eventData
-                          . '</div></body></html>';
-                    $request_data .= '-----------------------------24464570528145
-Content-Disposition: form-data; name="uploaded_file"; filename="s9y.htm"
-Content-Type: text/html
-
-' . $data . '
------------------------------24464570528145
-Content-Disposition: form-data; name="charset"
-
-' . $charset . '
------------------------------24464570528145
-Content-Disposition: form-data; name="doctype"
-
-' . $doctype . '
------------------------------24464570528145
-Content-Disposition: form-data; name="verbose"
-
-1
------------------------------24464570528145--';
-
-                    $request_length = strlen($request_data);
-                    $REQUEST = array();
-                    $REQUEST[] = 'POST ' . $path . ' HTTP/1.0';
-                    $REQUEST[] = 'Host: ' . $url;
-                    $REQUEST[] = 'User-Agent: serendipity/' . $serendipity['version'];
-                    $REQUEST[] = 'Referer: http://validator.w3.org/';
-                    $REQUEST[] = 'Content-Type: multipart/form-data; boundary=---------------------------24464570528145';
-                    $REQUEST[] = 'Content-Length: ' . $request_length;
-                    $REQUEST[] = 'Connection: close' . "\n";
-                    $REQUEST[] = $request_data;
-
-                    $REQUEST_STRING = implode("\n", $REQUEST);
-                    fputs($fp, $REQUEST_STRING);
-
-                    $line = fgets($fp, 1024);
-                    if (preg_match('@^HTTP/1\.. (2|3)0(2|0)@', $line)) {
-                        $out = '';
-                        $inheader = 1;
-                        while(!feof($fp) && strlen($out) < 200000) {
-                            $line = fgets($fp,1024);
-                            if ($inheader && ($line == "\n" || $line == "\r\n")) {
-                                $inheader = 0;
-                            } elseif (!$inheader) {
-                                $out .= $line;
-                            }
-                        }
-                    }
-                    fclose($fp);
-                    
-                    preg_match('@<table class="header">.+</table>.+</div>.+(<h2 .+)</body>@ms', $out, $html);
-
-                    // Cut the waste
-                    $html[1] = preg_replace(
-                                 array(
-                                   '@<address>.+</address>@ms',
-                                   '@<dl class="tip">.+</dl>@ms',
-                                   '@<div id="source".+>.+</div>@msU'
-                                 ),
-                                 
-                                 array(
-                                   '',
-                                   '',
-                                   ''
-                                 ),
-                                
-                                 $html[1]
-                    );
-                    
-                    echo '<div style="border: 1px solid red; margin: 10px; padding: 5px; "><div>' . $html[1] . '</div>';
+                    
+                    $url = 'validator.w3.org';
+                    $path = '/check';
+                    $fp = fsockopen($url, 80, $errno, $errstr, 30);
+
+                    $doctype = $this->get_config('doctype');
+                    $charset = $this->get_config('charset');
+
+                    if (empty($doctype)) {
+                        $doctype = 'XHTML 1.1';
+                    }
+                    
+                    if (empty($charset)) {
+                        $charset = 'iso-8859-1 (Western Europe)';
+                    }
+                    
+                    $data = '<html><head><title>s9y</title></head><body><div>'
+                          . $eventData
+                          . '</div></body></html>';
+                    $request_data .= '-----------------------------24464570528145
+Content-Disposition: form-data; name="uploaded_file"; filename="s9y.htm"
+Content-Type: text/html
+
+' . $data . '
+-----------------------------24464570528145
+Content-Disposition: form-data; name="charset"
+
+' . $charset . '
+-----------------------------24464570528145
+Content-Disposition: form-data; name="doctype"
+
+' . $doctype . '
+-----------------------------24464570528145
+Content-Disposition: form-data; name="verbose"
+
+1
+-----------------------------24464570528145--';
+
+                    $request_length = strlen($request_data);
+                    $REQUEST = array();
+                    $REQUEST[] = 'POST ' . $path . ' HTTP/1.0';
+                    $REQUEST[] = 'Host: ' . $url;
+                    $REQUEST[] = 'User-Agent: serendipity/' . $serendipity['version'];
+                    $REQUEST[] = 'Referer: http://validator.w3.org/';
+                    $REQUEST[] = 'Content-Type: multipart/form-data; boundary=---------------------------24464570528145';
+                    $REQUEST[] = 'Content-Length: ' . $request_length;
+                    $REQUEST[] = 'Connection: close' . "\n";
+                    $REQUEST[] = $request_data;
+
+                    $REQUEST_STRING = implode("\n", $REQUEST);
+                    fputs($fp, $REQUEST_STRING);
+
+                    $line = fgets($fp, 1024);
+                    if (preg_match('@^HTTP/1\.. (2|3)0(2|0)@', $line)) {
+                        $out = '';
+                        $inheader = 1;
+                        while(!feof($fp) && strlen($out) < 200000) {
+                            $line = fgets($fp,1024);
+                            if ($inheader && ($line == "\n" || $line == "\r\n")) {
+                                $inheader = 0;
+                            } elseif (!$inheader) {
+                                $out .= $line;
+                            }
+                        }
+                    }
+                    fclose($fp);
+                    
+                    preg_match('@<table class="header">.+</table>.+</div>.+(<h2 .+)</body>@ms', $out, $html);
+
+                    // Cut the waste
+                    $html[1] = preg_replace(
+                                 array(
+                                   '@<address>.+</address>@ms',
+                                   '@<dl class="tip">.+</dl>@ms',
+                                   '@<div id="source".+>.+</div>@msU'
+                                 ),
+                                 
+                                 array(
+                                   '',
+                                   '',
+                                   ''
+                                 ),
+                                
+                                 $html[1]
+                    );
+                    
+                    echo '<div style="border: 1px solid red; margin: 10px; padding: 5px; "><div>' . $html[1] . '</div>';
                     return true;
-                    break;
-                
-                default:
-                    return false;
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
+                    break;
+                
+                default:
+                    return false;
+                    break;
+            }
+        } else {
+            return false;
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

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

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_event_mailer.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_mailer.php	10 Feb 2004 15:50:29 -0000	1.2
+++ serendipity_event_mailer.php	3 Apr 2004 17:36:17 -0000	1.3
@@ -1,5 +1,5 @@
 <?php # $Id$
-
+
 switch ($serendipity['lang']) {
     case 'de':
         @define('PLUGIN_EVENT_MAILER_NAME', 'Artikel mailen');
@@ -25,26 +25,26 @@
         global $serendipity;
         
         $propbag->add('name',          PLUGIN_EVENT_MAILER_NAME);
-        $propbag->add('description',   PLUGIN_EVENT_MAILER_DESC);
-        $propbag->add('event_hooks',    array(
-            'backend_publish' => true
-        ));
-        
+        $propbag->add('description',   PLUGIN_EVENT_MAILER_DESC);
+        $propbag->add('event_hooks',    array(
+            'backend_publish' => true
+        ));
+        
         $propbag->add('configuration', array('mailto'));
     }
 
     function introspect_config_item($name, &$propbag)
-    {
-        switch($name) {
+    {
+        switch($name) {
             case 'mailto':
                 $propbag->add('type',        'string');
                 $propbag->add('name',        PLUGIN_EVENT_MAILER_RECIPIENT);
-                $propbag->add('description', PLUGIN_EVENT_MAILER_RECIPIENTDESC);
-                break;
-            default:
-                break;
-        }
-        
+                $propbag->add('description', PLUGIN_EVENT_MAILER_RECIPIENTDESC);
+                break;
+            default:
+                break;
+        }
+        
         return true;
     }
 
@@ -57,8 +57,8 @@
         
         $hooks = &$bag->get('event_hooks');
 
-        if (isset($hooks[$event])) {
-            switch($event) {
+        if (isset($hooks[$event])) {
+            switch($event) {
                 case 'backend_publish':
                     $mail = array(
                       'to'      => $this->get_config('mailto'),
@@ -67,18 +67,18 @@
                       'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
                     );
                     
-                    mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
+                    mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
                     return true;
-                    break;
-                
-                default:
-                    return false;
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
+                    break;
+                
+                default:
+                    return false;
+                    break;
+            }
+        } else {
+            return false;
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.4,1.5

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_event_statistics.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_statistics.php	30 Mar 2004 08:03:42 -0000	1.4
+++ serendipity_event_statistics.php	3 Apr 2004 17:36:17 -0000	1.5
@@ -1,55 +1,55 @@
 <?php # $Id$
-
+
 switch ($serendipity['lang']) {
     case 'de':
         @define('PLUGIN_EVENT_STATISTICS_NAME', 'Statistiken');
         @define('PLUGIN_EVENT_STATISTICS_DESC', 'Zeigt einen Link zu Statistiken in der Autorenoberfläche');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_STATISTICS', 'Statistik');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY', 'Erster Eintrag');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY', 'Letzter Eintrag');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES', 'Insgesamt verfasste Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ENTRIES', 'Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC', ' ... davon öffentlich');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS', ' ... davon Entwürfe');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES', 'Vorhandene Kategorien');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2', 'Kategorie(n)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES', 'Verteilung der Artikel auf Kategorien');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2', 'eingetragene(r) Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES', 'Hochgeladene Bilder');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2', 'Bild(er)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES', 'Verteilung der Bild-Dateitypen');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2', 'vorhandene Datei(en)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS', 'Erhaltene Kommentare');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2', 'Kommentar(e)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3', 'Top kommentierte Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS', 'Top Kommentatoren');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_LINK', 'Link');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS', 'Abonnenten');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2', 'Abonnent(en)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS', 'Top abonnierte Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2', 'eingetragene(r) Abonnent(en)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS', 'Erhaltene Trackbacks');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2', 'Trackback(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK', 'Top Trackback-Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2', 'eingetragene(r) Trackback(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3', 'Top Trackbacker');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE', 'Durchschnittliche Kommentare pro Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE', 'Durchschnittliche Trackbacks pro Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY', 'Durchschnittliche Artikel pro Tag');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK', 'Durchschnittliche Artikel pro Woche');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH', 'Durchschnittliche Artikel pro Monat');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE2', 'Kommentare/Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2', 'Trackbacks/Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2', 'Artikel/Tag');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2', 'Artikel/Woche');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2', 'Artikel/Monat');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS', 'Menge der verfassten Zeichen');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS2', 'Zeichen');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE', 'Zeichen pro Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2', 'Zeichen/Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_STATISTICS', 'Statistik');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY', 'Erster Eintrag');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY', 'Letzter Eintrag');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES', 'Insgesamt verfasste Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ENTRIES', 'Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC', ' ... davon öffentlich');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS', ' ... davon Entwürfe');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES', 'Vorhandene Kategorien');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2', 'Kategorie(n)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES', 'Verteilung der Artikel auf Kategorien');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2', 'eingetragene(r) Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES', 'Hochgeladene Bilder');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2', 'Bild(er)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES', 'Verteilung der Bild-Dateitypen');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2', 'vorhandene Datei(en)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS', 'Erhaltene Kommentare');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2', 'Kommentar(e)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3', 'Top kommentierte Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS', 'Top Kommentatoren');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_LINK', 'Link');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS', 'Abonnenten');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2', 'Abonnent(en)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS', 'Top abonnierte Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2', 'eingetragene(r) Abonnent(en)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS', 'Erhaltene Trackbacks');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2', 'Trackback(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK', 'Top Trackback-Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2', 'eingetragene(r) Trackback(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3', 'Top Trackbacker');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE', 'Durchschnittliche Kommentare pro Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE', 'Durchschnittliche Trackbacks pro Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY', 'Durchschnittliche Artikel pro Tag');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK', 'Durchschnittliche Artikel pro Woche');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH', 'Durchschnittliche Artikel pro Monat');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE2', 'Kommentare/Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2', 'Trackbacks/Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2', 'Artikel/Tag');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2', 'Artikel/Woche');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2', 'Artikel/Monat');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS', 'Menge der verfassten Zeichen');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS2', 'Zeichen');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE', 'Zeichen pro Artikel');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2', 'Zeichen/Artikel');
         @define('PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES', 'Die %s längsten Artikel');
-        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS', 'Anzahl Einträge');
-        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC', 'Wieviele Einträge sollen pro Wert dargestellt werden? (Standard: 20)');
+        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS', 'Anzahl Einträge');
+        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC', 'Wieviele Einträge sollen pro Wert dargestellt werden? (Standard: 20)');
         break;
     
     case 'en':
@@ -57,52 +57,52 @@
     default:
         @define('PLUGIN_EVENT_STATISTICS_NAME', 'Statistics');
         @define('PLUGIN_EVENT_STATISTICS_DESC', 'Display a link to statistics in entries-panel');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_STATISTICS', 'Statistics');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY', 'First entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY', 'Last entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES', 'Total entries');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ENTRIES', 'entries');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC', ' ... public');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS', ' ... drafts');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES', 'Categories');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2', 'categories');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES', 'Distribution of entries');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2', 'entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES', 'Uploaded images');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2', 'image(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES', 'Distribution of image types');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2', 'file(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS', 'Received comments');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2', 'comment(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3', 'Most frequently commented entries');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS', 'Most frequently commenting people');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_LINK', 'link');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS', 'Subscribers');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2', 'subscriber(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS', 'Most frequently subscribed entries');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2', 'subscriber(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS', 'Received trackbacks');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2', 'trackback(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK', 'Most frequently trackbacked entires');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2', 'trackback(s)');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3', 'Most frequently trackbacking people');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE', 'estimated comments per entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE', 'estimated trackbacks per entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY', 'estimated entries per day');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK', 'estimated entries per week');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH', 'estimated entries per month');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE2', 'comments/entries');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2', 'trackbacks/entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2', 'entries/day');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2', 'entries/week');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2', 'entries/month');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS', 'Total amount of characters');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS2', 'characters');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE', 'Characters per entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2', 'chars/entry');
-        @define('PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES', 'The %s longest entries');
-        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS', 'Maximum items');
-        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC', 'How many items to display per statistical value? (Default: 20)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_STATISTICS', 'Statistics');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY', 'First entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY', 'Last entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES', 'Total entries');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ENTRIES', 'entries');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC', ' ... public');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS', ' ... drafts');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES', 'Categories');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2', 'categories');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES', 'Distribution of entries');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2', 'entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES', 'Uploaded images');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2', 'image(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES', 'Distribution of image types');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2', 'file(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS', 'Received comments');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2', 'comment(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3', 'Most frequently commented entries');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS', 'Most frequently commenting people');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_LINK', 'link');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS', 'Subscribers');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2', 'subscriber(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS', 'Most frequently subscribed entries');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2', 'subscriber(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS', 'Received trackbacks');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2', 'trackback(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK', 'Most frequently trackbacked entires');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2', 'trackback(s)');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3', 'Most frequently trackbacking people');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE', 'estimated comments per entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE', 'estimated trackbacks per entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY', 'estimated entries per day');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK', 'estimated entries per week');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH', 'estimated entries per month');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE2', 'comments/entries');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2', 'trackbacks/entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2', 'entries/day');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2', 'entries/week');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2', 'entries/month');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS', 'Total amount of characters');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS2', 'characters');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE', 'Characters per entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2', 'chars/entry');
+        @define('PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES', 'The %s longest entries');
+        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS', 'Maximum items');
+        @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC', 'How many items to display per statistical value? (Default: 20)');
         break;
 }
 
@@ -113,17 +113,17 @@
         global $serendipity;
         
         $propbag->add('name',          PLUGIN_EVENT_STATISTICS_NAME);
-        $propbag->add('description',   PLUGIN_EVENT_STATISTICS_DESC);
-        $propbag->add('event_hooks',    array(
-            'backend_sidebar_entries' => true,
+        $propbag->add('description',   PLUGIN_EVENT_STATISTICS_DESC);
+        $propbag->add('event_hooks',    array(
+            'backend_sidebar_entries' => true,
             'backend_sidebar_entries_event_display_statistics' => true
-        ));
-        
+        ));
+        
         $propbag->add('configuration', array('max_items'));
     }
 
     function introspect_config_item($name, &$propbag)
-    {
+    {
         switch($name) {
             case 'max_items':
                 $propbag->add('type', 'string');
@@ -134,7 +134,7 @@
         
         return true;
     }
-
+
     function generate_content(&$title) {
         $title = PLUGIN_EVENT_STATISTICS_NAME;
     }
@@ -144,17 +144,17 @@
         
         $hooks = &$bag->get('event_hooks');
 
-        if (isset($hooks[$event])) {
+        if (isset($hooks[$event])) {
             switch($event) {
-                case 'backend_sidebar_entries':
+                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 />
-<?php
-                    // }
-                    
+<?php
+                    // }
+                    
                     break;
-                
+                
                 case 'backend_sidebar_entries_event_display_statistics':
                     $max_items = $this->get_config('max_items');
                     
@@ -162,287 +162,287 @@
                         $max_items = 20;
                     }
 
-                    $first_entry    = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC limit 1", true);
-                    $last_entry     = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp DESC limit 1", true);
-                    $total_count    = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries", true);
-                    $draft_count    = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'true'", true);
-                    $publish_count  = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'false'", true);
-                    $category_count = serendipity_db_query("SELECT count(categoryid) FROM {$serendipity['dbPrefix']}category", true);
-                    $category_rows  = serendipity_db_query("SELECT c.category_name, count(e.id) as postings
-                                                    FROM {$serendipity['dbPrefix']}category c,
-                                                         {$serendipity['dbPrefix']}entries e
-                                                    WHERE e.categoryid = c.categoryid
-                                                    GROUP BY e.categoryid
-                                                    ORDER BY postings DESC");
-
-                    $image_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}images", true);
-                    $image_rows = serendipity_db_query("SELECT extension, count(id) AS images FROM {$serendipity['dbPrefix']}images GROUP BY extension ORDER BY images DESC");
-                    
-                    $subscriber_count = count(serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL' AND subscribed = 'true' GROUP BY email"));
-                    $subscriber_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings
-                                                    FROM {$serendipity['dbPrefix']}comments c,
-                                                         {$serendipity['dbPrefix']}entries e
-                                                    WHERE e.id = c.entry_id AND type = 'NORMAL' AND subscribed = 'true'
-                                                    GROUP BY e.id, c.email
+                    $first_entry    = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC limit 1", true);
+                    $last_entry     = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp DESC limit 1", true);
+                    $total_count    = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries", true);
+                    $draft_count    = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'true'", true);
+                    $publish_count  = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'false'", true);
+                    $category_count = serendipity_db_query("SELECT count(categoryid) FROM {$serendipity['dbPrefix']}category", true);
+                    $category_rows  = serendipity_db_query("SELECT c.category_name, count(e.id) as postings
+                                                    FROM {$serendipity['dbPrefix']}category c,
+                                                         {$serendipity['dbPrefix']}entries e
+                                                    WHERE e.categoryid = c.categoryid
+                                                    GROUP BY e.categoryid
+                                                    ORDER BY postings DESC");
+
+                    $image_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}images", true);
+                    $image_rows = serendipity_db_query("SELECT extension, count(id) AS images FROM {$serendipity['dbPrefix']}images GROUP BY extension ORDER BY images DESC");
+                    
+                    $subscriber_count = count(serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL' AND subscribed = 'true' GROUP BY email"));
+                    $subscriber_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings
+                                                    FROM {$serendipity['dbPrefix']}comments c,
+                                                         {$serendipity['dbPrefix']}entries e
+                                                    WHERE e.id = c.entry_id AND type = 'NORMAL' AND subscribed = 'true'
+                                                    GROUP BY e.id, c.email
                                                     ORDER BY postings DESC
-                                                    LIMIT $max_items");
-
-                    $comment_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL'", true);
-                    $comment_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings
-                                                    FROM {$serendipity['dbPrefix']}comments c,
-                                                         {$serendipity['dbPrefix']}entries e
-                                                    WHERE e.id = c.entry_id AND type = 'NORMAL'
-                                                    GROUP BY e.id
+                                                    LIMIT $max_items");
+
+                    $comment_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL'", true);
+                    $comment_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings
+                                                    FROM {$serendipity['dbPrefix']}comments c,
+                                                         {$serendipity['dbPrefix']}entries e
+                                                    WHERE e.id = c.entry_id AND type = 'NORMAL'
+                                                    GROUP BY e.id
                                                     ORDER BY postings DESC
-                                                    LIMIT $max_items");
-
-                    $commentor_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
-                                                    FROM {$serendipity['dbPrefix']}comments c
-                                                    WHERE type = 'NORMAL'
-                                                    GROUP BY author
+                                                    LIMIT $max_items");
+
+                    $commentor_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
+                                                    FROM {$serendipity['dbPrefix']}comments c
+                                                    WHERE type = 'NORMAL'
+                                                    GROUP BY author
                                                     ORDER BY postings DESC
-                                                    LIMIT $max_items");
-
-                    $tb_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'TRACKBACK'", true);
-                    $tb_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings
-                                                    FROM {$serendipity['dbPrefix']}comments c,
-                                                         {$serendipity['dbPrefix']}entries e
-                                                    WHERE e.id = c.entry_id AND type = 'TRACKBACK'
-                                                    GROUP BY e.id
+                                                    LIMIT $max_items");
+
+                    $tb_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'TRACKBACK'", true);
+                    $tb_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings
+                                                    FROM {$serendipity['dbPrefix']}comments c,
+                                                         {$serendipity['dbPrefix']}entries e
+                                                    WHERE e.id = c.entry_id AND type = 'TRACKBACK'
+                                                    GROUP BY e.id
                                                     ORDER BY postings DESC
-                                                    LIMIT $max_items");
-
-                    $tbr_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
-                                                    FROM {$serendipity['dbPrefix']}comments c
-                                                    WHERE type = 'TRACKBACK'
-                                                    GROUP BY author
+                                                    LIMIT $max_items");
+
+                    $tbr_rows = serendipity_db_query("SELECT author, email, url, count(id) as postings
+                                                    FROM {$serendipity['dbPrefix']}comments c
+                                                    WHERE type = 'TRACKBACK'
+                                                    GROUP BY author
                                                     ORDER BY postings DESC
-                                                    LIMIT $max_items");
-
-                    $length = serendipity_db_query("SELECT SUM(LENGTH(body) + LENGTH(extended)) FROM {$serendipity['dbPrefix']}entries", true);
-                    $length_rows = serendipity_db_query("SELECT id, title, (LENGTH(body) + LENGTH(extended)) as full_length FROM {$serendipity['dbPrefix']}entries ORDER BY full_length DESC LIMIT $max_items");
-
-?>
-    <h3><?php echo PLUGIN_EVENT_STATISTICS_OUT_STATISTICS; ?></h3>
-    
-    <div style="margin: 5px; padding: 5px">
-    <dl>
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY; ?></strong></dt>
-        <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $first_entry[0])); ?></dd>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY; ?></strong></dt>
-        <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $last_entry[0])); ?></dd>
-        <br />
-        <hr />
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES; ?></strong></dt>
-        <dd><?php echo $total_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd>
-        <br />
-        <dl>
-            <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC; ?></strong></dt>
-            <dd><?php echo $publish_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd>
-            <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS; ?></strong></dt>
-            <dd><?php echo $draft_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd>
-        </dl>
-        <br />
-        <hr />
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES; ?></strong></dt>
-        <dd><?php echo $category_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2; ?></dd>
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES; ?></strong></dt>
-        <dl>
-<?php
-                    if (is_array($category_rows)) {
-                        foreach($category_rows AS $category => $cat_stat) {
-?>
-            <dt><strong><?php echo $cat_stat['category_name']; ?></strong></dt>
-            <dd><?php echo $cat_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-        <br />
-        <hr />
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES; ?></strong></dt>
-        <dd><?php echo $image_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2; ?></dd>
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES; ?></strong></dt>
-        <dl>
-<?php
-                    if (is_array($image_rows)) {
-                        foreach($image_rows AS $image => $image_stat) {
-?>
-            <dt><strong><?php echo $image_stat['extension']; ?></strong></dt>
-            <dd><?php echo $image_stat['images']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-        <br />
-        <hr />
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS; ?></strong></dt>
-        <dd><?php echo $comment_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3; ?></strong></dt>
-        <dl>
-<?php
-                    if (is_array($comment_rows)) {
-                        foreach($comment_rows AS $comment => $com_stat) {
-?>
-            <dt><strong><a href="<?php echo serendipity_archiveURL($com_stat['id'], $com_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $com_stat['title']; ?></a></strong></dt>
-            <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS; ?></strong></dt>
-        <dl>
-<?php
-                    if (is_array($commentor_rows)) {
-                        foreach($commentor_rows AS $comment => $com_stat) {
-?>
-            <dt><strong><a href="mailto:<?php echo $com_stat['email']; ?>"><?php echo $com_stat['author']; ?></a> (<a href="<?php echo $com_stat['url']; ?>"><?php echo PLUGIN_EVENT_STATISTICS_OUT_LINK; ?></a>)</strong></dt>
-            <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-        <br />
-        <hr />
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS; ?></strong></dt>
-        <dd><?php echo $subscriber_count; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2; ?></dd>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS; ?></strong></dt>
-        <dl>
-<?php
-                    if (is_array($subscriber_rows)) {
-                        foreach($subscriber_rows AS $subscriber => $subscriber_stat) {
-?>
-            <dt><strong><a href="<?php echo serendipity_archiveURL($subscriber_stat['id'], $subscriber_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $subscriber_stat['title']; ?></a></strong></dt>
-            <dd><?php echo $subscriber_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-        <br />
-        <hr />
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS; ?></strong></dt>
-        <dd><?php echo $tb_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2; ?></dd>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK; ?></strong></dt>
-        <dl>
-<?php
-                    if (is_array($tb_rows)) {
-                        foreach($tb_rows AS $tb => $tb_stat) {
-?>
-            <dt><strong><a href="<?php echo serendipity_archiveURL($tb_stat['id'], $tb_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $tb_stat['title']; ?></a></strong></dt>
-            <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3; ?></strong></dt>
-        <dl>
-<?php
-                    if (is_array($tbr_rows)) {
-                        foreach($tbr_rows AS $tb => $tb_stat) {
-?>
-            <dt><strong><a href="mailto:<?php echo $tb_stat['email']; ?>"><?php echo $tb_stat['author']; ?></a> (<a href="<?php echo $tb_stat['url']; ?>">Link</a>)</strong></dt>
-            <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-        <br />
-        <hr />
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt>
-        <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd>
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt>
-        <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd>
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY; ?></strong></dt>
-        <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2; ?></dd>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK; ?></strong></dt>
-        <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*7)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2; ?></dd>
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH; ?></strong></dt>
-        <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*31)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2; ?></dd>
-        <br />
-        <hr />
-        <br />
-
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS; ?></strong></dt>
-        <dd><?php echo $length[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS2; ?></dd>
-        <br />
-        
-        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE; ?></strong></dt>
-        <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd>
-        <br />
-
-        <dt><strong><?php printf(PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES, 5); ?></strong></dt>
-        <br />
-        <dl>
-<?php
-                    if (is_array($length_rows)) {
-                        foreach($length_rows AS $tb => $length_stat) {
-?>
-            <dt><strong><a href="<?php echo serendipity_archiveURL($length_stat['id'], $length_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $length_stat['title']; ?></a></strong></dt>
-            <dd><?php echo $length_stat['full_length']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS2; ?></dd>
-<?php
-                        }
-                    }
-?>
-        </dl>
-    </dl>
-    </div>
-<?php
+                                                    LIMIT $max_items");
+
+                    $length = serendipity_db_query("SELECT SUM(LENGTH(body) + LENGTH(extended)) FROM {$serendipity['dbPrefix']}entries", true);
+                    $length_rows = serendipity_db_query("SELECT id, title, (LENGTH(body) + LENGTH(extended)) as full_length FROM {$serendipity['dbPrefix']}entries ORDER BY full_length DESC LIMIT $max_items");
+
+?>
+    <h3><?php echo PLUGIN_EVENT_STATISTICS_OUT_STATISTICS; ?></h3>
+    
+    <div style="margin: 5px; padding: 5px">
+    <dl>
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY; ?></strong></dt>
+        <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $first_entry[0])); ?></dd>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_LAST_ENTRY; ?></strong></dt>
+        <dd><?php echo ucfirst(strftime(DATE_FORMAT_ENTRY . ' %H:%m', $last_entry[0])); ?></dd>
+        <br />
+        <hr />
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES; ?></strong></dt>
+        <dd><?php echo $total_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd>
+        <br />
+        <dl>
+            <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_PUBLIC; ?></strong></dt>
+            <dd><?php echo $publish_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd>
+            <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_DRAFTS; ?></strong></dt>
+            <dd><?php echo $draft_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd>
+        </dl>
+        <br />
+        <hr />
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES; ?></strong></dt>
+        <dd><?php echo $category_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2; ?></dd>
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES; ?></strong></dt>
+        <dl>
+<?php
+                    if (is_array($category_rows)) {
+                        foreach($category_rows AS $category => $cat_stat) {
+?>
+            <dt><strong><?php echo $cat_stat['category_name']; ?></strong></dt>
+            <dd><?php echo $cat_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+        <br />
+        <hr />
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES; ?></strong></dt>
+        <dd><?php echo $image_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2; ?></dd>
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES; ?></strong></dt>
+        <dl>
+<?php
+                    if (is_array($image_rows)) {
+                        foreach($image_rows AS $image => $image_stat) {
+?>
+            <dt><strong><?php echo $image_stat['extension']; ?></strong></dt>
+            <dd><?php echo $image_stat['images']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+        <br />
+        <hr />
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS; ?></strong></dt>
+        <dd><?php echo $comment_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS3; ?></strong></dt>
+        <dl>
+<?php
+                    if (is_array($comment_rows)) {
+                        foreach($comment_rows AS $comment => $com_stat) {
+?>
+            <dt><strong><a href="<?php echo serendipity_archiveURL($com_stat['id'], $com_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $com_stat['title']; ?></a></strong></dt>
+            <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPCOMMENTS; ?></strong></dt>
+        <dl>
+<?php
+                    if (is_array($commentor_rows)) {
+                        foreach($commentor_rows AS $comment => $com_stat) {
+?>
+            <dt><strong><a href="mailto:<?php echo $com_stat['email']; ?>"><?php echo $com_stat['author']; ?></a> (<a href="<?php echo $com_stat['url']; ?>"><?php echo PLUGIN_EVENT_STATISTICS_OUT_LINK; ?></a>)</strong></dt>
+            <dd><?php echo $com_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+        <br />
+        <hr />
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS; ?></strong></dt>
+        <dd><?php echo $subscriber_count; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_SUBSCRIBERS2; ?></dd>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS; ?></strong></dt>
+        <dl>
+<?php
+                    if (is_array($subscriber_rows)) {
+                        foreach($subscriber_rows AS $subscriber => $subscriber_stat) {
+?>
+            <dt><strong><a href="<?php echo serendipity_archiveURL($subscriber_stat['id'], $subscriber_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $subscriber_stat['title']; ?></a></strong></dt>
+            <dd><?php echo $subscriber_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPSUBSCRIBERS2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+        <br />
+        <hr />
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS; ?></strong></dt>
+        <dd><?php echo $tb_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS2; ?></dd>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK; ?></strong></dt>
+        <dl>
+<?php
+                    if (is_array($tb_rows)) {
+                        foreach($tb_rows AS $tb => $tb_stat) {
+?>
+            <dt><strong><a href="<?php echo serendipity_archiveURL($tb_stat['id'], $tb_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $tb_stat['title']; ?></a></strong></dt>
+            <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACKS3; ?></strong></dt>
+        <dl>
+<?php
+                    if (is_array($tbr_rows)) {
+                        foreach($tbr_rows AS $tb => $tb_stat) {
+?>
+            <dt><strong><a href="mailto:<?php echo $tb_stat['email']; ?>"><?php echo $tb_stat['author']; ?></a> (<a href="<?php echo $tb_stat['url']; ?>">Link</a>)</strong></dt>
+            <dd><?php echo $tb_stat['postings']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TOPTRACKBACK2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+        <br />
+        <hr />
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt>
+        <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd>
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt>
+        <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd>
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY; ?></strong></dt>
+        <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2; ?></dd>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK; ?></strong></dt>
+        <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*7)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_WEEK2; ?></dd>
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH; ?></strong></dt>
+        <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24*31)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_MONTH2; ?></dd>
+        <br />
+        <hr />
+        <br />
+
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS; ?></strong></dt>
+        <dd><?php echo $length[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS2; ?></dd>
+        <br />
+        
+        <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE; ?></strong></dt>
+        <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd>
+        <br />
+
+        <dt><strong><?php printf(PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES, 5); ?></strong></dt>
+        <br />
+        <dl>
+<?php
+                    if (is_array($length_rows)) {
+                        foreach($length_rows AS $tb => $length_stat) {
+?>
+            <dt><strong><a href="<?php echo serendipity_archiveURL($length_stat['id'], $length_stat['title'], 'serendipityHTTPPath'); ?>"><?php echo $length_stat['title']; ?></a></strong></dt>
+            <dd><?php echo $length_stat['full_length']; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS2; ?></dd>
+<?php
+                        }
+                    }
+?>
+        </dl>
+    </dl>
+    </div>
+<?php
                     return true;
-                    break;
-                
-                default:
-                    return false;
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
+                    break;
+                
+                default:
+                    return false;
+                    break;
+            }
+        } else {
+            return false;
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

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

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_event_weblogping.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_event_weblogping.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_weblogping.php	21 Mar 2004 16:35:32 -0000	1.3
+++ serendipity_event_weblogping.php	3 Apr 2004 17:36:18 -0000	1.4
@@ -22,56 +22,56 @@
 
 class serendipity_event_weblogping extends serendipity_event
 {
-var $services;
-
+var $services;
+
     function introspect(&$propbag)
     {
         global $serendipity;
         
         $propbag->add('name',          PLUGIN_EVENT_WEBLOGPING_TITLE);
-        $propbag->add('description',   PLUGIN_EVENT_WEBLOGPING_DESC);
-        $propbag->add('event_hooks',    array(
-            'backend_display' => true,
-            'frontend_display' => true,
-            'backend_insert' => true,
-            'backend_update' => true,
-            'backend_publish' => true,
-            'backend_draft' => true
-        ));
-        
-        $this->services = array(
-            array(
+        $propbag->add('description',   PLUGIN_EVENT_WEBLOGPING_DESC);
+        $propbag->add('event_hooks',    array(
+            'backend_display' => true,
+            'frontend_display' => true,
+            'backend_insert' => true,
+            'backend_update' => true,
+            'backend_publish' => true,
+            'backend_draft' => true
+        ));
+        
+        $this->services = array(
+            array(
               'name'     => 'blo.gs',
               'host'     => 'ping.blo.gs',
               'path'     => '/',
               'extended' => true
             ),
-    
-            array(
+    
+            array(
               'name' => 'blogrolling.com',
               'host' => 'rpc.blogrolling.com',
               'path' => '/pinger/'
             ),
-    
-            array(
+    
+            array(
               'name' => 'technorati.com',
               'host' => 'rpc.technorati.com',
               'path' => '/rpc/ping'
             ),
-    
-            array(
+    
+            array(
               'name' => 'weblogs.com',
               'host' => 'rpc.weblogs.com',
               'path' => '/RPC2'
             ),
-
-            array(
+
+            array(
               'name' => 'blogg.de',
               'host' => 'xmlrpc.blogg.de',
               'path' => '/'
             ),
-
-            array(
+
+            array(
               'name' => 'Yahoo!',
               'host' => 'api.my.yahoo.com',
               'path' => '/RPC2'
@@ -82,14 +82,14 @@
               'host' => 'xmlrpc.blogbot.de',
               'path' => '/',
               'supersedes' => 'blo.gs, blogrolling.com, technorati.com, weblogs.com'
-            )
+            )
         );
-
-        $conf_array = array();
-        foreach($this->services AS $key => $service) {
-            $conf_array[] = $service['name'];
-        }
-        
+
+        $conf_array = array();
+        foreach($this->services AS $key => $service) {
+            $conf_array[] = $service['name'];
+        }
+        
         $propbag->add('configuration', $conf_array);
     }
 
@@ -107,12 +107,12 @@
     
     function event_hook($event, &$bag, &$eventData) {
         global $serendipity;
-        
-        $hooks = &$bag->get('event_hooks');
-        if (isset($hooks[$event])) {
-            switch($event) {
-                case 'backend_display':
-?>
+        
+        $hooks = &$bag->get('event_hooks');
+        if (isset($hooks[$event])) {
+            switch($event) {
+                case 'backend_display':
+?>
                     <fieldset style="margin: 5px">
                         <legend><?php echo PLUGIN_EVENT_WEBLOGPING_PING; ?></legend>
 <?php
@@ -140,10 +140,10 @@
     }
 ?>
                     </fieldset>
-<?php
-                    return true;
-                    break;
-
+<?php
+                    return true;
+                    break;
+
                 case 'backend_publish':
                     // First cycle through list of services to remove superseding services which may have been checked
                     foreach ($this->services as $index => $service) {
@@ -155,7 +155,7 @@
                             }
                         }
                     }
-                    
+                    
                     foreach ($this->services as $index => $service) {
                         if (isset($serendipity['POST']['announce_entries_' . $service['name']])) {
                             printf(PLUGIN_EVENT_WEBLOGPING_SENDINGPING . '...<br />', $service['host']);
@@ -198,24 +198,24 @@
                     
                             # 15 second timeout may not be long enough for weblogs.com
                             $result = $client->send($message, 15);
-                        }
+                        }
                     }
                     
                     return true;
-                    break;
-                
-                case 'frontend_display':
-                case 'backend_insert':
-                case 'backend_update':
-                case 'backend_draft':
-                default:
-                    return false;
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
+                    break;
+                
+                case 'frontend_display':
+                case 'backend_insert':
+                case 'backend_update':
+                case 'backend_draft':
+                default:
+                    return false;
+                    break;
+            }
+        } else {
+            return false;
+        }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

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

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_plugin_eventwrapper.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_plugin_eventwrapper.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_eventwrapper/serendipity_plugin_eventwrapper.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_plugin_eventwrapper.php	9 Feb 2004 15:14:21 -0000	1.1
+++ serendipity_plugin_eventwrapper.php	3 Apr 2004 17:36:18 -0000	1.2
@@ -51,7 +51,7 @@
                     }
                 }
                 
-                $propbag->add('type',        'select');
+                $propbag->add('type',        'select');
                 $propbag->add('name',        PLUGIN_EVENT_WRAPPER_PLUGIN);
                 $propbag->add('description', PLUGIN_EVENT_WRAPPER_PLUGINDESC);
                 $propbag->add('select_values', $select);
@@ -62,7 +62,7 @@
                 $propbag->add('name',        TITLE);
                 $propbag->add('description', PLUGIN_EVENT_WRAPPER_TITLEDESC);
                 break;
-
+
             default:
                     return false;
         }
@@ -72,19 +72,19 @@
     function generate_content(&$title)
     {
         $bag = new serendipity_property_bag;
-        $this->introspect($bag);
-        $wrap = &serendipity_plugin_api::get_event_plugins($this->get_config('event_plugin'));
-        $faketitle = '';
-        if (is_object($wrap)) {
-            $wrap->generate_content($faketitle);
-        }
-        
-        if ($this->get_config('title') != '') {
-            $title = $this->get_config('title');
+        $this->introspect($bag);
+        $wrap = &serendipity_plugin_api::get_event_plugins($this->get_config('event_plugin'));
+        $faketitle = '';
+        if (is_object($wrap)) {
+            $wrap->generate_content($faketitle);
+        }
+        
+        if ($this->get_config('title') != '') {
+            $title = $this->get_config('title');
         } else {
-            $title = $faketitle;
+            $title = $faketitle;
         }
-    }
+    }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

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

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_event_templatechooser.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_event_templatechooser.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_templatechooser/serendipity_event_templatechooser.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_templatechooser.php	3 Mar 2004 08:18:00 -0000	1.1
+++ serendipity_event_templatechooser.php	3 Apr 2004 17:36:18 -0000	1.2
@@ -41,15 +41,15 @@
         if (isset($hooks[$event])) {
             switch($event) {
               case 'frontend_configure':
-
-                if (isset($_REQUEST['user_template']) && (in_array($_REQUEST['user_template'], serendipity_fetchTemplates())) ) {
-                    $_SESSION['serendipityUseTemplate'] = $_REQUEST['user_template'];
-                }
-
-                if (isset($_SESSION['serendipityUseTemplate']) ) {
-                    $eventData['CONFIG']['template'] = $_SESSION['serendipityUseTemplate'];
-                }
-                
+
+                if (isset($_REQUEST['user_template']) && (in_array($_REQUEST['user_template'], serendipity_fetchTemplates())) ) {
+                    $_SESSION['serendipityUseTemplate'] = $_REQUEST['user_template'];
+                }
+
+                if (isset($_SESSION['serendipityUseTemplate']) ) {
+                    $eventData['CONFIG']['template'] = $_SESSION['serendipityUseTemplate'];
+                }
+                
                 return true;
                 break;
 

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.18,1.19

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_lang_da.inc.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_da.inc.php	27 Mar 2004 18:35:36 -0000	1.18
+++ serendipity_lang_da.inc.php	3 Apr 2004 17:36:16 -0000	1.19
@@ -1,355 +1,355 @@
-<?php # $Id$
-
-// Danish Language file
-//
-// Maintained by: Tom Sommer, <ts...@dr...>
-//
-//     Thanks to: Jeppe Lund, <no...@no...>
-//                Robert Piil, <ro...@pi...>
-
-
-@define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'danish, da, da_DK');
-@define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
-
-@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administrationssuite');
-@define('HAVE_TO_BE_LOGGED_ON', 'Du skal være logget ind for at kunne se denne side:');
-@define('WRONG_USERNAME_OR_PASSWORD', 'Du har indtastet et forkert brugernavn eller adgangskode');
-@define('APPEARANCE', 'Udseende');
-@define('MANAGE_STYLES', 'Administrer temaer');
-@define('CONFIGURE_PLUGINS', 'Konfigurerer plugins');
-@define('ADMIN', 'Admin:');
-@define('CONFIGURATION', 'Konfiguration');
-@define('IMPORT_EXPORT_ENTRIES', 'Importer/Ekporter artikler');
-@define('BACK_TO_BLOG', 'Tilbage til weblog');
-@define('LOGIN', 'Login');
-@define('LOGOUT', 'Log ud');
-@define('LOGGEDOUT', 'Logget ud.');
-@define('CREATE', 'Opret');
-@define('EDIT_THIS_CAT', 'Redigerer "%s - %s"');
-@define('SAVE', 'Gem');
-@define('NAME', 'Navn');
-@define('CLICK_CAT_TO_EDIT', 'Klik på en kategori for at redigere den');
-@define('CREATE_NEW_CAT', 'Opret ny kategori');
-@define('SELECT_IMAGE', 'Vælg et billede');
-@define('I_WANT_THUMB', 'Jeg vil bruge minibilledet i min artikel.');
-@define('I_WANT_BIG_IMAGE', 'Jeg vil bruge det originale billede i min artikel.');
-@define('I_WANT_NO_LINK', 'Vis billedet uden link');
-@define('I_WANT_IT_TO_LINK', 'Vis billedet med link');
-@define('BACK', 'Tilbage');
-@define('FORWARD', 'Fremad');
-@define('ANONYMOUS', 'Annonym');
-@define('LINK_TO_COMMENT', 'Link til kommentar #');
-@define('SEND_MAIL_TO', 'Send en mail til');
-@define('NEW_TRACKBACK_TO', 'Ny trackback lavet til');
-@define('NEW_COMMENT_TO', 'Ny kommentar lavet til');
-@define('RECENT', 'Nyere...');
-@define('OLDER', 'Ældre...');
-@define('DONE', 'Færdig');
-@define('CLICK_IMAGE_TO_INSERT', 'Klik på billedet du vil indsætte:');
-@define('WELCOME_BACK', 'Velkommen tilbage,');
-@define('RUNNING', 'Du benytter Serendipity v.');
-@define('ADD_PLUGIN', 'Tilføj plugin');
-@define('TITLE', 'Titel');
-@define('PLUGIN', 'Plugin');
-@define('DESCRIPTION', 'Beskrivelse');
-@define('PLACEMENT', 'Placering');
-@define('DELETE', 'Slet');
-@define('SELECT_A_PLUGIN_TO_ADD', 'Vælg det plugin du vil tilføje');
-@define('UP', 'OP');
-@define('DOWN', 'NED');
-@define('ENTRIES', 'Artikler:');
-@define('NEW_ENTRY', 'Ny artikel');
-@define('AUTHOR_SUITE', 'Redaktørsuite');
-@define('EDIT_ENTRIES', 'Rediger artikler');
-@define('DELETE_ENTRIES', 'Slet artikler');
-@define('CATEGORIES', 'Kategorier');
-@define('EDIT_CATEGORIES', 'Administrer kategorier');
-@define('IMAGES', 'Billeder:');
-@define('ADD_IMAGES', 'Tilføj billeder');
-@define('WARNING_THIS_BLAHBLAH', "ADVARSEL:\\nDette kan tage lang tid hvis der er mange billeder uden minibilleder.");
-@define('CREATE_THUMBS', 'Genopbyg minibilleder');
-@define('MANAGE_IMAGES', 'Administrer billeder');
-@define('ADMIN_INTERFACE', 'Admin interface');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Redaktørsuite');
-@define('NAME', 'Navn');
-@define('EMAIL', 'Email');
-@define('HOMEPAGE', 'Hjemmeside');
-@define('COMMENT', 'Kommentar');
-@define('REMEMBER_INFO', 'Husk oplysninger?');
-@define('SUBMIT_COMMENT', 'Tilføj kommentar');
-@define('NO_ENTRIES_TO_PRINT', 'Der er ingen artikler at vise.');
-@define('COMMENTS', 'Kommentarer');
-@define('ADD_COMMENT', 'Tilføj kommentar');
-@define('NO_COMMENTS', 'Ingen kommentarer.');
-@define('POSTED_BY', 'Skrevet af');
-@define('TRACKBACK_FROM', 'Trackback fra');
-@define('ON', 'aktiv');
-@define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar er blevet oprettet på din blog "%s", til artiklen ved navn "%s".');
-@define('A_NEW_TRACKBACK_BLAHBLAH', 'Et nyt trackback er blevet lavet til din artikel ved navn "%s".');
-@define('NO_CATEGORY', 'Ingen kategori');
-@define('ENTRY_BODY', 'Artikel indhold');
-@define('EXTENDED_BODY', 'Udvidet indhold');
-@define('CATEGORY', 'Kategori:');
-@define('TEMPLATE_NAME', 'Navn på template');
-@define('CHOOSE_STYLESHEET', 'Vælg et stylesheet....');
-@define('EDIT', 'Rediger');
-@define('MAKE_DEFAULT', 'Sæt som standard');
-@define('CREATE_NEW_STYLESHEET', 'Opret nyt stylesheet');
-@define('NO_ENTRIES_BLAHBLAH', 'Ingen artikler blev fundet som indeholdt %s' . "\n");
-@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Din søgning på %s retunerede %s resultater:');
-@define('SEARCH_TOO_SHORT', 'Din søgning skal være på mere end 3 tegn');
-@define('IMAGE', 'Billede');
-@define('ERROR_FILE_NOT_EXISTS', 'Fejl: Det gamle filnavn findes ikke!');
-@define('ERROR_FILE_EXISTS', 'Fejl: Det nye filnavn bruges allerede, vælg et andet!');
-@define('ERROR_SOMETHING', 'Fejl: Der gik noget galt');
-@define('ADDING_IMAGE', 'Tilføjet billede...');
-@define('THUMB_CREATED_DONE', 'Minibillede er oprettet.<br>Done.');
-@define('ERROR_FILE_EXISTS_ALREADY', 'Fejl: Filen findes allerede på din maskine!');
-@define('ERROR_UNKNOWNE_NOUPLOAD', 'Der skete en fejl, filen kunne ikke uploades...');
-@define('ADD_IMAGE_BLAHBLAH', '<b>Tilføj et billede til dit opbevaringssted:</b><p>her kan du uploade billeder, eller få mig til at hente dem fra et sted på nettet! Hvis du ikke har et passende billede, så søg efter billeder på google som passer til dine tanker. Prøv <a href="http://images.google.com" target="_blank">Google\'s billedesøgning</a>, resultaterne er ofte brugebare og altid sjove :)<p><b>Vælg metode:</b><br>');
-@define('ENTER_IMAGE_URL', 'Skriv en URL til billedet der skal hentes:');
-@define('ENTER_IMAGE_TO_UP', 'Vælg det billede du ønsker at uploade:');
-@define('GO', 'Begynd!');
-@define('NEWSIZE', 'Ny størrelse: ');
-@define('RESIZE_BLAHBLAH', '<b>Ændre størrelse på %s</b><p>');
-@define('ORIGINAL_SIZE', 'Original størrelse: <i>%sx%s</i> pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Her kan du justere billedets størrelse. Hvis du vil bevare proportionerne, skal du bare indtaste én af værdirene og trykke på TAB-tasten, jeg vil dernæst automatisk beregne den anden værdi:');
-@define('CALENDAR', 'Kalender');
-@define('QUICKJUMP_CALENDAR', 'Hurtigkalender');
-@define('QUICKSEARCH', 'Søgning');
-@define('SEARCH_FOR_ENTRY', 'Søg efter en artikel');
-@define('ARCHIVES', 'Arkiver');
-@define('BROWSE_ARCHIVES', 'Gennemse arkiver efter måneder');
-@define('TOP_REFERRER', 'Referencer');
-@define('SHOWS_TOP_SITES', 'Viser de sites som oftest linker til din blog');
-@define('TOP_EXITS', 'Udgangssider');
-@define('SHOWS_TOP_EXIT', 'Viser de udgangssider der er klikket flest gange på');
-@define('SYNDICATION', 'Syndikering');
-@define('SHOWS_RSS_BLAHBLAH', 'Viser RSS syndikeringslinks');
-@define('ALLOWS_YOU_BLAHBLAH', 'Muliggører konfiguration og udgivelse af din blog');
-@define('PLUG', 'Plug');
-@define('ADVERTISES_BLAHBLAH', 'Reklamer for din blogs oprindelse');
-@define('HTML_NUGGET', 'HTML Nugget');
-@define('HOLDS_A_BLAHBLAH', 'Indeholder et stykke HTML i din sidebar');
-@define('TITLE_FOR_NUGGET', 'Titel på din nugget');
-@define('THE_NUGGET', 'HTML-indholdet af din nugget');
-@define('SYNDICATE_THIS_BLOG', 'Syndiker denne blog');
-@define('QUICKJUMP', 'Kalender');
-@define('YOU_CHOSE', 'Du valgte %s');
-@define('IMAGE_SIZE', 'Billedestørrelse');
-@define('IMAGE_AS_A_LINK', 'Billedeindsættelse');
-@define('POWERED_BY', 'Drives af');
-@define('SUPERUSER', 'Superbruger');
-@define('TRACKBACKS', 'Trackbacks');
-@define('TRACKBACK', 'Trackback');
-@define('NO_TRACKBACKS', 'Ingen Trackbacks');
-@define('TOPICS_OF', 'Emner af');
-@define('VIEW_FULL', 'View i fuld');
-@define('VIEW_TOPICS', 'Vis emner');
-@define('AT', 'kl');
-@define('SET_AS_TEMPLATE', 'Sæt som template');
-@define('VIEW_EXTENDED_ENTRY', 'Vis udvidet artikel');
-@define('IN', 'i');
-@define('EXCERPT', 'Uddrag');
-@define('TRACKED', 'Tracked');
-@define('LINK_TO_ENTRY', 'Link til artikel');
-@define('LINK_TO_REMOTE_ENTRY', 'Link til ekstern artikel');
-@define('IP_ADDRESS', 'IP-adresse');
-@define('USER', 'Bruger');
-@define('THUMBNAIL_USING_OWN', 'Bruger %s som dets eget minibillede, fordi det allerede er så lille.');
-@define('THUMBNAIL_FAILED_COPY', 'Ville gerne have brugt %s som dets egen minibillede, men kunne ikke kopiere!');
-@define('AUTHOR', 'Forfatter');
-@define('LAST_UPDATED', 'Sidst opdateret');
-@define('TRACKBACK_SPECIFIC', 'Trackback URI til denne artikel');
-@define('DIRECT_LINK', 'Direkte link til denne artikel');
-@define('COMMENT_ADDED', 'Din kommentar var tilføjet. ');
-@define('COMMENT_ADDED_CLICK', 'Klik %her for at gå tilbage%s til kommentarerne, og %sher for at lukke%s dette vindue.');
-@define('COMMENT_NOT_ADDED', 'Din kommentar kunne ikke tilføjes fordi kommentarer til denne atikel er blevet deaktiveret.');
-@define('COMMENT_NOT_ADDED_CLICK', 'Klik %sher for at gå tilbage%s til kommentarene, og %sher for at lukke%s dette vindue. ');
-@define('COMMENTS_DISABLE', 'Tillad ikke kommentarer til denne artikel');
-@define('COMMENTS_ENABLE', 'Tillad kommentarer til denne artikel');
-@define('COMMENTS_CLOSED', 'Forfatteren har valgt ikke at tillade kommentarer til denne artikel');
-@define('EMPTY_COMMENT', 'Din kommentar indeholdt ikke noget, gå venligst %stilbage%s og prøv igen');
-@define('ENTRIES_FOR', 'Artikler fra %s');
-@define('TOPICS_FOR', 'Emner fra %s');
-@define('DOCUMENT_NOT_FOUND', 'Dokumentet %s kunne ikke findes.');
-@define('USERNAME', 'Brugernavn');
-@define('PASSWORD', 'Adgangskode');
-@define('AUTOMATIC_LOGIN', 'Gem oplysningerne');
-@define('SERENDIPITY_INSTALLATION', 'Serendipityinstallation');
-@define('LEFT', 'venstre');
-@define('RIGHT', 'højre');
-@define('HIDDEN', 'skjult');
-@define('REMOVE_TICKED_PLUGINS', 'Fjern valgte plugins');
-@define('SAVE_CHANGES_TO_LAYOUT', 'Gem layout-ændringerne');
-@define('COMMENTS_FROM', 'Kommentar fra');
-@define('ERROR', 'Fejl');
-@define('ENTRY_SAVED', 'Artiklen blev gemt');
-@define('DELETE_SURE', 'Er du sikker på du vil slette #%s permanent?');
-@define('NOT_REALLY', 'Egentlig ikke...');
-@define('DUMP_IT', 'Smid den ud!');
-@define('RIP_ENTRY', 'Farvel artikel #%s');
-@define('CATEGORY_DELETED', 'Kategorien #%s blev slettet. Gamle artikler flyttet til kategori #%s');
-@define('CATEGORY_REMAINING', 'Slet denne kategori og flyt dens artikler til denne kategori: %s');
-@define('INVALID_CATEGORY', 'Ingen kategori blev valgt til sletning');
-@define('CATEGORY_SAVED', 'Kategori gemt');
-@define('SELECT_TEMPLATE', 'Vælg den template du ønsker at bruge til din blog');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Artikler indsat uden problemer!');
-@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Der var problemer under indsættelsen af artiklerne!');
-@define('VIEW_FEED_EXPORT', 'Vis eksporteret feed');
-@define('IMPORT', 'Importer');
-@define('EXPORT', 'Ekporter');
-@define('YES', 'Ja');
-@define('NO', 'Nej');
-@define('CHECK_N_SAVE', 'Check &amp; gem');
-@define('DIRECTORY_NOT_EXISTANT', 'Biblioteket %s findes ikke. Opret det!');
-@define('DIRECTORY_WRITE_ERROR', 'KAn ikke skrive til biblioteket %s. Check filrettighederne.');
-@define('DIRECTORY_CREATE_ERROR', 'Biblioteket %s eksisterer ikke og kunne ikke oprettes. Opret ventligst biblioteket manuelt');
-@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; Kør <i>%s %s</i>');
-@define('CANT_EXECUTE_BINARY', 'Kan ikke eksekvere %s');
-@define('FILE_WRITE_ERROR', 'Kan ikke skrive til filen %s.');
-@define('FILE_CREATE_YOURSELF', 'Opret venligst filen selv og check dens rettigheder');
-@define('COPY_CODE_BELOW', '<br />* Kopier blot koden nedenunder og placer den i %s i din %s mappe:<b><pre>%s</pre></b>' . "\n");
-@define('WWW_USER', 'Ændr www til den bruger som apache kører som (fx. nobody).');
-@define('BROWSER_RELOAD', 'Når du har gjort dette, så tryk på din browsers "reload" knap');
-@define('DIAGNOSTIC_ERROR', 'Vi har opdaget nogle fejl mens vi kørte nogle diagnostikker på dine indtastede informationer:');
-@define('ALL_VALID', 'Alle de indtastede informationer ser ud til at være korrekte.');
-@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity er endnu ikke installeret. Klik <a href="%s">her for at installere</a> nu.');
-@define('INCLUDE_ERROR', 'serendipityfejl: Kunne ikke inkludere %s - Afbryder.');
-@define('DATABASE_ERROR', 'serendipityfejl: Kunne ikke oprette forbindelse til databasen - Afbryder.');
-@define('ATTEMPT_SETUP_DATABASE', 'Forsøger at opsætte databasen...');
-@define('CHECK_DATABASE_EXISTS', 'Undersøger om databasen allerede findes. Hvis du ser et database fejl-query her, så ignorer det...');
-@define('CREATE_DATABASE', 'Opretter standarddatabase setup...');
-@define('DATABASE_DONE', 'Færdig med at opsætte database');
-@define('ATTEMPT_WRITE_FILE', 'Forsøger at skrive til %s ...');
-@define('SERENDIPITY_INSTALLED', '%sSerendipity er nu installeret på dit system.%s Husk venligst dit kodeord: "%s", dit brugernavn er "%s".%sDu kan finde din nye blog <a href="%s">lige her</a>');
-@define('WRITTEN_N_SAVED', 'Konfiguration skrevet &amp; gemt');
-@define('IMAGE_ALIGNMENT', 'Billedejustering');
-@define('ENTER_NEW_NAME', 'Indtast det nye navn for: ');
-@define('IMAGE_MANAGER', 'Billedehåndtering');
-@define('RESIZING', 'Ændre dimensioner');
-@define('RESIZE_DONE', 'Færdig (Ændrede %s billeder).');
-@define('SYNCING', 'Synkronisere databasen med billedemappen');
-@define('SYNC_DONE', 'Færdig (Synkroniserede %s billeder).');
-@define('DELETE_IMAGE', 'Slettede billedet ved navn <b>%s</b>');
-@define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette billedet <b>%s</b>');
-@define('DELETE_THUMBNAIL', 'Slettede billedet ved navn <b>%s</b>');
-@define('FILE_NOT_FOUND', 'Kunne ikke finde filen ved navn <b>%s</b>, måske er den allerede slettet?');
-@define('ABOUT_TO_DELETE_FILE', 'Du er ved at slette <b>%s</b><br />Hvis du bruger denne fil i nogle af dine artikler, will det forasage døde billeder<br />Er du sikker på du vil foresætte?<br /><br />');
-@define('IMAGE_FULLSIZE', 'Fuld størrelse');
-@define('IMAGE_RENAME', 'Omdøb dette billede');
-@define('IMAGE_RESIZE', 'Skalér dette billede');
-@define('IMAGE_DELETE', 'Slet dette billede');
-@define('ABORT_NOW', 'Afbryd nu');
-@define('REMOTE_FILE_NOT_FOUND', 'Filen kunne ikke findes på serveren, er du sikker på URLen: <b>%s</b> er korrekt?');
-@define('FILE_FETCHED', '%s hentet: %s');
-@define('FILE_UPLOADED', 'Filen %s er blevet uploadet: %s');
-@define('WORD_OR', 'eller');
-@define('SCALING_IMAGE', 'Skalérer %s til %s x %s px');
-@define('KEEP_PROPORTIONS', 'Bevar forholdet');
-@define('REALLY_SCALE_IMAGE', 'Er du sikker på du vil skalére dette billede? Der er ingen vej tilbage!');
-@define('TOGGLE_ALL', 'Vis/Skjul alle');
-@define('TOGGLE_OPTION', 'Vis/Skjul denne option');
-@define('SUBSCRIBE_TO_THIS_ENTRY', 'Abonnér på denne artikel');
-@define('UNSUBSCRIBE_OK', "%s er ikke længere abonnement på denne artikel");
-@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Ny kommentar på abonnerede artikel "%s"');
-@define('SUBSCRIPTION_MAIL', "Hej %s,\n\nEn ny kommentar er blevet lavet til en artikel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finde artiklen her: %s\n\nDu kan stoppe dit abonnement ved at klikke på dette link: %s\n");
-@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hej %s,\n\nEt nyt trackback er blevet lavet til en artikel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finde artiklen her: %s\n\nDu kan stoppe dit abonnement ved at klikke på dette link: %s\n");
-@define('SIGNATURE', "\n-- \n%s bruger Serendipity.\nDen bedste blog på dette, du kan også bruge det.\nKig nærmere på <http://s9y.org> for at finde mere information.");
-@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database er allerede installeret');
-@define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
-@define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
-@define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
-@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 kommentarer');
-@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
-@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Feltet "Admin-redaktør"');
-@define('SYNDICATION_PLUGIN_WEBMASTER',  'Feltet "webmaster"');
-@define('SYNDICATION_PLUGIN_BANNERURL', 'Billede til RSS feedet');
-@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Billedebredde');
-@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Billedehøjde');
-@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-mailadressen på webmasteren, hvis tilgængelig. (tom: skjult) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-mailadressen på redaktøren, hvis tilgængelig. (tom: skjult) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL på et billede i GIF/JPEG/PNG format, hvis tilgængeligt. (tom: serendipity-logo)');
-@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'i pixels, max. 144');
-@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'i pixels, max. 400');
-@define('SYNDICATION_PLUGIN_TTL', 'Feltet "ttl" (time-to-live)');
-@define('SYNDICATION_PLUGIN_TTL_DESC', 'Antallet af minutter din blog skal gemmes af eksterne sider/programmer (tom: skjult) [RSS 2.0]');
-@define('SYNDICATION_PLUGIN_PUBDATE', 'Feltet "pubDate"');
-@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Skal "pubDate"-feltet være indkapslet til en RSS-channel, for at vise datoen på den nyeste artikel?');
-@define('CONTENT', 'Indhold');
-@define('TYPE', 'Type');
-@define('DRAFT', 'Udkast');
-@define('PUBLISH', 'Udgiv');
-@define('PREVIEW', 'Vis');
-@define('DATE', 'Dato');
-@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
-@define('DATE_INVALID', 'Advarsel: Den dato du indtasede var ugyldig. Det skal indtastes i følgende format: YYYY-MM-DD HH:MM.');
-@define('CATEGORY_PLUGIN_DESC', 'Viser listen over kategorier.');
-@define('ALL_AUTHORS', 'Alle forfattere');
-@define('CATEGORIES_TO_FETCH', 'Kategorier som skal hentes');
-@define('CATEGORIES_TO_FETCH_DESC', 'Hent kategorier fra en bestemt forfatter?');
-@define('PAGE_BROWSE', 'Side %s af %s, i alt %s artikler');
-@define('PREVIOUS_PAGE', 'forrige side');
-@define('NEXT_PAGE', 'næste side');
-@define('ALL_CATEGORIES', 'Alle kategorier');
-@define('DO_MARKUP', 'Udført Markup-transformation');
-@define('DO_MARKUP_DESCRIPTION', 'Tilføj markup-transformationer på teksten (smilies, shortcut markups via *, /, _, ...). Hvis du slår dette fra vil al HTML-kode i teksten blive bibeholdt. Standard er "Ja".');
-@define('RECENTENTRIES_PLUGIN_TITLE', 'Nyeste artikler');
-@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Viser titlerne og datoerne på de nyeste artikler');
-@define('RECENTENTRIES_PLUGIN_NUMBER', 'Antallet af artikler');
-@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'Hvor mangel artikler skal der vises? (Standard: 10)');
-@define('COMMENTS_PLUGIN_BLAHBLAH', 'Viser de nyeste kommentarer på dine artikler');
-@define('COMMENTS_PLUGIN_WORDWRAP', 'Linieskift');
-@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'Hvor mange ord inden der skal ske et linieskift? (Standard: 30)');
-@define('COMMENTS_PLUGIN_MAXCHARS', 'Maximalt antal tegn per kommentar');
-@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'Hvor mange tegn skal vises af hver kommentar? (Standard: 120)');
-@define('COMMENTS_PLUGIN_MAXENTRIES', 'Maximalt antal kommentarer');
-@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'Hvor mange kommentarer vil blive vist? (Standard: 15)');
-@define('GENERAL_PLUGIN_DATEFORMAT', 'Datoformat');
-@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formatet på artiklens faktiske dato, brug PHPs strftime() variabler. (Standard: "%s")');
-@define('GENERAL_PLUGIN_LANGUAGE', 'Sprog');
-@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Hvilket sprog er brugt til datoer og tekstformatering? ("en|de", default "en")');
-@define('ERROR_TEMPLATE_FILE', 'Kunne ikke åbne skabelonen, opdater Serendipity!');
-@define('ADVANCED_OPTIONS', 'Advancerede indstillinger');
-@define('PING_WEBLOGS', 'Annoncer artikler (via XML-RPC ping) til:');
-@define('SENDING_PING', 'Send XML-RPC ping til host %s');
-@define('EDIT_ENTRY', 'Rediger artikel');
-@define('HTACCESS_ERROR', 'For at kunne checke din lokale webserver\'s installation, skal serendipity være i stand til at skrive til filen ".htaccess". Dette var ikke muligt pga. forkerte rettigheder. Justér rettighederne således: <br />&nbsp;&nbsp;%s<br />og genindlæs siden.');
-@define('SORT_ORDER', 'Sorter efter');
-@define('SORT_ORDER_NAME', 'Filnavn');
-@define('SORT_ORDER_EXTENSION', 'Filtype');
-@define('SORT_ORDER_SIZE', 'Filstørrelse');
-@define('SORT_ORDER_WIDTH', 'Billedebrede');
-@define('SORT_ORDER_HEIGHT', 'Billedehøjde');
-@define('SORT_ORDER_DATE', 'Upload-dato');
-@define('SORT_ORDER_ASC', 'Stigende');
-@define('SORT_ORDER_DESC', 'Faldende');
-@define('THUMBNAIL_SHORT', 'Mini');
-@define('ORIGINAL_SHORT', 'Orig.');
-@define('IMAGES_PER_PAGE', 'billeder pr. side');
-@define('APPLY_MARKUP_TO', 'Formatér %s');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Forhindrer HTTP caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis sat til "true" vil dette anbefale linket til dit RSS feed om ikke at tillade klienter at cache dit feed. Det anbefales at sætte dette til "false".'); 
-@define('CALENDAR_BEGINNING_OF_WEEK', 'Starten på ugen');
-@define('CALENDAR_BOW_DESC', 'Hvilken ugedag starter ugen på? 0 = søndag, 1 = mandag ... 6 = lørdag (standard: 1)');
-@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity har opdaget at din nuværende konfiguration passer til version %s. Serendipity selv er installeret som version %s, Det er nødvendigt at opgradere! <a href="%s">Klik her!</a>');
-@define('SERENDIPITY_UPGRADER_WELCOME', 'Velkommen til Serendipitys opgraderingsscript.');
-@define('SERENDIPITY_UPGRADER_PURPOSE', 'Scriptet vil hjælpe dig med at opgradere Serendipity %s.');
-@define('SERENDIPITY_UPGRADER_WHY', 'Denne meddelelse vises, fordi Serendipity er installeret med version %s, men databasen er endnu ikke opgraderet til denne version.');
-@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Databasen opdateringer (%s)');
-@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Følgende .sql-filer skal eksekveres før Serendipity igen kan fungere normalt.');
-@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Versionsspecifikke opgaver');
-@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Ingen versionsspecifikke opgaver fundet');
-@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Ønsker du at ovenstående opgaver udføres?');
-@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Nej, jeg udfører dem manuelt');
-@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Ja tak!');
-@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Det ser ud til at opgradering ikke er nødvendig.');
-@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Serendipity er opgraderet');
-@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Du har ignoreret en del af opgraderingen. Undersøg venligst om databasen er korrekt opdateret, og planlagte opgaver udført');
-@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Din Serendipity-installation er nu opgraderet til version %s');
-@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbage til din blog ved at klikke  %shere%s');
-@define('IMAGE_NAME', 'Gem dette billeder under følgende navn (efterlad tom hvis du ønsker at beholde det orignale navn): ');
-
-/* vim: set sts=4 ts=4 expandtab : */
-?>
+<?php # $Id$
+
+// Danish Language file
+//
+// Maintained by: Tom Sommer, <ts...@dr...>
+//
+//     Thanks to: Jeppe Lund, <no...@no...>
+//                Robert Piil, <ro...@pi...>
+
+
+@define('LANG_CHARSET', 'ISO-8859-1');
+@define('DATE_LOCALES', 'danish, da, da_DK');
+@define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
+
+@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administrationssuite');
+@define('HAVE_TO_BE_LOGGED_ON', 'Du skal være logget ind for at kunne se denne side:');
+@define('WRONG_USERNAME_OR_PASSWORD', 'Du har indtastet et forkert brugernavn eller adgangskode');
+@define('APPEARANCE', 'Udseende');
+@define('MANAGE_STYLES', 'Administrer temaer');
+@define('CONFIGURE_PLUGINS', 'Konfigurerer plugins');
+@define('ADMIN', 'Admin:');
+@define('CONFIGURATION', 'Konfiguration');
+@define('IMPORT_EXPORT_ENTRIES', 'Importer/Ekporter artikler');
+@define('BACK_TO_BLOG', 'Tilbage til weblog');
+@define('LOGIN', 'Login');
+@define('LOGOUT', 'Log ud');
+@define('LOGGEDOUT', 'Logget ud.');
+@define('CREATE', 'Opret');
+@define('EDIT_THIS_CAT', 'Redigerer "%s - %s"');
+@define('SAVE', 'Gem');
+@define('NAME', 'Navn');
+@define('CLICK_CAT_TO_EDIT', 'Klik på en kategori for at redigere den');
+@define('CREATE_NEW_CAT', 'Opret ny kategori');
+@define('SELECT_IMAGE', 'Vælg et billede');
+@define('I_WANT_THUMB', 'Jeg vil bruge minibilledet i min artikel.');
+@define('I_WANT_BIG_IMAGE', 'Jeg vil bruge det originale billede i min artikel.');
+@define('I_WANT_NO_LINK', 'Vis billedet uden link');
+@define('I_WANT_IT_TO_LINK', 'Vis billedet med link');
+@define('BACK', 'Tilbage');
+@define('FORWARD', 'Fremad');
+@define('ANONYMOUS', 'Annonym');
+@define('LINK_TO_COMMENT', 'Link til kommentar #');
+@define('SEND_MAIL_TO', 'Send en mail til');
+@define('NEW_TRACKBACK_TO', 'Ny trackback lavet til');
+@define('NEW_COMMENT_TO', 'Ny kommentar lavet til');
+@define('RECENT', 'Nyere...');
+@define('OLDER', 'Ældre...');
+@define('DONE', 'Færdig');
+@define('CLICK_IMAGE_TO_INSERT', 'Klik på billedet du vil indsætte:');
+@define('WELCOME_BACK', 'Velkommen tilbage,');
+@define('RUNNING', 'Du benytter Serendipity v.');
+@define('ADD_PLUGIN', 'Tilføj plugin');
+@define('TITLE', 'Titel');
+@define('PLUGIN', 'Plugin');
+@define('DESCRIPTION', 'Beskrivelse');
+@define('PLACEMENT', 'Placering');
+@define('DELETE', 'Slet');
+@define('SELECT_A_PLUGIN_TO_ADD', 'Vælg det plugin du vil tilføje');
+@define('UP', 'OP');
+@define('DOWN', 'NED');
+@define('ENTRIES', 'Artikler:');
+@define('NEW_ENTRY', 'Ny artikel');
+@define('AUTHOR_SUITE', 'Redaktørsuite');
+@define('EDIT_ENTRIES', 'Rediger artikler');
+@define('DELETE_ENTRIES', 'Slet artikler');
+@define('CATEGORIES', 'Kategorier');
+@define('EDIT_CATEGORIES', 'Administrer kategorier');
+@define('IMAGES', 'Billeder:');
+@define('ADD_IMAGES', 'Tilføj billeder');
+@define('WARNING_THIS_BLAHBLAH', "ADVARSEL:\\nDette kan tage lang tid hvis der er mange billeder uden minibilleder.");
+@define('CREATE_THUMBS', 'Genopbyg minibilleder');
+@define('MANAGE_IMAGES', 'Administrer billeder');
+@define('ADMIN_INTERFACE', 'Admin interface');
+@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Redaktørsuite');
+@define('NAME', 'Navn');
+@define('EMAIL', 'Email');
+@define('HOMEPAGE', 'Hjemmeside');
+@define('COMMENT', 'Kommentar');
+@define('REMEMBER_INFO', 'Husk oplysninger?');
+@define('SUBMIT_COMMENT', 'Tilføj kommentar');
+@define('NO_ENTRIES_TO_PRINT', 'Der er ingen artikler at vise.');
+@define('COMMENTS', 'Kommentarer');
+@define('ADD_COMMENT', 'Tilføj kommentar');
+@define('NO_COMMENTS', 'Ingen kommentarer.');
+@define('POSTED_BY', 'Skrevet af');
+@define('TRACKBACK_FROM', 'Trackback fra');
+@define('ON', 'aktiv');
+@define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar er blevet oprettet på din blog "%s", til artiklen ved navn "%s".');
+@define('A_NEW_TRACKBACK_BLAHBLAH', 'Et nyt trackback er blevet lavet til din artikel ved navn "%s".');
+@define('NO_CATEGORY', 'Ingen kategori');
+@define('ENTRY_BODY', 'Artikel indhold');
+@define('EXTENDED_BODY', 'Udvidet indhold');
+@define('CATEGORY', 'Kategori:');
+@define('TEMPLATE_NAME', 'Navn på template');
+@define('CHOOSE_STYLESHEET', 'Vælg et stylesheet....');
+@define('EDIT', 'Rediger');
+@define('MAKE_DEFAULT', 'Sæt som standard');
+@define('CREATE_NEW_STYLESHEET', 'Opret nyt stylesheet');
+@define('NO_ENTRIES_BLAHBLAH', 'Ingen artikler blev fundet som indeholdt %s' . "\n");
+@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Din søgning på %s retunerede %s resultater:');
+@define('SEARCH_TOO_SHORT', 'Din søgning skal være på mere end 3 tegn');
+@define('IMAGE', 'Billede');
+@define('ERROR_FILE_NOT_EXISTS', 'Fejl: Det gamle filnavn findes ikke!');
+@define('ERROR_FILE_EXISTS', 'Fejl: Det nye filnavn bruges allerede, vælg et andet!');
+@define('ERROR_SOMETHING', 'Fejl: Der gik noget galt');
+@define('ADDING_IMAGE', 'Tilføjet billede...');
+@define('THUMB_CREATED_DONE', 'Minibillede er oprettet.<br>Done.');
+@define('ERROR_FILE_EXISTS_ALREADY', 'Fejl: Filen findes allerede på din maskine!');
+@define('ERROR_UNKNOWNE_NOUPLOAD', 'Der skete en fejl, filen kunne ikke uploades...');
+@define('ADD_IMAGE_BLAHBLAH', '<b>Tilføj et billede til dit opbevaringssted:</b><p>her kan du uploade billeder, eller få mig til at hente dem fra et sted på nettet! Hvis du ikke har et passende billede, så søg efter billeder på google som passer til dine tanker. Prøv <a href="http://images.google.com" target="_blank">Google\'s billedesøgning</a>, resultaterne er ofte brugebare og altid sjove :)<p><b>Vælg metode:</b><br>');
+@define('ENTER_IMAGE_URL', 'Skriv en URL til billedet der skal hentes:');
+@define('ENTER_IMAGE_TO_UP', 'Vælg det billede du ønsker at uploade:');
+@define('GO', 'Begynd!');
+@define('NEWSIZE', 'Ny størrelse: ');
+@define('RESIZE_BLAHBLAH', '<b>Ændre størrelse på %s</b><p>');
+@define('ORIGINAL_SIZE', 'Original størrelse: <i>%sx%s</i> pixel');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Her kan du justere billedets størrelse. Hvis du vil bevare proportionerne, skal du bare indtaste én af værdirene og trykke på TAB-tasten, jeg vil dernæst automatisk beregne den anden værdi:');
+@define('CALENDAR', 'Kalender');
+@define('QUICKJUMP_CALENDAR', 'Hurtigkalender');
+@define('QUICKSEARCH', 'Søgning');
+@define('SEARCH_FOR_ENTRY', 'Søg efter en artikel');
+@define('ARCHIVES', 'Arkiver');
+@define('BROWSE_ARCHIVES', 'Gennemse arkiver efter måneder');
+@define('TOP_REFERRER', 'Referencer');
+@define('SHOWS_TOP_SITES', 'Viser de sites som oftest linker til din blog');
+@define('TOP_EXITS', 'Udgangssider');
+@define('SHOWS_TOP_EXIT', 'Viser de udgangssider der er klikket flest gange på');
+@define('SYNDICATION', 'Syndikering');
+@define('SHOWS_RSS_BLAHBLAH', 'Viser RSS syndikeringslinks');
+@define('ALLOWS_YOU_BLAHBLAH', 'Muliggører konfiguration og udgivelse af din blog');
+@define('PLUG', 'Plug');
+@define('ADVERTISES_BLAHBLAH', 'Reklamer for din blogs oprindelse');
+@define('HTML_NUGGET', 'HTML Nugget');
+@define('HOLDS_A_BLAHBLAH', 'Indeholder et stykke HTML i din sidebar');
+@define('TITLE_FOR_NUGGET', 'Titel på din nugget');
+@define('THE_NUGGET', 'HTML-indholdet af din nugget');
+@define('SYNDICATE_THIS_BLOG', 'Syndiker denne blog');
+@define('QUICKJUMP', 'Kalender');
+@define('YOU_CHOSE', 'Du valgte %s');
+@define('IMAGE_SIZE', 'Billedestørrelse');
+@define('IMAGE_AS_A_LINK', 'Billedeindsættelse');
+@define('POWERED_BY', 'Drives af');
+@define('SUPERUSER', 'Superbruger');
+@define('TRACKBACKS', 'Trackbacks');
+@define('TRACKBACK', 'Trackback');
+@define('NO_TRACKBACKS', 'Ingen Trackbacks');
+@define('TOPICS_OF', 'Emner af');
+@define('VIEW_FULL', 'View i fuld');
+@define('VIEW_TOPICS', 'Vis emner');
+@define('AT', 'kl');
+@define('SET_AS_TEMPLATE', 'Sæt som template');
+@define('VIEW_EXTENDED_ENTRY', 'Vis udvidet artikel');
+@define('IN', 'i');
+@define('EXCERPT', 'Uddrag');
+@define('TRACKED', 'Tracked');
+@define('LINK_TO_ENTRY', 'Link til artikel');
+@define('LINK_TO_REMOTE_ENTRY', 'Link til ekstern artikel');
+@define('IP_ADDRESS', 'IP-adresse');
+@define('USER', 'Bruger');
+@define('THUMBNAIL_USING_OWN', 'Bruger %s som dets eget minibillede, fordi det allerede er så lille.');
+@define('THUMBNAIL_FAILED_COPY', 'Ville gerne have brugt %s som dets egen minibillede, men kunne ikke kopiere!');
+@define('AUTHOR', 'Forfatter');
+@define('LAST_UPDATED', 'Sidst opdateret');
+@define('TRACKBACK_SPECIFIC', 'Trackback URI til denne artikel');
+@define('DIRECT_LINK', 'Direkte link til denne artikel');
+@define('COMMENT_ADDED', 'Din kommentar var tilføjet. ');
+@define('COMMENT_ADDED_CLICK', 'Klik %her for at gå tilbage%s til kommentarerne, og %sher for at lukke%s dette vindue.');
+@define('COMMENT_NOT_ADDED', 'Din kommentar kunne ikke tilføjes fordi kommentarer til denne atikel er blevet deaktiveret.');
+@define('COMMENT_NOT_ADDED_CLICK', 'Klik %sher for at gå tilbage%s til kommentarene, og %sher for at lukke%s dette vindue. ');
+@define('COMMENTS_DISABLE', 'Tillad ikke kommentarer til denne artikel');
+@define('COMMENTS_ENABLE', 'Tillad kommentarer til denne artikel');
+@define('COMMENTS_CLOSED', 'Forfatteren har valgt ikke at tillade kommentarer til denne artikel');
+@define('EMPTY_COMMENT', 'Din kommentar indeholdt ikke noget, gå venligst %stilbage%s og prøv igen');
+@define('ENTRIES_FOR', 'Artikler fra %s');
+@define('TOPICS_FOR', 'Emner fra %s');
+@define('DOCUMENT_NOT_FOUND', 'Dokumentet %s kunne ikke findes.');
+@define('USERNAME', 'Brugernavn');
+@define('PASSWORD', 'Adgangskode');
+@define('AUTOMATIC_LOGIN', 'Gem oplysningerne');
+@define('SERENDIPITY_INSTALLATION', 'Serendipityinstallation');
+@define('LEFT', 'venstre');
+@define('RIGHT', 'højre');
+@define('HIDDEN', 'skjult');
+@define('REMOVE_TICKED_PLUGINS', 'Fjern valgte plugins');
+@define('SAVE_CHANGES_TO_LAYOUT', 'Gem layout-ændringerne');
+@define('COMMENTS_FROM', 'Kommentar fra');
+@define('ERROR', 'Fejl');
+@define('ENTRY_SAVED', 'Artiklen blev gemt');
+@define('DELETE_SURE', 'Er du sikker på du vil slette #%s permanent?');
+@define('NOT_REALLY', 'Egentlig ikke...');
+@define('DUMP_IT', 'Smid den ud!');
+@define('RIP_ENTRY', 'Farvel artikel #%s');
+@define('CATEGORY_DELETED', 'Kategorien #%s blev slettet. Gamle artikler flyttet til kategori #%s');
+@define('CATEGORY_REMAINING', 'Slet denne kategori og flyt dens artikler til denne kategori: %s');
+@define('INVALID_CATEGORY', 'Ingen kategori blev valgt til sletning');
+@define('CATEGORY_SAVED', 'Kategori gemt');
+@define('SELECT_TEMPLATE', 'Vælg den template du ønsker at bruge til din blog');
+@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Artikler indsat uden problemer!');
+@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Der var problemer under indsættelsen af artiklerne!');
+@define('VIEW_FEED_EXPORT', 'Vis eksporteret feed');
+@define('IMPORT', 'Importer');
+@define('EXPORT', 'Ekporter');
+@define('YES', 'Ja');
+@define('NO', 'Nej');
+@define('CHECK_N_SAVE', 'Check &amp; gem');
+@define('DIRECTORY_NOT_EXISTANT', 'Biblioteket %s findes ikke. Opret det!');
+@define('DIRECTORY_WRITE_ERROR', 'KAn ikke skrive til biblioteket %s. Check filrettighederne.');
+@define('DIRECTORY_CREATE_ERROR', 'Biblioteket %s eksisterer ikke og kunne ikke oprettes. Opret ventligst biblioteket manuelt');
+@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; Kør <i>%s %s</i>');
+@define('CANT_EXECUTE_BINARY', 'Kan ikke eksekvere %s');
+@define('FILE_WRITE_ERROR', 'Kan ikke skrive til filen %s.');
+@define('FILE_CREATE_YOURSELF', 'Opret venligst filen selv og check dens rettigheder');
+@define('COPY_CODE_BELOW', '<br />* Kopier blot koden nedenunder og placer den i %s i din %s mappe:<b><pre>%s</pre></b>' . "\n");
+@define('WWW_USER', 'Ændr www til den bruger som apache kører som (fx. nobody).');
+@define('BROWSER_RELOAD', 'Når du har gjort dette, så tryk på din browsers "reload" knap');
+@define('DIAGNOSTIC_ERROR', 'Vi har opdaget nogle fejl mens vi kørte nogle diagnostikker på dine indtastede informationer:');
+@define('ALL_VALID', 'Alle de indtastede informationer ser ud til at være korrekte.');
+@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity er endnu ikke installeret. Klik <a href="%s">her for at installere</a> nu.');
+@define('INCLUDE_ERROR', 'serendipityfejl: Kunne ikke inkludere %s - Afbryder.');
+@define('DATABASE_ERROR', 'serendipityfejl: Kunne ikke oprette forbindelse til databasen - Afbryder.');
+@define('ATTEMPT_SETUP_DATABASE', 'Forsøger at opsætte databasen...');
+@define('CHECK_DATABASE_EXISTS', 'Undersøger om databasen allerede findes. Hvis du ser et database fejl-query her, så ignorer det...');
+@define('CREATE_DATABASE', 'Opretter standarddatabase setup...');
+@define('DATABASE_DONE', 'Færdig med at opsætte database');
+@define('ATTEMPT_WRITE_FILE', 'Forsøger at skrive til %s ...');
+@define('SERENDIPITY_INSTALLED', '%sSerendipity er nu installeret på dit system.%s Husk venligst dit kodeord: "%s", dit brugernavn er "%s".%sDu kan finde din nye blog <a href="%s">lige her</a>');
+@define('WRITTEN_N_SAVED', 'Konfiguration skrevet &amp; gemt');
+@define('IMAGE_ALIGNMENT', 'Billedejustering');
+@define('ENTER_NEW_NAME', 'Indtast det nye navn for: ');
+@define('IMAGE_MANAGER', 'Billedehåndtering');
+@define('RESIZING', 'Ændre dimensioner');
+@define('RESIZE_DONE', 'Færdig (Ændrede %s billeder).');
+@define('SYNCING', 'Synkronisere databasen med billedemappen');
+@define('SYNC_DONE', 'Færdig (Synkroniserede %s billeder).');
+@define('DELETE_IMAGE', 'Slettede billedet ved navn <b>%s</b>');
+@define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette billedet <b>%s</b>');
+@define('DELETE_THUMBNAIL', 'Slettede billedet ved navn <b>%s</b>');
+@define('FILE_NOT_FOUND', 'Kunne ikke finde filen ved navn <b>%s</b>, måske er den allerede slettet?');
+@define('ABOUT_TO_DELETE_FILE', 'Du er ved at slette <b>%s</b><br />Hvis du bruger denne fil i nogle af dine artikler, will det forasage døde billeder<br />Er du sikker på du vil foresætte?<br /><br />');
+@define('IMAGE_FULLSIZE', 'Fuld størrelse');
+@define('IMAGE_RENAME', 'Omdøb dette billede');
+@define('IMAGE_RESIZE', 'Skalér dette billede');
+@define('IMAGE_DELETE', 'Slet dette billede');
+@define('ABORT_NOW', 'Afbryd nu');
+@define('REMOTE_FILE_NOT_FOUND', 'Filen kunne ikke findes på serveren, er du sikker på URLen: <b>%s</b> er korrekt?');
+@define('FILE_FETCHED', '%s hentet: %s');
+@define('FILE_UPLOADED', 'Filen %s er blevet uploadet: %s');
+@define('WORD_OR', 'eller');
+@define('SCALING_IMAGE', 'Skalérer %s til %s x %s px');
+@define('KEEP_PROPORTIONS', 'Bevar forholdet');
+@define('REALLY_SCALE_IMAGE', 'Er du sikker på du vil skalére dette billede? Der er ingen vej tilbage!');
+@define('TOGGLE_ALL', 'Vis/Skjul alle');
+@define('TOGGLE_OPTION', 'Vis/Skjul denne option');
+@define('SUBSCRIBE_TO_THIS_ENTRY', 'Abonnér på denne artikel');
+@define('UNSUBSCRIBE_OK', "%s er ikke længere abonnement på denne artikel");
+@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Ny kommentar på abonnerede artikel "%s"');
+@define('SUBSCRIPTION_MAIL', "Hej %s,\n\nEn ny kommentar er blevet lavet til en artikel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finde artiklen her: %s\n\nDu kan stoppe dit abonnement ved at klikke på dette link: %s\n");
+@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hej %s,\n\nEt nyt trackback er blevet lavet til en artikel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finde artiklen her: %s\n\nDu kan stoppe dit abonnement ved at klikke på dette link: %s\n");
+@define('SIGNATURE', "\n-- \n%s bruger Serendipity.\nDen bedste blog på dette, du kan også bruge det.\nKig nærmere på <http://s9y.org> for at finde mere information.");
+@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database er allerede installeret');
+@define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
+@define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
+@define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
+@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 kommentarer');
+@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
+@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Feltet "Admin-redaktør"');
+@define('SYNDICATION_PLUGIN_WEBMASTER',  'Feltet "webmaster"');
+@define('SYNDICATION_PLUGIN_BANNERURL', 'Billede til RSS feedet');
+@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Billedebredde');
+@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Billedehøjde');
+@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'E-mailadressen på webmasteren, hvis tilgængelig. (tom: skjult) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-mailadressen på redaktøren, hvis tilgængelig. (tom: skjult) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL på et billede i GIF/JPEG/PNG format, hvis tilgængeligt. (tom: serendipity-logo)');
+@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'i pixels, max. 144');
+@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'i pixels, max. 400');
+@define('SYNDICATION_PLUGIN_TTL', 'Feltet "ttl" (time-to-live)');
+@define('SYNDICATION_PLUGIN_TTL_DESC', 'Antallet af minutter din blog skal gemmes af eksterne sider/programmer (tom: skjult) [RSS 2.0]');
+@define('SYNDICATION_PLUGIN_PUBDATE', 'Feltet "pubDate"');
+@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Skal "pubDate"-feltet være indkapslet til en RSS-channel, for at vise datoen på den nyeste artikel?');
+@define('CONTENT', 'Indhold');
+@define('TYPE', 'Type');
+@define('DRAFT', 'Udkast');
+@define('PUBLISH', 'Udgiv');
+@define('PREVIEW', 'Vis');
+@define('DATE', 'Dato');
+@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
+@define('DATE_INVALID', 'Advarsel: Den dato du indtasede var ugyldig. Det skal indtastes i følgende format: YYYY-MM-DD HH:MM.');
+@define('CATEGORY_PLUGIN_DESC', 'Viser listen over kategorier.');
+@define('ALL_AUTHORS', 'Alle forfattere');
+@define('CATEGORIES_TO_FETCH', 'Kategorier som skal hentes');
+@define('CATEGORIES_TO_FETCH_DESC', 'Hent kategorier fra en bestemt forfatter?');
+@define('PAGE_BROWSE', 'Side %s af %s, i alt %s artikler');
+@define('PREVIOUS_PAGE', 'forrige side');
+@define('NEXT_PAGE', 'næste side');
+@define('ALL_CATEGORIES', 'Alle kategorier');
+@define('DO_MARKUP', 'Udført Markup-transformation');
+@define('DO_MARKUP_DESCRIPTION', 'Tilføj markup-transformationer på teksten (smilies, shortcut markups via *, /, _, ...). Hvis du slår dette fra vil al HTML-kode i teksten blive bibeholdt. Standard er "Ja".');
+@define('RECENTENTRIES_PLUGIN_TITLE', 'Nyeste artikler');
+@define('RECENTENTRIES_PLUGIN_BLAHBLAH', 'Viser titlerne og datoerne på de nyeste artikler');
+@define('RECENTENTRIES_PLUGIN_NUMBER', 'Antallet af artikler');
+@define('RECENTENTRIES_PLUGIN_NUMBER_BLAHBLAH', 'Hvor mangel artikler skal der vises? (Standard: 10)');
+@define('COMMENTS_PLUGIN_BLAHBLAH', 'Viser de nyeste kommentarer på dine artikler');
+@define('COMMENTS_PLUGIN_WORDWRAP', 'Linieskift');
+@define('COMMENTS_PLUGIN_WORDWRAP_BLAHBLAH', 'Hvor mange ord inden der skal ske et linieskift? (Standard: 30)');
+@define('COMMENTS_PLUGIN_MAXCHARS', 'Maximalt antal tegn per kommentar');
+@define('COMMENTS_PLUGIN_MAXCHARS_BLAHBLAH', 'Hvor mange tegn skal vises af hver kommentar? (Standard: 120)');
+@define('COMMENTS_PLUGIN_MAXENTRIES', 'Maximalt antal kommentarer');
+@define('COMMENTS_PLUGIN_MAXENTRIES_BLAHBLAH', 'Hvor mange kommentarer vil blive vist? (Standard: 15)');
+@define('GENERAL_PLUGIN_DATEFORMAT', 'Datoformat');
+@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formatet på artiklens faktiske dato, brug PHPs strftime() variabler. (Standard: "%s")');
+@define('GENERAL_PLUGIN_LANGUAGE', 'Sprog');
+@define('GENERAL_PLUGIN_LANGUAGE_BLAHBLAH', 'Hvilket sprog er brugt til datoer og tekstformatering? ("en|de", default "en")');
+@define('ERROR_TEMPLATE_FILE', 'Kunne ikke åbne skabelonen, opdater Serendipity!');
+@define('ADVANCED_OPTIONS', 'Advancerede indstillinger');
+@define('PING_WEBLOGS', 'Annoncer artikler (via XML-RPC ping) til:');
+@define('SENDING_PING', 'Send XML-RPC ping til host %s');
+@define('EDIT_ENTRY', 'Rediger artikel');
+@define('HTACCESS_ERROR', 'For at kunne checke din lokale webserver\'s installation, skal serendipity være i stand til at skrive til filen ".htaccess". Dette var ikke muligt pga. forkerte rettigheder. Justér rettighederne således: <br />&nbsp;&nbsp;%s<br />og genindlæs siden.');
+@define('SORT_ORDER', 'Sorter efter');
+@define('SORT_ORDER_NAME', 'Filnavn');
+@define('SORT_ORDER_EXTENSION', 'Filtype');
+@define('SORT_ORDER_SIZE', 'Filstørrelse');
+@define('SORT_ORDER_WIDTH', 'Billedebrede');
+@define('SORT_ORDER_HEIGHT', 'Billedehøjde');
+@define('SORT_ORDER_DATE', 'Upload-dato');
+@define('SORT_ORDER_ASC', 'Stigende');
+@define('SORT_ORDER_DESC', 'Faldende');
+@define('THUMBNAIL_SHORT', 'Mini');
+@define('ORIGINAL_SHORT', 'Orig.');
+@define('IMAGES_PER_PAGE', 'billeder pr. side');
+@define('APPLY_MARKUP_TO', 'Formatér %s');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Forhindrer HTTP caching');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis sat til "true" vil dette anbefale linket til dit RSS feed om ikke at tillade klienter at cache dit feed. Det anbefales at sætte dette til "false".'); 
+@define('CALENDAR_BEGINNING_OF_WEEK', 'Starten på ugen');
+@define('CALENDAR_BOW_DESC', 'Hvilken ugedag starter ugen på? 0 = søndag, 1 = mandag ... 6 = lørdag (standard: 1)');
+@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity har opdaget at din nuværende konfiguration passer til version %s. Serendipity selv er installeret som version %s, Det er nødvendigt at opgradere! <a href="%s">Klik her!</a>');
+@define('SERENDIPITY_UPGRADER_WELCOME', 'Velkommen til Serendipitys opgraderingsscript.');
+@define('SERENDIPITY_UPGRADER_PURPOSE', 'Scriptet vil hjælpe dig med at opgradere Serendipity %s.');
+@define('SERENDIPITY_UPGRADER_WHY', 'Denne meddelelse vises, fordi Serendipity er installeret med version %s, men databasen er endnu ikke opgraderet til denne version.');
+@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Databasen opdateringer (%s)');
+@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Følgende .sql-filer skal eksekveres før Serendipity igen kan fungere normalt.');
+@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Versionsspecifikke opgaver');
+@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Ingen versionsspecifikke opgaver fundet');
+@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Ønsker du at ovenstående opgaver udføres?');
+@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Nej, jeg udfører dem manuelt');
+@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Ja tak!');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Det ser ud til at opgradering ikke er nødvendig.');
+@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Serendipity er opgraderet');
+@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Du har ignoreret en del af opgraderingen. Undersøg venligst om databasen er korrekt opdateret, og planlagte opgaver udført');
+@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Din Serendipity-installation er nu opgraderet til version %s');
+@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbage til din blog ved at klikke  %shere%s');
+@define('IMAGE_NAME', 'Gem dette billeder under følgende navn (efterlad tom hvis du ønsker at beholde det orignale navn): ');
+
+/* vim: set sts=4 ts=4 expandtab : */
+?>

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

[Kristian K?h. <is...@us...>]

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

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
list="`find . -name \*.php`"
list="$list `find . -name \*.txt`"
perl -i -pe 's=^M==g' $list
cvs tag pre-control-m-removal
cvs commit
cvs tag post-control-m-removal



Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_bbcode.php	18 Mar 2004 12:09:04 -0000	1.2
+++ serendipity_event_bbcode.php	3 Apr 2004 17:36:17 -0000	1.3
@@ -51,54 +51,54 @@
         }
         $propbag->add('configuration', $conf_array);
 
-        $this->bbcodes = array(
-          '/(?<!\\\\)\[color(?::\w+)?=(.*?)\](.*?)\[\/color(?::\w+)?\]/si'   => "<span style=\"color:\\1\">\\2</span>",
-          '/(?<!\\\\)\[size(?::\w+)?=(.*?)\](.*?)\[\/size(?::\w+)?\]/si'     => "<span style=\"font-size:\\1\">\\2</span>",
-          '/(?<!\\\\)\[font(?::\w+)?=(.*?)\](.*?)\[\/font(?::\w+)?\]/si'     => "<span style=\"font-family:\\1\">\\2</span>",
-          '/(?<!\\\\)\[align(?::\w+)?=(.*?)\](.*?)\[\/align(?::\w+)?\]/si'   => "<div style=\"text-align:\\1\">\\2</div>",
-          '/(?<!\\\\)\[b(?::\w+)?\](.*?)\[\/b(?::\w+)?\]/si'                 => "<span style=\"font-weight:bold\">\\1</span>",
-          '/(?<!\\\\)\[i(?::\w+)?\](.*?)\[\/i(?::\w+)?\]/si'                 => "<span style=\"font-style:italic\">\\1</span>",
-          '/(?<!\\\\)\[u(?::\w+)?\](.*?)\[\/u(?::\w+)?\]/si'                 => "<span style=\"text-decoration:underline\">\\1</span>",
-          '/(?<!\\\\)\[center(?::\w+)?\](.*?)\[\/center(?::\w+)?\]/si'       => "<div style=\"text-align:center\">\\1</div>",
-
-          // [code] & [php]
-          '/(?<!\\\\)\[code(?::\w+)?\](.*?)\[\/code(?::\w+)?\]/si'           => "<div class=\"bb-code\">\\1</div>",
-          '/(?<!\\\\)\[php(?::\w+)?\](.*?)\[\/php(?::\w+)?\]/si'             => "<div class=\"bb-php\">\\1</div>",
+        $this->bbcodes = array(
+          '/(?<!\\\\)\[color(?::\w+)?=(.*?)\](.*?)\[\/color(?::\w+)?\]/si'   => "<span style=\"color:\\1\">\\2</span>",
+          '/(?<!\\\\)\[size(?::\w+)?=(.*?)\](.*?)\[\/size(?::\w+)?\]/si'     => "<span style=\"font-size:\\1\">\\2</span>",
+          '/(?<!\\\\)\[font(?::\w+)?=(.*?)\](.*?)\[\/font(?::\w+)?\]/si'     => "<span style=\"font-family:\\1\">\\2</span>",
+          '/(?<!\\\\)\[align(?::\w+)?=(.*?)\](.*?)\[\/align(?::\w+)?\]/si'   => "<div style=\"text-align:\\1\">\\2</div>",
+          '/(?<!\\\\)\[b(?::\w+)?\](.*?)\[\/b(?::\w+)?\]/si'                 => "<span style=\"font-weight:bold\">\\1</span>",
+          '/(?<!\\\\)\[i(?::\w+)?\](.*?)\[\/i(?::\w+)?\]/si'                 => "<span style=\"font-style:italic\">\\1</span>",
+          '/(?<!\\\\)\[u(?::\w+)?\](.*?)\[\/u(?::\w+)?\]/si'                 => "<span style=\"text-decoration:underline\">\\1</span>",
+          '/(?<!\\\\)\[center(?::\w+)?\](.*?)\[\/center(?::\w+)?\]/si'       => "<div style=\"text-align:center\">\\1</div>",
 
-          // [email]
-          '/(?<!\\\\)\[email(?::\w+)?\](.*?)\[\/email(?::\w+)?\]/si'         => "<a href=\"mailto:\\1\" class=\"bb-email\">\\1</a>",
-          '/(?<!\\\\)\[email(?::\w+)?=(.*?)\](.*?)\[\/email(?::\w+)?\]/si'   => "<a href=\"mailto:\\1\" class=\"bb-email\">\\2</a>",
+          // [code] & [php]
+          '/(?<!\\\\)\[code(?::\w+)?\](.*?)\[\/code(?::\w+)?\]/si'           => "<div class=\"bb-code\">\\1</div>",
+          '/(?<!\\\\)\[php(?::\w+)?\](.*?)\[\/php(?::\w+)?\]/si'             => "<div class=\"bb-php\">\\1</div>",
 
-          // [url]
-          '/(?<!\\\\)\[url(?::\w+)?\]www\.(.*?)\[\/url(?::\w+)?\]/si'        => "<a href=\"http://www.\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
-          '/(?<!\\\\)\[url(?::\w+)?\](.*?)\[\/url(?::\w+)?\]/si'             => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
-          '/(?<!\\\\)\[url(?::\w+)?=(.*?)?\](.*?)\[\/url(?::\w+)?\]/si'      => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\2</a>",
+          // [email]
+          '/(?<!\\\\)\[email(?::\w+)?\](.*?)\[\/email(?::\w+)?\]/si'         => "<a href=\"mailto:\\1\" class=\"bb-email\">\\1</a>",
+          '/(?<!\\\\)\[email(?::\w+)?=(.*?)\](.*?)\[\/email(?::\w+)?\]/si'   => "<a href=\"mailto:\\1\" class=\"bb-email\">\\2</a>",
 
-          // [img]
-          '/(?<!\\\\)\[img(?::\w+)?\](.*?)\[\/img(?::\w+)?\]/si'             => "<img src=\"\\1\" alt=\"\\1\" class=\"bb-image\" />",
-          '/(?<!\\\\)\[img(?::\w+)?=(.*?)x(.*?)\](.*?)\[\/img(?::\w+)?\]/si' => "<img width=\"\\1\" height=\"\\2\" src=\"\\3\" alt=\"\\3\" class=\"bb-image\" />",
+          // [url]
+          '/(?<!\\\\)\[url(?::\w+)?\]www\.(.*?)\[\/url(?::\w+)?\]/si'        => "<a href=\"http://www.\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
+          '/(?<!\\\\)\[url(?::\w+)?\](.*?)\[\/url(?::\w+)?\]/si'             => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
+          '/(?<!\\\\)\[url(?::\w+)?=(.*?)?\](.*?)\[\/url(?::\w+)?\]/si'      => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\2</a>",
 
-          // [quote]
-          '/(?<!\\\\)\[quote(?::\w+)?\](.*?)\[\/quote(?::\w+)?\]/si'         => "<div>Quote:<div class=\"bb-quote\">\\1</div></div>",
-          '/(?<!\\\\)\[quote(?::\w+)?=(?:&quot;|"|\')?(.*?)["\']?(?:&quot;|"|\')?\](.*?)\[\/quote\]/si'   => "<div>Quote \\1:<div class=\"bb-quote\">\\2</div></div>",
+          // [img]
+          '/(?<!\\\\)\[img(?::\w+)?\](.*?)\[\/img(?::\w+)?\]/si'             => "<img src=\"\\1\" alt=\"\\1\" class=\"bb-image\" />",
+          '/(?<!\\\\)\[img(?::\w+)?=(.*?)x(.*?)\](.*?)\[\/img(?::\w+)?\]/si' => "<img width=\"\\1\" height=\"\\2\" src=\"\\3\" alt=\"\\3\" class=\"bb-image\" />",
 
-          // [list]
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\*(?::\w+)?\](.*?)(?=(?:\s*<br\s*\/?>\s*)?\[\*|(?:\s*<br\s*\/?>\s*)?\[\/?list)/si' => "\n<li class=\"bb-listitem\">\\1</li>",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list(:(?!u|o)\w+)?\](?:<br\s*\/?>)?/si'    => "\n</ul>",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list:u(:\w+)?\](?:<br\s*\/?>)?/si'         => "\n</ul>",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list:o(:\w+)?\](?:<br\s*\/?>)?/si'         => "\n</ol>",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(:(?!u|o)\w+)?\]\s*(?:<br\s*\/?>)?/si'   => "\n<ul class=\"bb-list-unordered\">",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list:u(:\w+)?\]\s*(?:<br\s*\/?>)?/si'        => "\n<ul class=\"bb-list-unordered\">",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list:o(:\w+)?\]\s*(?:<br\s*\/?>)?/si'        => "\n<ol class=\"bb-list-ordered\">",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=1\]\s*(?:<br\s*\/?>)?/si' => "\n<ol class=\"bb-list-ordered,bb-list-ordered-d\">",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=i\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-lr\">",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=I\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-ur\">",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=a\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-la\">",
-          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=A\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-ua\">",
+          // [quote]
+          '/(?<!\\\\)\[quote(?::\w+)?\](.*?)\[\/quote(?::\w+)?\]/si'         => "<div>Quote:<div class=\"bb-quote\">\\1</div></div>",
+          '/(?<!\\\\)\[quote(?::\w+)?=(?:&quot;|"|\')?(.*?)["\']?(?:&quot;|"|\')?\](.*?)\[\/quote\]/si'   => "<div>Quote \\1:<div class=\"bb-quote\">\\2</div></div>",
 
-          // escaped tags like \[b], \[color], \[url], ...
-          '/\\\\(\[\/?\w+(?::\w+)*\])/'                                      => "\\1"
-        );
+          // [list]
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\*(?::\w+)?\](.*?)(?=(?:\s*<br\s*\/?>\s*)?\[\*|(?:\s*<br\s*\/?>\s*)?\[\/?list)/si' => "\n<li class=\"bb-listitem\">\\1</li>",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list(:(?!u|o)\w+)?\](?:<br\s*\/?>)?/si'    => "\n</ul>",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list:u(:\w+)?\](?:<br\s*\/?>)?/si'         => "\n</ul>",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[\/list:o(:\w+)?\](?:<br\s*\/?>)?/si'         => "\n</ol>",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(:(?!u|o)\w+)?\]\s*(?:<br\s*\/?>)?/si'   => "\n<ul class=\"bb-list-unordered\">",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list:u(:\w+)?\]\s*(?:<br\s*\/?>)?/si'        => "\n<ul class=\"bb-list-unordered\">",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list:o(:\w+)?\]\s*(?:<br\s*\/?>)?/si'        => "\n<ol class=\"bb-list-ordered\">",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=1\]\s*(?:<br\s*\/?>)?/si' => "\n<ol class=\"bb-list-ordered,bb-list-ordered-d\">",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=i\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-lr\">",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=I\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-ur\">",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=a\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-la\">",
+          '/(?<!\\\\)(?:\s*<br\s*\/?>\s*)?\[list(?::o)?(:\w+)?=A\]\s*(?:<br\s*\/?>)?/s'  => "\n<ol class=\"bb-list-ordered,bb-list-ordered-ua\">",
+
+          // escaped tags like \[b], \[color], \[url], ...
+          '/\\\\(\[\/?\w+(?::\w+)*\])/'                                      => "\\1"
+        );
     }
 
 
@@ -115,9 +115,9 @@
         return true;
     }
     
-    function bbcode($input) {
+    function bbcode($input) {
         /* Regular expressions taken from http://smarty.incutio.com/?page=BBCodePlugin Wiki (Andre Rabold) */
-        return preg_replace(array_keys($this->bbcodes), array_values($this->bbcodes), $input);
+        return preg_replace(array_keys($this->bbcodes), array_values($this->bbcodes), $input);
 }
 
     function event_hook($event, &$bag, &$eventData) {

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

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

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
mod_speling


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_creativecommons.php	3 Apr 2004 07:55:51 -0000	1.3
+++ serendipity_event_creativecommons.php	3 Apr 2004 17:19:34 -0000	1.4
@@ -2,18 +2,18 @@
 
 switch ($serendipity['lang']) {
     case 'de':
-        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons Lizens');
-        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Wählen Sie eine Lizens für den Inhalt');
+        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons Lizenz');
+        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Wählen Sie eine Lizenz für den Inhalt');
         @define('PLUGIN_CREATIVECOMMONS_TXT',         'Text anzeigen?');
         @define('PLUGIN_CREATIVECOMMONS_TXT_DESC',    'Zeigt eine kurze Erklärung zu Ihrer individuellen Lizensierung an');
-        @define('PLUGIN_CREATIVECOMMONS_CAP',         'Der Inhalt dieses Werkes ist lizensiert unter der <a href="#license_uri#">Creative Commons Lizens</a>');
+        @define('PLUGIN_CREATIVECOMMONS_CAP',         'Der Inhalt dieses Werkes ist lizensiert unter der <a href="#license_uri#">Creative Commons Lizenz</a>');
         @define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Der Inhalt dieses Werkes ist als <a href="#license_url#}">Public Domain</a> gewidmet');
         @define('PLUGIN_CREATIVECOMMONS_BY',          'Attribution (Nennung als Author) erforderlich?');
-        @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'Der Lizensgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung müssen Lizensnehmer den ursprünglichen Authoren nennen.');
+        @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'Der Lizenzgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung müssen Lizenznehmer den ursprünglichen Authoren nennen.');
         @define('PLUGIN_CREATIVECOMMONS_NC',          'Kommerzielle Nutzung des Werkes erlauben?');
-        @define('PLUGIN_CREATIVECOMMONS_NC_DESC',     'Der Lizensgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung dürfen die Lizensnehmer das Werk nicht in kommerziellem Kontext einsetzen - es sei denn, sie erhalten die ausdrückliche Genehmigung.');
+        @define('PLUGIN_CREATIVECOMMONS_NC_DESC',     'Der Lizenzgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung dürfen die Lizenznehmer das Werk nicht in kommerziellem Kontext einsetzen - es sei denn, sie erhalten die ausdrückliche Genehmigung.');
         @define('PLUGIN_CREATIVECOMMONS_ND',          'Veränderungen des Werkes erlauben?');
-        @define('PLUGIN_CREATIVECOMMONS_ND_DESC',     'Der Lizensgeber erlaubt anderen dieses Werk in unveränderter Form zu kopieren, zu verteilen, anzuwenden und darzustellen. Daran anlehnende oder ableitende Werke sind nicht erlaubt.');
+        @define('PLUGIN_CREATIVECOMMONS_ND_DESC',     'Der Lizenzgeber erlaubt anderen dieses Werk in unveränderter Form zu kopieren, zu verteilen, anzuwenden und darzustellen. Daran anlehnende oder ableitende Werke sind nicht erlaubt.');
         @define('PLUGIN_CREATIVECOMMONS_SA_DESC',     'Ja, solange dieses Recht weitergegeben wird');
         break;
 

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

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

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
Patch by Evan Nemerson <ev...@co...>.

Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_creativecommons.php	2 Apr 2004 11:03:20 -0000	1.2
+++ serendipity_event_creativecommons.php	3 Apr 2004 07:55:51 -0000	1.3
@@ -187,19 +187,16 @@
             $license_type[] = 'by';
         }
 
+        if ($this->get_config('nd') == 'no') {
+            $license_type[] = 'nd';
+        }
+
         if ($this->get_config('nc') == 'false') {
             $license_type[] = 'nc';
         }
 
-        switch ($this->get_config('nd')) {
-            case 'sa':
-                $license_type[] = 'sa';
-                break;
-
-            case 'no':
-            default:
-                $license_type[] = 'nd';
-            break;
+        if ($this->get_config('nd') == 'sa') {
+            $license_type[] = 'sa';
         }
 
         $license_string = implode('-', $license_type);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.247,1.248

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fix for problems with email resulting from comments with Reply-To: 
addresses.  Specifically, made sure the output of phpversion(); is
the last thing in the generated header.  N.B.: This should be
investigated further, to understand the reasons for the problem.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- serendipity_functions.inc.php	2 Apr 2004 09:09:28 -0000	1.247
+++ serendipity_functions.inc.php	2 Apr 2004 12:34:58 -0000	1.248
@@ -1333,7 +1333,7 @@
               . "\n" . strip_tags($comment);
     }
 
-    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} - $fromName <$to>\r\n". $serendipity['mailheaders'] . (!empty($fromEmail) ? "\r\nReply-To: $fromEmail" : ''));
+    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} - $fromName <$to>". (!empty($fromEmail) ? "\r\nReply-To: $fromEmail" : ''). "\r\n". $serendipity['mailheaders']);
 }
 
 function serendipity_fetchReferences($id)

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

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

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
Should fix some issues with wrong radio button configuration.
Clean up code. Beautify and use correct indentation.
German translation (Sebastian, can you check if I did that right?).


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_creativecommons.php	2 Apr 2004 09:09:29 -0000	1.1
+++ serendipity_event_creativecommons.php	2 Apr 2004 11:03:20 -0000	1.2
@@ -1,21 +1,37 @@
 <?php # $Id$
 
 switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons Lizens');
+        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Wählen Sie eine Lizens für den Inhalt');
+        @define('PLUGIN_CREATIVECOMMONS_TXT',         'Text anzeigen?');
+        @define('PLUGIN_CREATIVECOMMONS_TXT_DESC',    'Zeigt eine kurze Erklärung zu Ihrer individuellen Lizensierung an');
+        @define('PLUGIN_CREATIVECOMMONS_CAP',         'Der Inhalt dieses Werkes ist lizensiert unter der <a href="#license_uri#">Creative Commons Lizens</a>');
+        @define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Der Inhalt dieses Werkes ist als <a href="#license_url#}">Public Domain</a> gewidmet');
+        @define('PLUGIN_CREATIVECOMMONS_BY',          'Attribution (Nennung als Author) erforderlich?');
+        @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'Der Lizensgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung müssen Lizensnehmer den ursprünglichen Authoren nennen.');
+        @define('PLUGIN_CREATIVECOMMONS_NC',          'Kommerzielle Nutzung des Werkes erlauben?');
+        @define('PLUGIN_CREATIVECOMMONS_NC_DESC',     'Der Lizensgeber erlaubt anderen dieses Werk zu kopieren, zu verteilen, anzuwenden und darzustellen. Als Gegenleistung dürfen die Lizensnehmer das Werk nicht in kommerziellem Kontext einsetzen - es sei denn, sie erhalten die ausdrückliche Genehmigung.');
+        @define('PLUGIN_CREATIVECOMMONS_ND',          'Veränderungen des Werkes erlauben?');
+        @define('PLUGIN_CREATIVECOMMONS_ND_DESC',     'Der Lizensgeber erlaubt anderen dieses Werk in unveränderter Form zu kopieren, zu verteilen, anzuwenden und darzustellen. Daran anlehnende oder ableitende Werke sind nicht erlaubt.');
+        @define('PLUGIN_CREATIVECOMMONS_SA_DESC',     'Ja, solange dieses Recht weitergegeben wird');
+        break;
+
     case 'en':
     default:
         @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons License');
         @define('PLUGIN_CREATIVECOMMONS_DESC',        'Choose a creative commons license for your content');
         @define('PLUGIN_CREATIVECOMMONS_TXT',         'Show text?');
         @define('PLUGIN_CREATIVECOMMONS_TXT_DESC',    'For visible notifications of license status, show a brief explanation of your license choice.');
-	@define('PLUGIN_CREATIVECOMMONS_CAP',         'Original content in this work is licensed under a <a href="#license_uri#">Creative Commons License</a>');
-	@define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Original content in this work is dedicated to the <a href="#license_url#}">Public Domain</a>');
+        @define('PLUGIN_CREATIVECOMMONS_CAP',         'Original content in this work is licensed under a <a href="#license_uri#">Creative Commons License</a>');
+        @define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Original content in this work is dedicated to the <a href="#license_url#}">Public Domain</a>');
         @define('PLUGIN_CREATIVECOMMONS_BY',          'Require attribution?');
         @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees must give the original author credit.');
         @define('PLUGIN_CREATIVECOMMONS_NC',          'Allow commercial uses of your work?');
         @define('PLUGIN_CREATIVECOMMONS_NC_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees may not use the work for commercial purposes -- unless they get the licensor\'s permission.');
         @define('PLUGIN_CREATIVECOMMONS_ND',          'Allow modifications of your work?');
         @define('PLUGIN_CREATIVECOMMONS_ND_DESC',     'The licensor permits others to copy, distribute, display and perform only unaltered copies of the work -- not derivative works based on it.');
-	@define('PLUGIN_CREATIVECOMMONS_SA_DESC',     'Yes, as long as others share alike');
+        @define('PLUGIN_CREATIVECOMMONS_SA_DESC',     'Yes, as long as others share alike');
         break;
 }
 
@@ -43,221 +59,279 @@
                 $propbag->add('name',          PLUGIN_CREATIVECOMMONS_BY);
                 $propbag->add('description',   PLUGIN_CREATIVECOMMONS_BY_DESC);
                 break;
+
             case 'nc':
                 $propbag->add('type',          'boolean');
                 $propbag->add('name',          PLUGIN_CREATIVECOMMONS_NC);
                 $propbag->add('description',   PLUGIN_CREATIVECOMMONS_NC_DESC);
                 break;
+
             case 'nd':
                 $propbag->add('type',          'radio');
                 $propbag->add('name',          PLUGIN_CREATIVECOMMONS_ND);
                 $propbag->add('description',   PLUGIN_CREATIVECOMMONS_ND_DESC);
-                $propbag->add('radio_values',  array('yes' => YES, 'sa' => PLUGIN_CREATIVECOMMONS_SA_DESC, 'no' => NO));
+                $propbag->add('radio',         array(
+                    'value' => array('yes', 'sa', 'no'),
+                    'desc'  => array(YES, PLUGIN_CREATIVECOMMONS_SA_DESC, NO)
+                ));
+                $propbag->add('radio_per_row', '1');
                 break;
+
             case 'txt':
                 $propbag->add('type',          'boolean');
                 $propbag->add('name',          PLUGIN_CREATIVECOMMONS_TXT);
                 $propbag->add('description',   PLUGIN_CREATIVECOMMONS_TXT_DESC);
                 break;
+
             default:
                 return false;
-		break;
+                break;
         }
         return true;
     }
 
     function generate_content(&$title) {
-      $title = PLUGIN_CREATIVECOMMONS_NAME;
+        $title = PLUGIN_CREATIVECOMMONS_NAME;
     }
 
     function event_hook($event, &$bag, &$eventData) {
-      global $serendipity;
+        global $serendipity;
 
-      $license_data = $this->get_license_data();
-      $license_type = $license_data['type'];
-      $license_string = $license_data['string'];
-      $rdf = $license_data['rdf'];
+        $license_data    = $this->get_license_data();
+        $license_type    = $license_data['type'];
+        $license_string  = $license_data['string'];
+        $rdf             = $license_data['rdf'];
 
-      if ( $license_string == '' )
-	  $license_uri = 'http://web.resource.org/cc/PublicDomain';
-      else
-	  $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/1.0/';
+        if ($license_string == '') {
+            $license_uri = 'http://web.resource.org/cc/PublicDomain';
+        } else {
+            $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/1.0/';
+        }
 
-      $cc_visibility = 'invisible';
+        $cc_visibility = 'invisible';
 
-      switch ( $event ) {
-      case 'frontend_display:html_layout':
-	$cc_visibility = 'visible';
-      case 'frontend_display:html:per_entry':
-	$eventData['display_dat'] = '<div style="text-align: center;">';
-	if ( $license_string == '' ) {
-	  if ( $cc_visibility == 'visible' ) {
-	    $eventData['display_dat'] .= '<a href="http://creativecommons.org/licenses/publicdomain">';
-	    $eventData['display_dat'] .= '<img border="0" alt="No Rights Reserved" src="'.$serendipity['serendipityHTTPPath'].'/pixel/norights.png"/>';
-	    $eventData['display_dat'] .= '</a>';
-	    if ( $this->get_config('txt') != 'false' ) {
-	      $eventData['display_dat'] .= '<br />'.str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP_PD);
-	    }
-	  }
-	}
-	else {
-	  if ( $cc_visibility == 'visible' ) {
-	    $eventData['display_dat'] .= '<a href="'.$license_uri.'">';
-	    $eventData['display_dat'] .= '<img border="0" alt="Creative Commons License - Some Rights Reserved" src="'.$serendipity['serendipityHTTPPath'].'/pixel/somerights.png"/>';
-	    $eventData['display_dat'] .= '</a>';
-	    if ( $this->get_config('txt') != 'false' ) {
-	      $eventData['display_dat'] .= '<br />'.str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP);
-	    }
-	  }
-	}
+        switch ($event) {
+            case 'frontend_display:html_layout':
+                $cc_visibility = 'visible';
+            case 'frontend_display:html:per_entry':
+                $eventData['display_dat'] = '<div style="text-align: center;">';
+                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'] .= '</a>';
+                        if ($this->get_config('txt') != 'false') {
+                            $eventData['display_dat'] .= '<br />' . str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP_PD);
+                        }
+                    }
+                } 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/somerights.png" />';
+                    $eventData['display_dat'] .= '</a>';
+                    if ($this->get_config('txt') != 'false') {
+                        $eventData['display_dat'] .= '<br />' . str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP);
+                    }
+                }
 
-	$eventData['display_dat'] .= '<!-- <rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><Work rdf:about=""><license rdf:resource="'.$license_uri.'"/></Work><License rdf:about="'.$license_uri.'">';
-	foreach ( $rdf as $rdf_t => $rdf_v ) {
-	  $eventData['display_dat'] .= '  <'.$rdf_v.' rdf:resource="http://web.resource.org/cc/'.$rdf_t.'" />';
-	}
-	$eventData['display_dat'] .= '</License></rdf:RDF> -->';
-	$eventData['display_dat'] .= '</div>';
-	return true;
-	break;
-      case 'frontend_display:rss-2.0:per_entry':
-	$eventData['display_dat'] = '<creativeCommons:license>'.$license_uri.'</creativeCommons:license>';
-	return true;
-	break;
-      case 'frontend_display:rss-1.0:per_entry':
-	$eventData['display_dat'] = '<cc:license rdf:resource="'.$license_uri.'" />';
-	return true;
-	break;
-      case 'frontend_display:rss-1.0:once':
-	$eventData['display_dat'] = '<cc:License rdf:about="'.$license_uri.'">';
-	foreach ( $rdf as $rdf_t => $rdf_v ) {
-	  $eventData['display_dat'] .= '<cc:'.$rdf_v.' rdf:resource="http://web.resource.org/cc/'.$rdf_t.'" />';
-	}
-	$eventData['display_dat'] .= '</cc:License>';
-	return true;
-	break;
-      case 'frontend_display:rss-2.0:namespace':
-	$eventData['display_dat'] = 'xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule"';
-	return true;
-	break;
-      case 'frontend_display:rss-1.0:namespace':
-	$eventData['display_dat'] = 'xmlns:cc="http://web.resource.org/cc/"';
-	return true;
-	break;
-      default:
-	return true;
-	break;
-      }
+                $eventData['display_dat'] .= '<!-- <rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><Work rdf:about=""><license rdf:resource="'.$license_uri.'"/></Work><License rdf:about="'.$license_uri.'">';
+                if (is_array($df)) {
+                    foreach ($rdf as $rdf_t => $rdf_v) {
+                        $eventData['display_dat'] .= '  <'.$rdf_v.' rdf:resource="http://web.resource.org/cc/'.$rdf_t.'" />';
+                    }
+                }
+
+                $eventData['display_dat'] .= '</License></rdf:RDF> -->';
+                $eventData['display_dat'] .= '</div>';
+                return true;
+                break;
+
+            case 'frontend_display:rss-2.0:per_entry':
+                $eventData['display_dat'] = '<creativeCommons:license>'.$license_uri.'</creativeCommons:license>';
+                return true;
+                break;
+
+            case 'frontend_display:rss-1.0:per_entry':
+                $eventData['display_dat'] = '<cc:license rdf:resource="'.$license_uri.'" />';
+                return true;
+                break;
+
+            case 'frontend_display:rss-1.0:once':
+                $eventData['display_dat'] = '<cc:License rdf:about="'.$license_uri.'">';
+                foreach ($rdf as $rdf_t => $rdf_v) {
+                  $eventData['display_dat'] .= '<cc:'.$rdf_v.' rdf:resource="http://web.resource.org/cc/'.$rdf_t.'" />';
+                }
+                $eventData['display_dat'] .= '</cc:License>';
+                return true;
+                break;
+
+            case 'frontend_display:rss-2.0:namespace':
+                $eventData['display_dat'] = 'xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule"';
+                return true;
+                break;
+
+            case 'frontend_display:rss-1.0:namespace':
+                $eventData['display_dat'] = 'xmlns:cc="http://web.resource.org/cc/"';
+                return true;
+                break;
+
+            default:
+                return true;
+                break;
+        }
     }
 
     function get_license_data() {
-      $license_type = array();
+        $license_type = array();
 
-      if ( $this->get_config('by') != 'false' ) {
-	$license_type[] = 'by';
-      }
-      if ( $this->get_config('nc') == 'false' ) {
-	$license_type[] = 'nc';
-      }
-      switch ( $this->get_config('nd') ) {
-      case 'sa':
-	$license_type[] = 'sa';
-	break;
-      case 'no':
-      default:
-	$license_type[] = 'nd';
-	break;
-      }
+        if ($this->get_config('by') != 'false') {
+            $license_type[] = 'by';
+        }
 
-      $license_string = implode('-', $license_type);
+        if ($this->get_config('nc') == 'false') {
+            $license_type[] = 'nc';
+        }
 
-      switch ( $license_string ) {
-      case 'by':
-	$rdf = array('Attribution' =>     'requires',
-		     'Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits',
-		     'Notice' =>          'requires');
-	break;
-      case 'by-nd':
-	$rdf = array('Attribution' =>     'requires',
-		     'Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'Notice' =>          'requires');
-	break;
-      case 'by-nd-nc':
-	$rdf = array('Attribution' =>     'requires',
-		     'Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'CommercialUse' =>   'prohibits',
-		     'Notice' =>          'requires');
-	  break;
-      case 'by-nc':
-	$rdf = array('Attribution' =>     'requires',
-		     'Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits',
-		     'CommercialUse' =>   'prohibits',
-		     'Notice' =>          'requires');
-	break;
-      case 'by-nc-sa':
-	$rdf = array('Attribution' =>     'requires',
-		     'Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits',
-		     'ShareAlike' =>      'requires',
-		     'CommercialUse' =>   'prohibits',
-		     'Notice' =>          'requires');
-	break;
-      case 'by-sa':
-	$rdf = array('Attribution' =>     'requires',
-		     'Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits',
-		     'ShareAlike' =>      'requires',
-		     'Notice' =>          'requires');
-	break;
-      case 'nd':
-	$rdf = array('Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'Notice' =>          'requires');
-	break;
-      case 'nd-nc':
-	$rdf = array('Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'CommercialUse' =>   'prohibits',
-		     'Notice' =>          'requires');
-	break;
-      case 'nc':
-	$rdf = array('Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits',
-		     'CommercialUse' =>   'prohibits',
-		     'Notice' =>          'requires');
-	break;
-      case 'nc-sa':
-	$rdf = array('Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits',
-		     'ShareAlike' =>      'requires',
-		     'CommercialUse' =>   'prohibits',
-		     'Notice' =>          'requires');
-	break;
-      case 'sa':
-	$rdf = array('Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits',
-		     'ShareAlike' =>      'requires',
-		     'Notice' =>          'requires');
-	break;
-      case '':
-	$rdf = array('Reproduction' =>    'permits',
-		     'Distribution' =>    'permits',
-		     'DerivativeWorks' => 'permits');
-	break;
-      }
-      return array('type' => $license_type, 'string' => $license_string, 'rdf' => $rdf);
+        switch ($this->get_config('nd')) {
+            case 'sa':
+                $license_type[] = 'sa';
+                break;
+
+            case 'no':
+            default:
+                $license_type[] = 'nd';
+            break;
+        }
+
+        $license_string = implode('-', $license_type);
+
+        switch ($license_string) {
+            case 'by':
+                $rdf = array(
+                    'Attribution'     => 'requires',
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'by-nd':
+                $rdf = array(
+                    'Attribution'     => 'requires',
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'by-nd-nc':
+                $rdf = array(
+                    'Attribution'     => 'requires',
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'CommercialUse'   => 'prohibits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'by-nc':
+                $rdf = array(
+                    'Attribution'     => 'requires',
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits',
+                    'CommercialUse'   => 'prohibits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'by-nc-sa':
+                $rdf = array(
+                    'Attribution'     => 'requires',
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits',
+                    'ShareAlike'      => 'requires',
+                    'CommercialUse'   => 'prohibits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'by-sa':
+                $rdf = array(
+                    'Attribution'     => 'requires',
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits',
+                    'ShareAlike'      => 'requires',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'nd':
+                $rdf = array(
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'nd-nc':
+                $rdf = array(
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'CommercialUse'   => 'prohibits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'nc':
+                $rdf = array(
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits',
+                    'CommercialUse'   => 'prohibits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'nc-sa':
+                $rdf = array(
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits',
+                    'ShareAlike'      => 'requires',
+                    'CommercialUse'   => 'prohibits',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case 'sa':
+                $rdf = array(
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits',
+                    'ShareAlike'      => 'requires',
+                    'Notice'          => 'requires'
+                );
+                break;
+
+            case '':
+                $rdf = array(
+                    'Reproduction'    => 'permits',
+                    'Distribution'    => 'permits',
+                    'DerivativeWorks' => 'permits'
+                );
+            break;
+        }
+
+        return array(
+          'type'   => $license_type,
+          'string' => $license_string,
+          'rdf'    => $rdf
+        );
     }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

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

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

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

Modified Files:
	serendipity_plugin_creativecommons.php 
Log Message:
Should fix some issues with wrong radio button configuration.
Clean up code. Beautify and use correct indentation.
German translation (Sebastian, can you check if I did that right?).


Index: serendipity_plugin_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_creativecommons/serendipity_plugin_creativecommons.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_plugin_creativecommons.php	2 Apr 2004 09:09:30 -0000	1.1
+++ serendipity_plugin_creativecommons.php	2 Apr 2004 11:03:21 -0000	1.2
@@ -2,6 +2,11 @@
 
 switch ($serendipity['lang']) {
     case 'en':
+        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons');
+        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Zeigt einen Creative Commons Hinweis an');
+        break;
+
+    case 'en':
     default:
         @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons');
         @define('PLUGIN_CREATIVECOMMONS_DESC',        'Display a creative commons notification in the sidebar.');
@@ -15,7 +20,7 @@
         $propbag->add('description', PLUGIN_CREATIVECOMMONS_DESC);
         $propbag->add('configuration', array('title'));
 
-        $this->dependencies = array('serendipity_event_creativecommons' => 'remove'); 
+        $this->dependencies = array('serendipity_event_creativecommons' => 'remove');
     }
 
     function introspect_config_item($name, &$propbag)
@@ -29,7 +34,7 @@
         }
         return true;
     }
-  
+
     function generate_content(&$title) {
       global $serendipity;
 
@@ -42,4 +47,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/htmlarea/popups link.html,1.1,1.2

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

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

Modified Files:
	link.html 
Log Message:
fixed reference. seems nobody is using the editor, hum? :-)


Index: link.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/link.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- link.html	23 Mar 2004 15:41:10 -0000	1.1
+++ link.html	2 Apr 2004 09:58:27 -0000	1.2
@@ -5,8 +5,7 @@
   <script type="text/javascript" src="popup.js"></script>
   <script type="text/javascript">
     window.resizeTo(400, 200);
-
-I18N = window.opener.HTMLArea.I18N.dialogs;
+    I18N = window.opener.HTMLArea.I18N.msg;
 
 function i18n(str) {
   return (I18N[str] || str);

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

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

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

Added Files:
	serendipity_plugin_creativecommons.php 
Log Message:
Added CC plugin from Evan Nemerson. Thanks for contributing!


--- NEW FILE: serendipity_plugin_creativecommons.php ---
<?php # $Id: serendipity_plugin_creativecommons.php,v 1.1 2004/04/02 09:09:30 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'en':
    default:
        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons');
        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Display a creative commons notification in the sidebar.');
        break;
}

class serendipity_plugin_creativecommons extends serendipity_plugin {
    function introspect(&$propbag)
    {
        $propbag->add('name',        PLUGIN_CREATIVECOMMONS_NAME);
        $propbag->add('description', PLUGIN_CREATIVECOMMONS_DESC);
        $propbag->add('configuration', array('title'));

        $this->dependencies = array('serendipity_event_creativecommons' => 'remove'); 
    }

    function introspect_config_item($name, &$propbag)
    {
        switch($name) {
            case 'title':
                $propbag->add('type',          'string');
                $propbag->add('name',          TITLE);
                $propbag->add('description',   TITLE);
                break;
        }
        return true;
    }
  
    function generate_content(&$title) {
      global $serendipity;

      $title = $this->get_config('title');

      $eventData = array('display_dat' => '');
      serendipity_plugin_api::hook_event('frontend_display:html_layout', $eventData);
      echo $eventData['display_dat'];
    }
}

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

[php-blog-cvs] serendipity NEWS,1.102,1.103 rss.php,1.22,1.23 serendipity_functions.inc.php,1.246,1.247

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

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

Modified Files:
	NEWS rss.php serendipity_functions.inc.php 
Log Message:
Added CC plugin from Evan Nemerson. Thanks for contributing!


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- NEWS	2 Apr 2004 08:32:51 -0000	1.102
+++ NEWS	2 Apr 2004 09:09:28 -0000	1.103
@@ -3,6 +3,9 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Added plugin for usage of CreativeCommons (creativecommons.org)
+      license for the blog's contents (Evan Nemerson)
+
     * Templates with an "inactive.txt" or no "info.txt" inside their
       directory are not selectable for s9y. Usable for "work in progress"
       templates. (garvinhicking)

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- serendipity_functions.inc.php	2 Apr 2004 08:39:39 -0000	1.246
+++ serendipity_functions.inc.php	2 Apr 2004 09:09:28 -0000	1.247
@@ -887,7 +887,11 @@
                          dc:identifier="<?php echo serendipity_archiveURL($entry['id'], $entry['title']); ?>" />
                 </rdf:RDF>
                 -->
-
+		<?php
+		    $eventData = array_merge(array('display_dat' => ''), $entry);
+		    serendipity_plugin_api::hook_event('frontend_display:html:per_entry', $eventData);
+		    echo $eventData['display_dat'];
+		?>
 <?php
                 if (isset($serendipity['GET']['id'])) {
 ?>
@@ -1474,6 +1478,11 @@
     </content:encoded>
     <pubDate><?php echo date('r', $entry['timestamp']); ?></pubDate>
     <guid><?php echo $guid; ?></guid>
+    <?php
+      $eventData = array_merge(array('display_dat' => ''), $entry);
+      serendipity_plugin_api::hook_event('frontend_display:rss-2.0:per_entry', $eventData);
+      echo $eventData['display_dat'];
+    ?>
 </item>
 <?php
                     /*********** END 2.0 FEED EXTRAS *************/
@@ -1497,6 +1506,11 @@
                 echo utf8_encode(htmlspecialchars($entry['body'].$ext));
 ?>
     </description>
+    <?php
+      $eventData = array_merge(array('display_dat' => ''), $entry);
+      serendipity_plugin_api::hook_event('frontend_display:rss-1.0:per_entry', $eventData);
+      echo $eventData['display_dat'];
+    ?>
     <dc:publisher><?php echo utf8_encode(htmlspecialchars($serendipity['blogTitle'])); ?></dc:publisher>
     <dc:creator><?php echo utf8_encode(htmlspecialchars($entry['email'])) . ' (' . utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator>
     <dc:subject><?php echo utf8_encode(htmlspecialchars($entry['category_name'])); ?></dc:subject>

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- rss.php	21 Mar 2004 16:35:31 -0000	1.22
+++ rss.php	2 Apr 2004 09:09:28 -0000	1.23
@@ -121,8 +121,10 @@
             $rdf_seq_li .= '        <rdf:li resource="' . serendipity_rss_getguid($entry, $comments) . '" />' . "\n";
         }
     }
+    $eventData = array_merge(array('display_dat' => ''), $entries);
+    serendipity_plugin_api::hook_event('frontend_display:rss-1.0:namespace', $eventData);
     print <<<HEAD
-<rdf:RDF 
+<rdf:RDF {$eventData['display_dat']}
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
@@ -149,6 +151,8 @@
 break;
 
 case '2.0':
+    $eventData = array_merge(array('display_dat' => ''), $entries);
+    serendipity_plugin_api::hook_event('frontend_display:rss-2.0:namespace', $eventData);
     print <<<HEAD
 <rss version="2.0"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -156,7 +160,8 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
    xmlns:wfw="http://wellformedweb.org/CommentAPI/"
-   xmlns:content="http://purl.org/rss/1.0/modules/content/">
+   xmlns:content="http://purl.org/rss/1.0/modules/content/"
+   {$eventData['display_dat']}>
 <channel>
     <title>$title</title>
     <link>{$serendipity['baseURL']}</link>
@@ -208,6 +213,9 @@
     print "</rss>\n";
     break;
 case '1.0':
+    $eventData = array_merge(array('display_dat' => ''), $entries);
+    serendipity_plugin_api::hook_event('frontend_display:rss-1.0:once', $eventData);
+    echo $eventData['display_dat'];
     print '</rdf:RDF>';
     break;
 case 'atom0.3':

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

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

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

Added Files:
	serendipity_event_creativecommons.php 
Log Message:
Added CC plugin from Evan Nemerson. Thanks for contributing!


--- NEW FILE: serendipity_event_creativecommons.php ---
<?php # $Id: serendipity_event_creativecommons.php,v 1.1 2004/04/02 09:09:29 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'en':
    default:
        @define('PLUGIN_CREATIVECOMMONS_NAME',        'Creative Commons License');
        @define('PLUGIN_CREATIVECOMMONS_DESC',        'Choose a creative commons license for your content');
        @define('PLUGIN_CREATIVECOMMONS_TXT',         'Show text?');
        @define('PLUGIN_CREATIVECOMMONS_TXT_DESC',    'For visible notifications of license status, show a brief explanation of your license choice.');
	@define('PLUGIN_CREATIVECOMMONS_CAP',         'Original content in this work is licensed under a <a href="#license_uri#">Creative Commons License</a>');
	@define('PLUGIN_CREATIVECOMMONS_CAP_PD',      'Original content in this work is dedicated to the <a href="#license_url#}">Public Domain</a>');
        @define('PLUGIN_CREATIVECOMMONS_BY',          'Require attribution?');
        @define('PLUGIN_CREATIVECOMMONS_BY_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees must give the original author credit.');
        @define('PLUGIN_CREATIVECOMMONS_NC',          'Allow commercial uses of your work?');
        @define('PLUGIN_CREATIVECOMMONS_NC_DESC',     'The licensor permits others to copy, distribute, display, and perform the work. In return, licensees may not use the work for commercial purposes -- unless they get the licensor\'s permission.');
        @define('PLUGIN_CREATIVECOMMONS_ND',          'Allow modifications of your work?');
        @define('PLUGIN_CREATIVECOMMONS_ND_DESC',     'The licensor permits others to copy, distribute, display and perform only unaltered copies of the work -- not derivative works based on it.');
	@define('PLUGIN_CREATIVECOMMONS_SA_DESC',     'Yes, as long as others share alike');
        break;
}

class serendipity_event_creativecommons extends serendipity_event {
    function introspect(&$propbag)
    {
        $propbag->add('name',        PLUGIN_CREATIVECOMMONS_NAME);
        $propbag->add('description', PLUGIN_CREATIVECOMMONS_DESC);
        $propbag->add('configuration', array('by', 'nc', 'nd', 'txt'));
        $propbag->add('event_hooks',
                      array('frontend_display:rss-1.0:per_entry' => true,
                            'frontend_display:rss-1.0:once'      => true,
                            'frontend_display:rss-1.0:namespace' => true,
                            'frontend_display:rss-2.0:per_entry' => true,
                            'frontend_display:rss-2.0:namespace' => true,
                            'frontend_display:html:per_entry'    => true,
                            'frontend_display:html_layout'       => true));
    }

    function introspect_config_item($name, &$propbag)
    {
        switch($name) {
            case 'by':
                $propbag->add('type',          'boolean');
                $propbag->add('name',          PLUGIN_CREATIVECOMMONS_BY);
                $propbag->add('description',   PLUGIN_CREATIVECOMMONS_BY_DESC);
                break;
            case 'nc':
                $propbag->add('type',          'boolean');
                $propbag->add('name',          PLUGIN_CREATIVECOMMONS_NC);
                $propbag->add('description',   PLUGIN_CREATIVECOMMONS_NC_DESC);
                break;
            case 'nd':
                $propbag->add('type',          'radio');
                $propbag->add('name',          PLUGIN_CREATIVECOMMONS_ND);
                $propbag->add('description',   PLUGIN_CREATIVECOMMONS_ND_DESC);
                $propbag->add('radio_values',  array('yes' => YES, 'sa' => PLUGIN_CREATIVECOMMONS_SA_DESC, 'no' => NO));
                break;
            case 'txt':
                $propbag->add('type',          'boolean');
                $propbag->add('name',          PLUGIN_CREATIVECOMMONS_TXT);
                $propbag->add('description',   PLUGIN_CREATIVECOMMONS_TXT_DESC);
                break;
            default:
                return false;
		break;
        }
        return true;
    }

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

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

      $license_data = $this->get_license_data();
      $license_type = $license_data['type'];
      $license_string = $license_data['string'];
      $rdf = $license_data['rdf'];

      if ( $license_string == '' )
	  $license_uri = 'http://web.resource.org/cc/PublicDomain';
      else
	  $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/1.0/';

      $cc_visibility = 'invisible';

      switch ( $event ) {
      case 'frontend_display:html_layout':
	$cc_visibility = 'visible';
      case 'frontend_display:html:per_entry':
	$eventData['display_dat'] = '<div style="text-align: center;">';
	if ( $license_string == '' ) {
	  if ( $cc_visibility == 'visible' ) {
	    $eventData['display_dat'] .= '<a href="http://creativecommons.org/licenses/publicdomain">';
	    $eventData['display_dat'] .= '<img border="0" alt="No Rights Reserved" src="'.$serendipity['serendipityHTTPPath'].'/pixel/norights.png"/>';
	    $eventData['display_dat'] .= '</a>';
	    if ( $this->get_config('txt') != 'false' ) {
	      $eventData['display_dat'] .= '<br />'.str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP_PD);
	    }
	  }
	}
	else {
	  if ( $cc_visibility == 'visible' ) {
	    $eventData['display_dat'] .= '<a href="'.$license_uri.'">';
	    $eventData['display_dat'] .= '<img border="0" alt="Creative Commons License - Some Rights Reserved" src="'.$serendipity['serendipityHTTPPath'].'/pixel/somerights.png"/>';
	    $eventData['display_dat'] .= '</a>';
	    if ( $this->get_config('txt') != 'false' ) {
	      $eventData['display_dat'] .= '<br />'.str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP);
	    }
	  }
	}

	$eventData['display_dat'] .= '<!-- <rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><Work rdf:about=""><license rdf:resource="'.$license_uri.'"/></Work><License rdf:about="'.$license_uri.'">';
	foreach ( $rdf as $rdf_t => $rdf_v ) {
	  $eventData['display_dat'] .= '  <'.$rdf_v.' rdf:resource="http://web.resource.org/cc/'.$rdf_t.'" />';
	}
	$eventData['display_dat'] .= '</License></rdf:RDF> -->';
	$eventData['display_dat'] .= '</div>';
	return true;
	break;
      case 'frontend_display:rss-2.0:per_entry':
	$eventData['display_dat'] = '<creativeCommons:license>'.$license_uri.'</creativeCommons:license>';
	return true;
	break;
      case 'frontend_display:rss-1.0:per_entry':
	$eventData['display_dat'] = '<cc:license rdf:resource="'.$license_uri.'" />';
	return true;
	break;
      case 'frontend_display:rss-1.0:once':
	$eventData['display_dat'] = '<cc:License rdf:about="'.$license_uri.'">';
	foreach ( $rdf as $rdf_t => $rdf_v ) {
	  $eventData['display_dat'] .= '<cc:'.$rdf_v.' rdf:resource="http://web.resource.org/cc/'.$rdf_t.'" />';
	}
	$eventData['display_dat'] .= '</cc:License>';
	return true;
	break;
      case 'frontend_display:rss-2.0:namespace':
	$eventData['display_dat'] = 'xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule"';
	return true;
	break;
      case 'frontend_display:rss-1.0:namespace':
	$eventData['display_dat'] = 'xmlns:cc="http://web.resource.org/cc/"';
	return true;
	break;
      default:
	return true;
	break;
      }
    }

    function get_license_data() {
      $license_type = array();

      if ( $this->get_config('by') != 'false' ) {
	$license_type[] = 'by';
      }
      if ( $this->get_config('nc') == 'false' ) {
	$license_type[] = 'nc';
      }
      switch ( $this->get_config('nd') ) {
      case 'sa':
	$license_type[] = 'sa';
	break;
      case 'no':
      default:
	$license_type[] = 'nd';
	break;
      }

      $license_string = implode('-', $license_type);

      switch ( $license_string ) {
      case 'by':
	$rdf = array('Attribution' =>     'requires',
		     'Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits',
		     'Notice' =>          'requires');
	break;
      case 'by-nd':
	$rdf = array('Attribution' =>     'requires',
		     'Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'Notice' =>          'requires');
	break;
      case 'by-nd-nc':
	$rdf = array('Attribution' =>     'requires',
		     'Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'CommercialUse' =>   'prohibits',
		     'Notice' =>          'requires');
	  break;
      case 'by-nc':
	$rdf = array('Attribution' =>     'requires',
		     'Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits',
		     'CommercialUse' =>   'prohibits',
		     'Notice' =>          'requires');
	break;
      case 'by-nc-sa':
	$rdf = array('Attribution' =>     'requires',
		     'Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits',
		     'ShareAlike' =>      'requires',
		     'CommercialUse' =>   'prohibits',
		     'Notice' =>          'requires');
	break;
      case 'by-sa':
	$rdf = array('Attribution' =>     'requires',
		     'Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits',
		     'ShareAlike' =>      'requires',
		     'Notice' =>          'requires');
	break;
      case 'nd':
	$rdf = array('Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'Notice' =>          'requires');
	break;
      case 'nd-nc':
	$rdf = array('Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'CommercialUse' =>   'prohibits',
		     'Notice' =>          'requires');
	break;
      case 'nc':
	$rdf = array('Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits',
		     'CommercialUse' =>   'prohibits',
		     'Notice' =>          'requires');
	break;
      case 'nc-sa':
	$rdf = array('Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits',
		     'ShareAlike' =>      'requires',
		     'CommercialUse' =>   'prohibits',
		     'Notice' =>          'requires');
	break;
      case 'sa':
	$rdf = array('Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits',
		     'ShareAlike' =>      'requires',
		     'Notice' =>          'requires');
	break;
      case '':
	$rdf = array('Reproduction' =>    'permits',
		     'Distribution' =>    'permits',
		     'DerivativeWorks' => 'permits');
	break;
      }
      return array('type' => $license_type, 'string' => $license_string, 'rdf' => $rdf);
    }
}

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

[php-blog-cvs] serendipity/pixel norights.png,NONE,1.1 somerights.png,NONE,1.1

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

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

Added Files:
	norights.png somerights.png 
Log Message:
Added CC plugin from Evan Nemerson. Thanks for contributing!


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

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

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

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

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

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

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

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

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

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