phpslash-commit — A list for automatically mailed SCM Commits

[Phpslash-commit] CVS: phpslash-skins/public_html/styles/BE_default - New directory

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-skins/public_html/styles/BE_default
In directory sc8-pr-cvs1:/tmp/cvs-serv23526/BE_default

Log Message:
Directory /cvsroot/phpslash/phpslash-skins/public_html/styles/BE_default added to the repository

[Phpslash-commit] CVS: phpslash-skins/include/templates/en/BE_default - New directory

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/BE_default
In directory sc8-pr-cvs1:/tmp/cvs-serv23008/BE_default

Log Message:
Directory /cvsroot/phpslash/phpslash-skins/include/templates/en/BE_default added to the repository

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.53,1.54

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv29779/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
[ 838369 ] phpDoc style comments throughout functions.inc.

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** CHANGES	17 Nov 2003 14:49:52 -0000	1.53
--- CHANGES	17 Nov 2003 20:31:18 -0000	1.54
***************
*** 14,17 ****
--- 14,20 ----
  
  2003-November 17 9:00AM CST Joe Stewart <joe...@us...>
+ [W] - [ 838369 ] phpDoc style comments throughout functions.inc.
+ 
+ 2003-November 17 9:00AM CST Joe Stewart <joe...@us...>
  [F] - de_DE.LC_TIME.php3, de.php3 - contributed by alba.
        [ 777766 ] missing keys in de.php3 and [ 780429 ] de_DE.LC_TIME.php3.

[Phpslash-commit] CVS: phpslash-dev/include/class functions.inc,1.10,1.11

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/class
In directory sc8-pr-cvs1:/tmp/cvs-serv29649/phpslash-dev/include/class

Modified Files:
	functions.inc 
Log Message:
[ 838369 ] phpDoc style comments throughout functions.inc.

Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/functions.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** functions.inc	11 Nov 2003 20:50:07 -0000	1.10
--- functions.inc	17 Nov 2003 20:30:47 -0000	1.11
***************
*** 1,10 ****
  <?php
! /* phpSlash Function Library */
! /* $Id$ */
  
! /***************************************************************************
! function   : getError -> returns a template with $msg
! Parameters : $msg  -> The message you want to return to someone
! ****************************************************************************/
  function getError ($msg) {
     if (class_exists(pslGetClass('slashTemplate'))) {
--- 1,19 ----
  <?php
! /**
! * phpSlash Function Library
! *
! * @version $Id$
! */
  
! /**
! * Returns a template with $msg
! *
! * If slashTemplate doesnt exist, a default output format is used.
! * The message is translated into current language before output.
! *
! * @access public
! * @param string $msg The message you want to return to someone
! * @return htmlstring
! */
  function getError ($msg) {
     if (class_exists(pslGetClass('slashTemplate'))) {
***************
*** 16,24 ****
  }
  
! /***************************************************************************
! function   : getMessage -> return a template with $msg
! Parameters : $msg  -> The message you want to return to someone
!              $tpl  -> template to use ( "$tpl + ".tpl")
! ****************************************************************************/
  function  getMessage($msg, $tpl="", $translate=true) {
  
--- 25,41 ----
  }
  
! /**
! * Return a template with $msg
! *
! * By default, the message is translated using pslGetText first. If you want to embed
! * a variable in the string (eg 'Message %s deleted') - you'll have to translate
! * the string before you call getMessage, and live with the pslGetText error.
! *
! * @access public
! * @param string $msg       The message you want to return to someone
! * @param string $tpl       Template to use ( "$tpl + ".tpl")
! * @param boolean $translate If false, do not attempt to use pslGetText, avoiding loop if
! *                           slashTemplate doesnt exist, or there may be other template hassles
! */
  function  getMessage($msg, $tpl="", $translate=true) {
  
***************
*** 50,81 ****
  
  
! /***************************************************************************
! function   : error -> Outputs a template with $msg
! Parameters : $msg  -> The message you want to return to someone
! ****************************************************************************/
  function pslError($msg) {
!    
     echo getError( $msg);
  }
  
! /***************************************************************************
! function   : message -> Outputs a template with $msg
! Parameters : $msg  -> The message you want to return to someone
!              $tpl  -> template to use ( "$tpl + ".tpl")
! ****************************************************************************/
! 
! 
  function  message($msg, $tpl="") {
  
!    return getMessage( $msg, $tpl); 
  }
  
  
! /***************************************************************************
! function   : arg_separator -> call this function to get the current arg
!                               separator default & and make it RFC1866
! Parameters : $mode         -> What kind of arg separator (& or &amp;)
! Notes:     : maybe will move to $sess->arg_separator() ?
! ****************************************************************************/
  
  function arg_separator($mode) {
--- 67,110 ----
  
  
! /**
! * Outputs a template with $msg
! *
! * Wrapper to getError
! *
! * @see getError
! * @access public
! * @param string $msg    The message you want to return to someone
! */
  function pslError($msg) {
! 
     echo getError( $msg);
  }
  
! /**
! * Outputs a template with $msg
! *
! * Wrapper to getMessage
! *
! * @see getMessage
! * @access public
! * @param string $msg       The message you want to return to someone
! * @param string $tpl       Template to use ( "$tpl + ".tpl")
! */
  function  message($msg, $tpl="") {
  
!    return getMessage( $msg, $tpl);
  }
  
  
! /**
! * Call this function to get the current arg separator default & and make it RFC1866
! *
! * Uses get_cfg_var('arg_separator').
! * Notes: maybe will move to $sess->arg_separator() ?
! *
! * @access public
! * @param string $mode What kind of arg separator (& or &amp;). '1' => &amp;
! * @return string & or &amp;
! */
  
  function arg_separator($mode) {
***************
*** 100,109 ****
  }
  
! /***************************************************************************
! function   : stripBadHTML -> rids a string of unwanted HTML.  Wanted HTML
!                              goes in the global $approvedtags array (set
!                              in config.php)
! Parameters : $string      -> The string to examine / manipuate
! ****************************************************************************/
  
  function stripBadHTML($str,$seclev=0) {
--- 129,145 ----
  }
  
! /**
! * Rids a string of unwanted HTML
! *
! * Wanted HTML goes in the global $approvedtags array (set in config.php)
! *
! * PHP4 introduced function strip_tags which does pretty much the same thing, faster
! *
! * @access public
! * @global array $_PSL['approvedtags'] List of approved tags
! * @param string $str The string to examine / manipuate
! * @param integer $seclev Not used
! * @return htmlstring
! */
  
  function stripBadHTML($str,$seclev=0) {
***************
*** 154,162 ****
  
  
! /***************************************************************************
! function   : getTitleBar
! Parameters : width => table width 
!              title => title 
! ****************************************************************************/
  function getTitleBar($width, $title) {
  
--- 190,202 ----
  
  
! /**
! * Title bar for use on blocks
! *
! * @access public
! * @param string $width table width (shame it's the first parameter since it could default to 100%)
! * @param string $title Title for block (translated before use)
! * @global $_PSL['skin'] Used, not changed
! * @global $_PSL['imageurl'] Used, not changed
! */
  function getTitleBar($width, $title) {
  
***************
*** 182,196 ****
  }  // end getTitleBar
  
! /***************************************************************************
! function   : titlebar -> echoes out the contents returned from
!                          getTitlebar()
! Parameters : $width    -> table width 
!              $title    -> title for the bar 
! ****************************************************************************/
! 
  function titlebar($width, $title) {
     echo getTitleBar($width, $title);
  }
  
  function getFancyBox($width, $title, $contents, $link = "", $box_type="", $var_ary="") {
  
--- 222,253 ----
  }  // end getTitleBar
  
! /**
! * Echoes out the contents returned from getTitlebar()
! *
! * Deprecated?
! *
! * @see getTitleBar
! * @access public
! * @param string $width table width (shame it's the first parameter since it could default to 100%)
! * @param string $title Title for block (translated before use)
! */
  function titlebar($width, $title) {
     echo getTitleBar($width, $title);
  }
  
+ /**
+ * Wraps a frame around block contents
+ *
+ * @access public
+ * @param int $width
+ * @param htmlstring $title
+ * @param string $contents
+ * @param string $link Optional link for title to point at
+ * @param string $box_type Template to use for the box (mapped to $box_type.'box.tpl') Default 'fancy'
+ * @param array $var_ary Extra template values (name=>value)
+ * @global $_PSL['skin'] Used, not changed
+ * @global $_PSL['imageurl'] Used, not changed
+ * @return htmlstring
+ */
  function getFancyBox($width, $title, $contents, $link = "", $box_type="", $var_ary="") {
  
***************
*** 248,259 ****
  }
  
  function fancybox($width, $title, $contents, $link = "", $box_type="") {
    echo getFancyBox($width, $title, $contents, $link = "", $box_type="");
  }
  
! /******************************************************************************
! function   : generateID
! Parameters : generates an id for all new items to store in a DB.
! *******************************************************************************/
  function generateID($sequence) {
  
--- 305,328 ----
  }
  
+ /**
+ * Outputs a frame around block contents
+ *
+ * Deprecated?
+ *
+ * @see getFancyBox
+ */
  function fancybox($width, $title, $contents, $link = "", $box_type="") {
    echo getFancyBox($width, $title, $contents, $link = "", $box_type="");
  }
  
! /**
! * Generates an id for all new items to store in a DB.
! *
! * Exits with an error message if no sequence is specified
! *
! * @access public
! * @param string $sequence Sequence name
! * @return integer
! */
  function generateID($sequence) {
  
***************
*** 270,283 ****
  }
  
! /***************************************************************************
! Function   : logwrite()
! Use:       : Logs actions for admin evaluation later (adds time to entry)
! Parameters : $description => A short description of the logged data
!                              (ie: Admin Login, Story Added)
!              $data        => The actual data to log
!                              (ie: admin login by $author_name ($author_id)
!                              (ie: Story $story_title added by $author_name) 
! ****************************************************************************/
! 
  function logwrite($description,$data) {
     global $_PSL;
--- 339,352 ----
  }
  
! /**
! * Logs actions for admin evaluation later (adds time to entry)
! *
! * @access public
! * @param string $description  A short description of the logged data
! *                             eg: Admin Login, Story Added
! * @param string $data         The actual data to log
! *                             eg: admin login by $author_name ($author_id)
! *                             eg: Story $story_title added by $author_name)
! */
  function logwrite($description,$data) {
     global $_PSL;
***************
*** 316,320 ****
   * @require output buffering (built into PHP4)
   * @see print_r
!  * @param mixed 
   * @return string
   */
--- 385,390 ----
   * @require output buffering (built into PHP4)
   * @see print_r
!  * @access public
! * @param mixed
   * @return string
   */
***************
*** 329,344 ****
  /**
   * Generate diagnostic information or messages
!  * 
   * @access public
   * @author Matthew Leingang (sym...@us...)
   * @param string name of the variable or function you're debugging
   * @param mixed  message or variable to be debugged
!  * @param destination of message: 
!  *        'now' - output immediately 
   *        'log' - log in db
   *        'mail' - mail to whomever
   *        other - return as string
   *        (optional; default - specified in config file)
!  * @param int   maximum recursion level 
   *        (applies only to 'now' debugs')
   *        (-1 for no limit to recursion depth)
--- 399,414 ----
  /**
   * Generate diagnostic information or messages
!  *
   * @access public
   * @author Matthew Leingang (sym...@us...)
   * @param string name of the variable or function you're debugging
   * @param mixed  message or variable to be debugged
!  * @param destination of message:
!  *        'now' - output immediately
   *        'log' - log in db
   *        'mail' - mail to whomever
   *        other - return as string
   *        (optional; default - specified in config file)
!  * @param int   maximum recursion level
   *        (applies only to 'now' debugs')
   *        (-1 for no limit to recursion depth)
***************
*** 397,401 ****
   * @param  mixed  variable to diagnose
   * @param  string destination of message: 
!  * @param  int    maximum recursion level 
   * @param  int    current level of recursion
   * @param  bool   escape HTML output
--- 467,471 ----
   * @param  mixed  variable to diagnose
   * @param  string destination of message: 
!  * @param  int    maximum recursion level
   * @param  int    current level of recursion
   * @param  bool   escape HTML output
***************
*** 465,480 ****
  }
  
! /******************************************************************************
! function   : slashhead   -> Wrapper to getHeader
! 
!                             Replaces the 0.5x slashhead.inc file
!                             Used to generate the header at the top of the
!                             each page
! Parameters : $title      -> Title of the page being displayed
!              $metaobject -> Extra stuff about the page (Admin, Home, Poll)
!              $extra_ary  -> if supplied, the array keys are used as template
!                             placeholders with the values substituted.
!              $tpl        -> optional alternate template
! *******************************************************************************/
  function slashhead($title,$metaobject, $extra_ary='', $tpl='') {
  
--- 535,551 ----
  }
  
! /**
! * Used to generate the header at the top of each page
! *
! * Wrapper to getHeader
! *
! * @see getHeader
! * @access public
! * @param string $title        Title of the page being displayed
! * @param string $metaobject   Extra stuff about the page (Admin, Home, Poll)
! * @param array  $extra_ary    if supplied, the array keys are used as template
! *                             placeholders with the values substituted.
! * @param string $tpl          optional alternate template
! */
  function slashhead($title,$metaobject, $extra_ary='', $tpl='') {
  
***************
*** 483,501 ****
  }
  
! /******************************************************************************
! function   : getHeader   -> return header html to caller
! 
!                             Replaces the 0.5x slashhead.inc file
!                             Used to generate the header at the top of the
!                             each page
! Parameters : $title      -> Title of the page being displayed
!              $metaobject -> Extra stuff about the page (Admin, Home, Poll)
!                             Accepts an array of name/value pairs for metatags.
!                             Alternative navbar template or menu can be passed in
!                             navbar_ary[tpl] or navbar_ary[menu_ary].
!              $extra_ary  -> if supplied, the array keys are used as template
!                             placeholders with the values substituted.
!              $tpl        -> optional alternate template
! *******************************************************************************/
  function getHeader($title, $metaobject, $extra_ary='', $tpl='') {
  
--- 554,570 ----
  }
  
! /**
! * Return header html to caller
! *
! * Used to generate the header at the top of each page
! *
! * @access private
! * @param string $title        Title of the page being displayed
! * @param string $metaobject   Extra stuff about the page (Admin, Home, Poll)
! * @param array  $extra_ary    if supplied, the array keys are used as template
! *                             placeholders with the values substituted.
! * @param string $tpl          optional alternate template
! * @return htmlstring
! */
  function getHeader($title, $metaobject, $extra_ary='', $tpl='') {
  
***************
*** 599,627 ****
  }
  
! /******************************************************************************
! function   : slashfoot   -> Wrapper to getFooter
! 
!                             Replaces the 0.5x slashfoot.inc file
!                             Used to generate the footer on the bottom of
!                             each page
! Parameters : $tpl        -> optional alternate template
!              $extra_ary  -> if supplied, the array keys are used as template
!                             placeholders with the values substituted.
! *******************************************************************************/
  function slashfoot($tpl="", $extra_ary='') {
     echo getFooter($tpl, $extra_ary);
  }
  
! /******************************************************************************
! function   : getFooter   -> returns html to caller
! 
!                             Replaces the 0.5x slashfoot.inc file
!                             Used to generate the footer on the bottom of
!                             each page
! 
! Parameters : $tpl        -> optional alternate template
!              $extra_ary  -> if supplied, the array keys are used as template
!                             placeholders with the values substituted.
! *******************************************************************************/
  function getFooter($tpl="", $extra_ary='') {
  
--- 668,698 ----
  }
  
! /**
! * Used to generate the footer on the bottom of each page
! *
! * Wrapper to getFooter
! *
! * @see getFooter
! * @access public
! * @param string $tpl    Optional alternate template
! * @param array  $extra_ary  if supplied, the array keys are used as template
! *                           placeholders with the values substituted.
! */
  function slashfoot($tpl="", $extra_ary='') {
     echo getFooter($tpl, $extra_ary);
  }
  
! /**
! * Used to generate the footer on the bottom of each page
! *
! * Wrapper to getFooter
! *
! * @see getFooter
! * @access private
! * @param string $tpl    Optional alternate template
! * @param array  $extra_ary  if supplied, the array keys are used as template
! *                           placeholders with the values substituted.
! * @return htmlstring
! */
  function getFooter($tpl="", $extra_ary='') {
  
***************
*** 666,675 ****
  }
  
! /******************************************************************************
! function   : clean  -> removes nasty things that hurt databases
! Parameters : $dirty -> string or array to clean up
!              $allow_html -> if true, then we don't convert HTML characters
!                             like < and > into &gt; and &lt;
! *******************************************************************************/
  function clean ($dirty,$allow_html=false) {
  
--- 737,749 ----
  }
  
! /**
! * Removes nasty things that hurt databases
! *
! * @see dirty
! * @access public
! * @param mixed $dirty         string or array to clean up
! * @param boolean $allow_html  if true, then we don't convert HTML characters
! *                             like < and > into &gt; and &lt;
! */
  function clean ($dirty,$allow_html=false) {
  
***************
*** 700,708 ****
  
  
! /******************************************************************************
! function   : dirty  -> remove protective measures added to data for db storage
!                        use before outputting to browser
! Parameters : $clean -> string or array to dirty for browser
! *******************************************************************************/
  function dirty ($clean) {
     $dirty = str_replace("&#039;","'",(stripslashes($clean)));
--- 774,785 ----
  
  
! /**
! * Remove protective measures added to data for db storage use before outputting to browser
! *
! * @see clean
! * @param string $clean     String or array to dirty for browser
! * @access public
! * @return string
! */
  function dirty ($clean) {
     $dirty = str_replace("&#039;","'",(stripslashes($clean)));
***************
*** 741,750 ****
  }                  //END FUNCTION
  
! /******************************************************************************
! function   : breadcrumb  -> 
! Parameters : $ary -> cmd line array
! returns    : templated html for a "breadcrumb" link and 
!              sets global name variables
! *******************************************************************************/
  function breadcrumb ($ary) {
    
--- 818,863 ----
  }                  //END FUNCTION
  
! /**
! * Check format of email.
! *
! * No DNS or MX checks are performed
! *
! * @access public
! * @param string $address
! * @return boolean
! */
! function is_valid_email($address) {
! 
!    if (!$address) {
!       return false;
!    }
!    if(eregi("([_\.0-9a-z-]+@)([0-9a-z][0-9a-z-]+\.)+([a-z]{2,3})", $address)) {
!       $ary_address = ($address);
!       if ($ary_address[0]) {
!          return true;
!       } else {
!          return false;
!       }
!    } else {
!       return false;
!    }
! }
! 
! 
! /**
! * Generate string linking current page back to parents
! *
! * Sets global name variables
! *
! * @param array $ary     cmd line array
! * @global $_PSL['rooturl'] Used not changed
! * @global $_PSL['phpself'] Used not changed
! * @global $_PSL['mainpage'] Used not changed
! * @global $_PSL['home_section_id'] Used not changed
! * @global $_PSL['author']  Updated to author id if present in $ary
! * @global $_PSL['section'] Updated to section id if present in $ary
! * @global $_PSL['topic']   Updated to topic id if present in $ary
! * @return htmlstring       templated html for a "breadcrumb" link and
! */
  function breadcrumb ($ary) {
    
***************
*** 847,868 ****
  } /* end of function breadcrumb */
  
- /* from MailingList.class */
- function is_valid_email($address) {
- 
-    if (!$address) {
-       return false;
-    }
-    if(eregi("([_\.0-9a-z-]+@)([0-9a-z][0-9a-z-]+\.)+([a-z]{2,3})", $address)) {
-       $ary_address = ($address);
-       if ($ary_address[0]) {
-          return true;
-       } else {
-          return false;
-       }
-    } else {
-       return false;
-    }
- }
- 
  /**
  * function psl_censor - returns a "censored" string
--- 960,963 ----
***************
*** 884,895 ****
  * This format is compatible with the phorum censor.php file.  
  *
  * @param string string
- * 
  * @param string replacement [@!#$]
- *
  * @param string censorfile  [_PSL[censorfile]
- *
- * @access public
- *
  * @return string string
  */
--- 979,986 ----
  * This format is compatible with the phorum censor.php file.  
  *
+ * @access public
  * @param string string
  * @param string replacement [@!#$]
  * @param string censorfile  [_PSL[censorfile]
  * @return string string
  */
***************
*** 1201,1217 ****
  } 
  /**
! * function setSkinTpl returns skin template directory
  *
! * If argument "new_skin" is set, attempt is made to use it for 
! * setting skin template directory.  
  *
! * Otherwise, if browser cookie available, attempt to match appropriate 
  * skin template directory.
  *
- * new_skin = directory name that contains the .tpl files.
- * method   = method for phpslash to remember skin setting.
-              [""] (blank) default is to only change skin for this pageview.
- 	     "cookie" - set a cookie with skin choice
- * 
  * "skin" directories are assumed to be subdirectories of the original
  * "templatedir".
--- 1292,1303 ----
  } 
  /**
! * Returns skin template directory
  *
! * If argument "new_skin" is set, attempt is made to use it for
! * setting skin template directory.
  *
! * Otherwise, if browser cookie available, attempt to match appropriate
  * skin template directory.
  *
  * "skin" directories are assumed to be subdirectories of the original
  * "templatedir".
***************
*** 1221,1232 ****
  * Also currently attempts to append the skinname to imageurl
  *
  *
- * @param string new_skin 
- *
- * @param string method
- * 
  * @access public
! *
! * @return string templatedir 
  */
  
--- 1307,1317 ----
  * Also currently attempts to append the skinname to imageurl
  *
+ * @param string $new_skin  Directory name that contains the .tpl files.
+ * @param string $method    Method for phpslash to remember skin setting.
+ *                          [""] (blank) default is to only change skin for this pageview.
+ *                          "cookie" - set a cookie with skin choice
  *
  * @access public
! * @return string templatedir
  */
  
***************
*** 1775,1783 ****
  }
  
! /*************************************************************
! * The following function helps replace international characters
! * when emailing, from HTML to plain text code mappings
! * Luis Mondesi < le...@ho... >
! **************************************************************/
  function clean_latin($s = "") {
      // I like perl regex (preg_replace) better, but
--- 1860,1874 ----
  }
  
! /**
! * helps replace international characters when emailing, from HTML to plain text code mappings
! *
! * put_latin reverses the process
! *
! * @see put_atin
! * @author Luis Mondesi < le...@ho... >
! * @param string $s
! * @return string
! */
! 
  function clean_latin($s = "") {
      // I like perl regex (preg_replace) better, but
***************
*** 1822,1831 ****
  // end luis' clean_latin();
  
! /*************************************************************
! * The following function does the opposite of the last one:
! * helps replace international characters
! * to  HTML from plain text code mappings
! * Luis Mondesi < le...@ho... >
! **************************************************************/
  function put_latin($s = "") {
      // I like perl regex (preg_replace) better, but
--- 1913,1926 ----
  // end luis' clean_latin();
  
! /**
! * helps replace international characters to HTML from plain text code mappings
! *
! * Does the opposite of clean_latin
! *
! * @see clean_latin
! * @author Luis Mondesi < le...@ho... >
! * @param string $s
! * @return string
! */
  function put_latin($s = "") {
      // I like perl regex (preg_replace) better, but

[Phpslash-commit] CVS: phpslash-dev/include/locale de_DE.LC_TIME.php,NONE,1.1 de.php,1.1.1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv20468/phpslash-dev/include/locale

Modified Files:
	de.php 
Added Files:
	de_DE.LC_TIME.php 
Log Message:
[ 777766 ] missing keys in de.php3 and [ 780429 ] de_DE.LC_TIME.php3.

--- NEW FILE: de_DE.LC_TIME.php ---
<?php
/**
 * Local date/time information for PHPSlash (de_DE locale)
 *
 * $Id: de_DE.LC_TIME.php,v 1.1 2003/11/17 14:49:52 joestewart Exp $
 */

$pslstrings = array('date_format_long'=>'%e. %B %Y',
					'date_format_short'=>'%Y-%m-%d',
					'time_format_12'=>'%H:%M',
					'time_format_24'=>'%H:%M',
					'date_time_format_long'=>'%A, %e. %B %Y %H:%M',
					'date_time_format_short'=>'%Y-%m-%d %H:%M'
					);
?>

Index: de.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/locale/de.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** de.php	12 Mar 2003 16:12:52 -0000	1.1.1.1
--- de.php	17 Nov 2003 14:49:52 -0000	1.2
***************
*** 26,39 ****
  
        "You didn't supply a good submit value" =>
!       "Du hast keinen gültigen Wert eingegeben",
  
-       // commentShow.php
-       // commentSubmit.php
        // config.php
        "Home" =>
        "Home",
  
        "Add Story" =>
!       "Nachricht hinzufügen",
  
        "Archives" =>
--- 26,56 ----
  
        "You didn't supply a good submit value" =>
!       "Ungültiger Wert eingegeben",
! 
!       "View Parent Comment" =>
!       "Eine Stufe hinauf",
! 
!       "Submitted Comment" =>
!       "Eingereichter Kommentar",
! 
!       "Login required to post comments" =>
!       "Login notwendig um Kommentare zu schreiben",
! 
!       "Comment Error!" =>
!       "Kommentarfehler!",
  
        // config.php
+ 
+       "Login" =>
+       "Login",
+       
+       "Logout" =>
+       "Logout",
+ 
        "Home" =>
        "Home",
  
        "Add Story" =>
!       "Neuer Beitrag",
  
        "Archives" =>
***************
*** 79,82 ****
--- 96,108 ----
        "Logging",
  
+       "User Profile" =>
+       "Benutzereinstellungen",
+ 
+       "Admin" =>
+       "Admin",
+ 
+       "Group" =>
+       "Gruppe",
+ 
        // functions.inc
        "NO TITLE" =>
***************
*** 101,105 ****
  
         "%s Poll" =>
!        "%s Poll",
        // pollBooth.php
        // search.php
--- 127,131 ----
  
         "%s Poll" =>
!        "Umfrage %s",
        // pollBooth.php
        // search.php
***************
*** 120,124 ****
        
        "Something broke, I'm not sure what though??" =>
!       "Es ist ein Fehler aufgetreten, ich weiß nicht woran es genau liegt?!",
  
        "New Submission" =>
--- 146,150 ----
        
        "Something broke, I'm not sure what though??" =>
!       "Fehler aufgetreten, weiß aber nicht woran es genau liegt?!",
  
        "New Submission" =>
***************
*** 127,146 ****
        // submissionAdmin.php
        // /admin files
!       // authorAdmin
        "Error! Invalid Privileges" => 
!       "Fehler! Ungültige Privilegien",
        
        "Sorry. You do not have the necessary privilege to view this page." =>
!       "Leider hast Du nicht die notwendigen Privilegien um diese Seite aufzurufen.",
  
        // blockadmin.php
        // commentAdmin.php
        // glossaryAdmin.php
        // infologAdmin.php
        // mailinglistAdmin.php
        // pollAdmin.php
        // sectionAdmin.php
        // storyAdmin.php
        // submissionAdmin.php
        // topicAdmin.php
        // variableAdmin.php
--- 153,253 ----
        // submissionAdmin.php
        // /admin files
!       "Administration" => 
!       "Administration",
! 
        "Error! Invalid Privileges" => 
!       "Fehler! Unzureichende Privilegien",
        
        "Sorry. You do not have the necessary privilege to view this page." =>
!       "Unzureichende Privilegien um diese Seite aufzurufen.",
! 
!       // authorAdmin
!       "Author Administration" => 
!       "Autorenverwaltung",
  
        // blockadmin.php
+       "The Block has been Deleted" => 
+       "Block wurde gelöscht",
+ 
        // commentAdmin.php
+       "The comment was deleted" => 
+       "Kommentar wurde gelöscht",
+ 
+       "You didn't select any items to delete!" => 
+       "Nichts zum Löschen ausgewählt.",
+ 
+       "Comment # %s has been deleted." => 
+       "Kommentar %s wurde gelöscht.",
+ 
+       "There was an ERROR deleting comment #" =>
+       "Fehler beim Löschen von Kommentar ",
+ 
+       "Mark Comment Pending" =>
+       "Kommentar markiert",
+ 
+       "Marked comment # %s as pending" =>
+       "Kommentar %s markieren",
+ 
+       "There was an ERROR marking comment # %s as pending." =>
+       "Fehler beim Markieren von Kommentar %s.",
+ 
+       "Unmark Pending Comment" =>
+       "Kommentarmarkierung entfernen",
+ 
+       "Unmarked pending comment %s" =>
+       "Markierung von Kommentar %s entfernt",
+ 
+       "There was an ERROR unmarking the comment as pending." =>
+       "Fehler beim Entfernen der Kommentarmarkierung",
+ 
+       "The comment was moved up one level." =>
+       "Kommentar wurde eine Stufe hinauf verschoben.",
+ 
+       "The comment was moved to the top." =>
+       "Kommentar wurde auf die oberste Stufe verschoben.",
+ 
+       "Edit Comment" =>
+       "Kommentar bearbeiten",
+ 
+       "Error! No Action" =>
+       "Fehler! Keine Variable 'Action'",
+ 
        // glossaryAdmin.php
+       "has been updated" =>
+       "Änderung wurde übernommen",
+ 
+       "has not been updated" =>
+       "Änderung wurde nicht übernommen",
+ 
        // infologAdmin.php
        // mailinglistAdmin.php
        // pollAdmin.php
+       "Deleting poll" =>
+       "Lösche Umfrage",
+ 
        // sectionAdmin.php
        // storyAdmin.php
        // submissionAdmin.php
+       " record deleted" =>
+       " Datensatz gelöscht",
+ 
+       "This would work SO much better if you actually selected something to delete!" =>
+       "Nichts zum Löschen ausgewählt",
+ 
+       "Submission Saved" =>
+       "Beitrag gespeichert",
+ 
+       "Submission Preview" =>
+       "Voransicht des Beitrags",
+ 
+       "Edit Submission" =>
+       "Beitrag bearbeiten",
+ 
+       "Current Submissions" =>
+       "Aktuelle Beiträge",
+ 
+       "When you don't see the submission, it means there aren't any." =>
+       "Wenn keine Beiträge zu sehen sind, gibt es auch keine.",
+ 
        // topicAdmin.php
        // variableAdmin.php
***************
*** 149,153 ****
--- 256,375 ----
       
        // Author.class
+       "Existing Authors" =>
+       "Angelegte Autoren",
+ 
+       "There is no author_name in Author.class::saveProfile" =>
+       "Kein author_name in Author.class::saveProfile",
+ 
+       "There is no author_name in Author.class::saveAuthor" =>
+       "Kein author_name in Author.class::saveAuthor",
+ 
+       "You need to select some permissions in Author.class::saveAuthor" =>
+       "Zumindest eine Berechtigung muss ausgewählt werden in Author.class::saveAuthor",
+ 
+       "When changing the username, the password field must also be completed." =>
+       "Änderung des Benutzernamens erfordert auch Änderung des Passworts.",
+ 
+       "Author Updated" =>
+       "Autor geändert",
+ 
+       "Author deleted" =>
+       "Autor gelöscht",
+ 
+       "Add a new Author" =>
+       "Autor hinzufügen",
+ 
+       "Update Author (%s)" =>
+       "Autor bearbeiten (%s)",
+ 
+       "There is no password in Author.class::saveAuthor" =>
+       "Kein Passwort in Author.class::saveAuthor",
+ 
+       "Author Created" =>
+       "Autor angelegt",
+ 
+       "No permissions chosen." =>
+       "Keine Berechtigungen ausgewählt.",
+ 
+       "Profile Updated" =>
+       "Benutzereinstellungen geändert",
+ 
+       "You can't delete yourself!  Create another user, log in as he/she and then delete this account." =>
+       "Es ist nicht möglich, den eigenen Benutzer zu löschen. Statt dessen mit einem neu angelegten Benutzer einloggen.",
+ 
+       "Missing Username or ID" =>
+       "Fehlender Benutzername oder ID",
+ 
+       "Username not found" =>
+       "Benutzername nicht gefunden",
+ 
+       "Sorry the user's email address is not valid" =>
+       "Die E-Mailaddresse des Benutzers ist ungültig",
+ 
+       "Email Confirmation sent" =>
+       "Bestätigungs-E-Mail abgeschickt",
+ 
+       "Email Confirmation failure" =>
+       "Fehler beim Abschicken der Bestätigungs-E-Mail",
+ 
+       "This username is already taken. Please choose a different one." =>
+       "Benutzername ist bereits reserviert. Bitte einen anderen auswählen.",
+ 
        // Block.class
+       "Block Type: %s added with an id of: %s" =>
+       "Blocktyp: %s hinzugefügt mit ID: %s",
+ 
+       "Error entering %s!" =>
+       "Fehler bei Eingabe von %s",
+ 
+       "Sorry, this block_type(%s) is assigned to this block:  %s" =>
+       "Leider ist block_type(%s) bereits zugewiesen an Block:  %s",
+ 
+       "Block Type %s deleted" =>
+       "Blocktyp %s gelöscht",
+ 
+       "Multiple blocks exist with id: %s. Stopping." =>
+       "Mehr als ein Block hat id: %s. Abbruch.",
+ 
+       "Block: %s does not exist. Stopping." =>
+       "Block: %s existiert nicht. Abbruch.",
+ 
+       "Updating Block %s.  " =>
+       "Block %s geändert.",
+ 
+       "Creating new block from submitted info." =>
+       "Neuer Block angelegt.",
+ 
+       "Adding the block to the db..." =>
+       "Neuen Block in die Datenbank eingefügt.",
+ 
+       "No section chosen.  Block will not be displayed on site till a section is chosen for block:  %s" =>
+       "Keine Rubrik ausgewählt.  Der Block wird erst sichtbar, wenn er zumindest einer Rubrik zugeordnet wurde.",
+ 
+       "Checking db..." =>
+       "Überprüfe Datenbank...",
+ 
+       "Error adding block.  Query returned multiple results." =>
+       "Fehler beim Anlegen des Blocks. Abfrage ergab mehrere Ergebnisse.",
+ 
+       "Block::putBlock() received data not in an array." =>
+       "Block::putBlock() erhielt Daten nicht als Array.",
+ 
+       // Block_admin.class
+       "Update the Current Blocks" =>
+       "Angelegte Blöcke bearbeiten",
+ 
+       "Manage Block Types" =>
+       "Blocktypen verwalten",
+ 
+       "[Add or Remove Block Types]" =>
+       "[Blocktypen hinzufügen oder löschen]",
+ 
+       "Create a New Block" =>
+       "Neuen Block anlegen",
+ 
+       "Update a Block" =>
+       "Block bearbeiten",
+ 
        // Block_i.class
        // Block_render_cal.class
***************
*** 193,199 ****
--- 415,454 ----
        // Block_render_quote.class
        // Block_render_rss.class
+       "A block that displays the headlines from another site, generated from their RDF file" =>
+       "Ein Block, der die Schlagzeilen einer anderen Website anzeigt; generiert aus deren RDF-Datei",
+ 
+       "Block_render_rss.class:: Parse error reading [%s]" =>
+       "Block_render_rss.class:: Parse meldet Fehler bei [%s]",
+ 
+       "Block_render_rss.class:: Missing protocol declaration [%s]" =>
+       "Block_render_rss.class:: Fehlende Protokolldeklaration [%s]",
+ 
+       "Block_render_rss.class:: No hostname in [%s]" =>
+       "Block_render_rss.class:: Fehlender Rechnername in [%s]",
+ 
+       "Block_render_rss.class:: No http:// or ftp:// in [%s]" =>
+       "Block_render_rss.class:: Weder http:// noch ftp:// in [%s]",
+ 
        // Block_render_section.class
        // Block_render_topic.class
        // Block_render_url.class
+       "A block that displays the HTML returned from the source URL" => 
+       "Ein Block, der das resultierende HTML einer URL zeigt",
+ 
+       "Block_render_url.class:: Parse error reading [%s]" => 
+       "Block_render_url.class:: Parser meldet Fehler bei [%s]",
+ 
+       "Block_render_url.class:: Missing protocol declaration [%s]" => 
+       "Block_render_url.class:: Fehlende Protokolldeklaration [%s]",
+       
+       "Block_render_url.class:: No hostname in [%s]" => 
+       "Block_render_url.class:: Kein Rechnername in [%s]",
+ 
+       "Block_render_url.class:: No http:// or ftp:// in [%s]" => 
+       "Block_render_url.class:: Weder http:// noch ftp:// in [%s]",
+ 
+       "Block_render_url.class: %s contained no data." => 
+       "Block_render_url.class: %s enthielt keine Daten.",
+ 
        // Comment.class
        "Nested" => 
***************
*** 213,223 ****
        
        "Show Pending" => 
!       "Zu Erledigendes zeigen",
        
        // Glossary.class
        "Add a new Term" =>
        "Neuen Begriff hinzufügen",
        
        // Infolog.class
        // Mailinglist.class
        "Email Headline Updates" =>
--- 468,671 ----
        
        "Show Pending" => 
!       "Markierte zeigen",
! 
!       "Comment::getAllComments:  I'm confused with the mode variable:  '%s'" => 
!       "Comment::getAllComments:  Modusvariable '%s' ergibt keinen Sinn.",
! 
!       "Anonymous Poster" => 
!       "Anonymer Schreiber",
! 
!       "Comment::update - comment_text is blank" => 
!       "Comment::update - comment_text ist leer",
! 
!       "Comment saved" => 
!       "Kommentar gespeichert",
! 
!       "Comment::update --ERROR-- " => 
!       "Fehler bei Übernahme der Kommentaränderungen",
! 
!       "Comment::update - Adding the comment failed" =>
!       "Comment::update - Kommentar konnte nich hinzugefügt werden",
! 
!       "Comment::update - You don't have any permissions to update a comment" =>
!       "Comment::update - Keine Berechtigung zum Ändern eines Kommentars",
! 
!       "Comment::update - the update was good, but nothing changed" =>
!       "Comment::update - Update erfolgreich, es gab aber keine Änderung",
! 
!       "Comment::update - the update query failed" =>
!       "Comment::update - Fehler bei 'update query'",
! 
!       "Comment::update - can't update comment because I'm missing some data" =>
!       "Comment::update - Kommentar wegen unvollständiger Angaben nicht geändert",
        
+       "Comment updated" =>
+       "Comment updated",
+ 
+       "Comment::deleteOne --ERROR-- " =>
+       "Comment::deleteOne --FEHLER-- ",
+ 
+       "Comment::deleteOne - the query for all the children of the comment you're about to delete failed" =>
+       "Comment::deleteOne - Fehler bei Abfrage aller zu löschenden, untergeordneten Kommentare",
+ 
+       "Comment::deleteOne - the delete was good, but nothing changed" =>
+       "Comment::deleteOne - Löschung erfolgreich, es gab aber keine Änderung",
+ 
+       "Comment::deleteOne - The delete comment query failed" =>
+       "Comment::deleteOne - Fehler bei 'delete query'",
+ 
+       "Comment::delete - there is no comment_id" =>
+       "Comment::delete - Unbekannte comment_id",
+ 
+       "Comment::delete - there is no story_id" =>
+       "Comment::delete - Unbekannte story_id",
+ 
+       "Comment::reparentUp - invalid comment_id or story_id" =>
+       "Comment::reparentUp - Ungültige comment_id oder story_id",
+ 
+       "Comment::reparentUp - the query to get the parent_id failed" =>
+       "Comment::reparentUp - Fehler bei Abfrage für parent_id",
+ 
+       "Comment::reparentUp - the query to get the parent_id returned zero results" =>
+       "Comment::reparentUp - Keine Ergebniss bei Abfrage für parent_id",
+ 
+       "Comment::reparentUp - the comment is already at the root" =>
+       "Comment::reparentUp - Kommentar is bereits auf der äußersten Ebene",
+ 
+       "Comment::reparentUp - the query to get the NEW parent_id failed" =>
+       "Comment::reparentUp - Fehler bei Abfrage für neue parent_id",
+ 
+       "Comment::reparentUp - the query to get the NEW parent_id returned zero results" =>
+       "Comment::reparentUp - Keine Ergebniss bei Abfrage für neue parent_id",
+ 
+       "Comment::reparentUp - the update was good, but nothing changed" =>
+       "Comment::reparentUp - Update erfolgreich, es gab aber keine Änderung",
+ 
+       "Comment::reparentUp - the update failed" =>
+       "Comment::reparentUp - Fehler bei Änderung",
+ 
+       "Comment::reparentTop - either no comment_id, or no story_id" =>
+       "Comment::reparentTop - Entweder keine comment_id, oder keine story_id",
+ 
+       "Comment::reparentTop - the query was good, there was just nothing updated" =>
+       "Comment::reparentTop - Operation erfolgreich, es gab aber keine Änderung",
+ 
+       "Comment::reparentTop - the query failed" =>
+       "Comment::reparentTop - Fehler bei Datenbankoperation",
+ 
+       "Listing Pending Comments" =>
+       "Liste markierter Kommentare",
+ 
+       "Sorry. No Pending Comments" =>
+       "Es sind keine Kommentare markiert",
+ 
+       "Comment::decrementCommentCount - The Query Failed" =>
+       "Comment::decrementCommentCount - Fehler bei Datenbankoperation",
+ 
+       "Comment::decrementCommentCount - No story_id" =>
+       "Comment::decrementCommentCount - Keine story_id",
+ 
+       "Comment::incrementCommentCount - The Query Failed" =>
+       "Comment::incrementCommentCount - Fehler bei Datenbankoperation",
+ 
+       "(commentEdit Function): you're trying to update a comment but I couldn't find it?" =>
+       "(commentEdit Function): Kann den zu ändernden Kommentar nicht (mehr?) finden",
+ 
        // Glossary.class
        "Add a new Term" =>
        "Neuen Begriff hinzufügen",
+ 
+       "Glossary Edit" =>
+       "Glossar Bearbeiten",
+ 
+       "There is no term in Glossary.class::saveGlossary" =>
+       "Kein erklärter Begriff in Glossary.class::saveGlossary",
+ 
+       "There is no def in Glossary.class::saveGlossary" =>
+       "Kein Definition in Glossary.class::saveGlossary",
+ 
+       // Group.class
+       "There is no group_name in Group.class::saveGroup" =>
+       "Kein group_name in Group.class::saveGroup",
+ 
+       "There is no description in Group.class::saveGroup" =>
+       "Keine Beschreibung in Group.class::saveGroup",
+ 
+       "Group information updated" =>
+       "Gruppeninformation geändert",
+ 
+       "Group information saved" =>
+       "Groupinformation gespeichert",
+ 
+       "No section chosen." =>
+       "Keine Rubrik ausgewählt.",
+ 
+       "Sorry, this group is assigned to author " =>
+       "Diese Gruppe gehört Autor ",
+ 
+       "Sorry, this group is assigned to group" =>
+       "Diese Gruppe gehört Gruppe",
+ 
+       " Group not deleted" =>
+       " Gruppe nicht gelöscht",
+ 
+       "Group deleted" =>
+       "Group gelöscht",
+ 
+       "There is no permission_name in Permission.class::savePermission" =>
+       "Kein permission_name in Permission.class::savePermission",
+ 
+       "There is no description in Permission.class::savePermission" =>
+       "Kein description in Permission.class::savePermission",
+ 
+       "Permission information updated" =>
+       "Zugriffsinformation geändert",
+ 
+       "Permission information saved" =>
+       "Zugriffsinformation gespeichert",
+ 
+       "Sorry, this permission is assigned to group " =>
+       "Zugriffsinformation gehört Gruppe ",
+ 
+       " Permission not deleted" =>
+       " Zugriffsinformation nicht gelöscht",
+ 
+       "Permission deleted" =>
+       "Zugriffsinformation gelöscht",
+ 
+       "[Edit]" =>
+       "[Bearbeiten]",
+ 
+       "[Delete]" =>
+       "[Löschen]",
+ 
+       "Add a new Group" =>
+       "Neue Gruppe anlegen",
+ 
+       "Change existing Groups" =>
+       "Bestehende Gruppe bearbeiten",
+ 
+       "Edit Group" =>
+       "Gruppe bearbeiten",
+ 
+       "Change existing Permissions" =>
+       "Bestehende Zugriffsinformation löschen",
+ 
+       "Add a new Permission" =>
+       "Add a new Permission",
+ 
+       "Edit Permission" =>
+       "Edit Permission",
        
        // Infolog.class
+       "Deleting all log entries...." =>
+       "Alle Logeinträge gelöscht...",
+ 
+       "Done!" =>
+       "Fertig!",
+ 
+       "Deleting log entry " =>
+       "Lösche Logeintrag ",
+ 
        // Mailinglist.class
        "Email Headline Updates" =>
***************
*** 228,232 ****
  
        "There was an error inserting your subscription information into the database." =>
!       "Beim Speichern Deines Beitrages in der Datenbank ist ein Fehler aufgetreten.",
  
        "There was an error inserting your frequency data." =>
--- 676,680 ----
  
        "There was an error inserting your subscription information into the database." =>
!       "Beim Speichern des Beitrags in der Datenbank ist ein Fehler aufgetreten.",
  
        "There was an error inserting your frequency data." =>
***************
*** 259,263 ****
  
        "Now ignoring abort calls..." =>
!       "Abbruch Befehle werden ignoriert...",
  
        "Sending mail to the following users:" =>
--- 707,711 ----
  
        "Now ignoring abort calls..." =>
!       "Abbruch-Befehle werden ignoriert...",
  
        "Sending mail to the following users:" =>
***************
*** 271,286 ****
  
        "You didn't give a email subject!  Halting." =>
!       "Du hast keinen Betreff eingegeben! Der Vorgang wurde abgebrochen.",
        
        // Navbar.class
-       "Login" =>
-       "Login",
-       
        "Logout %s" =>
        "Logout %s",
        
        // Poll.class
        "Your vote has been registered" =>
!       "Deine Abstimmung wurde gespeichert",
  
        "Your vote hasn't been registered because there was no remote address:  %s" =>
--- 719,797 ----
  
        "You didn't give a email subject!  Halting." =>
!       "Kein Betreff eingegeben! Vorgang abgebrochen.",
! 
!       "Nothing to send, Halting." =>
!       "Nichts zu senden. Vorgang abgebrochen",
        
        // Navbar.class
        "Logout %s" =>
        "Logout %s",
        
        // Poll.class
+       "Create A New Poll" =>
+       "Neue Umfrage anlegen",
+ 
+       "No Question ID" =>
+       "Keine Frage-ID",
+ 
+       "There was a weird number of affected rows when setting the 'current' field to 1:  " =>
+       "Seltsame Anzahl betroffener Zeilen beim Setzen von 'current' auf 1:  ",
+ 
+       "Either there were no current polls, or more then one?  Affected Rows is:  " =>
+       "Entweder gibt gar es keine aktuelle Umfrage, oder mehr als eine.  Betroffene Zeilen sind:  ",
+ 
+       "No ID to edit" =>
+       "Keine ID zum Bearbeiten",
+ 
+       "Couldn't find your question (%s) in the DB" =>
+       "Kann die Frage (%s) nicht in der Datenbank finden",
+ 
+       "Edit An Existing Poll" =>
+       "Ändern einer existierenden Umfrage",
+ 
+       "Silly admin! You need to have a question before you can have a poll." =>
+       "Ohne Frage gibt es auch keine Umfrage.",
+ 
+       "You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?" =>
+       "Mindestens zwei verschiedene Antworten notwendig.",
+ 
+       "Choice %s, %s (%s), was updated" =>
+       "Antwort %s, %s (%s), wurde geändert",
+ 
+       "Choice %s, %s (%s), was inserted" =>
+       "Antwort %s, %s (%s), wurde angelegt",
+ 
+       "You can't delete the current poll. Please make another poll current, then delete this one" =>
+       "Aktuelle Umfrage kann nicht gelöscht werden. Vorher eine neue anlegen.",
+ 
+       "No question_id in Poll::deletePoll" =>
+       "Keine question_id in Poll::deletePoll",
+ 
+       "Choice %s was ignored." =>
+       "Antwort %s wurde ignoriert.",
+ 
+       "There was an error in setting %s as the current poll:" =>
+       "Kann %s nicht zur aktuellen Umfrage machen:",
+ 
+       "I couldn't find your Poll, " =>
+       "Kann diese Umfrage nicht finden, ",
+ 
+       "Sorry, I couldn't find your poll when trying to update." =>
+       "Kann zu verändernde Umfrage nicht finden.",
+ 
+       "There was an error deleting your poll answers" =>
+       "Fehler beim Löschen der Umfrageantworten",
+ 
+       "There was an error deleting your poll question" =>
+       "Fehler beim Löschen der Umfragefrage",
+ 
+       "There was an error removing the votes" =>
+       "Fehler beim Löschen der Abstimmungsergebnisse",
+ 
+       "Poll %s was deleted" =>
+       "Umfrage %s wurde gelöscht",
+ 
        "Your vote has been registered" =>
!       "Deine Auswahl wurde gespeichert",
  
        "Your vote hasn't been registered because there was no remote address:  %s" =>
***************
*** 290,295 ****
--- 801,826 ----
        "Deine Abstimmung kann nicht berücksichtigt werden, weil Du (oder jemand mit der gleichen IP Adresse) schon abgestimmt hat.",
  
+       "No Poll Found:  " =>
+       "Keine Umfrage gefunden:  ",
  
        // Section.class
+       "Section %s(%s) deleted" =>
+       "Rubrik %s(%s) gelöscht",
+ 
+       "Change Existing Sections" =>
+       "Bearbeiten einer existierenden Rubrik",
+ 
+       "There is no section_name in Section.class::saveSection" =>
+       "Kein section_name in Section.class::saveSection",
+ 
+       "There is no description in Section.class::saveSection" =>
+       "Kein description in Section.class::saveSection",
+ 
+       "New Section" =>
+       "Neue Rubrik",
+ 
+       "Edit Section" =>
+       "Rubrik bearbeiten",
+ 
        // Story.class
        "More" =>
***************
*** 313,326 ****
        "Comments?" =>
        "Kommentieren?",
!       
        // Submission.class
        "Anonymous Coward" =>
!       "Anonymer Feigling"
  
        // Topic.class
        // TopicBar.class
        // Variable.class
!       
     );
  ?>
- 
--- 844,1036 ----
        "Comments?" =>
        "Kommentieren?",
! 
!       // Story_admin.class
!       "The storyid is:  " =>
!       "Die Nachrichten-ID ist:  ",
! 
!       "You deleted %s comments" =>
!       "%s Kommentare gelöscht",
! 
!       "removed %s section pointer(s)" =>
!       "%s Rubrikreferenzen gelöscht",
! 
!       "removed %s topic pointer(s)" =>
!       "%s Themenreferencen gelöscht",
! 
!       "removed the story" =>
!       "Nachricht gelöscht",
! 
!       "All Authors" =>
!       "Alle Autoren",
! 
!       "All Topics" =>
!       "All Themen",
! 
!       "All Sections" =>
!       "All Rubriken",
! 
!       // Story_base.class
!       "There is no story_id in Story.class::saveStory" =>
!       "Keine story_id in Story.class::saveStory",
! 
!       "You need to select at least one topic in Story.class::saveStory" =>
!       "Zumindest eine Thema muss ausgewählt werden in Story.class::saveStory",
! 
!       "You need to select at least one section in Story.class::saveStory" =>
!       "Zumindest eine Rubrik muss ausgewählt werden in Story.class::saveStory",
! 
!       "There is no title in Story.class::saveStory" =>
!       "Kein Titel in Story.class::saveStory",
! 
!       "There is no intro_text in Story.class::saveStory" =>
!       "Kein intro_text in Story.class::saveStory",
! 
!       "There is no author_id in Story.class::saveStory" =>
!       "Keine no author_id in Story.class::saveStory",
! 
!       "Topic bar could not be reorganized" =>
!       "Themenleiste konnte nicht neu angeordnet werden",
! 
!       "story(%s) saved:  %s" =>
!       "Nachricht(%s) gespeichert:  %s",
! 
        // Submission.class
        "Anonymous Coward" =>
!       "Anonymer Feigling",
! 
!       "No Submission Found:  %s" =>
!       "Kein Beitrag gefunden:  %s",
! 
!       "You need to select at least one topic in Submission.class::saveSubmission" =>
!       "Mindestens ein Thema muss ausgewählt werden in Submission.class::saveSubmission",
! 
!       "You need to select at least one section in Submission.class::saveSubmission" =>
!       "Mindestens eine Rubrik muss ausgewählt werden in Submission.class::saveSubmission",
! 
!       "There is no subject in Submission.class::saveSubmission" =>
!       "Kein Betreff in Submission.class::saveSubmission",
! 
!       "There is no story in Submission.class::saveSubmission" =>
!       "Keine Nachricht in Submission.class::saveSubmission",
! 
!       "Can't find Submission_id ('%s') in psl_submission!" =>
!       "Kann Submission_id ('%s') nicht finden in psl_submission!",
! 
!       "Submission by " =>
!       "Eingereicht von ",
  
        // Topic.class
+       "Change existing Topics" =>
+       "Existierendes Thema bearbeiten",
+ 
+       "There is no topic_name in Topic.class::saveTopic" =>
+       "Kein topic_name in Topic.class::saveTopic",
+ 
+       "There is no image in Topic.class::saveTopic" =>
+       "Kein image in Topic.class::saveTopic",
+ 
+       "There is no alt_text in Topic.class::saveTopic" =>
+       "Kein alt_text in Topic.class::saveTopic",
+ 
+       "Sorry, ths story is assigned to this topic:" =>
+       "Diese Nachricht ist bereits diesem Thema zugeordnet:",
+ 
+       "Sorry, this submission is assigned to this topic:" =>
+       "Dieser Beitrag ist bereits diesem Thema zugeordnet:",
+ 
+       "Topic deleted" =>
+       "Thema gelöscht",
+ 
+       "Add a new Topic" =>
+       "Neues Thema anlegen",
+ 
+       "Edit Topic" =>
+       "Thema bearbeiten",
+ 
+       "Display Topic Images" =>
+       "Themenbilder anzeigen",
+ 
+       "[Display all possible topic images]" =>
+       "[Alle vorhandenen Themenbilder anzeigen]",
+ 
        // TopicBar.class
        // Variable.class
!       // cronmail.php
! 
!       "Written" =>
!       "Geschrieben",
! 
!       "Intro" =>
!       "Einleitung",
! 
!       "To add or remove yourself go to" =>
!       "Um sich selber hinzuzufügen oder zu löschen:",
! 
!       // Titles in different php-files
!       "About Page" =>
!       "Über uns",
! 
!       "Articles" =>
!       "Nachrichten",
! 
!       "Comment Display" =>
!       "Kommentaranzeige",
! 
!       "Page not found" =>
!       "Seite nicht gefunden",
! 
!       "Error document" =>
!       "Fehlerdokument",
! 
!       "Glossary Administration" =>
!       "Glossar-Verwaltung",
! 
!       "Administration" =>
!       "Verwaltung",
! 
!       "Home page" =>
!       "Home page",
! 
!       "Administration Page" =>
!       "Administrations-Seite",
! 
!       "Mailing List Admin" =>
!       "Mailing-List-Administration",
! 
!       "Poll Booth" =>
!       "Umfrage-Seite",
! 
!       "Search" =>
!       "Suche",
! 
!       "Search Page" =>
!       "Such-Seite",
! 
!       "Submission" =>
!       "Beitrag",
! 
!       "Author Administration" =>
!       "Autor-Administration",
! 
!       "Block Administration" =>
!       "Block-Administration",
! 
!       "Comment Administration" =>
!       "Kommentar-Administration",
! 
!       "Poll Administration" =>
!       "Umfrage-Administration",
! 
!       "Story Administration" =>
!       "Nachrichten-Administration",
! 
!       "Submission Administration" =>
!       "Beitrags-Administration",
! 
!       "Topic Administration" =>
!       "Themen-Administration",
! 
!       "Group Administration" =>
!       "Gruppen-Administration"
     );
  ?>

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.52,1.53

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv20468/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
[ 777766 ] missing keys in de.php3 and [ 780429 ] de_DE.LC_TIME.php3.

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** CHANGES	13 Nov 2003 21:46:28 -0000	1.52
--- CHANGES	17 Nov 2003 14:49:52 -0000	1.53
***************
*** 13,16 ****
--- 13,20 ----
   9 - Removal of something (kill -9 :)
  
+ 2003-November 17 9:00AM CST Joe Stewart <joe...@us...>
+ [F] - de_DE.LC_TIME.php3, de.php3 - contributed by alba.
+       [ 777766 ] missing keys in de.php3 and [ 780429 ] de_DE.LC_TIME.php3.
+ 
  2003-November 13 3:30PM CST Joe Stewart <joe...@us...>
  [B] - config_setup.php tweaking.

[Phpslash-commit] CVS: phpslash-ft CHANGES,1.775,1.776

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-ft
In directory sc8-pr-cvs1:/tmp/cvs-serv19958/phpslash-ft

Modified Files:
	CHANGES 
Log Message:
[ 777766 ] missing keys in de.php3 and [ 780429 ] de_DE.LC_TIME.php3.

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.775
retrieving revision 1.776
diff -C2 -d -r1.775 -r1.776
*** CHANGES	26 Jun 2003 19:02:53 -0000	1.775
--- CHANGES	17 Nov 2003 14:47:40 -0000	1.776
***************
*** 13,16 ****
--- 13,20 ----
   9 - Removal of something (kill -9 :)
  
+ 2003-November 17 9:00AM CST Joe Stewart <joe...@us...>
+ [F] - de_DE.LC_TIME.php3, de.php3 - contributed by alba.
+       [ 777766 ] missing keys in de.php3 and [ 780429 ] de_DE.LC_TIME.php3.
+ 
  2003-June 26 2:00PM CDT Joe Stewart <joe...@us...>
  [B] - poll.php3 - comment mode wasn't being set correctly.

[Phpslash-commit] CVS: phpslash-ft/class/locale de_DE.LC_TIME.php3,NONE,1.1 de.php3,1.6,1.7

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-ft/class/locale
In directory sc8-pr-cvs1:/tmp/cvs-serv19685/phpslash-ft/class/locale

Modified Files:
	de.php3 
Added Files:
	de_DE.LC_TIME.php3 
Log Message:
[ 777766 ] missing keys in de.php3 and [ 780429 ] de_DE.LC_TIME.php3.

--- NEW FILE: de_DE.LC_TIME.php3 ---
<?php
/**
 * Local date/time information for PHPSlash (de_DE locale)
 *
 * $Id: de_DE.LC_TIME.php3,v 1.1 2003/11/17 14:46:59 joestewart Exp $
 */

$pslstrings = array('date_format_long'=>'%e. %B %Y',
					'date_format_short'=>'%Y-%m-%d',
					'time_format_12'=>'%H:%M',
					'time_format_24'=>'%H:%M',
					'date_time_format_long'=>'%A, %e. %B %Y %H:%M',
					'date_time_format_short'=>'%Y-%m-%d %H:%M'
					);
?>

Index: de.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/locale/de.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** de.php3	19 Dec 2001 20:00:41 -0000	1.6
--- de.php3	17 Nov 2003 14:46:58 -0000	1.7
***************
*** 26,39 ****
  
        "You didn't supply a good submit value" =>
!       "Du hast keinen gültigen Wert eingegeben",
  
-       // commentShow.php3
-       // commentSubmit.php3
        // config.php3
        "Home" =>
        "Home",
  
        "Add Story" =>
!       "Nachricht hinzufügen",
  
        "Archives" =>
--- 26,56 ----
  
        "You didn't supply a good submit value" =>
!       "Ungültiger Wert eingegeben",
! 
!       "View Parent Comment" =>
!       "Eine Stufe hinauf",
! 
!       "Submitted Comment" =>
!       "Eingereichter Kommentar",
! 
!       "Login required to post comments" =>
!       "Login notwendig um Kommentare zu schreiben",
! 
!       "Comment Error!" =>
!       "Kommentarfehler!",
  
        // config.php3
+ 
+       "Login" =>
+       "Login",
+       
+       "Logout" =>
+       "Logout",
+ 
        "Home" =>
        "Home",
  
        "Add Story" =>
!       "Neuer Beitrag",
  
        "Archives" =>
***************
*** 79,82 ****
--- 96,108 ----
        "Logging",
  
+       "User Profile" =>
+       "Benutzereinstellungen",
+ 
+       "Admin" =>
+       "Admin",
+ 
+       "Group" =>
+       "Gruppe",
+ 
        // functions.inc
        "NO TITLE" =>
***************
*** 101,105 ****
  
         "%s Poll" =>
!        "%s Poll",
        // pollBooth.php3
        // search.php3
--- 127,131 ----
  
         "%s Poll" =>
!        "Umfrage %s",
        // pollBooth.php3
        // search.php3
***************
*** 120,124 ****
        
        "Something broke, I'm not sure what though??" =>
!       "Es ist ein Fehler aufgetreten, ich weiß nicht woran es genau liegt?!",
  
        "New Submission" =>
--- 146,150 ----
        
        "Something broke, I'm not sure what though??" =>
!       "Fehler aufgetreten, weiß aber nicht woran es genau liegt?!",
  
        "New Submission" =>
***************
*** 127,146 ****
        // submissionAdmin.php3
        // /admin files
!       // authorAdmin
        "Error! Invalid Privileges" => 
!       "Fehler! Ungültige Privilegien",
        
        "Sorry. You do not have the necessary privilege to view this page." =>
!       "Leider hast Du nicht die notwendigen Privilegien um diese Seite aufzurufen.",
  
        // blockadmin.php3
        // commentAdmin.php3
        // glossaryAdmin.php3
        // infologAdmin.php3
        // mailinglistAdmin.php3
        // pollAdmin.php3
        // sectionAdmin.php3
        // storyAdmin.php
        // submissionAdmin.php3
        // topicAdmin.php3
        // variableAdmin.php3
--- 153,253 ----
        // submissionAdmin.php3
        // /admin files
!       "Administration" => 
!       "Administration",
! 
        "Error! Invalid Privileges" => 
!       "Fehler! Unzureichende Privilegien",
        
        "Sorry. You do not have the necessary privilege to view this page." =>
!       "Unzureichende Privilegien um diese Seite aufzurufen.",
! 
!       // authorAdmin
!       "Author Administration" => 
!       "Autorenverwaltung",
  
        // blockadmin.php3
+       "The Block has been Deleted" => 
+       "Block wurde gelöscht",
+ 
        // commentAdmin.php3
+       "The comment was deleted" => 
+       "Kommentar wurde gelöscht",
+ 
+       "You didn't select any items to delete!" => 
+       "Nichts zum Löschen ausgewählt.",
+ 
+       "Comment # %s has been deleted." => 
+       "Kommentar %s wurde gelöscht.",
+ 
+       "There was an ERROR deleting comment #" =>
+       "Fehler beim Löschen von Kommentar ",
+ 
+       "Mark Comment Pending" =>
+       "Kommentar markiert",
+ 
+       "Marked comment # %s as pending" =>
+       "Kommentar %s markieren",
+ 
+       "There was an ERROR marking comment # %s as pending." =>
+       "Fehler beim Markieren von Kommentar %s.",
+ 
+       "Unmark Pending Comment" =>
+       "Kommentarmarkierung entfernen",
+ 
+       "Unmarked pending comment %s" =>
+       "Markierung von Kommentar %s entfernt",
+ 
+       "There was an ERROR unmarking the comment as pending." =>
+       "Fehler beim Entfernen der Kommentarmarkierung",
+ 
+       "The comment was moved up one level." =>
+       "Kommentar wurde eine Stufe hinauf verschoben.",
+ 
+       "The comment was moved to the top." =>
+       "Kommentar wurde auf die oberste Stufe verschoben.",
+ 
+       "Edit Comment" =>
+       "Kommentar bearbeiten",
+ 
+       "Error! No Action" =>
+       "Fehler! Keine Variable 'Action'",
+ 
        // glossaryAdmin.php3
+       "has been updated" =>
+       "Änderung wurde übernommen",
+ 
+       "has not been updated" =>
+       "Änderung wurde nicht übernommen",
+ 
        // infologAdmin.php3
        // mailinglistAdmin.php3
        // pollAdmin.php3
+       "Deleting poll" =>
+       "Lösche Umfrage",
+ 
        // sectionAdmin.php3
        // storyAdmin.php
        // submissionAdmin.php3
+       " record deleted" =>
+       " Datensatz gelöscht",
+ 
+       "This would work SO much better if you actually selected something to delete!" =>
+       "Nichts zum Löschen ausgewählt",
+ 
+       "Submission Saved" =>
+       "Beitrag gespeichert",
+ 
+       "Submission Preview" =>
+       "Voransicht des Beitrags",
+ 
+       "Edit Submission" =>
+       "Beitrag bearbeiten",
+ 
+       "Current Submissions" =>
+       "Aktuelle Beiträge",
+ 
+       "When you don't see the submission, it means there aren't any." =>
+       "Wenn keine Beiträge zu sehen sind, gibt es auch keine.",
+ 
        // topicAdmin.php3
        // variableAdmin.php3
***************
*** 149,153 ****
--- 256,375 ----
       
        // Author.class
+       "Existing Authors" =>
+       "Angelegte Autoren",
+ 
+       "There is no author_name in Author.class::saveProfile" =>
+       "Kein author_name in Author.class::saveProfile",
+ 
+       "There is no author_name in Author.class::saveAuthor" =>
+       "Kein author_name in Author.class::saveAuthor",
+ 
+       "You need to select some permissions in Author.class::saveAuthor" =>
+       "Zumindest eine Berechtigung muss ausgewählt werden in Author.class::saveAuthor",
+ 
+       "When changing the username, the password field must also be completed." =>
+       "Änderung des Benutzernamens erfordert auch Änderung des Passworts.",
+ 
+       "Author Updated" =>
+       "Autor geändert",
+ 
+       "Author deleted" =>
+       "Autor gelöscht",
+ 
+       "Add a new Author" =>
+       "Autor hinzufügen",
+ 
+       "Update Author (%s)" =>
+       "Autor bearbeiten (%s)",
+ 
+       "There is no password in Author.class::saveAuthor" =>
+       "Kein Passwort in Author.class::saveAuthor",
+ 
+       "Author Created" =>
+       "Autor angelegt",
+ 
+       "No permissions chosen." =>
+       "Keine Berechtigungen ausgewählt.",
+ 
+       "Profile Updated" =>
+       "Benutzereinstellungen geändert",
+ 
+       "You can't delete yourself!  Create another user, log in as he/she and then delete this account." =>
+       "Es ist nicht möglich, den eigenen Benutzer zu löschen. Statt dessen mit einem neu angelegten Benutzer einloggen.",
+ 
+       "Missing Username or ID" =>
+       "Fehlender Benutzername oder ID",
+ 
+       "Username not found" =>
+       "Benutzername nicht gefunden",
+ 
+       "Sorry the user's email address is not valid" =>
+       "Die E-Mailaddresse des Benutzers ist ungültig",
+ 
+       "Email Confirmation sent" =>
+       "Bestätigungs-E-Mail abgeschickt",
+ 
+       "Email Confirmation failure" =>
+       "Fehler beim Abschicken der Bestätigungs-E-Mail",
+ 
+       "This username is already taken. Please choose a different one." =>
+       "Benutzername ist bereits reserviert. Bitte einen anderen auswählen.",
+ 
        // Block.class
+       "Block Type: %s added with an id of: %s" =>
+       "Blocktyp: %s hinzugefügt mit ID: %s",
+ 
+       "Error entering %s!" =>
+       "Fehler bei Eingabe von %s",
+ 
+       "Sorry, this block_type(%s) is assigned to this block:  %s" =>
+       "Leider ist block_type(%s) bereits zugewiesen an Block:  %s",
+ 
+       "Block Type %s deleted" =>
+       "Blocktyp %s gelöscht",
+ 
+       "Multiple blocks exist with id: %s. Stopping." =>
+       "Mehr als ein Block hat id: %s. Abbruch.",
+ 
+       "Block: %s does not exist. Stopping." =>
+       "Block: %s existiert nicht. Abbruch.",
+ 
+       "Updating Block %s.  " =>
+       "Block %s geändert.",
+ 
+       "Creating new block from submitted info." =>
+       "Neuer Block angelegt.",
+ 
+       "Adding the block to the db..." =>
+       "Neuen Block in die Datenbank eingefügt.",
+ 
+       "No section chosen.  Block will not be displayed on site till a section is chosen for block:  %s" =>
+       "Keine Rubrik ausgewählt.  Der Block wird erst sichtbar, wenn er zumindest einer Rubrik zugeordnet wurde.",
+ 
+       "Checking db..." =>
+       "Überprüfe Datenbank...",
+ 
+       "Error adding block.  Query returned multiple results." =>
+       "Fehler beim Anlegen des Blocks. Abfrage ergab mehrere Ergebnisse.",
+ 
+       "Block::putBlock() received data not in an array." =>
+       "Block::putBlock() erhielt Daten nicht als Array.",
+ 
+       // Block_admin.class
+       "Update the Current Blocks" =>
+       "Angelegte Blöcke bearbeiten",
+ 
+       "Manage Block Types" =>
+       "Blocktypen verwalten",
+ 
+       "[Add or Remove Block Types]" =>
+       "[Blocktypen hinzufügen oder löschen]",
+ 
+       "Create a New Block" =>
+       "Neuen Block anlegen",
+ 
+       "Update a Block" =>
+       "Block bearbeiten",
+ 
        // Block_i.class
        // Block_render_cal.class
***************
*** 193,199 ****
--- 415,454 ----
        // Block_render_quote.class
        // Block_render_rss.class
+       "A block that displays the headlines from another site, generated from their RDF file" =>
+       "Ein Block, der die Schlagzeilen einer anderen Website anzeigt; generiert aus deren RDF-Datei",
+ 
+       "Block_render_rss.class:: Parse error reading [%s]" =>
+       "Block_render_rss.class:: Parse meldet Fehler bei [%s]",
+ 
+       "Block_render_rss.class:: Missing protocol declaration [%s]" =>
+       "Block_render_rss.class:: Fehlende Protokolldeklaration [%s]",
+ 
+       "Block_render_rss.class:: No hostname in [%s]" =>
+       "Block_render_rss.class:: Fehlender Rechnername in [%s]",
+ 
+       "Block_render_rss.class:: No http:// or ftp:// in [%s]" =>
+       "Block_render_rss.class:: Weder http:// noch ftp:// in [%s]",
+ 
        // Block_render_section.class
        // Block_render_topic.class
        // Block_render_url.class
+       "A block that displays the HTML returned from the source URL" => 
+       "Ein Block, der das resultierende HTML einer URL zeigt",
+ 
+       "Block_render_url.class:: Parse error reading [%s]" => 
+       "Block_render_url.class:: Parser meldet Fehler bei [%s]",
+ 
+       "Block_render_url.class:: Missing protocol declaration [%s]" => 
+       "Block_render_url.class:: Fehlende Protokolldeklaration [%s]",
+       
+       "Block_render_url.class:: No hostname in [%s]" => 
+       "Block_render_url.class:: Kein Rechnername in [%s]",
+ 
+       "Block_render_url.class:: No http:// or ftp:// in [%s]" => 
+       "Block_render_url.class:: Weder http:// noch ftp:// in [%s]",
+ 
+       "Block_render_url.class: %s contained no data." => 
+       "Block_render_url.class: %s enthielt keine Daten.",
+ 
        // Comment.class
        "Nested" => 
***************
*** 213,223 ****
        
        "Show Pending" => 
!       "Zu Erledigendes zeigen",
        
        // Glossary.class
        "Add a new Term" =>
        "Neuen Begriff hinzufügen",
        
        // Infolog.class
        // Mailinglist.class
        "Email Headline Updates" =>
--- 468,671 ----
        
        "Show Pending" => 
!       "Markierte zeigen",
! 
!       "Comment::getAllComments:  I'm confused with the mode variable:  '%s'" => 
!       "Comment::getAllComments:  Modusvariable '%s' ergibt keinen Sinn.",
! 
!       "Anonymous Poster" => 
!       "Anonymer Schreiber",
! 
!       "Comment::update - comment_text is blank" => 
!       "Comment::update - comment_text ist leer",
! 
!       "Comment saved" => 
!       "Kommentar gespeichert",
! 
!       "Comment::update --ERROR-- " => 
!       "Fehler bei Übernahme der Kommentaränderungen",
! 
!       "Comment::update - Adding the comment failed" =>
!       "Comment::update - Kommentar konnte nich hinzugefügt werden",
! 
!       "Comment::update - You don't have any permissions to update a comment" =>
!       "Comment::update - Keine Berechtigung zum Ändern eines Kommentars",
! 
!       "Comment::update - the update was good, but nothing changed" =>
!       "Comment::update - Update erfolgreich, es gab aber keine Änderung",
! 
!       "Comment::update - the update query failed" =>
!       "Comment::update - Fehler bei 'update query'",
! 
!       "Comment::update - can't update comment because I'm missing some data" =>
!       "Comment::update - Kommentar wegen unvollständiger Angaben nicht geändert",
        
+       "Comment updated" =>
+       "Comment updated",
+ 
+       "Comment::deleteOne --ERROR-- " =>
+       "Comment::deleteOne --FEHLER-- ",
+ 
+       "Comment::deleteOne - the query for all the children of the comment you're about to delete failed" =>
+       "Comment::deleteOne - Fehler bei Abfrage aller zu löschenden, untergeordneten Kommentare",
+ 
+       "Comment::deleteOne - the delete was good, but nothing changed" =>
+       "Comment::deleteOne - Löschung erfolgreich, es gab aber keine Änderung",
+ 
+       "Comment::deleteOne - The delete comment query failed" =>
+       "Comment::deleteOne - Fehler bei 'delete query'",
+ 
+       "Comment::delete - there is no comment_id" =>
+       "Comment::delete - Unbekannte comment_id",
+ 
+       "Comment::delete - there is no story_id" =>
+       "Comment::delete - Unbekannte story_id",
+ 
+       "Comment::reparentUp - invalid comment_id or story_id" =>
+       "Comment::reparentUp - Ungültige comment_id oder story_id",
+ 
+       "Comment::reparentUp - the query to get the parent_id failed" =>
+       "Comment::reparentUp - Fehler bei Abfrage für parent_id",
+ 
+       "Comment::reparentUp - the query to get the parent_id returned zero results" =>
+       "Comment::reparentUp - Keine Ergebniss bei Abfrage für parent_id",
+ 
+       "Comment::reparentUp - the comment is already at the root" =>
+       "Comment::reparentUp - Kommentar is bereits auf der äußersten Ebene",
+ 
+       "Comment::reparentUp - the query to get the NEW parent_id failed" =>
+       "Comment::reparentUp - Fehler bei Abfrage für neue parent_id",
+ 
+       "Comment::reparentUp - the query to get the NEW parent_id returned zero results" =>
+       "Comment::reparentUp - Keine Ergebniss bei Abfrage für neue parent_id",
+ 
+       "Comment::reparentUp - the update was good, but nothing changed" =>
+       "Comment::reparentUp - Update erfolgreich, es gab aber keine Änderung",
+ 
+       "Comment::reparentUp - the update failed" =>
+       "Comment::reparentUp - Fehler bei Änderung",
+ 
+       "Comment::reparentTop - either no comment_id, or no story_id" =>
+       "Comment::reparentTop - Entweder keine comment_id, oder keine story_id",
+ 
+       "Comment::reparentTop - the query was good, there was just nothing updated" =>
+       "Comment::reparentTop - Operation erfolgreich, es gab aber keine Änderung",
+ 
+       "Comment::reparentTop - the query failed" =>
+       "Comment::reparentTop - Fehler bei Datenbankoperation",
+ 
+       "Listing Pending Comments" =>
+       "Liste markierter Kommentare",
+ 
+       "Sorry. No Pending Comments" =>
+       "Es sind keine Kommentare markiert",
+ 
+       "Comment::decrementCommentCount - The Query Failed" =>
+       "Comment::decrementCommentCount - Fehler bei Datenbankoperation",
+ 
+       "Comment::decrementCommentCount - No story_id" =>
+       "Comment::decrementCommentCount - Keine story_id",
+ 
+       "Comment::incrementCommentCount - The Query Failed" =>
+       "Comment::incrementCommentCount - Fehler bei Datenbankoperation",
+ 
+       "(commentEdit Function): you're trying to update a comment but I couldn't find it?" =>
+       "(commentEdit Function): Kann den zu ändernden Kommentar nicht (mehr?) finden",
+ 
        // Glossary.class
        "Add a new Term" =>
        "Neuen Begriff hinzufügen",
+ 
+       "Glossary Edit" =>
+       "Glossar Bearbeiten",
+ 
+       "There is no term in Glossary.class::saveGlossary" =>
+       "Kein erklärter Begriff in Glossary.class::saveGlossary",
+ 
+       "There is no def in Glossary.class::saveGlossary" =>
+       "Kein Definition in Glossary.class::saveGlossary",
+ 
+       // Group.class
+       "There is no group_name in Group.class::saveGroup" =>
+       "Kein group_name in Group.class::saveGroup",
+ 
+       "There is no description in Group.class::saveGroup" =>
+       "Keine Beschreibung in Group.class::saveGroup",
+ 
+       "Group information updated" =>
+       "Gruppeninformation geändert",
+ 
+       "Group information saved" =>
+       "Groupinformation gespeichert",
+ 
+       "No section chosen." =>
+       "Keine Rubrik ausgewählt.",
+ 
+       "Sorry, this group is assigned to author " =>
+       "Diese Gruppe gehört Autor ",
+ 
+       "Sorry, this group is assigned to group" =>
+       "Diese Gruppe gehört Gruppe",
+ 
+       " Group not deleted" =>
+       " Gruppe nicht gelöscht",
+ 
+       "Group deleted" =>
+       "Group gelöscht",
+ 
+       "There is no permission_name in Permission.class::savePermission" =>
+       "Kein permission_name in Permission.class::savePermission",
+ 
+       "There is no description in Permission.class::savePermission" =>
+       "Kein description in Permission.class::savePermission",
+ 
+       "Permission information updated" =>
+       "Zugriffsinformation geändert",
+ 
+       "Permission information saved" =>
+       "Zugriffsinformation gespeichert",
+ 
+       "Sorry, this permission is assigned to group " =>
+       "Zugriffsinformation gehört Gruppe ",
+ 
+       " Permission not deleted" =>
+       " Zugriffsinformation nicht gelöscht",
+ 
+       "Permission deleted" =>
+       "Zugriffsinformation gelöscht",
+ 
+       "[Edit]" =>
+       "[Bearbeiten]",
+ 
+       "[Delete]" =>
+       "[Löschen]",
+ 
+       "Add a new Group" =>
+       "Neue Gruppe anlegen",
+ 
+       "Change existing Groups" =>
+       "Bestehende Gruppe bearbeiten",
+ 
+       "Edit Group" =>
+       "Gruppe bearbeiten",
+ 
+       "Change existing Permissions" =>
+       "Bestehende Zugriffsinformation löschen",
+ 
+       "Add a new Permission" =>
+       "Add a new Permission",
+ 
+       "Edit Permission" =>
+       "Edit Permission",
        
        // Infolog.class
+       "Deleting all log entries...." =>
+       "Alle Logeinträge gelöscht...",
+ 
+       "Done!" =>
+       "Fertig!",
+ 
+       "Deleting log entry " =>
+       "Lösche Logeintrag ",
+ 
        // Mailinglist.class
        "Email Headline Updates" =>
***************
*** 228,232 ****
  
        "There was an error inserting your subscription information into the database." =>
!       "Beim Speichern Deines Beitrages in der Datenbank ist ein Fehler aufgetreten.",
  
        "There was an error inserting your frequency data." =>
--- 676,680 ----
  
        "There was an error inserting your subscription information into the database." =>
!       "Beim Speichern des Beitrags in der Datenbank ist ein Fehler aufgetreten.",
  
        "There was an error inserting your frequency data." =>
***************
*** 259,263 ****
  
        "Now ignoring abort calls..." =>
!       "Abbruch Befehle werden ignoriert...",
  
        "Sending mail to the following users:" =>
--- 707,711 ----
  
        "Now ignoring abort calls..." =>
!       "Abbruch-Befehle werden ignoriert...",
  
        "Sending mail to the following users:" =>
***************
*** 271,286 ****
  
        "You didn't give a email subject!  Halting." =>
!       "Du hast keinen Betreff eingegeben! Der Vorgang wurde abgebrochen.",
        
        // Navbar.class
-       "Login" =>
-       "Login",
-       
        "Logout %s" =>
        "Logout %s",
        
        // Poll.class
        "Your vote has been registered" =>
!       "Deine Abstimmung wurde gespeichert",
  
        "Your vote hasn't been registered because there was no remote address:  %s" =>
--- 719,797 ----
  
        "You didn't give a email subject!  Halting." =>
!       "Kein Betreff eingegeben! Vorgang abgebrochen.",
! 
!       "Nothing to send, Halting." =>
!       "Nichts zu senden. Vorgang abgebrochen",
        
        // Navbar.class
        "Logout %s" =>
        "Logout %s",
        
        // Poll.class
+       "Create A New Poll" =>
+       "Neue Umfrage anlegen",
+ 
+       "No Question ID" =>
+       "Keine Frage-ID",
+ 
+       "There was a weird number of affected rows when setting the 'current' field to 1:  " =>
+       "Seltsame Anzahl betroffener Zeilen beim Setzen von 'current' auf 1:  ",
+ 
+       "Either there were no current polls, or more then one?  Affected Rows is:  " =>
+       "Entweder gibt gar es keine aktuelle Umfrage, oder mehr als eine.  Betroffene Zeilen sind:  ",
+ 
+       "No ID to edit" =>
+       "Keine ID zum Bearbeiten",
+ 
+       "Couldn't find your question (%s) in the DB" =>
+       "Kann die Frage (%s) nicht in der Datenbank finden",
+ 
+       "Edit An Existing Poll" =>
+       "Ändern einer existierenden Umfrage",
+ 
+       "Silly admin! You need to have a question before you can have a poll." =>
+       "Ohne Frage gibt es auch keine Umfrage.",
+ 
+       "You need to have at least 2 possible answers, otherwise it wouldn't be a very effective poll, would it?" =>
+       "Mindestens zwei verschiedene Antworten notwendig.",
+ 
+       "Choice %s, %s (%s), was updated" =>
+       "Antwort %s, %s (%s), wurde geändert",
+ 
+       "Choice %s, %s (%s), was inserted" =>
+       "Antwort %s, %s (%s), wurde angelegt",
+ 
+       "You can't delete the current poll. Please make another poll current, then delete this one" =>
+       "Aktuelle Umfrage kann nicht gelöscht werden. Vorher eine neue anlegen.",
+ 
+       "No question_id in Poll::deletePoll" =>
+       "Keine question_id in Poll::deletePoll",
+ 
+       "Choice %s was ignored." =>
+       "Antwort %s wurde ignoriert.",
+ 
+       "There was an error in setting %s as the current poll:" =>
+       "Kann %s nicht zur aktuellen Umfrage machen:",
+ 
+       "I couldn't find your Poll, " =>
+       "Kann diese Umfrage nicht finden, ",
+ 
+       "Sorry, I couldn't find your poll when trying to update." =>
+       "Kann zu verändernde Umfrage nicht finden.",
+ 
+       "There was an error deleting your poll answers" =>
+       "Fehler beim Löschen der Umfrageantworten",
+ 
+       "There was an error deleting your poll question" =>
+       "Fehler beim Löschen der Umfragefrage",
+ 
+       "There was an error removing the votes" =>
+       "Fehler beim Löschen der Abstimmungsergebnisse",
+ 
+       "Poll %s was deleted" =>
+       "Umfrage %s wurde gelöscht",
+ 
        "Your vote has been registered" =>
!       "Deine Auswahl wurde gespeichert",
  
        "Your vote hasn't been registered because there was no remote address:  %s" =>
***************
*** 290,295 ****
--- 801,826 ----
        "Deine Abstimmung kann nicht berücksichtigt werden, weil Du (oder jemand mit der gleichen IP Adresse) schon abgestimmt hat.",
  
+       "No Poll Found:  " =>
+       "Keine Umfrage gefunden:  ",
  
        // Section.class
+       "Section %s(%s) deleted" =>
+       "Rubrik %s(%s) gelöscht",
+ 
+       "Change Existing Sections" =>
+       "Bearbeiten einer existierenden Rubrik",
+ 
+       "There is no section_name in Section.class::saveSection" =>
+       "Kein section_name in Section.class::saveSection",
+ 
+       "There is no description in Section.class::saveSection" =>
+       "Kein description in Section.class::saveSection",
+ 
+       "New Section" =>
+       "Neue Rubrik",
+ 
+       "Edit Section" =>
+       "Rubrik bearbeiten",
+ 
        // Story.class
        "More" =>
***************
*** 313,326 ****
        "Comments?" =>
        "Kommentieren?",
!       
        // Submission.class
        "Anonymous Coward" =>
!       "Anonymer Feigling"
  
        // Topic.class
        // TopicBar.class
        // Variable.class
!       
     );
  ?>
- 
--- 844,1036 ----
        "Comments?" =>
        "Kommentieren?",
! 
!       // Story_admin.class
!       "The storyid is:  " =>
!       "Die Nachrichten-ID ist:  ",
! 
!       "You deleted %s comments" =>
!       "%s Kommentare gelöscht",
! 
!       "removed %s section pointer(s)" =>
!       "%s Rubrikreferenzen gelöscht",
! 
!       "removed %s topic pointer(s)" =>
!       "%s Themenreferencen gelöscht",
! 
!       "removed the story" =>
!       "Nachricht gelöscht",
! 
!       "All Authors" =>
!       "Alle Autoren",
! 
!       "All Topics" =>
!       "All Themen",
! 
!       "All Sections" =>
!       "All Rubriken",
! 
!       // Story_base.class
!       "There is no story_id in Story.class::saveStory" =>
!       "Keine story_id in Story.class::saveStory",
! 
!       "You need to select at least one topic in Story.class::saveStory" =>
!       "Zumindest eine Thema muss ausgewählt werden in Story.class::saveStory",
! 
!       "You need to select at least one section in Story.class::saveStory" =>
!       "Zumindest eine Rubrik muss ausgewählt werden in Story.class::saveStory",
! 
!       "There is no title in Story.class::saveStory" =>
!       "Kein Titel in Story.class::saveStory",
! 
!       "There is no intro_text in Story.class::saveStory" =>
!       "Kein intro_text in Story.class::saveStory",
! 
!       "There is no author_id in Story.class::saveStory" =>
!       "Keine no author_id in Story.class::saveStory",
! 
!       "Topic bar could not be reorganized" =>
!       "Themenleiste konnte nicht neu angeordnet werden",
! 
!       "story(%s) saved:  %s" =>
!       "Nachricht(%s) gespeichert:  %s",
! 
        // Submission.class
        "Anonymous Coward" =>
!       "Anonymer Feigling",
! 
!       "No Submission Found:  %s" =>
!       "Kein Beitrag gefunden:  %s",
! 
!       "You need to select at least one topic in Submission.class::saveSubmission" =>
!       "Mindestens ein Thema muss ausgewählt werden in Submission.class::saveSubmission",
! 
!       "You need to select at least one section in Submission.class::saveSubmission" =>
!       "Mindestens eine Rubrik muss ausgewählt werden in Submission.class::saveSubmission",
! 
!       "There is no subject in Submission.class::saveSubmission" =>
!       "Kein Betreff in Submission.class::saveSubmission",
! 
!       "There is no story in Submission.class::saveSubmission" =>
!       "Keine Nachricht in Submission.class::saveSubmission",
! 
!       "Can't find Submission_id ('%s') in psl_submission!" =>
!       "Kann Submission_id ('%s') nicht finden in psl_submission!",
! 
!       "Submission by " =>
!       "Eingereicht von ",
  
        // Topic.class
+       "Change existing Topics" =>
+       "Existierendes Thema bearbeiten",
+ 
+       "There is no topic_name in Topic.class::saveTopic" =>
+       "Kein topic_name in Topic.class::saveTopic",
+ 
+       "There is no image in Topic.class::saveTopic" =>
+       "Kein image in Topic.class::saveTopic",
+ 
+       "There is no alt_text in Topic.class::saveTopic" =>
+       "Kein alt_text in Topic.class::saveTopic",
+ 
+       "Sorry, ths story is assigned to this topic:" =>
+       "Diese Nachricht ist bereits diesem Thema zugeordnet:",
+ 
+       "Sorry, this submission is assigned to this topic:" =>
+       "Dieser Beitrag ist bereits diesem Thema zugeordnet:",
+ 
+       "Topic deleted" =>
+       "Thema gelöscht",
+ 
+       "Add a new Topic" =>
+       "Neues Thema anlegen",
+ 
+       "Edit Topic" =>
+       "Thema bearbeiten",
+ 
+       "Display Topic Images" =>
+       "Themenbilder anzeigen",
+ 
+       "[Display all possible topic images]" =>
+       "[Alle vorhandenen Themenbilder anzeigen]",
+ 
        // TopicBar.class
        // Variable.class
!       // cronmail.php3
! 
!       "Written" =>
!       "Geschrieben",
! 
!       "Intro" =>
!       "Einleitung",
! 
!       "To add or remove yourself go to" =>
!       "Um sich selber hinzuzufügen oder zu löschen:",
! 
!       // Titles in different php-files
!       "About Page" =>
!       "Über uns",
! 
!       "Articles" =>
!       "Nachrichten",
! 
!       "Comment Display" =>
!       "Kommentaranzeige",
! 
!       "Page not found" =>
!       "Seite nicht gefunden",
! 
!       "Error document" =>
!       "Fehlerdokument",
! 
!       "Glossary Administration" =>
!       "Glossar-Verwaltung",
! 
!       "Administration" =>
!       "Verwaltung",
! 
!       "Home page" =>
!       "Home page",
! 
!       "Administration Page" =>
!       "Administrations-Seite",
! 
!       "Mailing List Admin" =>
!       "Mailing-List-Administration",
! 
!       "Poll Booth" =>
!       "Umfrage-Seite",
! 
!       "Search" =>
!       "Suche",
! 
!       "Search Page" =>
!       "Such-Seite",
! 
!       "Submission" =>
!       "Beitrag",
! 
!       "Author Administration" =>
!       "Autor-Administration",
! 
!       "Block Administration" =>
!       "Block-Administration",
! 
!       "Comment Administration" =>
!       "Kommentar-Administration",
! 
!       "Poll Administration" =>
!       "Umfrage-Administration",
! 
!       "Story Administration" =>
!       "Nachrichten-Administration",
! 
!       "Submission Administration" =>
!       "Beitrags-Administration",
! 
!       "Topic Administration" =>
!       "Themen-Administration",
! 
!       "Group Administration" =>
!       "Gruppen-Administration"
     );
  ?>

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.51,1.52

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv25487/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
config_setup.php tweaking

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** CHANGES	13 Nov 2003 12:16:49 -0000	1.51
--- CHANGES	13 Nov 2003 21:46:28 -0000	1.52
***************
*** 13,16 ****
--- 13,19 ----
   9 - Removal of something (kill -9 :)
  
+ 2003-November 13 3:30PM CST Joe Stewart <joe...@us...>
+ [B] - config_setup.php tweaking.
+ 
  2003-November 13 7:00AM CST Joe Stewart <joe...@us...>
  [FT] - New Feature - Block plugins added.

[Phpslash-commit] CVS: phpslash-dev/public_html config_setup.php,1.4,1.5

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv25487/phpslash-dev/public_html

Modified Files:
	config_setup.php 
Log Message:
config_setup.php tweaking

Index: config_setup.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** config_setup.php	13 Nov 2003 21:00:59 -0000	1.4
--- config_setup.php	13 Nov 2003 21:46:28 -0000	1.5
***************
*** 665,668 ****
--- 665,669 ----
  function setup_database_show() {
      $vars = parse_ini_file(CONFIG_OUT);
+     $vars['table_filepath'] = null;
      _showHeaders();
      ?>
***************
*** 741,745 ****
  echo "<input type=\"hidden\" name=\"user[name]\" value=\"" . $vars['DB_User'] ."\">";
  echo "<input type=\"hidden\" name=\"user[pass]\" value=\"" . $vars['DB_Password'] ."\">";
! echo "<input type=\"hidden\" name=\"user[pass]\" value=\"" . $vars['table_filepath'] ."\">";
  echo "<input type=\"hidden\" name=\"do_not_create\" value=\"alreadyExists\">";
  } 
--- 742,746 ----
  echo "<input type=\"hidden\" name=\"user[name]\" value=\"" . $vars['DB_User'] ."\">";
  echo "<input type=\"hidden\" name=\"user[pass]\" value=\"" . $vars['DB_Password'] ."\">";
! echo "<input type=\"hidden\" name=\"user[table_filepath]\" value=\"" . $vars['table_filepath'] ."\">";
  echo "<input type=\"hidden\" name=\"do_not_create\" value=\"alreadyExists\">";
  } 

[Phpslash-commit] CVS: phpslash-skins/include/templates/en/ShankZen slashHead-htmlarea3.tpl,1.2,1.3

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen
In directory sc8-pr-cvs1:/tmp/cvs-serv22805/phpslash-skins/include/templates/en/ShankZen

Modified Files:
	slashHead-htmlarea3.tpl 
Log Message:
htmlArea editing support to the Story entry form.

Index: slashHead-htmlarea3.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/slashHead-htmlarea3.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slashHead-htmlarea3.tpl	13 Nov 2003 21:12:48 -0000	1.2
--- slashHead-htmlarea3.tpl	13 Nov 2003 21:33:06 -0000	1.3
***************
*** 17,21 ****
  <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
  <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
! <!-- <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> -->
  <!-- BEGIN HTMLAREA3 Javascript -->
  <script TYPE="text/javascript" LANGUAGE="JavaScript"> 
--- 17,21 ----
  <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
  <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
! <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> 
  <!-- BEGIN HTMLAREA3 Javascript -->
  <script TYPE="text/javascript" LANGUAGE="JavaScript"> 

[Phpslash-commit] CVS: phpslash-dev/include/modules/story/plugins Story_plugin_bbcode.class,1.3,1.4

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/story/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv19244/phpslash-dev/include/modules/story/plugins

Modified Files:
	Story_plugin_bbcode.class 
Log Message:
htmlArea editing support to the Story entry form.

Index: Story_plugin_bbcode.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/plugins/Story_plugin_bbcode.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Story_plugin_bbcode.class	13 Nov 2003 12:16:49 -0000	1.3
--- Story_plugin_bbcode.class	13 Nov 2003 21:16:04 -0000	1.4
***************
*** 17,20 ****
--- 17,22 ----
     function parse($ary) {
  
+       $parsed = null;
+ 
        // Straight from the PEAR package example
        // The PEAR package can be downloaded here:
***************
*** 44,56 ****
        $parser->setText($ary['intro_text']);
        $parser->parse();
!       $ary['intro_text'] = $parser->getParsed();
  
        // then body
        $parser->setText($ary['body_text']);
        $parser->parse();
! 
!       // add line break
!       $ary['body_text'] = nl2br($parser->getParsed());
!       // $ary['body_text'] = $parser->getParsed();
  
        $this->output = $ary;
--- 46,65 ----
        $parser->setText($ary['intro_text']);
        $parser->parse();
!       $parsed = $parser->getParsed();
!      
!       // only apply line break if changed
!       if($ary['intro_text'] != $parsed) {
!          $ary['intro_text'] = nl2br($parsed);
!       }
  
        // then body
        $parser->setText($ary['body_text']);
        $parser->parse();
!       $parsed = $parser->getParsed();
!       
!       // only apply break if changed
!       if($ary['body_text'] != $parsed) {
!          $ary['body_text'] = nl2br($parsed);
!       }
  
        $this->output = $ary;

[Phpslash-commit] CVS: phpslash-dev/include/modules/block/plugins Block_plugin_bbcode.class,1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/block/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv19244/phpslash-dev/include/modules/block/plugins

Modified Files:
	Block_plugin_bbcode.class 
Log Message:
htmlArea editing support to the Story entry form.

Index: Block_plugin_bbcode.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/plugins/Block_plugin_bbcode.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_plugin_bbcode.class	13 Nov 2003 12:16:50 -0000	1.1
--- Block_plugin_bbcode.class	13 Nov 2003 21:16:04 -0000	1.2
***************
*** 45,51 ****
        
        $parsed = $parser->getParsed();
!       // add line break
!       $block_info["cache_data"] = nl2br($parsed);
!       $block_info["cache_data"] = $parsed;
  
        $this->output = $block_info;
--- 45,53 ----
        
        $parsed = $parser->getParsed();
!       
!       if($block_info["cache_data"] != $parsed) {
!          // only apply break if changed
!          $block_info["cache_data"] = nl2br($parsed);
!       }
  
        $this->output = $block_info;

[Phpslash-commit] CVS: phpslash-skins/include/templates/en/ShankZen slashHead-htmlarea3.tpl,1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen
In directory sc8-pr-cvs1:/tmp/cvs-serv18476/phpslash-skins/include/templates/en/ShankZen

Modified Files:
	slashHead-htmlarea3.tpl 
Log Message:
htmlArea editing support to the Story entry form.

Index: slashHead-htmlarea3.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/slashHead-htmlarea3.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** slashHead-htmlarea3.tpl	13 Nov 2003 02:35:34 -0000	1.1
--- slashHead-htmlarea3.tpl	13 Nov 2003 21:12:48 -0000	1.2
***************
*** 17,21 ****
  <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
  <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
! <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style>
  <!-- BEGIN HTMLAREA3 Javascript -->
  <script TYPE="text/javascript" LANGUAGE="JavaScript"> 
--- 17,21 ----
  <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
  <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
! <!-- <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> -->
  <!-- BEGIN HTMLAREA3 Javascript -->
  <script TYPE="text/javascript" LANGUAGE="JavaScript"> 

[Phpslash-commit] CVS: phpslash-dev/public_html config_setup.php,1.3,1.4

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv16151

Modified Files:
	config_setup.php 
Log Message:
script looking much better. merge changes and added minor TODO notes. After upgrade, my changes are not necessary...

Index: config_setup.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config_setup.php	11 Nov 2003 20:50:07 -0000	1.3
--- config_setup.php	13 Nov 2003 21:00:59 -0000	1.4
***************
*** 33,36 ****
--- 33,39 ----
   *  - Generalize the editing of the config file (instead of using special
   *    constants, use the config file syntax)
+  *  - if config.ini.php exists, use those values to populate forms
+  *    using all values except the password. Be clear to let users know that
+  *    they have to remove config_setup.php once the instalation is complete
   */
  

[Phpslash-commit] CVS: phpslash-dev/public_html config_setup.ini.php,1.3,1.4

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv11200

Modified Files:
	config_setup.ini.php 
Log Message:
made it easier to edit under vi/vim

Index: config_setup.ini.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.ini.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config_setup.ini.php	11 Nov 2003 21:20:01 -0000	1.3
--- config_setup.ini.php	13 Nov 2003 20:41:46 -0000	1.4
***************
*** 3,6 ****
--- 3,7 ----
  ;; config.ini.php - Configuration File for PHPSlash
  ;; $Id$
+ ;; vi: set ft=dosini :
  ;;;;;;;;;;
  

[Phpslash-commit] CVS: phpslash-dev/public_html config-dist.ini.php,1.5,1.6

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1:/tmp/cvs-serv10710

Modified Files:
	config-dist.ini.php 
Log Message:
made it easier to edit under vi/vim

Index: config-dist.ini.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config-dist.ini.php	11 Nov 2003 20:50:07 -0000	1.5
--- config-dist.ini.php	13 Nov 2003 20:40:48 -0000	1.6
***************
*** 3,6 ****
--- 3,7 ----
  ;; config.ini.php - Configuration File for PHPSlash
  ;; $Id$
+ ;; vi: set ft=dosini :
  ;;;;;;;;;;
  

[Phpslash-commit] CVS: phpslash-dev/doc/html Makefile,1.1.1.1,1.2 phpslash.sgml,1.3,1.4

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/doc/html
In directory sc8-pr-cvs1:/tmp/cvs-serv3111/phpslash-dev/doc/html

Modified Files:
	Makefile phpslash.sgml 
Log Message:
htmlArea editing support to the Story entry form.

Index: Makefile
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/doc/html/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	12 Mar 2003 16:12:48 -0000	1.1.1.1
--- Makefile	13 Nov 2003 20:10:02 -0000	1.2
***************
*** 13,44 ****
  master = *.sgml
  
  # Make all the docs
! all : clean check longhtml html txt
  
  check : $(master)
  	@echo "----------- Checking SGML Source"
! 	sgmlcheck $(master)
  
  # Make one big html file of stuff
! longhtml : $(master)
  	@echo "----------- Making single page HTML doc from SGML in single/"
  	# cp $(master) single/
  	# cd single ; sgml2html -s 0 $(master) ; cd ../
  	# rm single/$(master)
! 	sgml2html -s 0 $(master)
  	mv *.html single/
  
! # Make seperate html files
  html : $(master)
! 	@echo "----------- Making multi page HTML doc from SGML"
! 	sgml2html -s 1 $(master)
! 
  # Make a text version too
  txt : $(master)
  	@echo "----------- Making single page text docs from SGML in single/"
! 	sgml2txt $(master)
  	mv *.txt single/
  clean :
  	@echo "----------- Removing all generated docs"
! 	rm -f *.html single/*.txt single/*.html
  
--- 13,62 ----
  master = *.sgml
  
+ # new single command approach
+ COMMAND=sgmltools --backend=
+ 
  # Make all the docs
! all : clean check onehtml html txt rtf pdf
  
  check : $(master)
  	@echo "----------- Checking SGML Source"
! 	# sgmlcheck $(master)
! 	# $(COMMAND)$@ $(master)
  
  # Make one big html file of stuff
! onehtml : $(master)
  	@echo "----------- Making single page HTML doc from SGML in single/"
  	# cp $(master) single/
  	# cd single ; sgml2html -s 0 $(master) ; cd ../
  	# rm single/$(master)
! 	# sgml2html -s 0 $(master)
! 	$(COMMAND)$@ $(master)
  	mv *.html single/
  
! # Make separate html files
  html : $(master)
! 	@echo "----------- Making multi page HTML doc from SGML in subdirectory"
! 	# sgml2html -s 1 $(master)
! 	$(COMMAND)$@ $(master)
  # Make a text version too
  txt : $(master)
  	@echo "----------- Making single page text docs from SGML in single/"
! 	# sgml2txt $(master)
! 	$(COMMAND)$@ $(master)
  	mv *.txt single/
+ # Make a rtf version too
+ rtf : $(master)
+ 	@echo "----------- Making single page rtf docs from SGML in single/"
+ 	# sgml2txt $(master)
+ 	$(COMMAND)$@ $(master)
+ 	mv *.rtf single/
+ # Make a rtf version too
+ pdf : $(master)
+ 	@echo "----------- Making single page rtf docs from SGML in single/"
+ 	# sgml2txt $(master)
+ 	$(COMMAND)ps $(master)
+ 	# mv *.pdf single/
  clean :
  	@echo "----------- Removing all generated docs"
! 	rm -f *.html single/*.txt single/*.html single/*.rtf 
  

Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/doc/html/phpslash.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** phpslash.sgml	12 Nov 2003 16:02:10 -0000	1.3
--- phpslash.sgml	13 Nov 2003 20:10:02 -0000	1.4
***************
*** 1,3 ****
! a!doctype linuxdoc system>
  
  <!-- 
--- 1,3 ----
! <!doctype linuxdoc system>
  
  <!-- 
***************
*** 1021,1025 ****
   
  <itemize>
!    <item>If you find yourself troubleshooting a problem, it might be helpful to turn the output cache off temporarily.  Change config.php3:  $JPCACHE_ON = 0.
  
  </itemize>
--- 1021,1025 ----
   
  <itemize>
!    <item>If you find yourself troubleshooting a problem, it might be helpful to turn the output cache off temporarily.  Change config.php:  $JPCACHE_ON = 0.
  
  </itemize>

[Phpslash-commit] CVS: phpslash-dev VERSION,1.2,1.3

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv3111/phpslash-dev

Modified Files:
	VERSION 
Log Message:
htmlArea editing support to the Story entry form.

Index: VERSION
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/VERSION,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VERSION	31 Oct 2003 19:26:18 -0000	1.2
--- VERSION	13 Nov 2003 20:10:01 -0000	1.3
***************
*** 1 ****
! 0.8lalpha
--- 1 ----
! 0.8alpha

[Phpslash-commit] CVS: phpslash-dev/include/modules/block Block_plugin_i.class,NONE,1.1

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/block
In directory sc8-pr-cvs1:/tmp/cvs-serv31271/phpslash-dev/include/modules/block

Added Files:
	Block_plugin_i.class 
Log Message:
Block plugins

--- NEW FILE: Block_plugin_i.class ---
<?php
/* Block_plugin_skel.class -> Base class for story plugins */
/* $Id: Block_plugin_i.class,v 1.1 2003/11/13 19:51:45 joestewart Exp $  */

/**
 * Class that defines the interface to story plugins and implements
 * common functionality
 *
 * @access public
 * @author Will Dyson, June 2002
 * @package phpslash
 */

class Block_plugin_i {

   var $psl;
   var $type;
   var $description;
   var $options;
   var $output;
   
   function Block_plugin_i() {
      global $_PSL;

      $this->psl = &$_PSL;
      $this->output = "";
      $this->type = "";
      $this->description = "No description";
   }
   
   function getType() {
      return $this->type;
   }

   function getDesc() {
      return $this->description;
   }

   function getOpts() {
      return $this->options;
   }

   // should never actually be called
   function parse($block_info) {
      return 0;
   }

   function getFinal() {
      return $this->output;
   }
} 

?>

[Phpslash-commit] CVS: phpslash-dev/include/modules/story Story_plugin_i.class,NONE,1.1

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/story
In directory sc8-pr-cvs1:/tmp/cvs-serv26014/phpslash-dev/include/modules/story

Added Files:
	Story_plugin_i.class 
Log Message:
htmlArea editing support to the Story entry form.

--- NEW FILE: Story_plugin_i.class ---
<?php
/* Story_plugin_skel.class -> Base class for story plugins */
/* $Id: Story_plugin_i.class,v 1.1 2003/11/13 19:25:24 joestewart Exp $  */

/**
 * Class that defines the interface to story plugins and implements
 * common functionality
 *
 * @access public
 * @author Will Dyson, June 2002
 * @package phpslash
 */

class Story_plugin_i {

   var $psl;
   var $type;
   var $description;
   var $options;
   var $output;
   
   function Story_plugin_i() {
      global $_PSL;

      $this->psl = &$_PSL;
      $this->output = "";
      $this->type = "";
      $this->description = "No description";
   }
   
   function getType() {
      return $this->type;
   }

   function getDesc() {
      return $this->description;
   }

   function getOpts() {
      return $this->options;
   }

   // should never actually be called
   function parse($block_info) {
      return 0;
   }

   function getFinal() {
      return $this->output;
   }
} 

?>

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.50,1.51

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1:/tmp/cvs-serv883/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
Block plugins

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** CHANGES	13 Nov 2003 02:34:21 -0000	1.50
--- CHANGES	13 Nov 2003 12:16:49 -0000	1.51
***************
*** 13,16 ****
--- 13,20 ----
   9 - Removal of something (kill -9 :)
  
+ 2003-November 13 7:00AM CST Joe Stewart <joe...@us...>
+ [FT] - New Feature - Block plugins added.
+        Added BBCode Story plugin using the PEAR BBCodeParser.
+ 
  2003-November 12 8:30PM CST Joe Stewart <joe...@us...>
  [FT] - slashHead-html3.tpl tweaking.

[Phpslash-commit] CVS: phpslash-dev/include/modules/story/plugins Story_plugin_bbcode.class,1.2,1.3

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/story/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv883/phpslash-dev/include/modules/story/plugins

Modified Files:
	Story_plugin_bbcode.class 
Log Message:
Block plugins

Index: Story_plugin_bbcode.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/plugins/Story_plugin_bbcode.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Story_plugin_bbcode.class	12 Nov 2003 16:02:10 -0000	1.2
--- Story_plugin_bbcode.class	13 Nov 2003 12:16:49 -0000	1.3
***************
*** 49,53 ****
        $parser->setText($ary['body_text']);
        $parser->parse();
!       $ary['body_text'] = $parser->getParsed();
  
        $this->output = $ary;
--- 49,56 ----
        $parser->setText($ary['body_text']);
        $parser->parse();
! 
!       // add line break
!       $ary['body_text'] = nl2br($parser->getParsed());
!       // $ary['body_text'] = $parser->getParsed();
  
        $this->output = $ary;

[Phpslash-commit] CVS: phpslash-dev/include/modules/block Block.class,1.7,1.8 Block_i.class,1.2,1.3 admin.php,1.3,1.4 index.php,1.4,1.5

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/block
In directory sc8-pr-cvs1:/tmp/cvs-serv883/phpslash-dev/include/modules/block

Modified Files:
	Block.class Block_i.class admin.php index.php 
Log Message:
Block plugins

Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block.class	6 Jun 2003 17:00:08 -0000	1.7
--- Block.class	13 Nov 2003 12:16:50 -0000	1.8
***************
*** 777,780 ****
--- 777,836 ----
     }
  
+    /**
+    * getPluginParser -  get parser method for Block_plugin type
+    *             
+    * @param string mytpe
+    * 
+    * @access private 
+    *
+    * return object this->parser 
+    */
+    function getPluginParser($mytype) {
+ 
+       /* Start a new object to render info */
+       $parserName  = "Block_plugin_" . $mytype;
+       $parserFile  = $parserName . ".class";
+       $parserPath  = $this->psl['moduledir'] ."/block/plugins/". $parserFile;
+ 
+       // bail out if the file doesn't exist
+       if(!file_exists($parserPath)) {
+          return false;
+       }
+ 
+       // register the class
+       AddClassRequirement($parserName,"block_plugin_i");
+       AddClassRequirement($parserName, $parserPath);
+ 
+       static $pluginparser_arr;
+ 
+       if( empty($pluginparser_arr[$mytype])) {
+          $pluginparser_arr[$mytype] = pslNew($parserName);
+       }
+       $this->pluginparser = $pluginparser_arr[$mytype];
+       return $pluginparser_arr[$mytype];
+    }
+    
+    /**
+    * doPluginParse - parse the plugin, storing the parsedData in the db cache
+    *             
+    * @param string autoStore ( deprecated)
+    * 
+    * @access private 
+    *
+    * return boolean success 
+    */
+    function doPluginParse($type,$ary) {
+       
+       if ($this->getPluginParser($type)) {
+          $this->pluginparser->parse($ary);
+          $this->parsedPluginData = $this->pluginparser->getFinal();
+          return true;
+       } else {
+ 	 return false;
+       }
+    }
+ 
+ 
+ 
  }  /* End class Block */
  ?>

Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/Block_i.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Block_i.class	15 May 2003 18:19:53 -0000	1.2
--- Block_i.class	13 Nov 2003 12:16:50 -0000	1.3
***************
*** 50,69 ****
     
     /**
-    * getAllBlocksForIndex - wrapper to getBlocks 
-    *
-    * Should use getBlocks instead, include for historical
-    * compatibility.
-    *
-    * @param array ary
-    * @param string column
-    *
-    * @access public 
-    */
-    function getAllBlocksForIndex($section, $column="") {
-       $ary['section'] = $section;
-       return $this->getBlocks($ary, $column); 
-    }
- 
-    /**
     * getBlocks - returns html formatted blocks 
     *
--- 50,53 ----
***************
*** 143,150 ****
  	 
           if (is_array($ary['block_options'])) {
! 	         // remove column from array
! 	         unset($ary["block_options"]["column"]);
              foreach( $ary["block_options"] as $key => $val) {
! 	         // while( list( $key, $val) = @each( $ary["block_options"] )) {
             
                 switch($key) {
--- 127,134 ----
  	 
           if (is_array($ary['block_options'])) {
! 	    // remove column from array
! 	    unset($ary["block_options"]["column"]);
              foreach( $ary["block_options"] as $key => $val) {
! 	    // while( list( $key, $val) = @each( $ary["block_options"] )) {
             
                 switch($key) {
***************
*** 152,156 ****
  		            case "width":
  		               // pass width to getFancyBox
!                      $width = $ary["block_options"]["width"];
  		               // remove width from array
  		               $ary["block_options"]["width"] = '';
--- 136,140 ----
  		            case "width":
  		               // pass width to getFancyBox
!                                $width = $ary["block_options"]["width"];
  		               // remove width from array
  		               $ary["block_options"]["width"] = '';
***************
*** 164,173 ****
  		               break;
  
!                   case "perms":
  		               // remove perms from array
  		               $ary["block_options"]["perms"] = '';
  		               break;
  
!                   case "cache_data":
  		               // remove cache_data from array
  		               $ary["block_options"]["cache_data"] = '';
--- 148,157 ----
  		               break;
  
!                             case "perms":
  		               // remove perms from array
  		               $ary["block_options"]["perms"] = '';
  		               break;
  
!                             case "cache_data":
  		               // remove cache_data from array
  		               $ary["block_options"]["cache_data"] = '';
***************
*** 175,188 ****
  
  		            default:
! 	                  // pluggable user defined function
!                      if (!empty($this->psl['block_options_udf'])) {
!                         $ary = $this->psl['block_options_udf']($key, $value, $ary);
!                      }
!                      // let the fancybox template parse any block options left over.
!                      $var_ary = array(strtoupper($key) => $ary['block_options'][$key]);
! 		               $ary['block_options'][$key] = '';
!                      // what is left over?
!                      // debug("block_options[$key]", $val);
!                      break;
   
  	            }
--- 159,181 ----
  
  		            default:
! 	                       
!                                // attempt to handle any plugins and if not there proceed
!                                // yes - one equal sign
!                                if($parsed = $this->doPluginParse($val,$ary)) {
!                                   $ary = $this->parsedPluginData;
!                                } else {
! 
! 			          // pluggable user defined function
!                                   if (!empty($this->psl['block_options_udf'])) {
!                                      $ary = $this->psl['block_options_udf']($key, $value, $ary);
!                                   }
!                                   // let the fancybox template parse any block options left over.
!                                   $var_ary = array(strtoupper($key) => $ary['block_options'][$key]);
! 		               }
! 			       
! 			       $ary['block_options'][$key] = '';
!                                // what is left over?
!                                // debug("block_options[$key]", $val);
!                                break;
   
  	            }

Index: admin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin.php	24 Jun 2003 19:32:34 -0000	1.3
--- admin.php	13 Nov 2003 12:16:50 -0000	1.4
***************
*** 9,12 ****
--- 9,13 ----
  AddClassRequirement("block_i",$_PSL['moduledir'] ."/". $_PSL['module']['Block'] ."/Block_i.class");
  AddClassRequirement("block_render_i",$_PSL['moduledir'] ."/". $_PSL['module']['Block'] ."/Block_render_i.class");
+ AddClassRequirement("block_plugin_i",$_PSL['moduledir'] ."/". $_PSL['module']['Block'] ."/Block_plugin_i.class");
  AddClassRequirement("block_admin","block_i");
  AddClassRequirement("block_admin",$_PSL['moduledir'] ."/". $_PSL['module']['Block'] ."/Block_admin.class");

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/block/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php	24 Jun 2003 19:32:34 -0000	1.4
--- index.php	13 Nov 2003 12:16:50 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  AddClassRequirement("block_i",$_PSL['moduledir'] ."/". $_PSL['module']['Block'] ."/Block_i.class");
  AddClassRequirement("block_render_i",$_PSL['moduledir'] ."/". $_PSL['module']['Block'] ."/Block_render_i.class");
+ AddClassRequirement("block_plugin_i",$_PSL['moduledir'] ."/". $_PSL['module']['Block'] ."/Block_plugin_i.class");
  AddClassRequirement("block_admin","block_i");
  

[Phpslash-commit] CVS: phpslash-dev/include/modules/block/plugins BBCodeParser.ini,NONE,1.1 Block_plugin_bbcode.class,NONE,1.1

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/block/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv883/phpslash-dev/include/modules/block/plugins

Added Files:
	BBCodeParser.ini Block_plugin_bbcode.class 
Log Message:
Block plugins

--- NEW FILE: BBCodeParser.ini ---
[HTML_BBCodeParser]

; possible values: single|double
; use single or double quotes for attributes
quotestyle  = single

; possible values: all|nothing|strings
; quote all attribute values, none, or only the strings
quotewhat   = all

; the opening tag character
open        = [

; the closing tag character
close       = ]

; possible values: true|false
; use xml style closing tags for single html tags (<img> or <img />)
xmlclose    = true

; possible values: a comma seperated list of filters
; comma seperated list of filters to use
filters     = Basic,Links,Images,Lists,Email

--- NEW FILE: Block_plugin_bbcode.class ---
<?php

/* Block_plugin_bbcode.class -> Methods for phpslash specfic story plugins */
/* $Id: Block_plugin_bbcode.class,v 1.1 2003/11/13 12:16:50 joestewart Exp $ */


class Block_plugin_bbcode extends Block_plugin_i {

   /* constructor */
   function Block_plugin_bbcode() {
      $this->Block_plugin_i();
      
      $this->type = "bbcode";  /* set the 'type' */
      $this->description = "A plugin that converts bbcode to html"; 
   }

   function parse($block_info) {

      // Straight from the PEAR package example
      // The PEAR package can be downloaded here:
      // http://pear.php.net/package/HTML_BBCodeParser
      // or from the command line:
      // pear install BBCodeParser

      // adjust include_path to include PEAR 
      // ini_set('include_path', ini_get('include_path').':/usr/share/pear');

      // all your errors are belong to us 
      // error_reporting(E_ALL);

      // require PEAR and the parser 
      require_once('PEAR.php');
      require_once('HTML/BBCodeParser.php');

      // get options from the ini file //
      $config = parse_ini_file($this->psl['moduledir'] ."/story/plugins/".'BBCodeParser.ini', true);
      $options = &PEAR::getStaticProperty('HTML_BBCodeParser', '_options');
      $options = $config['HTML_BBCodeParser'];
      unset($options);

      $parser = new HTML_BBCodeParser();
  
      $parser->setText($block_info["cache_data"]);
      $parser->parse();
      
      $parsed = $parser->getParsed();
      // add line break
      $block_info["cache_data"] = nl2br($parsed);
      $block_info["cache_data"] = $parsed;

      $this->output = $block_info;
      return true;
      
   }
}

?>