php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.282,1.283

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Pimp up that category selector:
* If one item is selected (or the selector is contracted) show the normal dropdown, otherwise show the multibox
* Hide no-category in multibox
* Make sure prefix works with this new behaviour

Should work like a charm, please test :)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- serendipity_functions.inc.php	7 Jun 2004 17:47:31 -0000	1.282
+++ serendipity_functions.inc.php	7 Jun 2004 18:56:30 -0000	1.283
@@ -2428,7 +2428,7 @@
     }
 
     $n = "\n";
-    $cat_list = '<select id="categoryselector" name="serendipity[categories][]" multiple="multiple" style="vertical-align: middle;" size="3">' . $n;
+    $cat_list = '<select id="categoryselector" name="serendipity[categories][]" style="vertical-align: middle;" multiple="multple">' . $n;
     $cat_list .= '    <option value="0">[' . NO_CATEGORY . ']</option>' . $n;
     $selected = array();
     if (is_array($entry['categories'])) {
@@ -2492,24 +2492,59 @@
                     <script type="text/javascript" language="JavaScript">
                     var selector_toggle = new Array();
                     var selector_store  = new Array();
-
                     function showItem(id) {
+                        var selected = 0;
                         if (document.getElementById) {
                             el = document.getElementById(id);
                             if (selector_toggle[id] && selector_toggle[id] == 'off') {
                                 el.size = selector_store[id];
                                 selector_toggle[id] = 'on';
+
+                                /* Show a normal dropdown */
+                                el.multiple = false;
+
+                                /* Show the [No Category] item */
+                                el.options.item(0).style.display = '';
+
+                                /* Hack to make sure that when the single dropdown is shown, don't have multiple selections */
+                                for (i=0; i< el.options.length; i++) {
+                                    if ( el.options[i].selected == true ) selected++;
+
+                                    if ( selected > 1 ) {
+                                        /* If there is more than one selected, we reset all those to false
+                                           This is because otherwise the label will say 'No Category', but the categories will still be selected */
+                                        for (i=0; i< el.options.length; i++) el.options[i].selected = false;
+
+                                        el.selectedIndex = 0
+                                        break;
+                                    }
+                                }
+
+                                if ( el.selectedIndex == -1 ) el.selectedIndex = 0;
+
                                 document.getElementById('option_' + id).src = 'pixel/plus.png';
                             } else {
                                 selector_store[id] = el.size;
-                                el.size = <?php echo count($cats)+1; ?>;
+                                el.size = <?php echo count($cats)+1; ?>-1;
                                 selector_toggle[id] = 'off';
+
+                                /* Show multiple items */
+                                el.multiple = true;
+
+                                /* Hide the [No Category] item when we are in multi-mode */
+                                el.options.item(0).style.display = 'none';
+
                                 document.getElementById('option_' + id).src = 'pixel/minus.png';
                             }
                         }
                     }
                     </script>
-                    <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="option_categoryselector" alt="+/-" border="0" /></a> <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?></td>
+                    <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="option_categoryselector" alt="+/-" border="0" /></a> <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?>
+<?php
+                echo '<script>selector_toggle[\'categoryselector\'] = \''. (sizeof($serendipity['POST']['categories']) > 1 ? 'on' : 'off') .'\'; showItem(\'categoryselector\'); </script>';
+?>
+
+</td>
             </tr>
             <tr>
 <?php

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.24,1.25

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

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

Modified Files:
	serendipity_admin_entries.inc.php 
Log Message:
Fix foreach() error during preview when no category was selected


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_admin_entries.inc.php	7 Jun 2004 14:22:47 -0000	1.24
+++ serendipity_admin_entries.inc.php	7 Jun 2004 18:38:16 -0000	1.25
@@ -302,7 +302,7 @@
             if (!isset($entry['comments']) || !$entry['comments'])     $entry['comments']   = 0;
             if (!isset($entry['username']) || !$entry['username'])     $entry['username']   = $serendipity['serendipityUser'];
 
-            $categories = $entry['categories'];
+            $categories = (array)$entry['categories'];
             $entry['categories'] = array();
             foreach ( $categories as $catid ) {
                 $entry['categories'][] = serendipity_fetchCategoryInfo($catid);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.281,1.282

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed display of comment's id (will be like 1, 2, 3, 4.1, 4.2, 4.2.1, ...)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -d -r1.281 -r1.282
--- serendipity_functions.inc.php	7 Jun 2004 17:37:23 -0000	1.281
+++ serendipity_functions.inc.php	7 Jun 2004 17:47:31 -0000	1.282
@@ -1381,7 +1381,7 @@
     return $comments;
 }
 
-function serendipity_generateCommentList($id, $comments = NULL, $selected = 0, $parent = 0, $level = 0) {
+function serendipity_generateCommentList($id, $comments = NULL, $selected = 0, $parent = 0, $level = 0, $indent = '') {
     global $serendipity;
 
     if ( !is_array($comments) ) {
@@ -1389,10 +1389,12 @@
     }
 
     $retval = $parent ? '' : '<select id="serendipity[replyTo]" name="serendipity[replyTo]"><option value="0">[ ' . TOP_LEVEL . ' ]</option>';
+    $i = 0;
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
-            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $comment['id'] . ': ' . (empty($comment['author']) ? ANONYMOUS : $comment['author']) . ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp'])) . "</option>\n";
-            $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1);
+            $i++;
+            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['author']) ? ANONYMOUS : $comment['author']) . ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp'])) . "</option>\n";
+            $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $i . '.');
         }
     }
     $retval .= $parent ? '' : '</select>';
@@ -1400,7 +1402,7 @@
     return $retval;
 }
 
-function serendipity_printComments($comments, $allow_comments = true, $show_admin = true, $parentid = 0)
+function serendipity_printComments($comments, $allow_comments = true, $show_admin = true, $parentid = 0, $indent = '')
 {
     global $serendipity;
 ?>
@@ -1412,7 +1414,10 @@
 <?php
     }
 
+    $i = 0;
     foreach ($comments as $comment) {
+        $i++;
+
         if (!isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
 
             $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
@@ -1435,7 +1440,7 @@
             <?php echo $body; ?><br />
 
             <div class="serendipity_comment_source">
-                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $comment['id']; ?>">#<?php echo $comment['id'] ; ?></a>
+                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $indent . $i; ?>">#<?php echo $indent . $i; ?></a>
 <?php
         /* Link to the user's email */
             if (!empty($comment['email'])) {
@@ -1461,7 +1466,7 @@
 ?>
 
             </div>
-            <?php serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id']); ?>
+            <?php serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id'], $i . '.'); ?>
         </div>
         <br />
 <?php

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.280,1.281

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
We need to return an array(), otherwise foreach() craps out all over the place


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -d -r1.280 -r1.281
--- serendipity_functions.inc.php	7 Jun 2004 15:29:39 -0000	1.280
+++ serendipity_functions.inc.php	7 Jun 2004 17:37:23 -0000	1.281
@@ -756,7 +756,7 @@
                 // check whether there were any associated categories.
                 // if not, store a 'True' value for compatibility.
                 if ($i > -1 && !isset($return[$i]['categories'])) {
-                    $return[$i]['categories'] = 1;
+                    $return[$i]['categories'] = array();
                 }
 
                 $i++;
@@ -780,7 +780,7 @@
 
         if ($i > -1 && !isset($return[$i]['categories'])) {
             // see above
-            $return[$i]['categories'] = 1;
+            $return[$i]['categories'] = array();
         }
 
         return $return;

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.279,1.280

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
performance increase: do not call serendipity_fetchcategoryinfo once per
entry; once per query is often enougn ;)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- serendipity_functions.inc.php	7 Jun 2004 14:22:47 -0000	1.279
+++ serendipity_functions.inc.php	7 Jun 2004 15:29:39 -0000	1.280
@@ -714,7 +714,13 @@
                     e.last_modified,
 
                     a.username,
-                    a.email
+                    a.email,
+
+                    c.categoryid,
+                    c.category_name,
+                    c.category_description,
+                    c.category_icon,
+                    c.parentid
 
                     $body
               FROM
@@ -725,8 +731,6 @@
                         ON e.id = ec.entryid
                     LEFT JOIN {$serendipity['dbPrefix']}category c
                         ON ec.categoryid = c.categoryid $and
-                    GROUP BY
-                        e.id
                     ORDER BY
                         $orderby
                     $limit";
@@ -738,10 +742,50 @@
     }
 
     if (is_array($ret)) {
-        foreach ($ret as $i => $entry) {
-            $ret[$i]['categories'] = $ret[$i][] = serendipity_fetchEntryCategories($entry['id']);
+        // We want to save us a few DB query, so we don't group the above query by ids,
+        // and instead populate an array flattened to entry ids, but with all supplemental
+        // category information.
+
+        $return  = array(); // will hold the flattened array
+        $seen_id = array(); // holds information of already seen entries
+        $i       = -1;      // inremental counter for array-compatibility
+
+        foreach ($ret as $_id => $entry) {
+
+            if (!isset($seen_id[$entry['id']])) {
+                // check whether there were any associated categories.
+                // if not, store a 'True' value for compatibility.
+                if ($i > -1 && !isset($return[$i]['categories'])) {
+                    $return[$i]['categories'] = 1;
+                }
+
+                $i++;
+                $return[$i]            = $entry;
+                $seen_id[$entry['id']] = true;
+            }
+
+            if (isset($entry['categoryid'])) {
+                // Only append category array if association is present
+                $return[$i]['categories'][] = array(
+                    'categoryid'           => $entry['categoryid'],
+                    'category_name'        => $entry['category_name'],
+                    'category_description' => $entry['category_description'],
+                    'category_icon'        => $entry['category_icon'],
+                    'parentid'             => $entry['parentid']
+                );
+            }
+
+            unset($ret[$_id]); // save some memory, we don't need this array element any more :-)
         }
+
+        if ($i > -1 && !isset($return[$i]['categories'])) {
+            // see above
+            $return[$i]['categories'] = 1;
+        }
+
+        return $return;
     }
+
     return $ret;
 }
 

[php-blog-cvs] serendipity NEWS,1.141,1.142 comment.php,1.33,1.34 index.php,1.38,1.39 serendipity_admin_category.inc.php,1.13,1.14 serendipity_admin_entries.inc.php,1.23,1.24 serendipity_admin_plugins.inc.php,1.24,1.25 serendipity_admin_upgrader.inc.php,1.10,1.11 serendipity_config.inc.php,1.76,1.77 serendipity_functions.inc.php,1.278,1.279 serendipity_sidebar_items.php,1.57,1.58

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

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

Modified Files:
	NEWS comment.php index.php serendipity_admin_category.inc.php 
	serendipity_admin_entries.inc.php 
	serendipity_admin_plugins.inc.php 
	serendipity_admin_upgrader.inc.php serendipity_config.inc.php 
	serendipity_functions.inc.php serendipity_sidebar_items.php 
Log Message:
Great patch by Evan nemerson: Subcategories, post to multiple categories, threaded comments.

My basic tests left no problems or issues with it, but make sure you update your databases when testing!


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- index.php	7 Apr 2004 12:42:42 -0000	1.38
+++ index.php	7 Jun 2004 14:22:47 -0000	1.39
@@ -10,7 +10,7 @@
 include_once('serendipity_config.inc.php');
 serendipity_login();
 header('Content-Type: text/html; charset='. LANG_CHARSET);
- 
+
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
 
@@ -78,6 +78,7 @@
         $comment['name']      = $serendipity['POST']['name'];
         $comment['email']     = $serendipity['POST']['email'];
         $comment['subscribe'] = $serendipity['POST']['subscribe'];
+        $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
                 header('Location: ' . $_SERVER['REQUEST_URI'] . (strstr($_SERVER['REQUEST_URI'], '?') ? '&' : '?') . 'serendipity[csuccess]=true');

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_config.inc.php	26 May 2004 17:02:32 -0000	1.76
+++ serendipity_config.inc.php	7 Jun 2004 14:22:47 -0000	1.77
@@ -12,7 +12,7 @@
 }
 
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
-$serendipity['version']      = '0.6.4-CVS';
+$serendipity['version']      = '0.6.5-CVS';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_admin_plugins.inc.php	13 Apr 2004 10:00:36 -0000	1.24
+++ serendipity_admin_plugins.inc.php	7 Jun 2004 14:22:47 -0000	1.25
@@ -453,6 +453,9 @@
 <?php
                 serendipity_emit_htmlarea_code('nugget', 'nugget');
                 break;
+            case 'hidden':
+                ?><tr><td colspan="2"><input type="hidden" id="hidden" name="serendipity[plugin][<?php echo $config_item; ?>]" /></td></tr><?php
+                break;
         }
     }
 ?>

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_admin_entries.inc.php	13 May 2004 20:29:08 -0000	1.23
+++ serendipity_admin_entries.inc.php	7 Jun 2004 14:22:47 -0000	1.24
@@ -61,9 +61,7 @@
     $sort .= '</select> ' . CATEGORY . ' <select name="serendipity[filter_category]"><option value="">--</option>';
     $categories = serendipity_fetchCategories();
     if (is_array($categories)) {
-        foreach($categories AS $row) {
-            $sort .= '<option value="' . $row['categoryid'] . '" ' . (isset($serendipity['GET']['filter_category']) && $serendipity['GET']['filter_category'] == $row['categoryid'] ? 'selected="selected"' : '') . '>' . $row['category_name'] . '</option>' . "\n";
-        }
+        $sort .= serendipity_generateCategoryList($categories, (isset($serendipity['GET']['filter_category']) ? array($serendipity['GET']['filter_category']) : array(0)), 2);
     }
 
     $sort .= '</select> '
@@ -109,7 +107,7 @@
     }
 
     if (!empty($serendipity['GET']['filter_category'])) {
-        $filter[] = "e.categoryid = '" . serendipity_db_escape_string($serendipity['GET']['filter_category']) . "'";
+        $filter[] = "ec.categoryid = '" . serendipity_db_escape_string($serendipity['GET']['filter_category']) . "'";
     }
 
     if (!empty($serendipity['GET']['filter_body'])) {
@@ -197,7 +195,18 @@
                 <?php if ($entries[$entryIndex]['isdraft'] == 'true') echo DRAFT . ':'; ?>
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
                     <?php echo htmlspecialchars(substr(empty($entries[$entryIndex]['title']) ? (empty($entries[$entryIndex]['body']) ? '---' : $entries[$entryIndex]['body']) : $entries[$entryIndex]['title'], 0, 40)); ?></a><br />
-                <?php echo POSTED_BY . ' ' . $entries[$entryIndex]['username'] . ( !empty($entries[$entryIndex]['category_name']) ? ' ' . IN . ' ' . $entries[$entryIndex]['category_name'] :''); ?><br />
+                <?php
+                echo POSTED_BY . ' ' . $entries[$entryIndex]['username'];
+                if (count($entries[$entryIndex]['categories'])) {
+                    echo ' ' . IN . ' ';
+                    $cats = array();
+                    foreach ($entries[$entryIndex]['categories'] as $cat) {
+                        $cats[] = '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $cat['categoryid'] . '_' . serendipity_makeFilename($cat['category_name']) . '">' . $cat['category_name'] . '</a>';
+                    }
+                    echo implode(', ', $cats);
+                }
+                ?>
+                <br />
             </td>
 <?php
                 } else {
@@ -249,7 +258,7 @@
                    'timestamp'      => $serendipity['POST']['timestamp'],
                    'body'           => $serendipity['POST']['body'],
                    'extended'       => $serendipity['POST']['extended'],
-                   'categoryid'     => $serendipity['POST']['categoryid'],
+                   'categories'     => $serendipity['POST']['categories'],
                    'isdraft'        => $serendipity['POST']['isdraft'],
                    'allow_comments' => $serendipity['POST']['allow_comments']
         );
@@ -293,6 +302,12 @@
             if (!isset($entry['comments']) || !$entry['comments'])     $entry['comments']   = 0;
             if (!isset($entry['username']) || !$entry['username'])     $entry['username']   = $serendipity['serendipityUser'];
 
+            $categories = $entry['categories'];
+            $entry['categories'] = array();
+            foreach ( $categories as $catid ) {
+                $entry['categories'][] = serendipity_fetchCategoryInfo($catid);
+            }
+
             echo '<strong>' . PREVIEW . '</strong>';
             echo '<div style="border:1px solid #000000; padding: 15px;">';
             serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- serendipity_functions.inc.php	7 Jun 2004 12:12:21 -0000	1.278
+++ serendipity_functions.inc.php	7 Jun 2004 14:22:47 -0000	1.279
@@ -215,10 +215,15 @@
 <?php
 }
 
-function serendipity_displayCommentForm($id, $url = '?') {
+function serendipity_displayCommentForm($id, $url = '?', $comments = NULL) {
     global $serendipity;
+
+    if ( $comments == NULL ) {
+        $comments = serendipity_fetchComments($id);
+    }
 ?>
 <div class="serendipityCommentForm">
+    <a name="serendipity_CommentForm"></a>
     <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post" onsubmit="if (document.getElementById('serendipity_remember') && document.getElementById('serendipity_remember').checked) rememberMe(this, '<?php echo $_SERVER['HTTP_HOST']; ?>')">
     <div><input type="hidden" name="serendipity[entry_id]" value="<?php echo $id; ?>" /></div>
     <table border="0" width="100%" cellpadding="3">
@@ -238,6 +243,11 @@
         </tr>
 
         <tr>
+            <td class="serendipity_commentsLabel"><?php echo IN_REPLY_TO; ?></td>
+            <td class="serendipity_commentsValue"><?php echo serendipity_generateCommentList($id, $comments, ((isset($serendipity['POST']['serendipity']['replyTo']) && ($_POST['serendipity']['replyTo'])) ? $serendipity['POST']['serendipity']['replyTo'] : 0)); ?></td>
+        </tr>
+
+        <tr>
             <td class="serendipity_commentsLabel"><?php echo COMMENT; ?></td>
             <td class="serendipity_commentsValue">
                 <textarea rows="10" cols="40" name="serendipity[comment]"><?php echo (isset($serendipity['POST']['comment']) ? $serendipity['POST']['comment'] : ''); ?></textarea><br />
@@ -382,7 +392,6 @@
     }
 
     // Find out about diary entries
-    $querystring = "SELECT timestamp from {$serendipity['dbPrefix']}entries WHERE timestamp >= $ts and timestamp <= $endts AND isdraft = 'false'";
     $add_query   = '';
     $base_query  = '';
     if (isset($serendipity['GET']['category'])) {
@@ -390,12 +399,27 @@
         $categoryid  = serendipity_db_escape_string($_categoryid[0]);
 
         if (is_numeric($categoryid)) {
-            $querystring .= " AND categoryid = $categoryid";
             $base_query   = '?serendipity[category]=' . $categoryid;
             $add_query    = '&amp;' . $base_query;
+            $querystring = "SELECT timestamp
+                              FROM {$serendipity['dbPrefix']}entries e,
+                                   {$serendipity['dbPrefix']}category c,
+                                   {$serendipity['dbPrefix']}entrycat ec
+                             WHERE e.timestamp  >= $ts
+                               AND e.timestamp  <= $endts
+                               AND e.isdraft     = 'false'
+                               AND e.id          = ec.entryid
+                               AND c.categoryid  = ec.categoryid
+                               AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid)) . ")";
         }
     }
 
+    if (!isset($querystring)) {
+        $querystring = "SELECT timestamp
+                          FROM {$serendipity['dbPrefix']}entries e
+                         WHERE e.timestamp >= $ts and e.timestamp <= $endts AND e.isdraft = 'false'";
+    }
+
     $rows = serendipity_db_query($querystring);
     $activeDays = array();
     if (is_array($rows)) {
@@ -523,6 +547,51 @@
 <?php
 } // end function: serendipity_drawCalendar
 
+function serendipity_fetchCategoryRange($categoryid) {
+    global $serendipity;
+
+    $res = serendipity_db_query("SELECT category_left, category_right FROM {$serendipity['dbPrefix']}category WHERE categoryid='{$categoryid}'");
+    return array('category_left' => $res[0]['category_left'], 'category_right' => $res[0]['category_right']);
+}
+
+function serendipity_fetchCategoryInfo($categoryid) {
+  global $serendipity;
+
+    if (is_numeric($categoryid)) {
+        $query = "SELECT
+                         c.categoryid,
+                         c.category_name,
+                         c.category_description,
+                         c.category_icon,
+                         c.parentid
+                    FROM {$serendipity['dbPrefix']}category AS c
+                   WHERE categoryid = {$categoryid}";
+
+        $ret = serendipity_db_query($query);
+        return $ret[0];
+    }
+}
+
+function serendipity_fetchEntryCategories($entryid) {
+  global $serendipity;
+
+    if (is_numeric($entryid)) {
+        $query = "SELECT
+                         c.categoryid,
+                         c.category_name,
+                         c.category_description,
+                         c.category_icon,
+                         c.parentid
+                    FROM {$serendipity['dbPrefix']}category AS c
+               LEFT JOIN {$serendipity['dbPrefix']}entrycat AS ec
+                      ON ec.categoryid = c.categoryid
+                   WHERE ec.entryid = {$entryid}";
+
+        return serendipity_db_query($query);
+    }
+}
+
+
 /**
 * Give it a range in YYYYMMDD format to gather the desired entries
 * (For february 2002 you would pass 200202 e.g.
@@ -592,9 +661,9 @@
 
         if (is_numeric($categoryid)) {
             if (!empty($and)) {
-                $and .= " AND e.categoryid = $categoryid";
+                $and .= " AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
             } else {
-                $and = "WHERE e.categoryid = $categoryid";
+                $and = "WHERE c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
             }
         }
     }
@@ -639,25 +708,25 @@
                     e.exflag,
                     e.author,
                     e.authorid,
-                    e.categoryid,
                     e.trackbacks,
                     e.isdraft,
                     e.allow_comments,
                     e.last_modified,
 
                     a.username,
-                    a.email,
+                    a.email
 
-                    c.category_name,
-                    c.categoryid,
-                    c.category_icon
                     $body
               FROM
-                    ({$serendipity['dbPrefix']}entries AS e
-                        LEFT JOIN {$serendipity['dbPrefix']}category c
-                        ON e.categoryid = c.categoryid)
+                    {$serendipity['dbPrefix']}entries AS e
                     LEFT JOIN {$serendipity['dbPrefix']}authors a
-                        ON e.authorid = a.authorid $and
+                        ON e.authorid = a.authorid
+                    LEFT JOIN {$serendipity['dbPrefix']}entrycat ec
+                        ON e.id = ec.entryid
+                    LEFT JOIN {$serendipity['dbPrefix']}category c
+                        ON ec.categoryid = c.categoryid $and
+                    GROUP BY
+                        e.id
                     ORDER BY
                         $orderby
                     $limit";
@@ -668,6 +737,11 @@
         die("Query failed: $ret");
     }
 
+    if (is_array($ret)) {
+        foreach ($ret as $i => $entry) {
+            $ret[$i]['categories'] = $ret[$i][] = serendipity_fetchEntryCategories($entry['id']);
+        }
+    }
     return $ret;
 }
 
@@ -689,24 +763,21 @@
 
     $querystring = "SELECT
                             *,
-                            c.category_name,
-                            c.categoryid,
-                            c.category_icon,
                             a.username,
                             a.email
                     FROM
-                            {$serendipity['dbPrefix']}entries e
-                                LEFT JOIN {$serendipity['dbPrefix']}category c
-                                ON e.categoryid = c.categoryid,
+                            {$serendipity['dbPrefix']}entries e,
                             {$serendipity['dbPrefix']}authors a
                     WHERE
                             a.authorid = e.authorid
-                            AND $key LIKE $val
+                            AND e.$key LIKE $val
                             $admin
                             $drafts
                     LIMIT 1";
 
-    return serendipity_db_query($querystring, true);
+    $ret = serendipity_db_query($querystring, true);
+    $ret['categories'] = $ret[] = serendipity_fetchEntryCategories($ret['id']);
+    return $ret;
 }
 
 /**
@@ -729,11 +800,35 @@
         $where = '';
     }
 
-    $querystring = "SELECT c.*, a.username FROM {$serendipity['dbPrefix']}category AS c LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a ON c.authorid = a.authorid $where ORDER BY category_name";
+    $querystring = "SELECT
+                           c.*,
+                           a.username
+                      FROM {$serendipity['dbPrefix']}category AS c
+           LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a
+                        ON c.authorid = a.authorid $where
+                  ORDER BY category_name";
 
     return serendipity_db_query($querystring);
 }
 
+function serendipity_rebuildCategoryTree($parent = 0, $left = 0) {
+    // Based on http://www.sitepoint.com/article/hierarchical-data-database/1
+    global $serendipity;
+    $right = $left + 1;
+
+    $result = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category WHERE parentid='" . $parent . "'");
+    if ( is_array($result) ) {
+        foreach ( $result as $category ) {
+            $right = serendipity_rebuildCategoryTree($category['categoryid'], $right);
+        }
+    }
+    if ( $parent > 0 ) {
+        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}category SET category_left='{$left}', category_right='{$right}' WHERE categoryid='{$parent}'");
+    }
+
+    return $right + 1;
+}
+
 function serendipity_fetchUsers($user = '') {
     global $serendipity;
 
@@ -758,8 +853,7 @@
                             e.author,
                             a.username,
                             a.email,
-                            e.categoryid,
-                            c.category_name,
+                            ec.categoryid,
                             e.timestamp,
                             e.comments,
                             e.title,
@@ -768,14 +862,16 @@
                             e.trackbacks,
                             e.exflag
                     FROM
-                            {$serendipity['dbPrefix']}entries e
-                                LEFT JOIN {$serendipity['dbPrefix']}category c
-                                ON e.categoryid = c.categoryid,
-                            {$serendipity['dbPrefix']}authors a
+                            {$serendipity['dbPrefix']}entries e,
+                            {$serendipity['dbPrefix']}authors a,
+                            {$serendipity['dbPrefix']}entrycat ec
                     WHERE
                             a.authorid = e.authorid
+                            AND e.id = ec.entryid
                             AND MATCH (title,body,extended) AGAINST ('".addslashes($term)."')
                             AND isdraft = 'false'
+                    GROUP BY
+                            e.id
                     ORDER BY
                             timestamp DESC";
 
@@ -883,13 +979,17 @@
         }
     }
 
-    $querystring  = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'false'";
+    $querystring  = "SELECT count(id)
+                       FROM {$serendipity['dbPrefix']}entries e,
+                         {$serendipity['dbPrefix']}entrycat ec
+                       WHERE isdraft = 'false'
+                         AND e.id = ec.entryid";
     if (isset($serendipity['GET']['category'])) {
         $_categoryid = explode('_', $serendipity['GET']['category']);
         $categoryid  = serendipity_db_escape_string($_categoryid[0]);
 
         if (is_numeric($categoryid)) {
-            $querystring .= " AND categoryid = $categoryid";
+            $querystring .= " e.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
         }
     }
 
@@ -975,15 +1075,34 @@
         <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>';
-            } ?>
+                <?php
+                if (is_array($entry['categories'])) {
+                    $icon_string = '';
+                    foreach ($entry['categories'] as $cat) {
+                        if ($cat['category_icon'] != '') {
+                            $icon_string .= '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $cat['categoryid'] . '_' . serendipity_makeFilename($cat['category_name']) . '"><img class="serendipity_entryIcon" alt="' . htmlspecialchars($cat['category_name']) . '" src="' . htmlspecialchars($cat['category_icon']) . '"/></a>';
+                        }
+                    }
+                    if ($icon_string != '') {
+                        echo '<span class="serendipity_entryIcon">' . $icon_string . '</span>';
+                    }
+                }
+                ?>
             <span class="<?php echo $extended_css; ?>"><?php echo $entry['body']; ?></span>
             <?php echo $html_extended; ?>
 
             <div class='serendipity_entryFooter'>
 <?php
-                echo '                ' . POSTED_BY . ' ' . htmlspecialchars($entry['username']) . (!empty($entry['category_name']) ? ' ' . IN . ' <a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $entry['categoryid'] . '_' . serendipity_makeFilename($entry['category_name']) . '">' . $entry['category_name'] . '</a> ' : ' ') . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";
+                echo ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['username']);
+                if (is_array($entry['categories'])) {
+                    echo ' ' . IN . ' ';
+                    $cats = array();
+                    foreach ($entry['categories'] as $cat) {
+                        $cats[] = '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $cat['categoryid'] . '_' . serendipity_makeFilename($cat['category_name']) . '">' . $cat['category_name'] . '</a>';
+                    }
+                    echo implode(', ', $cats);
+                    echo ' ' . AT . ' <a href="' . $entryLink . '">' . date('H:i', $entry['timestamp']) . '</a>'. "\n";
+                }
 
                 if (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['comments'] > 0) {
                     if (!isset($serendipity['GET']['id'])) {
@@ -1051,11 +1170,13 @@
                               'author'    => $serendipity['POST']['name'],
                               'body'      => $serendipity['POST']['comment'],
                               'url'       => $serendipity['POST']['url'],
+                              'parent_id' => $serendipity['POST']['replyTo'],
                               'timestamp' => time()
                             )
                           ),
                           false,
-                          false
+                          false,
+                          $serendipity['POST']['replyTo']
                         );
                     }
 
@@ -1177,12 +1298,15 @@
                     e.id AS entryid,
                     e.authorid,
                     co.id AS commentid,
+                    co.parent_id AS parent_id,
                     c.category_name
               FROM
                     {$serendipity['dbPrefix']}comments co
                     LEFT JOIN {$serendipity['dbPrefix']}entries e ON (co.entry_id = e.id)
-                    LEFT JOIN {$serendipity['dbPrefix']}category c ON (e.categoryid = c.categoryid)
+                    LEFT JOIN {$serendipity['dbPrefix']}entrycat ec ON (e.id = ec.entryid)
+                    LEFT JOIN {$serendipity['dbPrefix']}category c ON (ec.categoryid = c.categoryid)
                     WHERE co.type LIKE 'NORMAL' AND entry_id > 0 $and
+                    GROUP BY co.id
                     ORDER BY
                         co.id " . ($order != '' ? $order : '') . "
                     $limit";
@@ -1213,68 +1337,95 @@
     return $comments;
 }
 
-function serendipity_printComments($comments, $allow_comments = true, $show_admin = true)
+function serendipity_generateCommentList($id, $comments = NULL, $selected = 0, $parent = 0, $level = 0) {
+    global $serendipity;
+
+    if ( !is_array($comments) ) {
+        $comments = serendipity_fetchComments($id);
+    }
+
+    $retval = $parent ? '' : '<select id="serendipity[replyTo]" name="serendipity[replyTo]"><option value="0">[ ' . TOP_LEVEL . ' ]</option>';
+    foreach ($comments as $comment) {
+        if ($comment['parent_id'] == $parent) {
+            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $comment['id'] . ': ' . (empty($comment['author']) ? ANONYMOUS : $comment['author']) . ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp'])) . "</option>\n";
+            $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1);
+        }
+    }
+    $retval .= $parent ? '' : '</select>';
+
+    return $retval;
+}
+
+function serendipity_printComments($comments, $allow_comments = true, $show_admin = true, $parentid = 0)
 {
     global $serendipity;
 ?>
 
 <?php
-    if (!count($comments)) {
+    if (!count($comments) && !$parentid) {
 ?>
             <div align="center"><?php echo NO_COMMENTS; ?></div>
 <?php
     }
 
-    $x = 0;
     foreach ($comments as $comment) {
-        $x++;
+        if (!isset($comment['parent_id']) || $comment['parent_id'] == $parentid) {
 
-        $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
-        if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') {
-            $comment['url'] = 'http://' . $comment['url'];
-        }
+            $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
+            if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') {
+                $comment['url'] = 'http://' . $comment['url'];
+            }
 
-        serendipity_plugin_api::hook_event('frontend_display', $comment);
+            serendipity_plugin_api::hook_event('frontend_display', $comment);
 
-        /* Protect submitted mails against spam, by replacing @ with [at]*/
-        if (!empty($comment['email'])) {
-            $comment['email'] = str_replace('@', '[at]', $comment['email']);
-        }
+            /* Protect submitted mails against spam, by replacing @ with [at]*/
+            if (!empty($comment['email'])) {
+                $comment['email'] = str_replace('@', '[at]', $comment['email']);
+            }
 
-        $name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
-        $body = $comment['comment'];
+            $name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
+            $body = $comment['comment'];
 ?>
     <div class="serendipity_comment">
             <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="c<?php echo $comment['id']; ?>"></a>
             <?php echo $body; ?><br />
 
             <div class="serendipity_comment_source">
-                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $x; ?>">#<?php echo $x ; ?></a>
+                <a href="#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT . $comment['id']; ?>">#<?php echo $comment['id'] ; ?></a>
 <?php
         /* Link to the user's email */
-        if (!empty($comment['email'])) {
-            echo  '<a href="mailto:' . htmlspecialchars($comment['email']) . '"  title="' . SEND_MAIL_TO . ' ' . htmlspecialchars($name) . ' (' . $comment['email'] . ')">' . htmlspecialchars($name) . '</a>';
-        } else {
-            echo htmlspecialchars($name);
-        }
+            if (!empty($comment['email'])) {
+                echo  '<a href="mailto:' . htmlspecialchars($comment['email']) . '"  title="' . SEND_MAIL_TO . ' ' . htmlspecialchars($name) . ' (' . $comment['email'] . ')">' . htmlspecialchars($name) . '</a>';
+            } else {
+                echo htmlspecialchars($name);
+            }
 
-        /* Link to the user's website, if the URL is valid */
-        if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
-            echo ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
-        }
+            /* Link to the user's website, if the URL is valid */
+            if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
+                echo ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
+            }
 
-        /* Show when the entry was made */
-        echo ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp']));
+            /* Show when the entry was made */
+            echo ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $comment['timestamp']));
 
-        if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
-            echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments">' . DELETE . '</a>)';
-        }
+            if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
+                echo ' (<a href="' . $serendipity['baseURL'] . 'comment.php?serendipity[delete]=' . $comment['id'] . '&amp;serendipity[entry]=' . $comment['entry_id'] . '&amp;serendipity[type]=comments">' . DELETE . '</a>)';
+            }
+
+            /* Allow people to easily reply to this comment */
+            echo ' <a href="#serendipity_CommentForm" onclick="document.getElementById(\'serendipity[replyTo]\').value=\'' . $comment['id'] . '\';">' . REPLY . '</a>';
 ?>
 
             </div>
+            <?php serendipity_printComments($comments, $allow_comments, $show_admin, $comment['id']); ?>
         </div>
         <br />
 <?php
+        }
+    }
+
+    if ($parentid != 0) {
+        return true;
     }
 
     if ($show_admin && $_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $comment['authorid'])) {
@@ -1349,6 +1500,7 @@
         $name          = serendipity_db_escape_string($commentInfo['name']);
         $url           = serendipity_db_escape_string($commentInfo['url']);
         $email         = serendipity_db_escape_string($commentInfo['email']);
+        $parentid      = (isset($commentInfo['parent_id']) && is_numeric($commentInfo['parent_id'])) ? $commentInfo['parent_id'] : 0;
 
         if (isset($commentInfo['subscribe'])) {
             $subscribe = 'true';
@@ -1357,8 +1509,8 @@
         }
 
         $t      = time();
-        $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, author, email, url, body, type, timestamp, title, subscribed)";
-        $query .= " VALUES ('$id', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe')";
+        $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, author, email, url, body, type, timestamp, title, subscribed)";
+        $query .= " VALUES ('$id', '$parentid', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe')";
 
         serendipity_db_query($query);
 
@@ -1573,6 +1725,10 @@
                 $entry['email'] = $results[0]['email'];
             }
 
+            if (!is_array($entry['categories'])) {
+                $entry['categories'] = array(0 => $entry['category_name']);
+            }
+
             if ($version == 'atom0.3') {
                 /*********** ATOM 0.3 FEED *************/
 ?>
@@ -1619,8 +1775,10 @@
 
                 if ($version == '2.0') {
                     /*********** RSS 2.0 FEED EXTRAS *************/
+                    foreach ($entry['categories'] AS $idx => $cat) {
+                        ?><category><?php echo utf8_encode(htmlspecialchars($cat['category_name'])); ?></category><?php
+                    }
 ?>
-    <category><?php echo serendipity_utf8_encode(htmlspecialchars($entry['category_name'])); ?></category>
     <comments><?php echo $guid; ?></comments>
     <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
 <?php
@@ -1658,6 +1816,11 @@
                     /*********** END RSS 0.91 FEED EXTRAS *************/
                 }
             } else if ($version == '1.0') {
+                $categories = array();
+                foreach ($entry['categories'] AS $idx => $cat) {
+                    $categories[] = $cat['category_name'];
+                }
+
 ?>
 <item rdf:about="<?php echo $guid; ?>">
     <title><?php echo serendipity_utf8_encode(htmlspecialchars($entry['title'])); ?></title>
@@ -1674,7 +1837,7 @@
     ?>
     <dc:publisher><?php echo serendipity_utf8_encode(htmlspecialchars($serendipity['blogTitle'])); ?></dc:publisher>
     <dc:creator><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator>
-    <dc:subject><?php echo serendipity_utf8_encode(htmlspecialchars($entry['category_name'])); ?></dc:subject>
+    <dc:subject><?php echo utf8_encode(htmlspecialchars(implode(', ', $categories))); ?></dc:subject>
     <dc:date><?php echo date('Y-m-d\TH:i:s\Z', $entry['timestamp']); ?></dc:date>
     <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo (isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']); ?></wfw:comment>
 <?php
@@ -2019,6 +2182,9 @@
 function serendipity_updertEntry($entry) {
     global $serendipity;
 
+    $categories = $entry['categories'];
+    unset($entry['categories']);
+
     $newEntry = 0;
     $exflag = 0;
 
@@ -2054,8 +2220,15 @@
 
         $res = serendipity_db_insert('entries', $entry);
 
-        if ($res)
+        if ($res) {
             $entry['id'] = serendipity_db_insert_id();
+            if (is_array($categories)) {
+                foreach ($categories as $cat) {
+                  if (is_numeric($cat))
+                      serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entrycat (entryid, categoryid) VALUES ({$entry['id']}, {$cat})");
+                }
+            }
+        }
         else {
             //Some error message here
             return ENTRIES_NOT_SUCCESSFULLY_INSERTED;
@@ -2072,6 +2245,11 @@
             unset($entry['isdraft']);
         }
 
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}entrycat WHERE entryid={$entry['id']}");
+        foreach ($categories as $cat) {
+            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}entrycat (entryid, categoryid) VALUES ({$entry['id']}, {$cat})");
+        }
+
         $res = serendipity_db_update('entries', array('id' => $entry['id']), $entry);
         $newEntry = 0;
     }
@@ -2133,6 +2311,47 @@
     return array($f, $suf);
 }
 
+function serendipity_generateCategoryList($cats, $select = array(0), $type = 0, $id = 0, $level = 0) {
+    global $serendipity;
+
+    if ( !is_array($cats) || !count($cats) )
+        return;
+
+    $ret = '';
+    foreach ($cats as $cat) {
+        if ($cat['parentid'] == $id) {
+            switch ($type) {
+                case 0:
+                    $ret .= str_repeat('&nbsp;', $level * 2).'&bull;&nbsp;<span id="catItem_' . $cat['categoryid'] . '"' . (($cat['categoryid'] && in_array($cat['categoryid'], $select)) ? ' selected="selected"' : '') . '><a href="?serendipity[adminModule]=category&amp;serendipity[cat][catid]=' . $cat['categoryid'] . '">' . (!empty($cat['category_icon']) ? '<img style="vertical-align: middle;" src="' . $cat['category_icon'] . '" alt="' . $cat['category_name'] . '"/> ' : '') . htmlspecialchars($cat['category_name']) . ' - ' . htmlspecialchars($cat['category_description']) . '</a></span><br/>' . "\n";
+                    break;
+                case 1:
+                case 2:
+                   $ret .= '<option value="' . $cat['categoryid'] . '"' . (($cat['categoryid'] && in_array($cat['categoryid'], $select)) ? ' selected="selected"' : '') . '>';
+                   $ret .= str_repeat('&nbsp;', $level * 2) . htmlspecialchars($cat['category_name']) . ($type == 1 ? (' - ' . htmlspecialchars($cat['category_description'])) : '');
+                   $ret .= '</option>';
+                   break;
+                case 3:
+                    $category_id = serendipity_makeFilename($cat['category_name']);
+                    $ret .= sprintf(
+                      '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a>&nbsp;%s' .
+                      '<a href="%s" title="%s">%s</a><br />',
+
+                      $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id,
+                      htmlspecialchars($cat['category_description']),
+                      ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
+                      serendipity_getTemplateFile('img/xml.gif'),
+                      str_repeat('&nbsp;', $level * 3),
+                      $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES . '/' . $cat['categoryid'] . '_' . $category_id,
+                      htmlspecialchars($cat['category_description']),
+                      htmlspecialchars($cat['category_name']));
+                      break;
+            }
+            $ret .= serendipity_generateCategoryList($cats, $select, $type, $cat['categoryid'], $level + 1);
+        }
+    }
+    return $ret;
+}
+
 /**
 * Prints a form to enter new diary entries
 **/
@@ -2140,7 +2359,6 @@
     global $serendipity;
 
     $serendipity['EditorBrowsers'] = '(IE|Mozilla)';
-    $cats = serendipity_fetchCategories();
 
     $draftD = '';
     $draftP = '';
@@ -2160,38 +2378,18 @@
         $allow_comments = '';
     }
 
-    if (isset($entry['categoryid']) && $entry['categoryid'] != 0) {
-        $edit_cat=0;
-        if (is_array($cats)) {
-        foreach ($cats as $cat_data) {
-                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 id="categoryselector" name="serendipity[categories][]" multiple="multiple" style="vertical-align: middle;" size="3">' . $n;
+    $cat_list .= '    <option value="0">[' . NO_CATEGORY . ']</option>' . $n;
+    $selected = array();
+    if (is_array($entry['categories'])) {
+        foreach ($entry['categories'] as $cat)
+            $selected[] = $cat['categoryid'];
     }
+    if (is_array($cats = serendipity_fetchCategories())) {
+        $cat_list .= serendipity_generateCategoryList($cats, ($selected == array() ? array(0) : $selected), 1);
+    }
+    $cat_list .= '</select>' . $n;
 
     $hidden = '';
     foreach($hiddens as $key => $value) {
@@ -2242,7 +2440,27 @@
 <?php
         }
 ?>
-                    <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?></td>
+                    <script type="text/javascript" language="JavaScript">
+                    var selector_toggle = new Array();
+                    var selector_store  = new Array();
+
+                    function showItem(id) {
+                        if (document.getElementById) {
+                            el = document.getElementById(id);
+                            if (selector_toggle[id] && selector_toggle[id] == 'off') {
+                                el.size = selector_store[id];
+                                selector_toggle[id] = 'on';
+                                document.getElementById('option_' + id).src = 'pixel/plus.png';
+                            } else {
+                                selector_store[id] = el.size;
+                                el.size = <?php echo count($cats)+1; ?>;
+                                selector_toggle[id] = 'off';
+                                document.getElementById('option_' + id).src = 'pixel/minus.png';
+                            }
+                        }
+                    }
+                    </script>
+                    <a style="border:0; text-decoration: none" href="#" onclick="showItem('categoryselector'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="option_categoryselector" alt="+/-" border="0" /></a> <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?></td>
             </tr>
             <tr>
 <?php
@@ -2635,8 +2853,12 @@
     if (!$postid || !$categories) {
         return;
     }
-    $query = "UPDATE $serendipity[dbPrefix]entries set categoryid = $categories[0] where id = $postid";
-    $err = serendipity_db_query($query);
+
+    $query = "DELETE FORM $serendipity[dbPrefix]entrycat WHERE entryid = $postid";
+    serendipity_db_query($query);
+
+    $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES ($categories[0], $postid)";
+    serendipity_db_query($query);
 }
 
 /*

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- NEWS	7 Jun 2004 10:39:24 -0000	1.141
+++ NEWS	7 Jun 2004 14:22:47 -0000	1.142
@@ -3,7 +3,13 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
-    * WYSIWYG-Editor: Links were prefixed with '/' wrongly (IE only). 
+    * Post to multiple categories and subcategories implemented.
+      (Evan Nemerson, garvinhicking)
+
+    * Threaded comments.
+      (Evan Nemerson)                       [DB Layout change - > 0.6.5]
+
+    * WYSIWYG-Editor: Links were prefixed with '/' wrongly (IE only).
       Now all entered links will be put to an absolute URL consistently.
       (garvinhicking)
 

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- serendipity_sidebar_items.php	21 Apr 2004 14:03:40 -0000	1.57
+++ serendipity_sidebar_items.php	7 Jun 2004 14:22:47 -0000	1.58
@@ -554,22 +554,7 @@
         $html       = '';
 
         if (is_array($categories) && count($categories)) {
-            foreach ($categories as $category) {
-                $category_id = serendipity_makeFilename($category['category_name']);
-
-                $html .= sprintf(
-                  '<a href="%s" title="%s"><img alt="xml" %s src="%s" /></a>&nbsp;' .
-                  '<a href="%s" title="%s">%s</a><br />',
-
-                  $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $category['categoryid'] . '_' . $category_id,
-                  htmlspecialchars($category['category_description']),
-                  ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
-                  serendipity_getTemplateFile('img/xml.gif'),
-                  $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_CATEGORIES.'/' . $category['categoryid'] . '_' . $category_id,
-                  htmlspecialchars($category['category_description']),
-                  htmlspecialchars($category['category_name'])
-                );
-            }
+            $html .= serendipity_generateCategoryList($categories, array(0), 3, 0);
         }
 
         $html .= sprintf(

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- comment.php	14 May 2004 08:19:54 -0000	1.33
+++ comment.php	7 Jun 2004 14:22:47 -0000	1.34
@@ -119,7 +119,7 @@
 ?>
     <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div>
 <?php
-                serendipity_displayCommentForm($id);
+                serendipity_displayCommentForm($id, '?', $comments);
             }
         }
     } else {
@@ -128,6 +128,7 @@
         $comment['name']      = $serendipity['POST']['name'];
         $comment['email']     = $serendipity['POST']['email'];
         $comment['subscribe'] = $serendipity['POST']['subscribe'];
+        $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
                 header('Location: ' . $serendipity['baseURL'] . 'comment.php?entry_id=' . $serendipity['POST']['entry_id'] . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']));

Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_admin_category.inc.php	19 May 2004 21:03:46 -0000	1.13
+++ serendipity_admin_category.inc.php	7 Jun 2004 14:22:47 -0000	1.14
@@ -14,14 +14,24 @@
     $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']);
+    $parentid = (isset($_POST['serendipity']['cat']['parent_cat']) && is_numeric($_POST['serendipity']['cat']['parent_cat'])) ? $_POST['serendipity']['cat']['parent_cat'] : 0;
 
     if ($cat_to_edit == 0) {
-            $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid, category_icon) values ('$name', '$desc', $authorid, '$icon')";
+            $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid, category_icon, parentid) values ('$name', '$desc', $authorid, '$icon', $parentid)";
     } else {
-            $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc', authorid=$authorid, category_icon='$icon' WHERE categoryid=$cat_to_edit $admin_category";
+            /* Check to make sure parent is not a child of self */
+            $r = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category c WHERE c.categoryid={$parentid} AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($cat_to_edit)));
+            if ( !is_array($r) ) {
+                $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc', authorid=$authorid, category_icon='$icon', parentid=$parentid WHERE categoryid=$cat_to_edit $admin_category";
+            }
+            else {
+                $r = serendipity_db_query("SELECT category_name FROM {$serendipity['dbPrefix']}category WHERE categoryid={$parentid}");
+                $msg = sprintf(ALREADY_SUBCATEGORY, $r[0]['category_name'], $name);
+            }
     }
 
-    $r = serendipity_db_query($query);
+    $r = empty($msg) ? serendipity_db_query($query) : $msg;
+    serendipity_rebuildCategoryTree();
     if (is_string($r)) {
             $msg = $r;
     } else {
@@ -126,6 +136,28 @@
         <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
+    if (isset($cats) && is_array($cats) && count($cats)) {
+?>
+    <tr>
+        <th><label for="parent_cat"><?php echo PARENT_CATEGORY; ?></label></th>
+        <td>
+            <select id="parent_cat" name="serendipity[cat][parent_cat]">
+                <option value="0"<?php if ( $cat_to_edit == 0 ) echo ' selected="selected"'; ?>>[ <?php echo NO_CATEGORY; ?> ]</option>
+<?php
+       foreach ( $cats as $cat ) {
+           if ( $cat['categoryid'] == $cat_to_edit ) {
+               $parentid = $cat['parentid'];
+           }
+       }
+       echo serendipity_generateCategoryList($cats, array($parentid), 2);
+?>
+            </select>
+        </td>
+    </tr>
+<?php
+}
+?>
 </table>
 
 <div>
@@ -136,14 +168,11 @@
 <hr>
 <b><?php echo CLICK_CAT_TO_EDIT; ?></b>
 
-<table>
-<?php echo $existing_cats_table; ?>
-    <tr>
-        <td>
-            &bull; <a href="?serendipity[adminModule]=category&amp;serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a>
-        </td>
-    </tr>
-</table>
+<div>
+    <?php echo serendipity_generateCategoryList($cats, array($cat_to_edit)); ?>
+    <p><a href="?serendipity[adminModule]=category&amp;serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a></li></p>
+</div>
+
 </form>
 <?php
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_upgrader.inc.php	3 Jun 2004 21:18:46 -0000	1.10
+++ serendipity_admin_upgrader.inc.php	7 Jun 2004 14:22:47 -0000	1.11
@@ -5,7 +5,8 @@
 $upgradeLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=upgrade';
 
 /* Functions which needs to be run if installed version is equal or lower */
-$tasks = array('0.5.1' => 'serendipity_syncThumbs');
+$tasks = array('0.5.1' => 'serendipity_syncThumbs',
+               '0.6.5' => 'serendipity_rebuildCategoryTree');
 
 
 /* Fetch SQL files which needs to be run */
@@ -47,6 +48,7 @@
     foreach ($tasks as $version => $function) {
         if (version_compare(serendipity_version($serendipity['versionInstalled']), $version, '<=') ) {
             if (is_callable($function)) {
+                echo 'Calling ' . $function . '...<br />';
                 call_user_func($function);
             } else {
                 $errors[] = 'Unable to call '. $function;
@@ -132,6 +134,13 @@
   }</pre><br />';
     }
 
+    if (version_compare(serendipity_version($serendipity['versionInstalled']), '0.6.5', '<')) {
+        echo '<br /><strong>0.6.5 - Nested subcategories, post to multiple categories</strong>';
+        echo '<br />[<strong style="color: red">INFO</strong>] This update will update the categories table of your database and update the relations from entries to categories. This is a possibly dangerous task to perform, so <strong style="color: red">make sure you have a backup of your database!</strong><br />';
+        echo '<br />The categories-update syntax feature has only been tested for MySQL. PostgreSQL support should be tested first!!!<br/>';
+        $taskCount++;
+    }
+
     /*
 
     Add more versions here using:

[php-blog-cvs] serendipity/sql db_update_0.6.4_0.6.5_mysql.sql,NONE,1.1 db_update_0.6.4_0.6.5_postgres.sql,NONE,1.1 db.sql,1.9,1.10

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

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

Modified Files:
	db.sql 
Added Files:
	db_update_0.6.4_0.6.5_mysql.sql 
	db_update_0.6.4_0.6.5_postgres.sql 
Log Message:
Great patch by Evan nemerson: Subcategories, post to multiple categories, threaded comments.

My basic tests left no problems or issues with it, but make sure you update your databases when testing!


--- NEW FILE: db_update_0.6.4_0.6.5_mysql.sql ---
ALTER TABLE {PREFIX}category
  ADD parentid INT(11) DEFAULT '0' NOT NULL,
  ADD category_left INT(11) DEFAULT '0' NOT NULL,
  ADD category_right INT(11) DEFAULT '0' NOT NULL;

create table {PREFIX}entrycat (
  entryid int(11) not null,
  categoryid int(11) not null
);

INSERT INTO {PREFIX}entrycat (entryid, categoryid) SELECT id, categoryid FROM {PREFIX}entries;

ALTER TABLE {PREFIX}entries DROP categoryid;

ALTER TABLE {PREFIX}comments ADD parent_id int(10) {UNSIGNED} default '0' not null;
Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- db.sql	26 May 2004 17:02:35 -0000	1.9
+++ db.sql	7 Jun 2004 14:22:48 -0000	1.10
@@ -20,6 +20,7 @@
 create table {PREFIX}comments (
   id {AUTOINCREMENT} {PRIMARY},
   entry_id int(10) {UNSIGNED} not null default '0',
+  parent_id int(10) {UNSIGNED} not null default '0',
   timestamp int(10) {UNSIGNED} default null,
   title varchar(150) default null,
   author varchar(80) default null,
@@ -150,7 +151,9 @@
   category_name varchar(255) default NULL,
   category_icon varchar(255) default NULL,
   category_description text,
-  authorid int(11) default NULL
+  authorid int(11) default NULL,
+  category_left int(11) default '0',
+  category_right int(11) default '0'
 );
 
 CREATE TABLE {PREFIX}images (
@@ -167,4 +170,9 @@
   path text
 );
 
+CREATE TABLE {PREFIX}entrycat (
+  entryid int(11) not null,
+  categoryid int(11) not null
+);
+
 CREATE {FULLTEXT} INDEX pathkey on {PREFIX}images (path);

--- NEW FILE: db_update_0.6.4_0.6.5_postgres.sql ---
ALTER TABLE {PREFIX}category
  ADD parentid INT(11) DEFAULT '0' NOT NULL,
  ADD category_left INT(11) DEFAULT '0' NOT NULL,
  ADD category_right INT(11) DEFAULT '0' NOT NULL;

create table {PREFIX}entrycat (
  entryid int(11) not null,
  categoryid int(11) not null
);

INSERT INTO {PREFIX}entrycat (entryid, categoryid) (SELECT id, categoryid FROM {PREFIX}entries);

ALTER TABLE {PREFIX}entries DROP categoryid;

ALTER TABLE {PREFIX}comments ADD parent_id int(10) {UNSIGNED} not null default '0';

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.16,1.17 serendipity_lang_cz.inc.php,1.16,1.17 serendipity_lang_da.inc.php,1.31,1.32 serendipity_lang_de.inc.php,1.41,1.42 serendipity_lang_en.inc.php,1.32,1.33 serendipity_lang_es.inc.php,1.33,1.34 serendipity_lang_fr.inc.php,1.12,1.13

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23021/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:
Great patch by Evan nemerson: Subcategories, post to multiple categories, threaded comments.

My basic tests left no problems or issues with it, but make sure you update your databases when testing!


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_cs.inc.php	1 Jun 2004 15:53:19 -0000	1.16
+++ serendipity_lang_cs.inc.php	7 Jun 2004 14:22:47 -0000	1.17
@@ -393,6 +393,11 @@
 @define('SKIPPING_FILE_EXTENSION', 'Vynechán soubor: Chybìjící pøípona %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Vynechán soubor: %s nelze naèíst.');
 @define('FOUND_FILE', 'Založit nový/zmìnit soubor: %s.');
+@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
+@define('PARENT_CATEGORY', 'Parent category');
+@define('REPLY', 'Reply');
+@define('IN_REPLY_TO', 'In reply to');
+@define('TOP_LEVEL', 'Top level');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', ',');

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_da.inc.php	25 May 2004 16:16:15 -0000	1.31
+++ serendipity_lang_da.inc.php	7 Jun 2004 14:22:48 -0000	1.32
@@ -391,10 +391,15 @@
 @define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.');
 @define('FOUND_FILE', 'Found new/modified file: %s.');
+@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
+@define('PARENT_CATEGORY', 'Parent category');
+@define('REPLY', 'Reply');
+@define('IN_REPLY_TO', 'In reply to');
+@define('TOP_LEVEL', 'Top level');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', '.');
 @define('NUMBER_FORMAT_THOUSANDS', ',');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_fr.inc.php	25 May 2004 16:16:15 -0000	1.12
+++ serendipity_lang_fr.inc.php	7 Jun 2004 14:22:48 -0000	1.13
@@ -385,6 +385,11 @@
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', '.');
 @define('NUMBER_FORMAT_THOUSANDS', ',');
+@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
+@define('PARENT_CATEGORY', 'Parent category');
+@define('REPLY', 'Reply');
+@define('IN_REPLY_TO', 'In reply to');
+@define('TOP_LEVEL', 'Top level');
 
 /* 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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_cz.inc.php	1 Jun 2004 15:53:19 -0000	1.16
+++ serendipity_lang_cz.inc.php	7 Jun 2004 14:22:48 -0000	1.17
@@ -393,6 +393,11 @@
 @define('SKIPPING_FILE_EXTENSION', 'Vynechán soubor: Chybìjící pøípona %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Vynechán soubor: %s nelze naèíst.');
 @define('FOUND_FILE', 'Zalo¾it nový/zmìnit soubor: %s.');
+@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
+@define('PARENT_CATEGORY', 'Parent category');
+@define('REPLY', 'Reply');
+@define('IN_REPLY_TO', 'In reply to');
+@define('TOP_LEVEL', 'Top level');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', ',');

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_lang_en.inc.php	25 May 2004 16:16:15 -0000	1.32
+++ serendipity_lang_en.inc.php	7 Jun 2004 14:22:48 -0000	1.33
@@ -381,6 +381,11 @@
 @define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.');
 @define('FOUND_FILE', 'Found new/modified file: %s.');
+@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
+@define('PARENT_CATEGORY', 'Parent category');
+@define('REPLY', 'Reply');
+@define('IN_REPLY_TO', 'In reply to');
+@define('TOP_LEVEL', 'Top level');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', '.');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_es.inc.php	25 May 2004 16:16:15 -0000	1.33
+++ serendipity_lang_es.inc.php	7 Jun 2004 14:22:48 -0000	1.34
@@ -375,6 +375,11 @@
 @define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.');
 @define('FOUND_FILE', 'Found new/modified file: %s.');
+@define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
+@define('PARENT_CATEGORY', 'Parent category');
+@define('REPLY', 'Reply');
+@define('IN_REPLY_TO', 'In reply to');
+@define('TOP_LEVEL', 'Top level');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', '.');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_lang_de.inc.php	27 May 2004 14:57:45 -0000	1.41
+++ serendipity_lang_de.inc.php	7 Jun 2004 14:22:48 -0000	1.42
@@ -359,8 +359,6 @@
 @define('LIMIT_TO_NUMBER', 'Wieviele Elemente sollen angezeigt werden?');
 @define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'Artikel pro Seite');
-
-/* TRANSLATE */
 @define('DIRECTORIES_AVAILABLE', 'In der Liste der verfügbaren Unterverzeichnisse kann durch einen Klick auf einen Verzeichnisnamen ein neuer Ordner unterhalb des gewählten erstellt werden.');
 @define('ALL_DIRECTORIES', 'alle Verzeichnisse');
 @define('MANAGE_DIRECTORIES', 'Verzeichnisse verwalten');
@@ -381,6 +379,11 @@
 @define('SKIPPING_FILE_EXTENSION', 'Überspringe Datei: Fehlende Dateiendung von %s.');
 @define('SKIPPING_FILE_UNREADABLE', 'Überspringe Datei: %s nicht lesbar.');
 @define('FOUND_FILE', 'Neue/Geänderte Datei %s gefunden.');
+@define('ALREADY_SUBCATEGORY', '%s ist bereits eine Unterkategorie von %s.');
+@define('PARENT_CATEGORY', 'Übergeordnete Kategorie');
+@define('REPLY', 'Antworten');
+@define('IN_REPLY_TO', 'Als Antwort zu');
+@define('TOP_LEVEL', 'Ursprung');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
 @define('NUMBER_FORMAT_DECPOINT', ',');

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.7,1.8

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

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

Modified Files:
	serendipity_event_statistics.php 
Log Message:
Great patch by Evan nemerson: Subcategories, post to multiple categories, threaded comments.

My basic tests left no problems or issues with it, but make sure you update your databases when testing!


Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_event_statistics.php	6 May 2004 11:03:41 -0000	1.7
+++ serendipity_event_statistics.php	7 Jun 2004 14:22:48 -0000	1.8
@@ -51,7 +51,7 @@
         @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS', 'Anzahl Einträge');
         @define('PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC', 'Wieviele Einträge sollen pro Wert dargestellt werden? (Standard: 20)');
         break;
-    
+
     case 'en':
     case 'es':
     default:
@@ -111,14 +111,14 @@
     function introspect(&$propbag)
     {
         global $serendipity;
-        
+
         $propbag->add('name',          PLUGIN_EVENT_STATISTICS_NAME);
         $propbag->add('description',   PLUGIN_EVENT_STATISTICS_DESC);
         $propbag->add('event_hooks',    array(
             'backend_sidebar_entries' => true,
             'backend_sidebar_entries_event_display_statistics' => true
         ));
-        
+
         $propbag->add('configuration', array('max_items'));
     }
 
@@ -131,7 +131,7 @@
                 $propbag->add('description', PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC);
                 break;
         }
-        
+
         return true;
     }
 
@@ -141,7 +141,7 @@
 
     function event_hook($event, &$bag, &$eventData) {
         global $serendipity;
-        
+
         $hooks = &$bag->get('event_hooks');
 
         if (isset($hooks[$event])) {
@@ -152,12 +152,12 @@
                         &bull; <a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=statistics"><?php echo PLUGIN_EVENT_STATISTICS_NAME; ?></a><br />
 <?php
                     // }
-                    
+
                     break;
-                
+
                 case 'backend_sidebar_entries_event_display_statistics':
                     $max_items = $this->get_config('max_items');
-                    
+
                     if (!$max_items || !is_numeric($max_items) || $max_items < 1) {
                         $max_items = 20;
                     }
@@ -168,16 +168,18 @@
                     $draft_count    = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'true'", true);
                     $publish_count  = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE isdraft = 'false'", true);
                     $category_count = serendipity_db_query("SELECT count(categoryid) FROM {$serendipity['dbPrefix']}category", true);
-                    $category_rows  = serendipity_db_query("SELECT c.category_name, count(e.id) as postings
-                                                    FROM {$serendipity['dbPrefix']}category c,
+                    $cat_sql        = "SELECT c.category_name, count(e.id) as postings
+                                                    FROM {$serendipity['dbPrefix']}entrycat ec,
+                                                         {$serendipity['dbPrefix']}category c,
                                                          {$serendipity['dbPrefix']}entries e
-                                                    WHERE e.categoryid = c.categoryid
-                                                    GROUP BY e.categoryid
-                                                    ORDER BY postings DESC");
+                                                    WHERE ec.categoryid = c.categoryid AND ec.entryid = e.id
+                                                    GROUP BY ec.categoryid
+                                                    ORDER BY postings DESC";
+                    $category_rows  = serendipity_db_query($cat_sql);
 
                     $image_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}images", true);
                     $image_rows = serendipity_db_query("SELECT extension, count(id) AS images FROM {$serendipity['dbPrefix']}images GROUP BY extension ORDER BY images DESC");
-                    
+
                     $subscriber_count = count(serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL' AND subscribed = 'true' GROUP BY email"));
                     $subscriber_rows = serendipity_db_query("SELECT e.id, e.title, count(c.id) as postings
                                                     FROM {$serendipity['dbPrefix']}comments c,
@@ -224,7 +226,7 @@
 
 ?>
     <h3><?php echo PLUGIN_EVENT_STATISTICS_OUT_STATISTICS; ?></h3>
-    
+
     <div style="margin: 5px; padding: 5px">
     <dl>
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_FIRST_ENTRY; ?></strong></dt>
@@ -236,7 +238,7 @@
         <br />
         <hr />
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TOTAL_ENTRIES; ?></strong></dt>
         <dd><?php echo $total_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ENTRIES; ?></dd>
         <br />
@@ -249,11 +251,11 @@
         <br />
         <hr />
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES; ?></strong></dt>
         <dd><?php echo $category_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CATEGORIES2; ?></dd>
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_CATEGORIES; ?></strong></dt>
         <dl>
 <?php
@@ -270,11 +272,11 @@
         <br />
         <hr />
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES; ?></strong></dt>
         <dd><?php echo $image_count[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_UPLOADED_IMAGES2; ?></dd>
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_DISTRIBUTION_IMAGES; ?></strong></dt>
         <dl>
 <?php
@@ -388,11 +390,11 @@
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt>
         <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd>
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt>
         <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd>
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY; ?></strong></dt>
         <dd><?php echo round($publish_count[0] / ((time() - $first_entry[0]) / (60*60*24)), 2);?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY2; ?></dd>
         <br />
@@ -410,7 +412,7 @@
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS; ?></strong></dt>
         <dd><?php echo $length[0]; ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS2; ?></dd>
         <br />
-        
+
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE; ?></strong></dt>
         <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd>
         <br />
@@ -434,7 +436,7 @@
 <?php
                     return true;
                     break;
-                
+
                 default:
                     return false;
                     break;

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.277,1.278

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
right printf()ing


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- serendipity_functions.inc.php	7 Jun 2004 09:49:55 -0000	1.277
+++ serendipity_functions.inc.php	7 Jun 2004 12:12:21 -0000	1.278
@@ -1455,7 +1455,7 @@
 
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {
     global $serendipity;
-    
+
     if (empty($fromName)) {
         $fromName = ANONYMOUS;
     }
@@ -2545,7 +2545,7 @@
     if (is_array($rows)) {
         foreach ($rows as $row) {
             printf(
-                '<a href="%s://%1$s" title="%1$s" >%1$s</a> (%2$s)<br />',
+                '<a href="%1$s://%2$s" title="%2$s" >%2$s</a> (%3$s)<br />',
                 $row['scheme'],
                 $row['host'],
                 $row['total']

[php-blog-cvs] serendipity/htmlarea htmlarea.js,1.5,1.6

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

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

Modified Files:
	htmlarea.js 
Log Message:
hopefully finally fixed the IE-Slash-prefixing for links within the WYSIWYG
editor.

Tested with those URLs:

<a href="uploads/angel.jpg">relative</a><br />
<a href="/serendipity/uploads/angel.jpg">absolute</a><br />
<a href="/index.php">outside absolute</a><br />
<a href="http://www.supergarv.de/">outside full absolute</a><br />
<a href="http://www.supergarv.de/serendipity/index.php">inside full
absolute</a><br /><a
href="http://www.supergarv.de/path/index.php">pathed</a><br /><a
href="http://www.google.de/">google</a><br />

which will all get rewritten to use 'http://www.supergarv.de/' now. Sadly
this introduces a full absolute URL scope, but it's the only way I've gotten
it to work, since IE does some nasty, unasked URL-replacing internally.



Index: htmlarea.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- htmlarea.js	13 Apr 2004 10:15:08 -0000	1.5
+++ htmlarea.js	7 Jun 2004 10:39:25 -0000	1.6
@@ -2058,13 +2058,14 @@
 	var baseurl = this.config.baseURL;
 	// strip to last directory in case baseurl points to a file
 	baseurl = baseurl.replace(/[^\/]+$/, '');
+	_baseurl = baseurl;
 	var basere = new RegExp(baseurl);
-	string = string.replace(basere, "/");
+	string = string.replace(basere, this.config.baseURL);
 
 	// strip host-part of URL which is added by MSIE to links relative to server root
 	baseurl = baseurl.replace(/^(https?:\/\/[^\/]+)(.*)$/, '$1');
 	basere = new RegExp(baseurl);
-	return string.replace(basere, "");
+	return string.replace(basere, baseurl);
 };
 
 String.prototype.trim = function() {

[php-blog-cvs] serendipity NEWS,1.140,1.141

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

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

Modified Files:
	NEWS 
Log Message:
hopefully finally fixed the IE-Slash-prefixing for links within the WYSIWYG
editor.

Tested with those URLs:

<a href="uploads/angel.jpg">relative</a><br />
<a href="/serendipity/uploads/angel.jpg">absolute</a><br />
<a href="/index.php">outside absolute</a><br />
<a href="http://www.supergarv.de/">outside full absolute</a><br />
<a href="http://www.supergarv.de/serendipity/index.php">inside full
absolute</a><br /><a
href="http://www.supergarv.de/path/index.php">pathed</a><br /><a
href="http://www.google.de/">google</a><br />

which will all get rewritten to use 'http://www.supergarv.de/' now. Sadly
this introduces a full absolute URL scope, but it's the only way I've gotten
it to work, since IE does some nasty, unasked URL-replacing internally.



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- NEWS	7 Jun 2004 09:49:54 -0000	1.140
+++ NEWS	7 Jun 2004 10:39:24 -0000	1.141
@@ -3,6 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * WYSIWYG-Editor: Links were prefixed with '/' wrongly (IE only). 
+      Now all entered links will be put to an absolute URL consistently.
+      (garvinhicking)
+
     * Minor https fixes, when https is used as links from commenting
       users or in referring/exit links. Fix for RPC-ping function submitting
       double http://http:// URLs. (garvinhicking)

[php-blog-cvs] serendipity NEWS,1.139,1.140 serendipity_functions.inc.php,1.276,1.277

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
https fix


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- serendipity_functions.inc.php	3 Jun 2004 21:18:45 -0000	1.276
+++ serendipity_functions.inc.php	7 Jun 2004 09:49:55 -0000	1.277
@@ -1230,7 +1230,7 @@
         $x++;
 
         $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
-        if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://') {
+        if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://' && substr($comment['url'], 0, 8) != 'https://') {
             $comment['url'] = 'http://' . $comment['url'];
         }
 
@@ -1259,7 +1259,7 @@
         }
 
         /* Link to the user's website, if the URL is valid */
-        if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^http://', $comment['url'])) {
+        if ((!isset($comment['type']) || $comment['type'] != 'trackback') && !empty($comment['url']) && $comment['url'] != 'http://' && eregi('^https?://', $comment['url'])) {
             echo ' (<a href="' . str_replace('"', '&quot;', $comment['url']) . '" ' . serendipity_xhtml_target('_blank') . ' title="' . htmlspecialchars($comment['url']) . '">Link</a>)';
         }
 
@@ -1760,7 +1760,7 @@
   <params>
     <param>
       <name>sourceURI</name>
-      <value><string>http://{$_SERVER['HTTP_HOST']}{$serendipity['baseURL']}</string></value>
+      <value><string>{$serendipity['baseURL']}</string></value>
     </param>
       <name>targetURI</name>
       <value><string>$loc</string></value>
@@ -1978,7 +1978,7 @@
 
     for ($i = 0, $j = count($locations); $i < $j; ++$i) {
         if($locations[$i][0] == '/') {
-            $locations[$i] = 'http://' . $_SERVER['HTTP_HOST'] . $locations[$i];
+            $locations[$i] = 'http' . (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $locations[$i];
         }
 
         $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE ";
@@ -2525,7 +2525,7 @@
          * but produces rolling 7 day totals, which is more
          * interesting
          */
-        $query = "SELECT host, SUM(count) AS total
+        $query = "SELECT scheme, host, SUM(count) AS total
                   FROM {$serendipity['dbPrefix']}$list
                   WHERE day > date_sub(current_date, interval 7 day)
                   GROUP BY host
@@ -2533,7 +2533,7 @@
                   LIMIT $limit";
     } else {
         /* Portable version of the same query */
-        $query = "SELECT host, SUM(count) AS total
+        $query = "SELECT scheme, host, SUM(count) AS total
                   FROM {$serendipity['dbPrefix']}$list
                   GROUP BY host
                   ORDER BY total DESC, host
@@ -2545,7 +2545,8 @@
     if (is_array($rows)) {
         foreach ($rows as $row) {
             printf(
-                '<a href="http://%1$s" title="%1$s" >%1$s</a> (%2$s)<br />',
+                '<a href="%s://%1$s" title="%1$s" >%1$s</a> (%2$s)<br />',
+                $row['scheme'],
                 $row['host'],
                 $row['total']
             );

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- NEWS	6 Jun 2004 19:55:53 -0000	1.139
+++ NEWS	7 Jun 2004 09:49:54 -0000	1.140
@@ -3,6 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Minor https fixes, when https is used as links from commenting
+      users or in referring/exit links. Fix for RPC-ping function submitting
+      double http://http:// URLs. (garvinhicking)
+
     * New sidebar plugin "eventlinks". Displays all links to the
       currently viewed article (only on full article view).
       (garvinhicking)

[php-blog-cvs] serendipity serendipity_db_mysql.inc.php,1.18,1.19 serendipity_db_postgres.inc.php,1.12,1.13

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

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

Modified Files:
	serendipity_db_mysql.inc.php serendipity_db_postgres.inc.php 
Log Message:
Add top exits statistics to entry links archive.
New db function _db_concat.


Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_db_mysql.inc.php	16 May 2004 15:20:18 -0000	1.18
+++ serendipity_db_mysql.inc.php	6 Jun 2004 20:30:00 -0000	1.19
@@ -123,5 +123,9 @@
     return true;
 }
 
+function serendipity_db_concat($string) {
+    return 'concat(' . $string . ')';
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_db_postgres.inc.php	16 May 2004 15:20:18 -0000	1.12
+++ serendipity_db_postgres.inc.php	6 Jun 2004 20:30:00 -0000	1.13
@@ -125,5 +125,9 @@
     return true;
 }
 
+function serendipity_db_concat($string) {
+    return 'concat_text(' . $string . ')';
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

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

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

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

Modified Files:
	serendipity_plugin_entrylinks.php 
Log Message:
Add top exits statistics to entry links archive.
New db function _db_concat.


Index: serendipity_plugin_entrylinks.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_entrylinks/serendipity_plugin_entrylinks.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_plugin_entrylinks.php	6 Jun 2004 19:55:54 -0000	1.1
+++ serendipity_plugin_entrylinks.php	6 Jun 2004 20:29:59 -0000	1.2
@@ -26,7 +26,7 @@
         $propbag->add('name',          PLUGIN_ENTRYLINKS_NAME);
         $propbag->add('description',   PLUGIN_ENTRYLINKS_BLAHBLAH);
 
-        $propbag->add('configuration', array('title', 'newwin', 'markup'));
+        $propbag->add('configuration', array('title', 'newwin', 'markup', 'show_exits'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -50,6 +50,12 @@
                 $propbag->add('description', DO_MARKUP_DESCRIPTION);
                 break;
 
+            case 'show_exits':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        TOP_EXITS);
+                $propbag->add('description', SHOWS_TOP_EXIT);
+                break;
+
             default:
                     return false;
         }
@@ -64,6 +70,8 @@
 
         if (!isset($serendipity['GET']['id']) || !is_numeric($serendipity['GET']['id'])) {
             return false;
+        } else {
+            $id = serendipity_db_escape_string($serendipity['GET']['id']);
         }
 
         $target = '';
@@ -73,11 +81,35 @@
             $target = ' target="_blank" ';
         }
 
-        $references = serendipity_db_query("SELECT link, name FROM {$serendipity['dbPrefix']}references WHERE entry_id = " . serendipity_db_escape_string($serendipity['GET']['id']) . " GROUP BY link");
+
+        $counter    = array();
+
+        if ($this->get_config('show_exits', 'true') == 'true') {
+            $exits      = serendipity_db_query("SELECT SUM(count) as fullcount, scheme, host, port, path, query, " . serendipity_db_concat("scheme, '://', host, ':', port, path, '?', query") . " AS fulllink FROM {$serendipity['dbPrefix']}exits WHERE entry_id = " . $id . " GROUP BY fulllink");
+            if (is_array($exits)) {
+                foreach($exits AS $key => $row) {
+                    $url = sprintf('%s://%s%s%s%s',
+                      $row['scheme'],
+                      $row['host'],
+                      (!empty($row['port']) ? ':' . $row['port'] : ''),
+                      $row['path'],
+                      (!empty($row['query']) ? '?' . $row['query'] : '')
+                    );
+
+                    $counter[$url] = $row['fullcount'];
+                }
+            }
+        }
+
+        $references = serendipity_db_query("SELECT link, name FROM {$serendipity['dbPrefix']}references WHERE entry_id = " . $id . " GROUP BY link");
         if (is_array($references)) {
             $links = '<ul style="margin: 5px; padding: 2px">';
             foreach($references AS $key => $row) {
-                $links .= '<li><a href="' . $row['link'] . '" ' . $target . '>' . $row['name'] . "</a></li>\n";
+                $count = '';
+                if (isset($counter[$row['link']])) {
+                    $count = ' (' . $counter[$row['link']] . ')';
+                }
+                $links .= '<li><a href="' . $row['link'] . '" ' . $target . '>' . $row['name'] . "</a>$count</li>\n";
             }
             $links .= '</ul>';
 

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

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

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

Added Files:
	serendipity_plugin_entrylinks.php 
Log Message:
new plugin 'entrylinks'.


--- NEW FILE: serendipity_plugin_entrylinks.php ---
<?php # $Id: serendipity_plugin_entrylinks.php,v 1.1 2004/06/06 19:55:54 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_ENTRYLINKS_NAME', 'Links des Artikels');
        @define('PLUGIN_ENTRYLINKS_BLAHBLAH', 'Zeigt alle referenzierten Links eines Artikels');
        @define('PLUGIN_ENTRYLINKS_NEWWIN', 'Links in neuem Fenster öffnen?');
        @define('PLUGIN_ENTRYLINKS_NEWWIN_BLAHBLAH', 'Sollen die Links in einem neuen Fenster geöffnet werden? (Standard: Nein)');
        break;

    case 'en':
    default:
        @define('PLUGIN_ENTRYLINKS_NAME', 'Entry\'s Links');
        @define('PLUGIN_ENTRYLINKS_BLAHBLAH', 'Shows all links referrenced in an article');
        @define('PLUGIN_ENTRYLINKS_NEWWIN', 'Open links in new window?');
        @define('PLUGIN_ENTRYLINKS_NEWWIN_BLAHBLAH', 'Should the links be opened in a new window? (Default: Current window)');
        break;
}

class serendipity_plugin_entrylinks extends serendipity_plugin
{
    function introspect(&$propbag)
    {
        global $serendipity;

        $propbag->add('name',          PLUGIN_ENTRYLINKS_NAME);
        $propbag->add('description',   PLUGIN_ENTRYLINKS_BLAHBLAH);

        $propbag->add('configuration', array('title', 'newwin', 'markup'));
    }

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

            case 'newwin':
                $propbag->add('type', 'boolean');
                $propbag->add('name', PLUGIN_ENTRYLINKS_NEWWIN);
                $propbag->add('description', PLUGIN_ENTRYLINKS_NEWWIN_BLAHBLAH);
                break;

            case 'markup':
                $propbag->add('type',        'boolean');
                $propbag->add('name',        DO_MARKUP);
                $propbag->add('description', DO_MARKUP_DESCRIPTION);
                break;

            default:
                    return false;
        }
        return true;
    }

    function generate_content(&$title)
    {
        global $serendipity;

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

        if (!isset($serendipity['GET']['id']) || !is_numeric($serendipity['GET']['id'])) {
            return false;
        }

        $target = '';
        $newwin = $this->get_config('newwin', 'false');

        if ($newwin == 'true') {
            $target = ' target="_blank" ';
        }

        $references = serendipity_db_query("SELECT link, name FROM {$serendipity['dbPrefix']}references WHERE entry_id = " . serendipity_db_escape_string($serendipity['GET']['id']) . " GROUP BY link");
        if (is_array($references)) {
            $links = '<ul style="margin: 5px; padding: 2px">';
            foreach($references AS $key => $row) {
                $links .= '<li><a href="' . $row['link'] . '" ' . $target . '>' . $row['name'] . "</a></li>\n";
            }
            $links .= '</ul>';

            if ($this->get_config('markup', 'true') == 'true') {
                $entry = array('html_nugget' => $links);
                serendipity_plugin_api::hook_event('frontend_display', $entry);
                echo $entry['html_nugget'];
            } else {
                echo $links;
            }
        }
    }
}

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

[php-blog-cvs] serendipity NEWS,1.138,1.139 serendipity_plugin_api.php,1.20,1.21

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

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

Modified Files:
	NEWS serendipity_plugin_api.php 
Log Message:
new plugin 'entrylinks'.


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_plugin_api.php	26 May 2004 12:06:59 -0000	1.20
+++ serendipity_plugin_api.php	6 Jun 2004 19:55:53 -0000	1.21
@@ -309,16 +309,19 @@
             $title  = get_class($plugin);
 
             ob_start();
-            $plugin->generate_content($title);
-            $content = ob_get_contents();
-            ob_end_clean();
+            if ($plugin->generate_content($title) !== false) {
+                $content = ob_get_contents();
+                ob_end_clean();
 
-            echo "    <div class=\"$plugin->wrap_class\">\n";
-            echo "        <h3 class=\"$plugin->title_class\">$title</h3>\n";
-            echo "        <div class=\"$plugin->content_class\">\n";
-            echo "            $content\n";
-            echo "        </div>\n";
-            echo "    </div>\n";
+                echo "    <div class=\"$plugin->wrap_class\">\n";
+                echo "        <h3 class=\"$plugin->title_class\">$title</h3>\n";
+                echo "        <div class=\"$plugin->content_class\">\n";
+                echo "            $content\n";
+                echo "        </div>\n";
+                echo "    </div>\n";
+            } else {
+                ob_end_clean();
+            }
         }
 
         echo "</$tagname>\n";

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- NEWS	1 Jun 2004 15:42:42 -0000	1.138
+++ NEWS	6 Jun 2004 19:55:53 -0000	1.139
@@ -3,6 +3,15 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * New sidebar plugin "eventlinks". Displays all links to the
+      currently viewed article (only on full article view).
+      (garvinhicking)
+
+    * Plugin API: The method 'generate_content' of a sidebar plugin
+      can now return false to instruct the plugin API to NOT display
+      the sidebar. Allows optional sidebar plugins to be only shown
+      on specific parameters (garvinhicking)
+
     * Updated upgrade.sh script for better checks (Jez Hancock)
 
     * Fixed javascript error when submitting comments with "remember me"

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

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

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

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

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.275,1.276 serendipity_admin_installer.inc.php,1.63,1.64 serendipity_admin_upgrader.inc.php,1.9,1.10

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

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

Modified Files:
	serendipity_functions.inc.php 
	serendipity_admin_installer.inc.php 
	serendipity_admin_upgrader.inc.php 
Log Message:
Remove notices which can be produced by session_destroy()


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_admin_installer.inc.php	24 May 2004 10:42:53 -0000	1.63
+++ serendipity_admin_installer.inc.php	3 Jun 2004 21:18:46 -0000	1.64
@@ -81,7 +81,7 @@
               $_POST['serendipityHTTPPath']
             );
 
-            session_destroy();
+            @session_destroy();
 
         }
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- serendipity_functions.inc.php	28 May 2004 09:31:18 -0000	1.275
+++ serendipity_functions.inc.php	3 Jun 2004 21:18:45 -0000	1.276
@@ -29,7 +29,7 @@
 
 function serendipity_logout() {
     $_SESSION['serendipityAuthedUser'] = false;
-    session_destroy();
+    @session_destroy();
     serendipity_deleteCookie('author_information');
 }
 
@@ -1455,7 +1455,7 @@
 
 function serendipity_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment, $type = 'NORMAL') {
     global $serendipity;
-
+    
     if (empty($fromName)) {
         $fromName = ANONYMOUS;
     }
@@ -2370,7 +2370,7 @@
             return true;
         } else {
             $_SESSION['serendipityAuthedUser'] = false;
-            session_destroy();
+            @session_destroy();
         }
     }
 

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_upgrader.inc.php	26 May 2004 17:02:32 -0000	1.9
+++ serendipity_admin_upgrader.inc.php	3 Jun 2004 21:18:46 -0000	1.10
@@ -71,7 +71,7 @@
     echo '<br />';
     printf(SERENDIPITY_UPGRADER_RETURN_HERE, '<a href="'. $serendipity['serendipityHTTPPath'] .'">', '</a>');
     $_SESSION['serendipityAuthedUser'] = false;
-    session_destroy();
+    @session_destroy();
 } else {
     echo SERENDIPITY_UPGRADER_WELCOME . '<br />';
     printf(SERENDIPITY_UPGRADER_PURPOSE . '<br />', $serendipity['versionInstalled']);

[php-blog-cvs] serendipity htaccess.errordocs.tpl,1.4,1.5 htaccess.normal.tpl,1.4,1.5 htaccess.rewrite.tpl,1.8,1.9

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

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

Modified Files:
	htaccess.errordocs.tpl htaccess.normal.tpl 
	htaccess.rewrite.tpl 
Log Message:
test: adjusting file permissions (644) within CVS.


Index: htaccess.errordocs.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.errordocs.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess.errordocs.tpl	23 May 2004 23:23:42 -0000	1.4
+++ htaccess.errordocs.tpl	3 Jun 2004 09:53:29 -0000	1.5
@@ -19,4 +19,5 @@
 <Files sqlite.db>
     deny from all
 </Files>
+
 # END s9y

Index: htaccess.normal.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.normal.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess.normal.tpl	23 May 2004 23:23:42 -0000	1.4
+++ htaccess.normal.tpl	3 Jun 2004 09:53:29 -0000	1.5
@@ -17,4 +17,5 @@
 <Files sqlite.db>
     deny from all
 </Files>
+
 # END s9y

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- htaccess.rewrite.tpl	23 May 2004 23:23:42 -0000	1.8
+++ htaccess.rewrite.tpl	3 Jun 2004 09:53:29 -0000	1.9
@@ -34,4 +34,5 @@
 <Files sqlite.db>
     deny from all
 </Files>
+
 # END s9y

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.15,1.16 serendipity_lang_cz.inc.php,1.15,1.16

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

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

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
Log Message:
updated czech translation. thanks to josef.


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_cs.inc.php	25 May 2004 16:16:15 -0000	1.15
+++ serendipity_lang_cs.inc.php	1 Jun 2004 15:53:19 -0000	1.16
@@ -4,8 +4,8 @@
 # serendipity - another blogger...                                       #
 ##########################################################################
 #                                                                        #
-# (c) 2004 Josef Klimosz <ok...@at...>                                 #
-# http://ok2wo.wz.cz                      #
+# (c) 2004 Josef Klimosz <ok...@at...>                                #
+# http://digiblog.vycom.cz                                               #
 #                                                                        #
 ##########################################################################
 // Czech language file
@@ -137,7 +137,6 @@
 @define('ADVERTISES_BLAHBLAH', 'Reklama na tvùrce systému vašeho weblogu');
 @define('HTML_NUGGET', 'Vložený HTML kód');
 @define('HOLDS_A_BLAHBLAH', 'Vložení HTML kódu do postranního sloupce');
-
 @define('TITLE_FOR_NUGGET', 'Název HTML kódu');
 @define('THE_NUGGET', 'Vložený HTML');
 @define('SYNDICATE_THIS_BLOG', 'Sdílení weblogu');
@@ -214,7 +213,6 @@
 @define('DIRECTORY_WRITE_ERROR', 'Nelze zapisovat do adresáøe %s. Provìøte oprávnìní.');
 @define('DIRECTORY_CREATE_ERROR', 'Adresáø %s neexistuje a nemohl být vytvoøen. Vytvoøte adresáø manuálnì.');
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; spustit <i>%s %s</i>');
-
 @define('CANT_EXECUTE_BINARY', 'Nelze spustit binární soubor %s.');
 @define('FILE_WRITE_ERROR', 'Nelze zapisovat do souboru %s.');
 @define('FILE_CREATE_YOURSELF', 'Vytvoøte soubor pøímo nebo provìøte oprávnìní');
@@ -374,31 +372,31 @@
 @define('ENTRIES_PER_PAGE', 'záznamù na stránku');
 
 /* TRANSLATE */
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
-@define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.');
-@define('ALL_DIRECTORIES', 'all directories');
-@define('MANAGE_DIRECTORIES', 'Manage directories');
-@define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.');
-@define('NEW_DIRECTORY', 'Create a new directory');
-@define('PARENT_DIRECTORY', 'Parent directory');
-@define('DELETE_DIRECTORY', 'Delete this directory');
-@define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('STORE_IN_DIRECTORY', 'Store inside this directory: ');
-@define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
-@define('FORCE_DELETE', 'Force deletion of files not inside the media database');
-@define('CHECKING_DIRECTORY', 'Checking files in directory %s');
-@define('DELETING_DIRECTORY', 'Deleting directory %s...');
-@define('DELETING_FILE', 'Deleting file %s...');
-@define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
-@define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.');
-@define('DIRECTORY_DELETE_SUCCESS', 'Directory %s successfully deleted.');
-@define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.');
-@define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.');
-@define('FOUND_FILE', 'Found new/modified file: %s.');
+@define('USER_SELF_INFO', 'pøihlášen jako %s, úroveò %s');
+@define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mùžete vytvoøit další podadresáø.');
+@define('ALL_DIRECTORIES', 'všechny adresáøe');
+@define('MANAGE_DIRECTORIES', 'Práce s adresáøi');
+@define('DIRECTORY_CREATED', 'Adresáø <strong>%s</strong> byl vytvoøen.');
+@define('NEW_DIRECTORY', 'Vytvoøit nový adresáø');
+@define('PARENT_DIRECTORY', 'Základní adresáø');
+@define('DELETE_DIRECTORY', 'Vymazat adresáø');
+@define('CONFIRM_DELETE_DIRECTORY', 'Jste si jist, že chcete odstranit všechen obsah adresáøe %s?');
+@define('STORE_IN_DIRECTORY', 'Uložit v tomto adresáøi: ');
+@define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
+@define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
+@define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
+@define('DELETING_DIRECTORY', 'Vymazání adresáøe %s...');
+@define('DELETING_FILE', 'Vymazání souboru %s...');
+@define('ERROR_DIRECTORY_NOT_EMPTY', 'Nelze odstranit neprázdný adresáø. Zkuste zvolit "vynucené mazání", pokud potøebujete vymazat tyto soubory, a odešlete požadavek znovu. Existující soubory jsou:');
+@define('DIRECTORY_DELETE_FAILED', 'Vymazání adresáøe %s se nepodaøilo. Zkontrolujte oprávnìní nebo ètìte zprávu výše.');
+@define('DIRECTORY_DELETE_SUCCESS', 'Adresáø %s byl úspìšnì vymazán.');
+@define('SKIPPING_FILE_EXTENSION', 'Vynechán soubor: Chybìjící pøípona %s.');
+@define('SKIPPING_FILE_UNREADABLE', 'Vynechán soubor: %s nelze naèíst.');
+@define('FOUND_FILE', 'Založit nový/zmìnit soubor: %s.');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', '.');
-@define('NUMBER_FORMAT_THOUSANDS', ',');
+@define('NUMBER_FORMAT_DECPOINT', ',');
+@define('NUMBER_FORMAT_THOUSANDS', ' ');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_cz.inc.php	25 May 2004 16:16:15 -0000	1.15
+++ serendipity_lang_cz.inc.php	1 Jun 2004 15:53:19 -0000	1.16
@@ -5,7 +5,7 @@
 ##########################################################################
 #                                                                        #
 # (c) 2004 Josef Klimosz <ok...@at...>                                #
-# http://ok2wo.wz.cz                                                     #
+# http://digiblog.vycom.cz                                               #
 #                                                                        #
 ##########################################################################
 // Czech language file
@@ -372,31 +372,31 @@
 @define('ENTRIES_PER_PAGE', 'záznamù na stránku');
 
 /* TRANSLATE */
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
-@define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.');
-@define('ALL_DIRECTORIES', 'all directories');
-@define('MANAGE_DIRECTORIES', 'Manage directories');
-@define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.');
-@define('NEW_DIRECTORY', 'Create a new directory');
-@define('PARENT_DIRECTORY', 'Parent directory');
-@define('DELETE_DIRECTORY', 'Delete this directory');
-@define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
-@define('STORE_IN_DIRECTORY', 'Store inside this directory: ');
-@define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
-@define('FORCE_DELETE', 'Force deletion of files not inside the media database');
-@define('CHECKING_DIRECTORY', 'Checking files in directory %s');
-@define('DELETING_DIRECTORY', 'Deleting directory %s...');
-@define('DELETING_FILE', 'Deleting file %s...');
-@define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
-@define('DIRECTORY_DELETE_FAILED', 'Deletion of directory %s failed. Check permissions or messages above.');
-@define('DIRECTORY_DELETE_SUCCESS', 'Directory %s successfully deleted.');
-@define('SKIPPING_FILE_EXTENSION', 'Skipping file: Missing extension on %s.');
-@define('SKIPPING_FILE_UNREADABLE', 'Skipping file: %s not readable.');
-@define('FOUND_FILE', 'Found new/modified file: %s.');
+@define('USER_SELF_INFO', 'pøihlá¹en jako %s, úroveò %s');
+@define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mù¾ete vytvoøit dal¹í podadresáø.');
+@define('ALL_DIRECTORIES', 'v¹echny adresáøe');
+@define('MANAGE_DIRECTORIES', 'Práce s adresáøi');
+@define('DIRECTORY_CREATED', 'Adresáø <strong>%s</strong> byl vytvoøen.');
+@define('NEW_DIRECTORY', 'Vytvoøit nový adresáø');
+@define('PARENT_DIRECTORY', 'Základní adresáø');
+@define('DELETE_DIRECTORY', 'Vymazat adresáø');
+@define('CONFIRM_DELETE_DIRECTORY', 'Jste si jist, ¾e chcete odstranit v¹echen obsah adresáøe %s?');
+@define('STORE_IN_DIRECTORY', 'Ulo¾it v tomto adresáøi: ');
+@define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
+@define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
+@define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
+@define('DELETING_DIRECTORY', 'Vymazání adresáøe %s...');
+@define('DELETING_FILE', 'Vymazání souboru %s...');
+@define('ERROR_DIRECTORY_NOT_EMPTY', 'Nelze odstranit neprázdný adresáø. Zkuste zvolit "vynucené mazání", pokud potøebujete vymazat tyto soubory, a ode¹lete po¾adavek znovu. Existující soubory jsou:');
+@define('DIRECTORY_DELETE_FAILED', 'Vymazání adresáøe %s se nepodaøilo. Zkontrolujte oprávnìní nebo ètìte zprávu vý¹e.');
+@define('DIRECTORY_DELETE_SUCCESS', 'Adresáø %s byl úspì¹nì vymazán.');
+@define('SKIPPING_FILE_EXTENSION', 'Vynechán soubor: Chybìjící pøípona %s.');
+@define('SKIPPING_FILE_UNREADABLE', 'Vynechán soubor: %s nelze naèíst.');
+@define('FOUND_FILE', 'Zalo¾it nový/zmìnit soubor: %s.');
 
 @define('NUMBER_FORMAT_DECIMALS', '2');
-@define('NUMBER_FORMAT_DECPOINT', '.');
-@define('NUMBER_FORMAT_THOUSANDS', ',');
+@define('NUMBER_FORMAT_DECPOINT', ',');
+@define('NUMBER_FORMAT_THOUSANDS', ' ');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity NEWS,1.137,1.138 upgrade.sh,1.1,1.2

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

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

Modified Files:
	NEWS upgrade.sh 
Log Message:
Removed some personal details.
Added checks to ensure backup directory is created correctly.
Modified echo statement so IP address is written to .htaccess file
correctly.
Added a comment to indicate where a user's cutsom backup commands should
go.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- NEWS	28 May 2004 09:31:18 -0000	1.137
+++ NEWS	1 Jun 2004 15:42:42 -0000	1.138
@@ -3,6 +3,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Updated upgrade.sh script for better checks (Jez Hancock)
+
     * Fixed javascript error when submitting comments with "remember me"
       checkbox. (garvinhicking)
 

Index: upgrade.sh
===================================================================
RCS file: /cvsroot/php-blog/serendipity/upgrade.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- upgrade.sh	7 Apr 2004 06:42:51 -0000	1.1
+++ upgrade.sh	1 Jun 2004 15:42:42 -0000	1.2
@@ -13,17 +13,14 @@
 # in a browser.  This IP address will be used in a .htaccess file to restrict
 # access during the upgrade process:
 ip=192.168.0.1
-ip=213.152.51.196
 
 # Change this to the directory containing the current serendipity web files:
 blog_dir=/usr/local/www/htdocs/serendipity
-blog_dir=/web/jez.hancock-family.com
 
 # Change this to the directory containing the new serendipity web files:
 # This should be the directory containing the cvs version of s9y or the s9y
 # tarball contents:
 import_dir=/home/username/serendipity
-import_dir=/home/munk/cvs/php-blog/serendipity
 
 # Change this to the directory you wish your weblog files and database to be
 # backed up to.  A subdirectory 's9y.YYYYMMDD' will be created under here into
@@ -37,7 +34,6 @@
 # Note if the backup directory already contains a backup from the current day,
 # the script will exit without doing anything.
 backup_dir=/home/username/backup
-backup_dir=/opt/backup
 
 # Change this to match your database user/name.  Note you will be prompted for
 # your password on the commandline.
@@ -73,7 +69,8 @@
 echo "Creating backup directory:"
 nl
 echo "$backup_dir"
-mkdir $backup_dir && ok
+mkdir $backup_dir && ok || \
+	echo "Could not create $backup_dir - exiting."
 
 # backup current weblog to a tarball in the backup dir:
 echo "Backing up weblog files from:"
@@ -128,8 +125,8 @@
 echo "Adding .htaccess directives to restrict browser access to blog to $ip"
 echo "during upgrade process"
 exec >> $blog_dir/.htaccess
-echo 'deny from all' 
-echo 'allow from $ip'
+echo "deny from all" 
+echo "allow from $ip"
 echo 'ErrorDocument 403 "Upgrading, please check back soon!!!'
 exec > /dev/tty
 ok
@@ -180,5 +177,10 @@
 echo "After confirming the upgrade was successful, you can safely remove"
 echo "this directory."
 
+# This is the place to do any custom backup stuff - for example I have various
+# directory structures that I copy from my blog base directory, a few custom
+# plugins I copy, etc etc.
+# ...
+
 # Uncomment/modify the following line if you run the server:
 #chown -R www:www $blog_dir && chmod 600 $blog_dir/serendipity_config_local.inc.php

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.7,1.8

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

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

Modified Files:
	serendipity_event_creativecommons.php 
Log Message:
Update CreativeCommons license version to 2.0.

Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_event_creativecommons.php	30 Apr 2004 09:45:47 -0000	1.7
+++ serendipity_event_creativecommons.php	29 May 2004 09:04:20 -0000	1.8
@@ -105,7 +105,7 @@
         if ($license_string == '') {
             $license_uri = 'http://web.resource.org/cc/PublicDomain';
         } else {
-            $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/1.0/';
+            $license_uri = 'http://creativecommons.org/licenses/'.$license_string.'/2.0/';
         }
 
         $cc_visibility = 'invisible';
@@ -126,7 +126,7 @@
                     }
                 } elseif ($cc_visibility == 'visible') {
                     $eventData['display_dat'] .= '<a href="'.$license_uri.'">';
-                    $eventData['display_dat'] .= '<img style="border: 0px" alt="Creative Commons License - Some Rights Reserved" src="' . $serendipity['serendipityHTTPPath'] . 'pixel/somerights.png" />';
+                    $eventData['display_dat'] .= '<img style="border: 0px" alt="Creative Commons License - Some Rights Reserved" src="' . $serendipity['serendipityHTTPPath'] . 'pixel/somerights20.gif" />';
                     $eventData['display_dat'] .= '</a>';
                     if (serendipity_db_bool($this->get_config('txt', true))) {
                         $eventData['display_dat'] .= '<br />' . str_replace('#license_uri#', $license_uri, PLUGIN_CREATIVECOMMONS_CAP);

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

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

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

Added Files:
	somerights20.gif 
Removed Files:
	somerights.png 
Log Message:
Update CreativeCommons license version to 2.0.

--- somerights.png DELETED ---

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

[php-blog-cvs] serendipity NEWS,1.136,1.137 serendipity_functions.inc.php,1.274,1.275

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

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

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
js error


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- serendipity_functions.inc.php	26 May 2004 17:02:32 -0000	1.274
+++ serendipity_functions.inc.php	28 May 2004 09:31:18 -0000	1.275
@@ -219,7 +219,7 @@
     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']; ?>')">
+    <form <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="serendipity_comment" action="<?php echo $url; ?>" method="post" onsubmit="if (document.getElementById('serendipity_remember') && document.getElementById('serendipity_remember').checked) rememberMe(this, '<?php echo $_SERVER['HTTP_HOST']; ?>')">
     <div><input type="hidden" name="serendipity[entry_id]" value="<?php echo $id; ?>" /></div>
     <table border="0" width="100%" cellpadding="3">
         <tr>

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- NEWS	27 May 2004 13:11:35 -0000	1.136
+++ NEWS	28 May 2004 09:31:18 -0000	1.137
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed javascript error when submitting comments with "remember me"
+      checkbox. (garvinhicking)
+
     * XML-RPC methods updated to includer blogger.getRecentPosts and
       blogger.getPost (Till Adam)