php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity NEWS,1.113,1.114 serendipity_admin_images.inc.php,1.21,1.22

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

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

Modified Files:
	NEWS serendipity_admin_images.inc.php 
Log Message:
image upload fix


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- NEWS	26 Apr 2004 10:33:20 -0000	1.113
+++ NEWS	26 Apr 2004 10:56:23 -0000	1.114
@@ -3,6 +3,9 @@
 Version 0.6.1 ()
 ------------------------------------------------------------------------
 
+    * Image upload now strips all characters not suggested for filename
+      use (garvinhicking)
+
     * Categories can now have a fixed image which is embedded for
       every article. Can be styled via CSS (.serendipity_entryIcon).
       Integrated with s9y image manager.

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_admin_images.inc.php	4 Apr 2004 16:24:46 -0000	1.21
+++ serendipity_admin_images.inc.php	26 Apr 2004 10:56:23 -0000	1.22
@@ -68,7 +68,7 @@
         }
 
         $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $file['extension'];
-        $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension']; 
+        $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension'];
         if ($serendipity['GET']['newname'] != '' && file_exists($oldfile) && !file_exists($newfile)) {
             // Rename file
             rename($oldfile, $newfile);
@@ -114,7 +114,8 @@
         } else {
             $tfile   = basename($serendipity['POST']['imageurl']);
         }
-        
+
+        $tfile  = preg_replace('@[^0-9a-z\._/-]@i', '', $tfile);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $tfile;
 
         if (file_exists($target)) {
@@ -141,7 +142,8 @@
         } else {
             $tfile   = $_FILES['userfile']['name'];
         }
-        
+
+        $tfile  = preg_replace('@[^0-9a-z\._/-]@i', '', $tfile);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $tfile;
 
         if (file_exists($target)) {
@@ -173,7 +175,7 @@
         document.getElementById(field).value = value.replace(re, "$1");
     }
     </script>
-    
+
     <form action="?" method="POST" id="uploadform" enctype="multipart/form-data">
         <div>
             <input type="hidden" name="MAX_FILE_SIZE"            value="3000000" />

[php-blog-cvs] serendipity/templates/mt-clean style.css,1.5,1.6

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-clean/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	25 Feb 2004 21:14:52 -0000	1.5
+++ style.css	26 Apr 2004 10:33:22 -0000	1.6
@@ -112,6 +112,11 @@
   clear: both;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 /* Comments */
 
 .serendipity_comment {

[php-blog-cvs] serendipity/templates/moz-modern style.css,1.5,1.6

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	13 Apr 2004 11:58:59 -0000	1.5
+++ style.css	26 Apr 2004 10:33:22 -0000	1.6
@@ -276,6 +276,11 @@
   color: #494F5D;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 /* Comments */
 
 .serendipityCommentForm input,

[php-blog-cvs] serendipity/templates/default style.css,1.16,1.17

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- style.css	13 Apr 2004 11:58:58 -0000	1.16
+++ style.css	26 Apr 2004 10:33:22 -0000	1.17
@@ -171,6 +171,16 @@
     clear: both;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 TD.serendipity_commentsLabel {
     font-size: 12px;
     font-weight: bold;

[php-blog-cvs] serendipity/templates/blue style.css,1.4,1.5

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/blue/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- style.css	13 Apr 2004 11:58:58 -0000	1.4
+++ style.css	26 Apr 2004 10:33:21 -0000	1.5
@@ -112,6 +112,11 @@
   width: auto;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 .serendipity_title {
   border: 1px;
   color: #1a3c5a;

[php-blog-cvs] serendipity NEWS,1.112,1.113 serendipity_admin_category.inc.php,1.10,1.11 serendipity_admin_image_selector.php,1.20,1.21 serendipity_config.inc.php,1.68,1.69 serendipity_editor.js,1.8,1.9 serendipity_functions.inc.php,1.256,1.257

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

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

Modified Files:
	NEWS serendipity_admin_category.inc.php 
	serendipity_admin_image_selector.php 
	serendipity_config.inc.php serendipity_editor.js 
	serendipity_functions.inc.php 
Log Message:
category icons


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- serendipity_config.inc.php	13 Apr 2004 10:31:44 -0000	1.68
+++ serendipity_config.inc.php	26 Apr 2004 10:33:20 -0000	1.69
@@ -1,7 +1,7 @@
 <?php # $Id$
 # Copyright (c) 2003-2004, Jannis Hermanns
 # All rights reserved.  See LICENSE file for licensing details
-
+require_once('validate.php');
 if (!defined('S9Y_INCLUDE_PATH')) {
     define('S9Y_INCLUDE_PATH', dirname(__FILE__) . '/');
 }
@@ -15,7 +15,7 @@
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']      = '0.6.1-CVS';
+$serendipity['version']      = '0.6.2-CVS';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_admin_image_selector.php	13 Apr 2004 11:58:57 -0000	1.20
+++ serendipity_admin_image_selector.php	26 Apr 2004 10:33:20 -0000	1.21
@@ -35,9 +35,9 @@
 switch ($serendipity['GET']['step']) {
     case '1':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
-        $imgsrc    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
-        $imgName   = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] .'.'. $file['extension'];
-        $thumbName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $imgsrc     = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $imgName    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] .'.'. $file['extension'];
+        $thumbName  = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
@@ -50,6 +50,12 @@
             <div>
                 <input type="hidden" name="imgName"   value="<?php echo $imgName; ?>" />
                 <input type="hidden" name="thumbName" value="<?php echo $thumbName; ?>" />
+                <?php if (!empty($serendipity['GET']['htmltarget'])) { ?>
+                <input type="hidden" name="serendipity[htmltarget]" value="<?php echo htmlspecialchars($serendipity['GET']['htmltarget']); ?>" />
+                <?php } ?>
+                <?php if (!empty($serendipity['GET']['filename_only'])) { ?>
+                <input type="hidden" name="serendipity[filename_only]" value="<?php echo htmlspecialchars($serendipity['GET']['filename_only']); ?>" />
+                <?php } ?>
 
                 <b><?php echo IMAGE_SIZE; ?>:</b>
                 <br />
@@ -57,6 +63,7 @@
                 <input id="radio_link_yes" type="radio" name="serendipity[linkThumbnail]" value="yes" /><label for="radio_link_yes"><?php echo I_WANT_BIG_IMAGE; ?></label><br />
                 <br />
 
+                <?php if (empty($serendipity['GET']['filename_only']) || $serendipity['GET']['filename_only'] != 'true') { ?>
                 <b><?php echo IMAGE_ALIGNMENT; ?>:</b>
                 <br />
                 <input type="radio" name="serendipity[align]" value="" />                       <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_top.png"   vspace="5"><br />
@@ -75,6 +82,7 @@
                 <br />
                 <textarea id="serendipity_imagecomment" name="serendipity[imagecomment]" rows="5" cols="40"></textarea>
                 <br />
+                <?php } ?>
 
                 <input type="button" value="<?php echo BACK; ?>" onclick="history.go(-1);" />
                 <input type="button" value="<?php echo DONE; ?>" onclick="serendipity_imageSelector_done()" />
@@ -92,6 +100,15 @@
         if (!is_numeric($serendipity['GET']['end'])) {
             $serendipity['GET']['end'] = 16;
         }
+
+        $add_url = '';
+        if (!empty($serendipity['GET']['htmltarget'])) {
+            $add_url .= '&amp;serendipity[htmltarget]=' . $serendipity['GET']['htmltarget'];
+        }
+
+        if (!empty($serendipity['GET']['filename_only'])) {
+            $add_url .= '&amp;serendipity[filename_only]=' . $serendipity['GET']['filename_only'];
+        }
 ?>
     <b><?php echo SELECT_IMAGE; ?></b>
     <br />
@@ -105,7 +122,7 @@
           isset($serendipity['GET']['end'])   ? $serendipity['GET']['end']   : 8,
           4,
           false,
-          '?serendipity[step]=1'
+          '?serendipity[step]=1' . $add_url
         );
 }
 ?>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- NEWS	26 Apr 2004 07:30:34 -0000	1.112
+++ NEWS	26 Apr 2004 10:33:20 -0000	1.113
@@ -3,6 +3,11 @@
 Version 0.6.1 ()
 ------------------------------------------------------------------------
 
+    * Categories can now have a fixed image which is embedded for
+      every article. Can be styled via CSS (.serendipity_entryIcon).
+      Integrated with s9y image manager.
+      (Evan Nemerson, garvinhicking)
+
     * Published entries from the future will only be displayed on the
       frontend when not in the future. They will get automagically
       displayed as soon as the publish time is effectively reached.

Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_editor.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_editor.js	13 Apr 2004 11:58:57 -0000	1.8
+++ serendipity_editor.js	26 Apr 2004 10:33:20 -0000	1.9
@@ -122,6 +122,12 @@
     area.focus();
 }
 
+function serendipity_imageSelector_addToElement (str, el)
+{
+    document.getElementById(el).value = str;
+    document.getElementById(el).focus();
+}
+
 function serendipity_imageSelector_addToBody (str)
 {
     document.forms['serendipityEntry']['serendipity[body]'].value += str;
@@ -141,6 +147,12 @@
         img = f['imgName'].value;
     }
 
+    if (f['serendipity[filename_only]'].value == 'true') {
+        self.opener.serendipity_imageSelector_addToElement(img, f['serendipity[htmltarget]'].value);
+        self.close();
+        return true;
+    }
+
     if (document.getElementById('serendipity_imagecomment').value != '') {
         styled = false;
     } else {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- serendipity_functions.inc.php	26 Apr 2004 07:30:36 -0000	1.256
+++ serendipity_functions.inc.php	26 Apr 2004 10:33:20 -0000	1.257
@@ -629,7 +629,8 @@
                     a.email,
 
                     c.category_name,
-                    c.categoryid
+                    c.categoryid,
+                    c.category_icon
                     $body
               FROM
                     ({$serendipity['dbPrefix']}entries AS e
@@ -670,6 +671,7 @@
                             *,
                             c.category_name,
                             c.categoryid,
+                            c.category_icon,
                             a.username,
                             a.email
                     FROM
@@ -881,6 +883,9 @@
         <h4 class="serendipity_title"><a href="<?php echo $entryLink; ?>"><?php echo htmlspecialchars($entry['title']); ?></a></h4>
 
         <div class="serendipity_entry">
+            <?php if ($entry['category_icon'] != '') {
+             echo '<a class="serendipity_entryIcon" href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $entry['categoryid'] . '_' . serendipity_makeFilename($entry['category_name']) . '"><img class="serendipity_entryIcon" alt="' . htmlspecialchars($entry['category_name']) . '" src="' . htmlspecialchars($entry['category_icon']) . '"/></a>';
+            } ?>
             <span class="<?php echo $extended_css; ?>"><?php echo $entry['body']; ?></span>
             <?php echo $html_extended; ?>
 

Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_category.inc.php	7 Apr 2004 12:42:42 -0000	1.10
+++ serendipity_admin_category.inc.php	26 Apr 2004 10:33:20 -0000	1.11
@@ -9,17 +9,18 @@
 $cat_to_edit = (isset($_GET['serendipity']['cat']['catid']) ? (int)$_GET['serendipity']['cat']['catid'] : 0);
 $msg         = '';
 
-$admin_category = ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF ? "AND (authorid = 0 OR authorid = {$serendipity['authorid']})" : ''); 
+$admin_category = ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF ? "AND (authorid = 0 OR authorid = {$serendipity['authorid']})" : '');
 
 if (isset($_POST['SAVE'])) {
     $name     = addslashes($_POST['serendipity']['cat']['name']);
     $desc     = addslashes($_POST['serendipity']['cat']['description']);
     $authorid = (isset($_POST['serendipity']['cat']['all_authors']) && $_POST['serendipity']['cat']['all_authors'] == 'true') ? '0' : $serendipity['authorid'];
+    $icon     = addslashes($_POST['serendipity']['cat']['icon']);
 
     if ($cat_to_edit == 0) {
-            $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid) values ('$name', '$desc', $authorid)";
+            $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid, category_icon) values ('$name', '$desc', $authorid, '$icon')";
     } else {
-            $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc', authorid=$authorid WHERE categoryid=$cat_to_edit $admin_category";
+            $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc', authorid=$authorid, category_icon='$icon' WHERE categoryid=$cat_to_edit $admin_category";
     }
 
     $r = serendipity_db_query($query);
@@ -59,19 +60,19 @@
                 $existing_cats_dropdown .= '<option value="' . $cat_data['categoryid'] . '">' . htmlspecialchars($cat_data['category_name']) . '</option>' . "\n";
             }
         }
-        
+
         $name      = htmlspecialchars($cat_data['category_name']);
         $desc      = htmlspecialchars($cat_data['category_description']);
         $edit_pre  = '<a href="?serendipity[adminModule]=category&amp;serendipity[cat][catid]=' . $cat_data['categoryid'] . '">';
         $edit_post = '</a>';
-        
+
         if ($cat_data['authorid'] == '0') {
             $desc .= ' (' . ALL_AUTHORS . ')';
         } elseif ($cat_data['authorid'] != $serendipity['authorid']) {
             $desc .= ' (' . $cat_data['username'] . ')';
             $edit_pre = $edit_post = '';
         }
-        
+
         $existing_cats_table .= <<<CAT
     <tr>
         <td>
@@ -115,6 +116,15 @@
     </tr>
 
     <tr>
+        <th><?php echo IMAGE; ?></th>
+        <td>
+            <script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script>
+            <input type="text" id="img_icon" name="serendipity[cat][icon]" value="<?php echo isset($this_cat['category_icon']) ? htmlspecialchars($this_cat['category_icon']) : ''; ?>" />
+            <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&serendipity[filename_only]=true', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+        </td>
+    </tr>
+
+    <tr>
         <th><label for="all_authors"><?php echo ALL_AUTHORS; ?></label></th>
         <td><input id="all_authors" type="checkbox" name="serendipity[cat][all_authors]" value="true" <?php echo (isset($this_cat['authorid']) && $this_cat['authorid'] == '0') ? 'checked="checked"' : ''; ?> /></td>
     </tr>

[php-blog-cvs] serendipity/sql db.sql,1.6,1.7

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

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

Modified Files:
	db.sql 
Log Message:
category icons


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- db.sql	4 Apr 2004 16:20:15 -0000	1.6
+++ db.sql	26 Apr 2004 10:33:21 -0000	1.7
@@ -147,6 +147,7 @@
 CREATE TABLE {PREFIX}category (
   categoryid {AUTOINCREMENT} {PRIMARY},
   category_name varchar(255) default NULL,
+  category_icon varchar(255) default NULL,
   category_description text,
   authorid int(11) default NULL
 );

[php-blog-cvs] serendipity/deployment serendipity_editor.js,1.2,1.3

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

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

Modified Files:
	serendipity_editor.js 
Log Message:
category icons


Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/deployment/serendipity_editor.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_editor.js	13 Apr 2004 11:58:57 -0000	1.2
+++ serendipity_editor.js	26 Apr 2004 10:33:21 -0000	1.3
@@ -122,6 +122,12 @@
     area.focus();
 }
 
+function serendipity_imageSelector_addToElement (str, el)
+{
+    document.getElementById(el).value = str;
+    document.getElementById(el).focus();
+}
+
 function serendipity_imageSelector_addToBody (str)
 {
     document.forms['serendipityEntry']['serendipity[body]'].value += str;
@@ -141,6 +147,12 @@
         img = f['imgName'].value;
     }
 
+    if (f['serendipity[filename_only]'].value == 'true') {
+        self.opener.serendipity_imageSelector_addToElement(img, f['serendipity[htmltarget]'].value);
+        self.close();
+        return true;
+    }
+
     if (document.getElementById('serendipity_imagecomment').value != '') {
         styled = false;
     } else {
@@ -196,4 +208,3 @@
 }
 
 // -->
-

[php-blog-cvs] serendipity/templates/mt-stormy style.css,1.5,1.6

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-stormy/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	25 Feb 2004 21:15:09 -0000	1.5
+++ style.css	26 Apr 2004 10:33:24 -0000	1.6
@@ -140,3 +140,8 @@
 #content {
   width: 100%;
 }
+
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}

[php-blog-cvs] serendipity/templates/mt-plainjane style.css,1.6,1.7

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-plainjane/style.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.css	25 Feb 2004 21:14:53 -0000	1.6
+++ style.css	26 Apr 2004 10:33:23 -0000	1.7
@@ -129,6 +129,11 @@
   font-size: x-small; 
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 /* Comments */
 
 .serendipity_comment {

[php-blog-cvs] serendipity/templates/mt-rusty style.css,1.5,1.6

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-rusty/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	25 Feb 2004 21:14:53 -0000	1.5
+++ style.css	26 Apr 2004 10:33:24 -0000	1.6
@@ -121,6 +121,11 @@
   clear: both;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 /* Comments */
 
 .serendipity_comment {

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

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	13 Apr 2004 11:58:59 -0000	1.5
+++ style.css	26 Apr 2004 10:33:25 -0000	1.6
@@ -302,3 +302,8 @@
     font-size: 9pt;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+

[php-blog-cvs] serendipity/templates/mt-trendy style.css,1.15,1.16

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-trendy/style.css,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- style.css	13 Apr 2004 11:58:59 -0000	1.15
+++ style.css	26 Apr 2004 10:33:24 -0000	1.16
@@ -221,3 +221,8 @@
     font-size: 9pt;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+

[php-blog-cvs] serendipity/templates/mt-gettysburg style.css,1.5,1.6

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-gettysburg/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	25 Feb 2004 21:14:53 -0000	1.5
+++ style.css	26 Apr 2004 10:33:23 -0000	1.6
@@ -94,6 +94,11 @@
   clear: both;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 /* Comments */
 
 .serendipity_comment {

[php-blog-cvs] serendipity/templates/mt-georgiablue style.css,1.6,1.7

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

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

Modified Files:
	style.css 
Log Message:
category icons


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-georgiablue/style.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.css	25 Feb 2004 21:18:43 -0000	1.6
+++ style.css	26 Apr 2004 10:33:23 -0000	1.7
@@ -132,6 +132,11 @@
   clear: both;
 }
 
+img.serendipity_entryIcon {
+    float: right;
+    border: 0px;
+}
+
 /* Comments */
 
 .serendipity_comment {

[php-blog-cvs] serendipity NEWS,1.111,1.112 serendipity_functions.inc.php,1.255,1.256

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
Published entries from the future will only be displayed on the
frontend when not in the future. They will get automagically displayed
as soon as the publish time is effectively reached.      
#RFE 939867



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- serendipity_functions.inc.php	23 Apr 2004 16:12:03 -0000	1.255
+++ serendipity_functions.inc.php	26 Apr 2004 07:30:36 -0000	1.256
@@ -201,7 +201,6 @@
 
 function serendipity_displayCommentForm($id, $url = '?') {
     global $serendipity;
-
 ?>
 <div class="serendipityCommentForm">
     <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post" onsubmit="if (this.serendipity_remember.checked) rememberMe(this, '<?php echo $_SERVER['HTTP_HOST']; ?>')">
@@ -604,6 +603,14 @@
         }
     }
 
+    if (!isset($serendipity['GET']['adminModule'])) {
+        if (!empty($and)) {
+            $and .= " AND e.timestamp <= '" . time() . "'";
+        } else {
+            $and = "WHERE e.timestamp <= '" . time() . "'";
+        }
+    }
+
     $query = "SELECT
                     e.id,
                     e.title,
@@ -2044,7 +2051,7 @@
     } else {
         $edit_cat=1;
     }
-    
+
     $n = "\n";
     if ($edit_cat) {
         $cat_list = '<select name="serendipity[categoryid]">' . $n;

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- NEWS	17 Apr 2004 11:30:42 -0000	1.111
+++ NEWS	26 Apr 2004 07:30:34 -0000	1.112
@@ -3,6 +3,11 @@
 Version 0.6.1 ()
 ------------------------------------------------------------------------
 
+    * Published entries from the future will only be displayed on the
+      frontend when not in the future. They will get automagically
+      displayed as soon as the publish time is effectively reached.
+      #RFE 939867 (garvinhicking)
+
     * Exit/Referrer plugin can now limit the number of elements
       (garvinhicking)
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.254,1.255

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
- superuser sees all categories, no matter who owns them.  That way they
can change post categories as needed.

- editors see their categories and all categories for users at levels less
than their own.  I.e. a level 1 user  sees categories that are:
 - all users
 - their own
 - all categories private to level 0 users

- When saving an edited entry, the user stays as the original poster.

- When editing a post, if the category of the post is NOT in the user's
   list, the category is locked and cannot be changed.  

    The language files have a new define for CANNOT_EDIT_CATEGORY.  I used
    babelfish to get german, french and spanish translations, I made a weak,
    half-english attempt at Czech, Dutch and Danish.  Someone please fix them
    later.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- serendipity_functions.inc.php	17 Apr 2004 11:30:42 -0000	1.254
+++ serendipity_functions.inc.php	23 Apr 2004 16:12:03 -0000	1.255
@@ -690,8 +690,12 @@
         $authorid = ((isset($serendipity['authorid']) && !empty($serendipity['GET']['adminModule'])) ? $serendipity['authorid'] : 1);
     }
 
+    if ($serendipity['serendipityUserlevel'] == USERLEVEL_ADMIN) {
+        $authorid = 'all';
+    }
+
     if ($authorid != 'all') {
-        $where = " WHERE (c.authorid = $authorid OR c.authorid = 0)";
+        $where = " WHERE (c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < ".$serendipity['serendipityUserlevel'];
     } else {
         $where = '';
     }
@@ -1911,10 +1915,6 @@
     }
 
     $entry['exflag']   = $exflag;
-    $entry['author']   = $serendipity['user'];
-    if (!isset($entry['authorid']) || empty($entry['authorid'])) {
-        $entry['authorid'] = $serendipity['authorid'];
-    }
 
     if (!is_numeric($entry['id'])) {
         /* we need to insert */
@@ -1922,6 +1922,12 @@
         unset($entry['id']);
         $entry['comments'] = 0;
 
+        // New entries need an author
+        $entry['author']   = $serendipity['user'];
+        if (!isset($entry['authorid']) || empty($entry['authorid'])) {
+            $entry['authorid'] = $serendipity['authorid'];
+        }
+
         $res = serendipity_db_insert('entries', $entry);
 
         if ($res)
@@ -2026,20 +2032,38 @@
         $allow_comments = '';
     }
 
-    $n = "\n";
-    $cat_list = '<select name="serendipity[categoryid]">' . $n;
-    $cat_list .= '    <option value="0">[' . NO_CATEGORY . ']</option>' . $n;
-    if (is_array($cats)) {
+    if (isset($entry['categoryid']) && $entry['categoryid'] != 0) {
+        $edit_cat=0;
+        if (is_array($cats)) {
         foreach ($cats as $cat_data) {
-            $selected = (isset($entry['categoryid']) && $cat_data['categoryid'] == $entry['categoryid'] ? ' selected="selected"' : '');
-            $cat_list .= '    <option value="' . $cat_data['categoryid'] . '" ' . $selected . '>'
-                       . htmlspecialchars($cat_data['category_name'])
-                       . ' - '
-                       . htmlspecialchars($cat_data['category_description'])
-                       . '</option>' . $n;
+                if ($cat_data['categoryid'] == $entry['categoryid'] ) {
+                    $edit_cat = 1;
+                }
+            }
         }
+    } else {
+        $edit_cat=1;
+    }
+    
+    $n = "\n";
+    if ($edit_cat) {
+        $cat_list = '<select name="serendipity[categoryid]">' . $n;
+        $cat_list .= '    <option value="0">[' . NO_CATEGORY . ']</option>' . $n;
+        if (is_array($cats)) {
+            foreach ($cats as $cat_data) {
+                $selected = (isset($entry['categoryid']) && $cat_data['categoryid'] == $entry['categoryid'] ? ' selected="selected"' : '');
+                $cat_list .= '    <option value="' . $cat_data['categoryid'] . '" ' . $selected . '>'
+                        . htmlspecialchars($cat_data['category_name'])
+                        . ' - '
+                        . htmlspecialchars($cat_data['category_description'])
+                        . '</option>' . $n;
+            }
+        }
+        $cat_list .= '</select>' . $n;
+    } else {
+        $cat_list = CANNOT_EDIT_CATEGORY . $n;
+        $cat_list .= '<input type="hidden" name="serendipity[categoryid]" value="' . $entry['categoryid'] . '" />' . $n;
     }
-    $cat_list .= '</select>' . $n;
 
     $hidden = '';
     foreach($hiddens as $key => $value) {

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.7,1.8 serendipity_lang_cz.inc.php,1.7,1.8 serendipity_lang_da.inc.php,1.23,1.24 serendipity_lang_de.inc.php,1.33,1.34 serendipity_lang_en.inc.php,1.26,1.27 serendipity_lang_es.inc.php,1.26,1.27 serendipity_lang_fr.inc.php,1.5,1.6

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php 
Log Message:
- superuser sees all categories, no matter who owns them.  That way they
can change post categories as needed.

- editors see their categories and all categories for users at levels less
than their own.  I.e. a level 1 user  sees categories that are:
 - all users
 - their own
 - all categories private to level 0 users

- When saving an edited entry, the user stays as the original poster.

- When editing a post, if the category of the post is NOT in the user's
   list, the category is locked and cannot be changed.  

    The language files have a new define for CANNOT_EDIT_CATEGORY.  I used
    babelfish to get german, french and spanish translations, I made a weak,
    half-english attempt at Czech, Dutch and Danish.  Someone please fix them
    later.


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_cs.inc.php	21 Apr 2004 08:58:14 -0000	1.7
+++ serendipity_lang_cs.inc.php	23 Apr 2004 16:12:05 -0000	1.8
@@ -91,6 +91,7 @@
 @define('A_NEW_COMMENT_BLAHBLAH', 'Nový komentáø k weblogu "%s", k záznamu s názvem "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Nová odezva na weblog/záznam s názvem "%s".');
 @define('NO_CATEGORY', 'Žádná kategorie');
+@define('CANNOT_EDIT_CATEGORY', 'Kategorie not available');
 @define('ENTRY_BODY', 'Text záznamu');
 @define('EXTENDED_BODY', 'Rozšíøená textová èást');
 @define('CATEGORY', 'Kategorie:');

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_da.inc.php	18 Apr 2004 21:17:06 -0000	1.23
+++ serendipity_lang_da.inc.php	23 Apr 2004 16:12:19 -0000	1.24
@@ -89,6 +89,7 @@
 @define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar er blevet oprettet på din blog "%s", til artiklen ved navn "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Et nyt trackback er blevet lavet til din artikel ved navn "%s".');
 @define('NO_CATEGORY', 'Ingen kategori');
+@define('CANNOT_EDIT_CATEGORY', 'Kategori not available');
 @define('ENTRY_BODY', 'Artikel indhold');
 @define('EXTENDED_BODY', 'Udvidet indhold');
 @define('CATEGORY', 'Kategori:');

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_fr.inc.php	18 Apr 2004 21:17:06 -0000	1.5
+++ serendipity_lang_fr.inc.php	23 Apr 2004 16:12:19 -0000	1.6
@@ -91,6 +91,7 @@
 @define('A_NEW_COMMENT_BLAHBLAH', 'Un nouveau commentaire a été posté sur votre blog "%s", dans la news intitulée "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Un nouveau suivi a été fait sur votre blog à la news intitulée "%s".');
 @define('NO_CATEGORY', 'Pas de Catégorie');
+@define('CANNOT_EDIT_CATEGORY', 'Catégorie non disponible');
 @define('ENTRY_BODY', 'Corps de la news');
 @define('EXTENDED_BODY', 'Extension de la news');
 @define('CATEGORY', 'Catégorie:');

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_cz.inc.php	21 Apr 2004 08:58:19 -0000	1.7
+++ serendipity_lang_cz.inc.php	23 Apr 2004 16:12:18 -0000	1.8
@@ -91,6 +91,7 @@
 @define('A_NEW_COMMENT_BLAHBLAH', 'Nový komentáø k weblogu "%s", k záznamu s názvem "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Nová odezva na weblog/záznam s názvem "%s".');
 @define('NO_CATEGORY', '®ádná kategorie');
+@define('CANNOT_EDIT_CATEGORY', 'Kategorie not available');
 @define('ENTRY_BODY', 'Text záznamu');
 @define('EXTENDED_BODY', 'Roz¹íøená textová èást');
 @define('CATEGORY', 'Kategorie:');

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_en.inc.php	18 Apr 2004 21:17:06 -0000	1.26
+++ serendipity_lang_en.inc.php	23 Apr 2004 16:12:19 -0000	1.27
@@ -91,6 +91,7 @@
 @define('A_NEW_COMMENT_BLAHBLAH', 'A new comment has been posted on your blog "%s", in the entry entitled "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'A new trackback has been made to your blog-entry entitled "%s".');
 @define('NO_CATEGORY', 'No Category');
+@define('CANNOT_EDIT_CATEGORY', 'Category Not Available');
 @define('ENTRY_BODY', 'Entry Body');
 @define('EXTENDED_BODY', 'Extended Body');
 @define('CATEGORY', 'Category:');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_es.inc.php	18 Apr 2004 21:17:06 -0000	1.26
+++ serendipity_lang_es.inc.php	23 Apr 2004 16:12:19 -0000	1.27
@@ -93,6 +93,7 @@
 @define('A_NEW_COMMENT_BLAHBLAH', 'Un nuevo comentario en el blog "%s", para el post "%s".');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Se ha realizado un nuevo trackback al post titulado "%s".');
 @define('NO_CATEGORY', 'No existe la categoría');
+@define('CANNOT_EDIT_CATEGORY', 'Categoría no disponible');
 @define('ENTRY_BODY', 'Texto del post');
 @define('EXTENDED_BODY', 'Texto ampliado');
 @define('CATEGORY', 'Categoría:');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_de.inc.php	18 Apr 2004 21:17:06 -0000	1.33
+++ serendipity_lang_de.inc.php	23 Apr 2004 16:12:19 -0000	1.34
@@ -88,6 +88,7 @@
 @define('ON', 'um');
 @define('A_NEW_COMMENT_BLAHBLAH', 'In Ihrem Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
 @define('NO_CATEGORY', 'Keine Kategorie');
+@define('CANNOT_EDIT_CATEGORY', 'Kategorie nicht vorhanden');
 @define('ENTRY_BODY', 'Eintrag');
 @define('EXTENDED_BODY', 'Erweiterter Eintrag');
 @define('CATEGORY', 'Kategorie:');

[php-blog-cvs] serendipity serendipity_admin_users.inc.php,1.5,1.6

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

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

Modified Files:
	serendipity_admin_users.inc.php 
Log Message:
Allow USERLEVEL_ADMIN to edit other USERLEVEL_ADMIN users...They are superuser, after all.


Index: serendipity_admin_users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_users.inc.php	22 Apr 2004 18:26:15 -0000	1.5
+++ serendipity_admin_users.inc.php	22 Apr 2004 18:50:55 -0000	1.6
@@ -142,7 +142,7 @@
 <?php
 if (!empty($_POST['EDIT'])) {
     $user = serendipity_fetchUsers($serendipity['POST']['user']);
-    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel'] && $user[0]['authorid'] != $serendipity['authorid']) {
+    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel'] && $user[0]['authorid'] != $serendipity['authorid'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
         echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong><br />';
         echo CREATE;
         $from = array();

[php-blog-cvs] serendipity serendipity_admin_users.inc.php,1.4,1.5

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

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

Modified Files:
	serendipity_admin_users.inc.php 
Log Message:
Display all users in the Manage Users chooser if the user is a admin.



Index: serendipity_admin_users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_users.inc.php	22 Apr 2004 18:23:21 -0000	1.4
+++ serendipity_admin_users.inc.php	22 Apr 2004 18:26:15 -0000	1.5
@@ -94,7 +94,7 @@
 <?php
 $users = serendipity_fetchUsers();
 foreach($users AS $user) {
-    if ($user['userlevel'] < $serendipity['serendipityUserlevel'] || $user['authorid'] == $serendipity['authorid']) {
+    if ($user['userlevel'] < $serendipity['serendipityUserlevel'] || $user['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN ) {
 ?>
     <tr>
         <td><?php echo htmlspecialchars($user['username']); ?></td>

[php-blog-cvs] serendipity serendipity_admin_users.inc.php,1.3,1.4

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

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

Modified Files:
	serendipity_admin_users.inc.php 
Log Message:
Fix type in delete code for user management


Index: serendipity_admin_users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_users.inc.php	18 Apr 2004 21:13:09 -0000	1.3
+++ serendipity_admin_users.inc.php	22 Apr 2004 18:23:21 -0000	1.4
@@ -33,7 +33,7 @@
     } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
         echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
     } else {
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authos WHERE authorid={$serendipity['POST']['user']}");
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid={$serendipity['POST']['user']}");
         printf('<strong>' . DELETED_USER . '</strong>', $serendipity['POST']['user'], $user[0]['username']);
     }
 }

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.56,1.57

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

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

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
missing commit for the "apply html nugget markup" bug


Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_sidebar_items.php	13 Apr 2004 12:08:33 -0000	1.56
+++ serendipity_sidebar_items.php	21 Apr 2004 14:03:40 -0000	1.57
@@ -502,7 +502,7 @@
     function generate_content(&$title)
     {
         $title = $this->get_config('title', $title);
-        if ($this->get_config('markup') == 'true' || $this->get_config('markup') == '') {
+        if ($this->get_config('markup', 'true') == 'true') {
             $entry = array('html_nugget' => $this->get_config('content'));
             serendipity_plugin_api::hook_event('frontend_display', $entry);
             echo $entry['html_nugget'];

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.6,1.7 serendipity_lang_cz.inc.php,1.6,1.7

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
Log Message:
more updates


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang_cs.inc.php	19 Apr 2004 13:24:17 -0000	1.6
+++ serendipity_lang_cs.inc.php	21 Apr 2004 08:58:14 -0000	1.7
@@ -367,8 +367,6 @@
 @define('USER_LEVEL', 'Úroveò');
 @define('DELETE_USER', 'Chcete vymazat uživatele #%d %s. Myslíte to vážnì? Tato akce znemožní prohlížet jím vytvoøené záznamy na hlavní stránce.');
 @define('DELETED_USER', 'Uživatel #%d %s je vymazán.');
-
-@define('LIMIT_TO_NUMBER', 'How many items should be displayed?'); /* TRANSLATE */
-
+@define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_lang_cz.inc.php	19 Apr 2004 13:24:17 -0000	1.6
+++ serendipity_lang_cz.inc.php	21 Apr 2004 08:58:19 -0000	1.7
@@ -365,6 +365,6 @@
 @define('USER_LEVEL', 'Úroveò');
 @define('DELETE_USER', 'Chcete vymazat u¾ivatele #%d %s. Myslíte to vá¾nì? Tato akce znemo¾ní prohlí¾et jím vytvoøené záznamy na hlavní stránce.');
 @define('DELETED_USER', 'U¾ivatel #%d %s je vymazán.');
-@define('LIMIT_TO_NUMBER', 'How many items should be displayed?'); /* TRANSLATE */
+@define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.5,1.6 serendipity_lang_cz.inc.php,1.5,1.6

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
Log Message:
updated czech translation by josef klimosz


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_cs.inc.php	18 Apr 2004 21:17:05 -0000	1.5
+++ serendipity_lang_cs.inc.php	19 Apr 2004 13:24:17 -0000	1.6
@@ -168,9 +168,9 @@
 @define('TRACKBACK_SPECIFIC', 'Odezva ze specifického URI na tento záznam');
 @define('DIRECT_LINK', 'Pøímý odkaz na tento záznam');
 @define('COMMENT_ADDED', 'Vᚠkomentáø byl úspìšnì pøidán.');
-@define('COMMENT_ADDED_CLICK', 'Kliknìte %szde pro návrat%s ke komentáøùm, %szde pro zavøení%s okna.');
-@define('COMMENT_NOT_ADDED', 'Vᚠkomentáø nebyl pøidán, protože komentáøe k tomuto záznamu nejsou umožnìny. %Vrate se%s zpìt ke komentáøùm nebo %szavøete toto okno%s.');
-@define('COMMENT_NOT_ADDED_CLICK', 'Kliknìte %szde pro návrat%s ke komentáøùm, %szde pro zavøení%s okna..');
+@define('COMMENT_ADDED_CLICK', 'Kliknìte %ssem%s pro návrat ke komentáøùm nebo %ssem%s pro zavøení okna.');
+@define('COMMENT_NOT_ADDED', 'Vᚠkomentáø nebyl pøidán, protože  k tomuto záznamu nejsou komentáøe umožnìny. %sVrate se%s zpìt ke komentáøùm nebo %szavøete%s toto okno.');
+@define('COMMENT_NOT_ADDED_CLICK', 'Kliknìte %ssem%s pro návrat ke komentáøùm nebo %ssem%s pro zavøení okna.');
 @define('COMMENTS_DISABLE', 'Neumožnit pøidávání komentáøù');
 @define('COMMENTS_ENABLE', 'Umožnit pøidávání komentáøù');
 @define('COMMENTS_CLOSED', 'Autor neumožnil pøidávat komentáøe');

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_lang_cz.inc.php	18 Apr 2004 21:17:06 -0000	1.5
+++ serendipity_lang_cz.inc.php	19 Apr 2004 13:24:17 -0000	1.6
@@ -167,9 +167,9 @@
 @define('TRACKBACK_SPECIFIC', 'Odezva ze specifického URI na tento záznam');
 @define('DIRECT_LINK', 'Pøímý odkaz na tento záznam');
 @define('COMMENT_ADDED', 'Vá¹ komentáø byl úspì¹nì pøidán.');
-@define('COMMENT_ADDED_CLICK', 'Kliknìte %szde pro návrat%s ke komentáøùm, %szde pro zavøení%s okna.');
-@define('COMMENT_NOT_ADDED', 'Vá¹ komentáø nebyl pøidán, proto¾e komentáøe k tomuto záznamu nejsou umo¾nìny. %Vra»te se%s zpìt ke komentáøùm nebo %szavøete toto okno%s.');
-@define('COMMENT_NOT_ADDED_CLICK', 'Kliknìte %szde pro návrat%s ke komentáøùm, %szde pro zavøení%s okna..');
+@define('COMMENT_ADDED_CLICK', 'Kliknìte %ssem%s pro návrat ke komentáøùm nebo %ssem%s pro zavøení okna.');
+@define('COMMENT_NOT_ADDED', 'Vá¹ komentáø nebyl pøidán, proto¾e  k tomuto záznamu nejsou komentáøe umo¾nìny. %sVra»te se%s zpìt ke komentáøùm nebo %szavøete%s toto okno.');
+@define('COMMENT_NOT_ADDED_CLICK', 'Kliknìte %ssem%s pro návrat ke komentáøùm nebo %ssem%s pro zavøení okna.');
 @define('COMMENTS_DISABLE', 'Neumo¾nit pøidávání komentáøù');
 @define('COMMENTS_ENABLE', 'Umo¾nit pøidávání komentáøù');
 @define('COMMENTS_CLOSED', 'Autor neumo¾nil pøidávat komentáøe');

[php-blog-cvs] serendipity/lang serendipity_config_local_cs.tpl,1.1,1.2 serendipity_config_local_cz.tpl,1.1,1.2 serendipity_config_user_cs.tpl,1.1,1.2 serendipity_config_user_cz.tpl,1.1,1.2

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

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

Modified Files:
	serendipity_config_local_cs.tpl 
	serendipity_config_local_cz.tpl serendipity_config_user_cs.tpl 
	serendipity_config_user_cz.tpl 
Log Message:
czech translation update by josef klimosz


Index: serendipity_config_user_cs.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_user_cs.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_user_cs.tpl	13 Apr 2004 06:51:16 -0000	1.1
+++ serendipity_config_user_cs.tpl	19 Apr 2004 13:20:30 -0000	1.2
@@ -1,11 +1,11 @@
 <?php # $Id$
 
-// Personal details
-# Your account details
-$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Your Username
-$serendipity['password']        = '{Your password|password|protected||0}';              // Your Password
-$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // Userlevel. Should be one of the following: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Chief editor, {USERLEVEL_EDITOR} - Standard editor.
-$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // Your E-Mail
-$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Do you want to receive emails when comments are posted to your entries?
-$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Do you want to receive emails when trackbacks are posted to your entries?
-?>
+// Osobní nastavení
+# Nastavení vašeho úètu
+$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Vaše uživatelské jméno (pøezdívka)
+$serendipity['password']        = '{Your password|password|protected||0}';              // Vaše heslo
+$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // Uživatelská úroveò. Vyberte jednu z: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Hlavní redaktor, {USERLEVEL_EDITOR} - Bìžný autor.
+$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // VᚠEmail
+$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Chcete dostávat zprávy o komentáøích Emailem?
+$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Chcete dostávat zprávy o odezvách na záznamy Emailem?
+?>
\ No newline at end of file

Index: serendipity_config_local_cz.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_local_cz.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_local_cz.tpl	13 Apr 2004 06:51:16 -0000	1.1
+++ serendipity_config_local_cz.tpl	19 Apr 2004 13:20:30 -0000	1.2
@@ -1,49 +1,49 @@
 <?php # $Id$
 
-// Database Settings
-#  Here you can enter all your database information. Serendipity needs this to be able to function
-$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Database type (mysql|postgres)
-$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Hostname
-$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // Username
-$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Password
-$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Name of your database
-$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix for the table names, i.e. serendipity_
+// Databáze
+#  Sem vlo¾te v¹ech informace o databázi. Serendipity je potøebuje k funkci.
+$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Typ databáze (mysql|postgres)
+$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Název hostujího serveru
+$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // U¾ivatelské jmého
+$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Heslo
+$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Název databáze
+$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix pro záznamy v databázi, napø. serendipity_
 
-// Paths
-# Various paths to different essential folders and files. Don't forget trailing slashes for directories!
-$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // The full and absolute path to your serendipity installation.
-$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
-$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Path to serendipity for your browser, typically '/serendipity/'
-$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // The path to the folder containing your templates - Relative to the 'relative path'
-$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Path to your uploads for browsers - Relative to the 'relative path'.
-$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Base URL to your serendipity installation
-$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Which file to use as index
+// Cesty
+# Rùzné cesty k rùzným adresáøùm a souborùm. Nezapomeòte na ukonèovací lomítko pro adresáøe!
+$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // Úplná absolutní cesta k va¹í instalaci Serendipity.
+$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // Sem budou smìrovány uploady, relativnì k 'Full path' - typicky 'uploads/'
+$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Cesta k Serendipity pro vá¹ prohlí¾eè, typicky '/serendipity/'
+$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // Cesta k adresáøi, obsahujícímu vzory (templates) - relativní k 'relative path'
+$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Cesta pro uploady pro prohlí¾eèe - relativní k 'relative path'
+$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Základní URL va¹í instalace Serendipity
+$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Název souboru pou¾itého jako index
 
-// General settings
-# Customize how Serendipity behaves
-$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Username for admin login
-$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Password for admin login
-$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email for admin login
-$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Do you want to receive emails when comments are posted to your entries?
-$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
-$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
-$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
-$serendipity['lang']                 = '{Language|lang|list|{LANGUAGE_LIST}|0}';      // Select the language for your blog
+// Základní nastavení
+# Upravte správu Serendipity
+$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Jméno pro pøihlá¹ení admina
+$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Heslo pro pøihlá¹ení admina
+$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email pro pøihlá¹ení admina
+$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Chcete dostávat Emailem zprávy o komentáøích k va¹im záznamùm?
+$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Umo¾nit u¾ivatelùm pøihlá¹ení k odbìru komentáøù k záznamùm
+$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // Název va¹eho weblogu
+$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Popis weblogu
+$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech(Win),cz=>Czech(ISO)|0}';      // Vyberte jazyk va¹eho weblogu
 
-// Appearance and options
-# Customize how Serendipity looks and feels
-$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
-$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)
-$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
-$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
-$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!
-$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
-$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.
+// Vzhled a volby
+# Upravte vzhled a chování Serendipity
+$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // Zde mù¾ete definovat URI stylesheetu, navíc k nastavení v administrátorské sekci (zadejte 'none', jestli¾e to nepotøebujete)
+$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Chcete pou¾ívat WYSIWYG editor? (Pracuje v IE5+, èásteènì v Mozille 1.3+)
+$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Chcete plnou kompatibilitu s XHTML 1.1? (mù¾e zpùsobit problémy ve star¹ích prohlí¾eèích)
+$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Chcete ve weblogu pou¾ívat vyskakovací okna pro komentáøe, odezvy a pod.?
+$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // Pokud chcete umístit weblog do va¹ich stránek, zvolte ano pro odstranìní v¹ech záhlaví, bude zobrazován jen obsah. Mù¾ete pou¾ít volitelný soubor indexFile pro obalení obsahu vlastními záhlavími a sloupci. Více informací najdete v souboru README!
+$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Chcete zamezit pøístup z urèitých adres? Seznam adres oddìlujte ';' a pozor, adresy jsou blokovány vèetnì subadres!
+$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Urèení pravidel pro tvorbu URL. Zapnutí módu rewrite zajistí správné URL va¹eho weblogu a zajistí lep¹í indexaci pro vyhledávaèe, jako je Google. Vá¹ webserver musí podporovat mod_rewrite nebo "AllowOverride All" v adresáøi pro Serendipity. Default nastavení je automaticky detekováno.
 
-// Imageconversion Settings
+// Úpravy obrázkù
 # Enter general information about how serendipity should handle Images
-$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Do you have image magick installed
-$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Full path & name of your image magick convert binary
-$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Thumbnails will be named original.Suffix.ext
-$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Static width of auto-generated thumbnails
-?>
+$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Máte instalován Imagemagick?
+$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Úplná cesta a název konverzního souboru Imagemagick
+$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Náhledy budou pojmenovány original.sufix.ext
+$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Pevná ¹íøka automaticky generovaných náhledù
+?>
\ No newline at end of file

Index: serendipity_config_user_cz.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_user_cz.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_user_cz.tpl	13 Apr 2004 06:51:16 -0000	1.1
+++ serendipity_config_user_cz.tpl	19 Apr 2004 13:20:30 -0000	1.2
@@ -1,11 +1,11 @@
 <?php # $Id$
 
-// Personal details
-# Your account details
-$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Your Username
-$serendipity['password']        = '{Your password|password|protected||0}';              // Your Password
-$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // Userlevel. Should be one of the following: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Chief editor, {USERLEVEL_EDITOR} - Standard editor.
-$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // Your E-Mail
-$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Do you want to receive emails when comments are posted to your entries?
-$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Do you want to receive emails when trackbacks are posted to your entries?
-?>
+// Osobní nastavení
+# Nastavení va¹eho úètu
+$serendipity['username']        = '{Your username|username|string|John Doe|0}';             // Va¹e u¾ivatelské jméno (pøezdívka)
+$serendipity['password']        = '{Your password|password|protected||0}';              // Va¹e heslo
+$serendipity['userlevel']       = '{Userlevel|userlevel|string||1}';           // U¾ivatelská úroveò. Vyberte jednu z: {USERLEVEL_ADMIN} - Admin, {USERLEVEL_CHIEF} - Hlavní redaktor, {USERLEVEL_EDITOR} - Bì¾ný autor.
+$serendipity['email']           = '{Your E-Mail|email|string|jo...@ex...|0}';           // Vá¹ Email
+$serendipity['mail_comments']   = '{Send comments?|mail_comments|bool|1|0}';           // Chcete dostávat zprávy o komentáøích Emailem?
+$serendipity['mail_trackbacks'] = '{Send trackbacks?|mail_trackbacks|bool|1|0}';         // Chcete dostávat zprávy o odezvách na záznamy Emailem?
+?>
\ No newline at end of file

Index: serendipity_config_local_cs.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_config_local_cs.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_config_local_cs.tpl	13 Apr 2004 06:51:16 -0000	1.1
+++ serendipity_config_local_cs.tpl	19 Apr 2004 13:20:29 -0000	1.2
@@ -1,49 +1,49 @@
 <?php # $Id$
 
-// Database Settings
-#  Here you can enter all your database information. Serendipity needs this to be able to function
-$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Database type (mysql|postgres)
-$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Hostname
-$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // Username
-$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Password
-$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Name of your database
-$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix for the table names, i.e. serendipity_
+// Databáze
+#  Sem vložte všech informace o databázi. Serendipity je potøebuje k funkci.
+$serendipity['dbType']               = '{Database type|dbType|string|mysql|255}';                 // Typ databáze (mysql|postgres)
+$serendipity['dbHost']               = '{Database host|dbHost|string|localhost |255}';             // Název hostujího serveru
+$serendipity['dbUser']               = '{Database user|dbUser|string|serendipity|255}';           // Uživatelské jmého
+$serendipity['dbPass']               = '{Database password|dbPass|protected||255}';       // Heslo
+$serendipity['dbName']               = '{Database name|dbName|string|serendipity|255}';           // Název databáze
+$serendipity['dbPrefix']             = '{Database prefix|dbPrefix|string|serendipity_|255}';      // Prefix pro záznamy v databázi, napø. serendipity_
 
-// Paths
-# Various paths to different essential folders and files. Don't forget trailing slashes for directories!
-$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // The full and absolute path to your serendipity installation.
-$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
-$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Path to serendipity for your browser, typically '/serendipity/'
-$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // The path to the folder containing your templates - Relative to the 'relative path'
-$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Path to your uploads for browsers - Relative to the 'relative path'.
-$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Base URL to your serendipity installation
-$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Which file to use as index
+// Cesty
+# Rùzné cesty k rùzným adresáøùm a souborùm. Nezapomeòte na ukonèovací lomítko pro adresáøe!
+$serendipity['serendipityPath']      = '{Full path|serendipityPath|string|/webroot/serendipity/|255}';          // Úplná absolutní cesta k vaší instalaci Serendipity.
+$serendipity['uploadPath']           = '{Upload path|uploadPath|string|uploads/|255}';                          // Sem budou smìrovány uploady, relativnì k 'Full path' - typicky 'uploads/'
+$serendipity['serendipityHTTPPath']  = '{Relative path|serendipityHTTPPath|string|/serendipity/|255}';          // Cesta k Serendipity pro vᚠprohlížeè, typicky '/serendipity/'
+$serendipity['templatePath']         = '{Relative template path|templatePath|string|templates/|255}';           // Cesta k adresáøi, obsahujícímu vzory (templates) - relativní k 'relative path'
+$serendipity['uploadHTTPPath']       = '{Relative upload path|uploadHTTPPath|string|uploads/|255}';             // Cesta pro uploady pro prohlížeèe - relativní k 'relative path'
+$serendipity['baseURL']              = '{URL to blog|baseURL|string|http://www.example.com/serendipity/|255}';  // Základní URL vaší instalace Serendipity
+$serendipity['indexFile']            = '{Index file|indexFile|string|index.php|255}';                           // Název souboru použitého jako index
 
-// General settings
-# Customize how Serendipity behaves
-$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Username for admin login
-$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Password for admin login
-$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email for admin login
-$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Do you want to receive emails when comments are posted to your entries?
-$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry
-$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // The title of your blog
-$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Description of your blog
-$serendipity['lang']                 = '{Language|lang|list|{LANGUAGE_LIST}|0}';      // Select the language for your blog
+// Základní nastavení
+# Upravte správu Serendipity
+$serendipity['user']                 = '{Admin username|user|string|John Doe|255}';             // Jméno pro pøihlášení admina
+$serendipity['pass']                 = '{Admin password|pass|protected|john|255}';              // Heslo pro pøihlášení admina
+$serendipity['email']                = '{Admin email|email|string|jo...@ex...|255}';       // Email pro pøihlášení admina
+$serendipity['want_mail']            = '{Send mails to admin?|want_mail|bool|1|255}';           // Chcete dostávat Emailem zprávy o komentáøích k vašim záznamùm?
+$serendipity['allowSubscriptions']   = '{Allow users to subscribe to entries?|allowSubscriptions|bool|1|255}'    // Umožnit uživatelùm pøihlášení k odbìru komentáøù k záznamùm
+$serendipity['blogTitle']            = '{Blog name|blogTitle|string|John Doe's personal blog|1|global}';             // Název vašeho weblogu
+$serendipity['blogDescription']      = '{Blog description|blogDescription|string|My little place on the web...|1|global}';   // Popis weblogu
+$serendipity['lang']                 = '{Language|lang|list|en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech(Win),cz=>Czech(ISO)|0}';      // Vyberte jazyk vašeho weblogu
 
-// Appearance and options
-# Customize how Serendipity looks and feels
-$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
-$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)
-$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
-$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
-$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!
-$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
-$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.
+// Vzhled a volby
+# Upravte vzhled a chování Serendipity
+$serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none|255}';          // Zde mùžete definovat URI stylesheetu, navíc k nastavení v administrátorské sekci (zadejte 'none', jestliže to nepotøebujete)
+$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0|0}';               // Chcete používat WYSIWYG editor? (Pracuje v IE5+, èásteènì v Mozille 1.3+)
+$serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0|255}';       // Chcete plnou kompatibilitu s XHTML 1.1? (mùže zpùsobit problémy ve starších prohlížeèích)
+$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1|255}';       // Chcete ve weblogu používat vyskakovací okna pro komentáøe, odezvy a pod.?
+$serendipity['embed']                = '{Is serendipity embedded?|embed|bool||255}';           // Pokud chcete umístit weblog do vašich stránek, zvolte ano pro odstranìní všech záhlaví, bude zobrazován jen obsah. Mùžete použít volitelný soubor indexFile pro obalení obsahu vlastními záhlavími a sloupci. Více informací najdete v souboru README!
+$serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;|255}';          // Chcete zamezit pøístup z urèitých adres? Seznam adres oddìlujte ';' a pozor, adresy jsou blokovány vèetnì subadres!
+$serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // Urèení pravidel pro tvorbu URL. Zapnutí módu rewrite zajistí správné URL vašeho weblogu a zajistí lepší indexaci pro vyhledávaèe, jako je Google. Vᚠwebserver musí podporovat mod_rewrite nebo "AllowOverride All" v adresáøi pro Serendipity. Default nastavení je automaticky detekováno.
 
-// Imageconversion Settings
+// Úpravy obrázkù
 # Enter general information about how serendipity should handle Images
-$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Do you have image magick installed
-$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Full path & name of your image magick convert binary
-$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Thumbnails will be named original.Suffix.ext
-$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Static width of auto-generated thumbnails
-?>
+$serendipity['magick']               = '{Use Imagemagick|magick|bool|0|255}';                                   // Máte instalován Imagemagick?
+$serendipity['convert']              = '{Path to convert binary|convert|string|/usr/local/bin/convert|255}';    // Úplná cesta a název konverzního souboru Imagemagick
+$serendipity['thumbSuffix']          = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb|255}';            // Náhledy budou pojmenovány original.sufix.ext
+$serendipity['thumbSize']            = '{Thumbnail dimensions|thumbSize|int|110|255}';                          // Pevná šíøka automaticky generovaných náhledù
+?>
\ No newline at end of file