php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/templates/mt3-squash - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/mt3-squash added to the repository

[php-blog-cvs] serendipity serendipity_genpage.inc.php,1.32,1.33

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

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

Modified Files:
	serendipity_genpage.inc.php 
Log Message:
Use serendipity_getTemplateFile to locate layout.php

Please test this on shared/embedded installations...


Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_genpage.inc.php	27 Jul 2004 16:29:10 -0000	1.32
+++ serendipity_genpage.inc.php	27 Jul 2004 21:02:17 -0000	1.33
@@ -40,12 +40,7 @@
 include_once('serendipity_config.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_plugin_api.php');
 include_once(S9Y_INCLUDE_PATH . 'serendipity_sidebar_items.php');
-
-if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/layout.php')) {
-    include $serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') . '/layout.php';
-} else {
-    include $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/layout.php';
-}
+include_once(serendipity_getTemplateFile('layout.php', 'serendipityPath'));
 
 if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
 ?>

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.32,1.33

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

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

Modified Files:
	serendipity_admin_entries.inc.php 
Log Message:
Correctly show if an entry is a draft


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_admin_entries.inc.php	27 Jul 2004 17:16:43 -0000	1.32
+++ serendipity_admin_entries.inc.php	27 Jul 2004 17:26:00 -0000	1.33
@@ -186,7 +186,7 @@
                 <table width="100%">
                     <tr>
                         <td>
-                            <strong><?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 $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo serendipity_truncateString($entry['title'],50) ?></a></strong>
+                            <strong><?php if ($entry['isdraft'] == 'true') echo DRAFT . ': '; ?><a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo serendipity_truncateString($entry['title'],50) ?></a></strong>
                         </td>
                         <td align="right">
                             <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ' ' .$lm; ?>

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

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

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

Modified Files:
	style.css 
Log Message:
Redesign entry list


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-chalkboard/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	26 Jul 2004 03:23:08 -0000	1.5
+++ style.css	27 Jul 2004 17:16:44 -0000	1.6
@@ -330,7 +330,6 @@
 }
 
 td.serendipity_admin_list_item {
-    padding: 15px;
     border: dashed 1px #000000;
 }
 
@@ -411,4 +410,4 @@
 
 .serendipity_msg_notice {
     color: green;
-}
\ No newline at end of file
+}

[php-blog-cvs] serendipity/templates/default style.css,1.24,1.25

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

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

Modified Files:
	style.css 
Log Message:
Redesign entry list


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- style.css	19 Jul 2004 08:50:56 -0000	1.24
+++ style.css	27 Jul 2004 17:16:44 -0000	1.25
@@ -308,7 +308,6 @@
 }
 
 td.serendipity_admin_list_item {
-    padding: 15px;
     border: dashed 1px #000000;
 }
 
@@ -388,4 +387,4 @@
 
 .serendipity_msg_notice {
     color: green;
-}
\ No newline at end of file
+}

[php-blog-cvs] serendipity/templates/mt3-independence style.css,1.3,1.4

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

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

Modified Files:
	style.css 
Log Message:
Redesign entry list


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-independence/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	26 Jul 2004 12:02:14 -0000	1.3
+++ style.css	27 Jul 2004 17:16:45 -0000	1.4
@@ -316,7 +316,6 @@
 }
 
 td.serendipity_admin_list_item {
-    padding: 15px;
     border: dashed 1px #000000;
 }
 

[php-blog-cvs] serendipity NEWS,1.189,1.190 serendipity_admin_entries.inc.php,1.31,1.32 serendipity_functions.inc.php,1.370,1.371

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

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

Modified Files:
	NEWS serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php 
Log Message:
Redesign entry list


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- serendipity_functions.inc.php	26 Jul 2004 17:45:37 -0000	1.370
+++ serendipity_functions.inc.php	27 Jul 2004 17:16:43 -0000	1.371
@@ -11,6 +11,13 @@
 include_once(S9Y_INCLUDE_PATH . "serendipity_functions_images.inc.php");
 include_once(S9Y_INCLUDE_PATH . "serendipity_functions_installer.inc.php");
 
+function serendipity_truncateString($s, $len) {
+    if ( strlen($s) > ($len+3) ) {
+        $s = substr($s, 0, $len) . '...';
+    }
+    return $s;
+}
+
 function serendipity_formatTime($format, $time) {
     static $cache;
     if (!isset($cache)) {

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_admin_entries.inc.php	22 Jul 2004 21:51:43 -0000	1.31
+++ serendipity_admin_entries.inc.php	27 Jul 2004 17:16:43 -0000	1.32
@@ -167,55 +167,53 @@
             </td>
         </tr>
     </table>
-    <table class="serendipity_admin_list" cellpadding="5">
+    <table class="serendipity_admin_list" cellpadding="5" width="100%">
 <?php
         // Print the entries
         $rows = 0;
-        for ($x = 0; $x < $count; $x += $perRow) {
+        foreach ( $entries as $entry ) {
             $rows++;
+            // Find out if the entry has been modified later than 30 minutes after creation
+            if ($entry['timestamp'] <= ($entry['last_modified'] - 60*30)) {
+                $lm = '<a href="#" title="' . LAST_UPDATED . ': ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entry['last_modified']) . '" onclick="alert(this.title)">*</a>';
+            } else {
+                $lm = '';
+            }
+
 ?>
         <tr>
-<?php
-            for ($xx = 0; $xx < $perRow; $xx++) {
-                $entryIndex = $x + $xx;
-                if (isset($entries[$entryIndex])) {
-                    // Find out if the entry has been modified later than 30 minutes after creation
-                    if ($entries[$entryIndex]['timestamp'] <= ($entries[$entryIndex]['last_modified'] - 60*30)) {
-                        $lm = '<a href="#" title="' . LAST_UPDATED . ': ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['last_modified']) . '" onclick="alert(this.title)">*</a>';
-                    } else {
-                        $lm = '';
-                    }
-?>
             <td class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($rows % 2 ? 'even' : 'uneven'); ?>">
-                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$entryIndex]['id']; ?>">
-                    <img style="float: right" class="serendipityImageButton" title="<?php echo DELETE; ?>" alt="<?php echo DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" />
-                </a>
-                <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['timestamp']) . ' ' .$lm; ?>
-                <br />
-                <?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[$entryIndex]['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'];
-                if (count($entries[$entryIndex]['categories'])) {
+                <table width="100%">
+                    <tr>
+                        <td>
+                            <strong><?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 $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo serendipity_truncateString($entry['title'],50) ?></a></strong>
+                        </td>
+                        <td align="right">
+                            <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ' ' .$lm; ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <?php
+                echo POSTED_BY . ' ' . $entry['username'];
+                if (count($entry['categories'])) {
                     echo ' ' . IN . ' ';
                     $cats = array();
-                    foreach ($entries[$entryIndex]['categories'] as $cat) {
+                    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);
                 }
                 ?>
-                <br />
+
+                        </td>
+                        <td align="right">
+                            [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo EDIT ?></a>]
+                          - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo DELETE ?></a>] 
+                        </td>
+                    </tr>
+                </table>
             </td>
-<?php
-                } else {
-?>
-            <td class="serendipity_admin_list_item">&nbsp;</td>
-<?php
-                }
-            } // end perRow output
-?>
         </tr>
 <?php
         } // end entries output

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- NEWS	27 Jul 2004 16:29:10 -0000	1.189
+++ NEWS	27 Jul 2004 17:16:43 -0000	1.190
@@ -3,6 +3,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Redesign entry list (tomsommer)
+
     * Display subtitle (usually blogname) in <title> tags (tomsommer)
 
     * Don't embed comments, trackbacks and comment-form in entry CSS

[php-blog-cvs] serendipity/templates/blue style.css,1.11,1.12

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

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

Modified Files:
	style.css 
Log Message:
Redesign entry list


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/blue/style.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- style.css	26 Jul 2004 03:23:07 -0000	1.11
+++ style.css	27 Jul 2004 17:16:43 -0000	1.12
@@ -234,7 +234,6 @@
 }
 
 td.serendipity_admin_list_item {
-  padding: 15px;
   border: dotted 1px #d0d0d0;
 }
 
@@ -315,4 +314,4 @@
 
 .serendipity_msg_notice {
     color: green;
-}
\ No newline at end of file
+}

[php-blog-cvs] serendipity NEWS,1.188,1.189 serendipity_genpage.inc.php,1.31,1.32

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

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

Modified Files:
	NEWS serendipity_genpage.inc.php 
Log Message:
* Add subtitle to <title> tag
* Spellcheck some of the NEWS file


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- NEWS	26 Jul 2004 10:29:40 -0000	1.188
+++ NEWS	27 Jul 2004 16:29:10 -0000	1.189
@@ -3,6 +3,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Display subtitle (usually blogname) in <title> tags (tomsommer)
+
     * Don't embed comments, trackbacks and comment-form in entry CSS
       class (tomsommer)
 
@@ -12,7 +14,7 @@
     * Removed full plaintext URI from trackback section and replaced it
       with a link to that URI (tomsommer, garvinhicking)
 
-    * Several german spelling mistakes corrected (thanks to Timbalu)
+    * Several German spelling mistakes corrected (thanks to Timbalu)
 
     * Show trackbacks on the full-entry page if popups are disabled
       (tomsommer)
@@ -62,7 +64,7 @@
     * Fixed link insertion in non-WYSIWYG-mode for Internet Explorer
       (garvinhicking)
 
-    * Fixed retrieving multiple stored categories for InternetExplorer
+    * Fixed retrieving multiple stored categories for Internet Explorer
       when editing existing entry (garvinhicking)
 
     * Added Bitflux Livesearch Javascript as plugin
@@ -88,7 +90,7 @@
     * Fixed bug causing the .htaccess file to never get updated when
       changing rewrite method (tomsommer)
 
-    * Track Exits plugin: Now only uses the link id for link referal.
+    * Track Exits plugin: Now only uses the link id for link referral.
       Reduces URI length and makes random exit.php calling useless for
       spammers, as no URL is tracked, which the author didn't refer to
       (garvinhicking, isotopp)
@@ -114,7 +116,7 @@
     * Fixed bug #983242: Missing entity encoding for blogtitle/subtitle
       for RSS feeds, thanks to Christian Wenz!
 
-    * Added dutch and portugues language. Thanks to Paul de Bruyne and
+    * Added dutch and Portuguese language. Thanks to Paul de Bruyne and
       Ranulfo Netto!
 
     * Multi User: Fixed bug #977695 where simple editors couldn't re-edit
@@ -185,7 +187,7 @@
       Statistics plugin for showing additional data of karmavotes
       (garvinhicking)
 
-    * Fixed receiving trackbacks of an intermediate s9y cvs release,
+    * Fixed receiving trackbacks of an intermediate s9y CVS release,
       which submitted wrong variables. Allow logging of incoming
       trackbacks to a file (for developers) (garvinhicking)
 

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_genpage.inc.php	14 Jul 2004 13:04:09 -0000	1.31
+++ serendipity_genpage.inc.php	27 Jul 2004 16:29:10 -0000	1.32
@@ -15,7 +15,7 @@
 ?>
 <html>
 <head>
-    <title><?php echo htmlspecialchars($serendipity['blogTitle']); ?></title>
+    <title><?php echo htmlspecialchars($serendipity['blogTitle']) . (isset($serendipity['blogSubTitle']) ? ' - '. htmlspecialchars($serendipity['blogSubTitle']) : '') ?></title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
     <meta name="Powered-By" content="Serendipity v.<?php echo $serendipity['version'] ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />

[php-blog-cvs] serendipity/plugins/serendipity_plugin_comments serendipity_plugin_comments.php,1.20,1.21

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

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

Modified Files:
	serendipity_plugin_comments.php 
Log Message:
fixed bad var


Index: serendipity_plugin_comments.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_comments/serendipity_plugin_comments.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_plugin_comments.php	5 Jul 2004 09:59:56 -0000	1.20
+++ serendipity_plugin_comments.php	27 Jul 2004 13:21:44 -0000	1.21
@@ -131,7 +131,7 @@
                 $aComment = explode('@@@', $comments);
                 $comment  = $aComment[0];
                 if (count($aComment) > 1) {
-                    $commentar .= ' [...]';
+                    $comment .= ' [...]';
                 }
 
                 if ($row['comment_type'] == 'TRACKBACK' && $row['comment_url'] != '') {

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

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

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

Modified Files:
	serendipity_functions_installer.inc.php 
Log Message:
Removed debugging code

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_functions_installer.inc.php	27 Jul 2004 12:37:17 -0000	1.24
+++ serendipity_functions_installer.inc.php	27 Jul 2004 12:43:33 -0000	1.25
@@ -593,8 +593,6 @@
         }
     }
 
-    var_dump(php_sapi_name());
-
     if(php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi')
       $htaccess_cgi = '.cgi';
     else

[php-blog-cvs] serendipity htaccess.cgi.errordocs.tpl,NONE,1.1 htaccess.cgi.normal.tpl,NONE,1.1 htaccess.cgi.rewrite.tpl,NONE,1.1 serendipity_functions_installer.inc.php,1.23,1.24

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

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

Modified Files:
	serendipity_functions_installer.inc.php 
Added Files:
	htaccess.cgi.errordocs.tpl htaccess.cgi.normal.tpl 
	htaccess.cgi.rewrite.tpl 
Log Message:
Fixing a bug with s9y in CGI/Fast-CGI enviroments

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_functions_installer.inc.php	26 Jul 2004 14:11:22 -0000	1.23
+++ serendipity_functions_installer.inc.php	27 Jul 2004 12:37:17 -0000	1.24
@@ -593,12 +593,19 @@
         }
     }
 
+    var_dump(php_sapi_name());
+
+    if(php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi')
+      $htaccess_cgi = '.cgi';
+    else
+      $htaccess_cgi = '';
+
     if ($rewrite == 'rewrite') {
-        $template = 'htaccess.rewrite.tpl';
+        $template = 'htaccess' . $htaccess_cgi . '.rewrite.tpl';
     } elseif ($rewrite == 'errordocs') {
-        $template = 'htaccess.errordocs.tpl';
+        $template = 'htaccess' . $htaccess_cgi . '.errordocs.tpl';
     } else {
-        $template = 'htaccess.normal.tpl';
+        $template = 'htaccess' . $htaccess_cgi . '.normal.tpl';
     }
 
     if (!($a = file($serendipity['serendipityPath'] . $template, 1))) {

--- NEW FILE: htaccess.cgi.rewrite.tpl ---
# BEGIN s9y
ErrorDocument 404 {PREFIX}{indexFile}
DirectoryIndex {PREFIX}{indexFile}

RewriteEngine On
RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1_short.html [L,NC,QSA]
RewriteRule ^([0-9]+)_[0-9a-z_]*\.html {indexFile}?url=$1_article.html [L,NC,QSA]
RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA]
RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA]
RewriteRule ^{PAT_APPROVE} {indexFile}?url={PATH_APPROVE}/$1/$2/$3 [L,QSA]
RewriteRule ^{PAT_DELETE} {indexFile}?url={PATH_DELETE}/$1/$2/$3 [L,QSA]
RewriteRule ^{PAT_ADMIN} serendipity_admin.php [L,QSA]
RewriteRule ^{PAT_ENTRIES} serendipity_entries.php [L,QSA]
RewriteRule ^{PAT_ARCHIVE} {indexFile}?url=/{PATH_ARCHIVE} [L,QSA]
RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA]
RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
RewriteRule ^{PAT_PLUGIN} {indexFile}?url=plugin/$1 [L,QSA]
RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]

<Files *.tpl>
    deny from all
</Files>

<Files *.sql>
    deny from all
</Files>

<Files *.inc.php>
    deny from all
</Files>

<Files *.db>
    deny from all
</Files>

# END s9y

--- NEW FILE: htaccess.cgi.errordocs.tpl ---
# BEGIN s9y
ErrorDocument 404 {PREFIX}{indexFile}
DirectoryIndex {PREFIX}{indexFile}

<Files *.tpl>
    deny from all
</Files>

<Files *.sql>
    deny from all
</Files>

<Files *.inc.php>
    deny from all
</Files>

<Files *.db>
    deny from all
</Files>

# END s9y

--- NEW FILE: htaccess.cgi.normal.tpl ---
# BEGIN s9y
DirectoryIndex {PREFIX}{indexFile}
<Files *.tpl>
    deny from all
</Files>

<Files *.sql>
    deny from all
</Files>

<Files *.inc.php>
    deny from all
</Files>

<Files *.db>
    deny from all
</Files>

# END s9y

[php-blog-cvs] serendipity serendipity_admin_plugins.inc.php,1.37,1.38

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

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

Modified Files:
	serendipity_admin_plugins.inc.php 
Log Message:
Reorganized HTML output so that error messages in plugins don't appear within a select
field and were not shown by the browser.


Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- serendipity_admin_plugins.inc.php	20 Jul 2004 17:07:36 -0000	1.37
+++ serendipity_admin_plugins.inc.php	27 Jul 2004 11:48:36 -0000	1.38
@@ -36,8 +36,6 @@
     <table cellspacing="0" align="center">
         <tr>
             <td colspan="2">
-                <select name="serendipity[plugin_to_add]">
-                    <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
 <?php
     $errorstack = array();
     $pluginstack = array();
@@ -59,7 +57,14 @@
         }
     }
     usort($pluginstack, 'serendipity_pluginListSort');
-    foreach ( $pluginstack as $plug ) {
+    foreach($errorstack as $e_idx => $e_name) {
+        echo ERROR . ': ' . $e_name . '<br />';
+    }
+?>
+                <select name="serendipity[plugin_to_add]">
+                    <option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
+<?php
+    foreach ($pluginstack as $plug) {
 ?>
                     <option value="<?php echo $plug['class_name']; ?>"><?php echo $plug['name'] . ' - ' . $plug['desc']; ?></option>
 <?php
@@ -78,12 +83,6 @@
         </td>
     </table>
         <br />
-<?php
-foreach($errorstack as $e_idx => $e_name) {
-    echo ERROR . ': ' . $class_name . '<br />';
-}
-?>
-        <br />
 
         <table border="0" cellpadding="5" cellspacing="0" width="100%">
             <tr>
@@ -101,7 +100,6 @@
 <?php } ?>
             </tr>
 <?php
-
     $sort_order = 0;
 
     /* Block display the plugins per placement location. */

[php-blog-cvs] serendipity serendipity_admin_comments.inc.php,1.8,1.9

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

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

Modified Files:
	serendipity_admin_comments.inc.php 
Log Message:
Close <form> tag, not used for anything, yet


Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_admin_comments.inc.php	26 Jul 2004 22:15:51 -0000	1.8
+++ serendipity_admin_comments.inc.php	26 Jul 2004 22:18:42 -0000	1.9
@@ -136,7 +136,7 @@
     }
 }
 </script>
-<form action="" method="POST"
+<form action="" method="POST">
 <table width="100%" cellspacing="5" cellpadding="0" border="0" class="serendipity_admin_list">
 <tr>
     <td align="center"><?php echo $linkPrevious; ?> (<?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?>) <?php echo $linkNext ?></td>

[php-blog-cvs] serendipity serendipity_admin_comments.inc.php,1.7,1.8

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

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

Modified Files:
	serendipity_admin_comments.inc.php 
Log Message:
Tweak comment moderation layout


Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_comments.inc.php	26 Jul 2004 17:12:22 -0000	1.7
+++ serendipity_admin_comments.inc.php	26 Jul 2004 22:15:51 -0000	1.8
@@ -3,7 +3,7 @@
     die ("Don't hack!");
 }
 
-$commentsPerPage = 15;
+$commentsPerPage = 10;
 $summaryLength = 200;
 
 /* We are asked to save the edited comment, and we are not in preview mode */
@@ -136,6 +136,7 @@
     }
 }
 </script>
+<form action="" method="POST"
 <table width="100%" cellspacing="5" cellpadding="0" border="0" class="serendipity_admin_list">
 <tr>
     <td align="center"><?php echo $linkPrevious; ?> (<?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?>) <?php echo $linkNext ?></td>
@@ -152,6 +153,9 @@
     if (empty($rs['email'])) {
         $rs['email'] = 'N/A';
     }
+    if (empty($rs['url'])) {
+        $rs['url'] = 'N/A';
+    }
 
     $fullBody = nl2br(strip_tags($rs['body']));
     $summary = substr($fullBody, 0, $summaryLength);
@@ -163,27 +167,36 @@
     $class = 'serendipity_admin_list_item_' . (($i++ % 2 == 0 ) ? 'even' : 'uneven');
 ?>
 <tr>
+    <td><a name="c<?php echo $rs['id'] ?>"></a>
+        <?php echo '#'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?>
+    </td>
+</tr>
+<tr>
     <td class="serendipity_admin_list_item <?php echo $class ?>" style="padding: 3px">
-        <a name="c<?php echo $rs['id'] ?>"></a>
-        <strong><?php echo $rs['title'] ?></strong>
         <table width="100%" cellspacing="0" cellpadding="2" border="0">
             <tr>
-                <td width="30">
+                <td rowspan="2" width="20" align="center">
 <?php
-// TODO; Multi-Delete
-/* <input type="checkbox" name="delete[<?php echo $rs['id'] ?>]"> */
-?>                  &nbsp;</td>
-                <td width="160"><?php echo $rs['author'] ?></td>
-                <td><?php echo $rs['email'] ?></td>
-                <td align="right">(<?php echo $rs['ip'] ?>)</td>
+    // TODO: Multi-Delete - Tom
+    /* <input type="checkbox" name="delete[<?php echo $rs['id'] ?>]"> */
+?>&nbsp;</td>
+                <td width="250"><strong><?php echo AUTHOR ?></strong>: <?php echo $rs['author'] ?></td>
+                <td><strong><?php echo EMAIL ?></strong>: <?php echo $rs['email'] ?></td>
             </tr>
             <tr>
-                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="4"><div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div><div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div></td>
+                <td><strong>IP</strong>: <?php echo $rs['ip'] ?></td>
+                <td><strong>URL</strong>: <?php echo $rs['url'] ?></a></td>
+            </tr>
+            <tr>
+                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="3">
+                    <div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div>
+                    <div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div>
+                </td>
             </tr>
         </table>
-<?php       if ($rs['status'] == 'pending') { ?>
-            <strong>[<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>">Approve</a>]</strong> -
-<?php       } ?>
+<?php if ($rs['status'] == 'pending') { ?>
+          <strong>[<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>">Approve</a>]</strong> - 
+<?php } ?>
           [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo DELETE ?></a>]
         - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo EDIT ?></a>]
 <?php if (strlen($fullBody) > strlen($summary) ) { ?>
@@ -191,8 +204,12 @@
 <?php } ?>
     </td>
 </tr>
+<tr>
+    <td><hr noshade></td>
+</tr>
 <?php } ?>
 <tr>
     <td align="center"><?php echo $linkPrevious; ?> (<?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?>) <?php echo $linkNext ?></td>
 </tr>
 </table>
+</form>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.369,1.370

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Make sure we get the year correct also


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -d -r1.369 -r1.370
--- serendipity_functions.inc.php	26 Jul 2004 17:38:55 -0000	1.369
+++ serendipity_functions.inc.php	26 Jul 2004 17:45:37 -0000	1.370
@@ -458,7 +458,7 @@
         </td>
 
         <td colspan="5" align="center" valign="bottom" class="serendipity_calendarHeader">
-            <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo serendipity_formatTime("%B '%y", mktime(0,0,0,$month)) ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b>
+            <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo serendipity_formatTime("%B '%y", mktime(0,0,0,$month, 1, $year)) ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b>
         </td>
 
         <td align="right" class="serendipity_calendarHeader">

[php-blog-cvs] serendipity index.php,1.44,1.45

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

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

Modified Files:
	index.php 
Log Message:
Convert range dates to strftime(), making them much prettier and continuous :)


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- index.php	23 Jul 2004 00:22:52 -0000	1.44
+++ index.php	26 Jul 2004 17:43:00 -0000	1.45
@@ -46,9 +46,9 @@
     $_GET['serendipity']['hidefooter'] = true;
 
     if (strlen($range) == 6) {
-        $date = date('m/Y', mktime(0, 0, 0, substr($range, 4, 6), 2, substr($range, 0, 4)));
+        $date = serendipity_formatTime('%B %Y', mktime(0, 0, 0, substr($range, 4, 6), 2, substr($range, 0, 4)));
     } else {
-        $date = date('d/m/Y', strtotime($range));
+        $date = serendipity_formatTime(DATE_FORMAT_ENTRY, strtotime($range));
     }
 
     $serendipity['blogSubTitle'] = sprintf(ENTRIES_FOR, $date);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.368,1.369

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Better way to display calendar month


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- serendipity_functions.inc.php	26 Jul 2004 17:05:46 -0000	1.368
+++ serendipity_functions.inc.php	26 Jul 2004 17:38:55 -0000	1.369
@@ -440,7 +440,7 @@
             $activeDays[date('j', $row['timestamp'])] = $row['timestamp'];
         }
     }
-    $monthName = ucfirst(strftime("%B", mktime(0,0,0,$month)));
+
     // Prepare the table
     $link = serendipity_archiveDateUrl($year . sprintf('%02d', $month)) . $base_query;
 ?>
@@ -458,7 +458,7 @@
         </td>
 
         <td colspan="5" align="center" valign="bottom" class="serendipity_calendarHeader">
-            <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo $monthName . ' \'' . substr($year, 2); ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b>
+            <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo serendipity_formatTime("%B '%y", mktime(0,0,0,$month)) ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b>
         </td>
 
         <td align="right" class="serendipity_calendarHeader">

[php-blog-cvs] serendipity serendipity_admin_comments.inc.php,1.6,1.7

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

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

Modified Files:
	serendipity_admin_comments.inc.php 
Log Message:
Only append " ..." to summary if the summary is shorter than the entire comment.
Only show [HIDE] and [VIEW] links if the summary is shorter than the entire comment.


Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_admin_comments.inc.php	26 Jul 2004 17:05:46 -0000	1.6
+++ serendipity_admin_comments.inc.php	26 Jul 2004 17:12:22 -0000	1.7
@@ -4,7 +4,7 @@
 }
 
 $commentsPerPage = 15;
-
+$summaryLength = 200;
 
 /* We are asked to save the edited comment, and we are not in preview mode */
 if ( isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminAction'] == 'doEdit' && !isset($serendipity['POST']['preview']) ) {
@@ -153,6 +153,13 @@
         $rs['email'] = 'N/A';
     }
 
+    $fullBody = nl2br(strip_tags($rs['body']));
+    $summary = substr($fullBody, 0, $summaryLength);
+
+    if (strlen($fullBody) > strlen($summary) ) {
+        $summary .= ' ...';
+    }
+
     $class = 'serendipity_admin_list_item_' . (($i++ % 2 == 0 ) ? 'even' : 'uneven');
 ?>
 <tr>
@@ -171,15 +178,17 @@
                 <td align="right">(<?php echo $rs['ip'] ?>)</td>
             </tr>
             <tr>
-                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="4"><div id="<?php echo $rs['id'] ?>_summary"><?php echo nl2br(substr(strip_tags($rs['body']), 0, 200)) ?> ...</div><div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div></td>
+                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="4"><div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div><div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div></td>
             </tr>
         </table>
 <?php       if ($rs['status'] == 'pending') { ?>
             <strong>[<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>">Approve</a>]</strong> -
 <?php       } ?>
-        [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo DELETE ?></a>] -
-        [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo EDIT ?></a>] -
-        [<a href="#c<?php echo $rs['id'] ?>" onClick="toggle(<?php echo $rs['id'] ?>); return false;" id="<?php echo $rs['id'] ?>_link"><?php echo VIEW ?></a>]
+          [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo DELETE ?></a>]
+        - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo EDIT ?></a>]
+<?php if (strlen($fullBody) > strlen($summary) ) { ?>
+        - [<a href="#c<?php echo $rs['id'] ?>" onClick="toggle(<?php echo $rs['id'] ?>); return false;" id="<?php echo $rs['id'] ?>_link"><?php echo VIEW ?></a>]
+<?php } ?>
     </td>
 </tr>
 <?php } ?>

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.44,1.45 serendipity_lang_cz.inc.php,1.44,1.45 serendipity_lang_da.inc.php,1.61,1.62 serendipity_lang_de.inc.php,1.76,1.77 serendipity_lang_en.inc.php,1.62,1.63 serendipity_lang_es.inc.php,1.60,1.61 serendipity_lang_fr.inc.php,1.40,1.41 serendipity_lang_nl.inc.php,1.18,1.19 serendipity_lang_pt.inc.php,1.18,1.19

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15893/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 serendipity_lang_nl.inc.php 
	serendipity_lang_pt.inc.php 
Log Message:
Add paging to comment moderation


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_lang_cs.inc.php	26 Jul 2004 13:52:03 -0000	1.44
+++ serendipity_lang_cs.inc.php	26 Jul 2004 17:05:47 -0000	1.45
@@ -298,7 +298,7 @@
 @define('ALL_AUTHORS', 'Všichni autoøi');
 @define('CATEGORIES_TO_FETCH', 'Vyhledat kategorie');
 @define('CATEGORIES_TO_FETCH_DESC', 'Vyhledat kategorie podle autorù?');
-@define('PAGE_BROWSE', 'Stránka %s z %s, celkem %s záznamù');
+@define('PAGE_BROWSE_ENTRIES', 'Stránka %s z %s, celkem %s záznamù');
 @define('PREVIOUS_PAGE', 'pøedchozí stránka');
 @define('NEXT_PAGE', 'další stránka');
 @define('ALL_CATEGORIES', 'Všechny kategorie');
@@ -554,6 +554,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_lang_da.inc.php	26 Jul 2004 13:52:03 -0000	1.61
+++ serendipity_lang_da.inc.php	26 Jul 2004 17:05:47 -0000	1.62
@@ -293,7 +293,7 @@
 @define('ALL_AUTHORS', 'Alle forfattere');
 @define('CATEGORIES_TO_FETCH', 'Kategorier som skal hentes');
 @define('CATEGORIES_TO_FETCH_DESC', 'Hent kategorier fra en bestemt forfatter?');
-@define('PAGE_BROWSE', 'Side %s af %s, i alt %s artikler');
+@define('PAGE_BROWSE_ENTRIES', 'Side %s af %s, i alt %s artikler');
 @define('PREVIOUS_PAGE', 'forrige side');
 @define('NEXT_PAGE', 'næste side');
 @define('ALL_CATEGORIES', 'Alle kategorier');
@@ -551,6 +551,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* 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.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_fr.inc.php	26 Jul 2004 13:52:03 -0000	1.40
+++ serendipity_lang_fr.inc.php	26 Jul 2004 17:05:47 -0000	1.41
@@ -294,7 +294,7 @@
 @define('ALL_AUTHORS', 'Tous les auteurs');
 @define('CATEGORIES_TO_FETCH', 'Catégories à diviser');
 @define('CATEGORIES_TO_FETCH_DESC', 'Diviser les catégories par auteur?');
-@define('PAGE_BROWSE', 'La page %s de %s, totalise %s news');
+@define('PAGE_BROWSE_ENTIRES', 'La page %s de %s, totalise %s news');
 @define('PREVIOUS_PAGE', 'Page précédente');
 @define('NEXT_PAGE', 'Page suivante');
 @define('ALL_CATEGORIES', 'Toutes les catégories');
@@ -543,6 +543,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* 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.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_lang_cz.inc.php	26 Jul 2004 13:52:03 -0000	1.44
+++ serendipity_lang_cz.inc.php	26 Jul 2004 17:05:47 -0000	1.45
@@ -298,7 +298,7 @@
 @define('ALL_AUTHORS', 'V¹ichni autoøi');
 @define('CATEGORIES_TO_FETCH', 'Vyhledat kategorie');
 @define('CATEGORIES_TO_FETCH_DESC', 'Vyhledat kategorie podle autorù?');
-@define('PAGE_BROWSE', 'Stránka %s z %s, celkem %s záznamù');
+@define('PAGE_BROWSE_ENTRIES', 'Stránka %s z %s, celkem %s záznamù');
 @define('PREVIOUS_PAGE', 'pøedchozí stránka');
 @define('NEXT_PAGE', 'dal¹í stránka');
 @define('ALL_CATEGORIES', 'V¹echny kategorie');
@@ -552,6 +552,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_nl.inc.php	26 Jul 2004 13:52:03 -0000	1.18
+++ serendipity_lang_nl.inc.php	26 Jul 2004 17:05:47 -0000	1.19
@@ -294,7 +294,7 @@
 @define('ALL_AUTHORS', 'Alle auteurs');
 @define('CATEGORIES_TO_FETCH', 'Op te laden Categorieën');
 @define('CATEGORIES_TO_FETCH_DESC', 'categorieën oplanden van welke auteur?');
-@define('PAGE_BROWSE', 'Pagina %s van %s, telt %s logs');
+@define('PAGE_BROWSE_ENTRIES', 'Pagina %s van %s, telt %s logs');
 @define('PREVIOUS_PAGE', 'vorige pagina');
 @define('NEXT_PAGE', 'volgende pagina');
 @define('ALL_CATEGORIES', 'Alle categorieën');
@@ -542,6 +542,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serendipity_lang_en.inc.php	26 Jul 2004 13:52:03 -0000	1.62
+++ serendipity_lang_en.inc.php	26 Jul 2004 17:05:47 -0000	1.63
@@ -297,7 +297,7 @@
 @define('ALL_AUTHORS', 'All authors');
 @define('CATEGORIES_TO_FETCH', 'Categories to fetch');
 @define('CATEGORIES_TO_FETCH_DESC', 'Fetch categories from which author?');
-@define('PAGE_BROWSE', 'Page %s of %s, totalling %s entries');
+@define('PAGE_BROWSE_ENTRIES', 'Page %s of %s, totalling %s entries');
 @define('PREVIOUS_PAGE', 'previous page');
 @define('NEXT_PAGE', 'next page');
 @define('ALL_CATEGORIES', 'All categories');
@@ -541,6 +541,6 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
-
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_lang_es.inc.php	26 Jul 2004 13:52:03 -0000	1.60
+++ serendipity_lang_es.inc.php	26 Jul 2004 17:05:47 -0000	1.61
@@ -291,7 +291,7 @@
 @define('ALL_AUTHORS', 'Todos los autores');
 @define('CATEGORIES_TO_FETCH', 'Categorías enlazadas');
 @define('CATEGORIES_TO_FETCH_DESC', '¿De que autor quiere enlazar las categorías?');
-@define('PAGE_BROWSE', 'Pagina %s de %s, en total %s posts');
+@define('PAGE_BROWSE_ENTRIES', 'Pagina %s de %s, en total %s posts');
 @define('PREVIOUS_PAGE', 'Pagina previa');
 @define('NEXT_PAGE', 'Pagina siguiente');
 @define('ALL_CATEGORIES', 'Todas las categorías');
@@ -536,6 +536,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_lang_de.inc.php	26 Jul 2004 13:52:03 -0000	1.76
+++ serendipity_lang_de.inc.php	26 Jul 2004 17:05:47 -0000	1.77
@@ -292,7 +292,7 @@
 @define('ALL_AUTHORS', 'Alle Autoren');
 @define('CATEGORIES_TO_FETCH', 'Quelle der Kategorien');
 @define('CATEGORIES_TO_FETCH_DESC', 'Kategorien welcher Autoren einbeziehen?');
-@define('PAGE_BROWSE', 'Seite %s von %s, insgesamt %s Einträge');
+@define('PAGE_BROWSE_ENTRIES', 'Seite %s von %s, insgesamt %s Einträge');
 @define('PREVIOUS_PAGE', 'vorige Seite');
 @define('NEXT_PAGE', 'nächste Seite');
 @define('ALL_CATEGORIES', 'Alle Kategorien');
@@ -538,6 +538,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Erstellt eine https-URL als Login-Link zum Blog. Der Webserver muss dies unterstützen!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Externe Links klickbar?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'Falls deaktiviert, so werden keine Referrer/Exit/Kommentar-URLs als aktive Links angezeigt. Dies kann innerhalb der Plugin-Konfiguration für die Seitenleiste teilweise überbrückt werden!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_pt.inc.php	26 Jul 2004 13:52:03 -0000	1.18
+++ serendipity_lang_pt.inc.php	26 Jul 2004 17:05:47 -0000	1.19
@@ -292,7 +292,7 @@
 @define('ALL_AUTHORS', 'Todos autores');
 @define('CATEGORIES_TO_FETCH', 'Categorias para trazer');
 @define('CATEGORIES_TO_FETCH_DESC', 'Trazer categorias de qual autor?');
-@define('PAGE_BROWSE', 'Página %s de %s, totalizando %s artigos');
+@define('PAGE_BROWSE_ENTRIES', 'Página %s de %s, totalizando %s artigos');
 @define('PREVIOUS_PAGE', 'página anterior');
 @define('NEXT_PAGE', 'próxima página');
 @define('ALL_CATEGORIES', 'Todas as categorias');
@@ -538,6 +538,7 @@
 @define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Lets the login-link point to a https-location. Your webserver needs to support this!');
 @define('INSTALL_SHOW_EXTERNAL_LINKS', 'Make external links clickable?');
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', 'If deactivated, no referrer/exit/comment-URLs will be shown as links. Can be overridden within sidebar plugin configuration!');
+@define('PAGE_BROWSE_COMMENTS', 'Page %s of %s, totalling %s comments'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin_comments.inc.php,1.5,1.6 serendipity_functions.inc.php,1.367,1.368

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

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

Modified Files:
	serendipity_admin_comments.inc.php 
	serendipity_functions.inc.php 
Log Message:
Add paging to comment moderation


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- serendipity_functions.inc.php	26 Jul 2004 16:07:28 -0000	1.367
+++ serendipity_functions.inc.php	26 Jul 2004 17:05:46 -0000	1.368
@@ -1118,7 +1118,7 @@
 <?php
         }
 ?>
-(<?php printf(PAGE_BROWSE, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>)
+(<?php printf(PAGE_BROWSE_ENTRIES, $serendipity['GET']['page'], $totalPages, $totalEntries); ?>)
 <?php
         if ($serendipity['GET']['page'] < $totalPages) {
 ?>

Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_comments.inc.php	20 Jul 2004 17:53:11 -0000	1.5
+++ serendipity_admin_comments.inc.php	26 Jul 2004 17:05:46 -0000	1.6
@@ -3,6 +3,8 @@
     die ("Don't hack!");
 }
 
+$commentsPerPage = 15;
+
 
 /* We are asked to save the edited comment, and we are not in preview mode */
 if ( isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminAction'] == 'doEdit' && !isset($serendipity['POST']['preview']) ) {
@@ -93,12 +95,28 @@
     return true;
 }
 
+$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments WHERE type = 'normal'", true);
+
+$totalComments = $sql['total'];
+$pages = ceil($totalComments/$commentsPerPage);
+$page = (int)$serendipity['GET']['page'];
+if ( $page == 0 ) {
+    $page = 1;
+}
+
+if ( $page != 1 && $page <= $pages ) {
+    $linkPrevious = '<a href="?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) .'">&laquo; '. PREVIOUS_PAGE .'</a>';
+}
+if ( $page != $pages ) {
+    $linkNext = '<a href="?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) .'"> '. NEXT_PAGE .' &raquo;</a>';
+}
+
 $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
                                 LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
                                 WHERE type = 'NORMAL'
                                 " . (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = ' . $serendipity['authorId'] : '') . "
                                 ORDER BY id DESC
-                                LIMIT 10");
+                                LIMIT ". ($page-1)*$commentsPerPage .",". $commentsPerPage);
 if (!is_array($sql)) {
     echo NO_COMMENTS;
     return;
@@ -119,6 +137,9 @@
 }
 </script>
 <table width="100%" cellspacing="5" cellpadding="0" border="0" class="serendipity_admin_list">
+<tr>
+    <td align="center"><?php echo $linkPrevious; ?> (<?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?>) <?php echo $linkNext ?></td>
+</tr>
 <?php
 $i = 0;
 foreach ($sql as $rs) {
@@ -162,4 +183,7 @@
     </td>
 </tr>
 <?php } ?>
+<tr>
+    <td align="center"><?php echo $linkPrevious; ?> (<?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?>) <?php echo $linkNext ?></td>
+</tr>
 </table>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.366,1.367

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Truely fix that we should not embed comments, trackbacks and comment-form in entry CSS class


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- serendipity_functions.inc.php	26 Jul 2004 13:52:02 -0000	1.366
+++ serendipity_functions.inc.php	26 Jul 2004 16:07:28 -0000	1.367
@@ -1255,7 +1255,7 @@
                 }
 ?>
                 </div>
-
+            </div>
                 <!--
                 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
                          xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
@@ -1378,7 +1378,6 @@
 <?php
                 }
 ?>
-        </div>
 <?php
                 if ($preview) {
                     serendipity_plugin_api::hook_event('backend_preview', $article);

[php-blog-cvs] serendipity/bundled-libs/XML/RPC Server.php,1.1.1.1,1.2

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

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

Modified Files:
	Server.php 
Log Message:
Updating to current Version of XML_RPC

Index: Server.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/XML/RPC/Server.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Server.php	28 Mar 2003 20:05:28 -0000	1.1.1.1
+++ Server.php	26 Jul 2004 15:08:11 -0000	1.2
@@ -1,7 +1,7 @@
 <?php
+// /* vim: set expandtab tabstop=4 shiftwidth=4: */
 // by Edd Dumbill (C) 1999,2000
 // <ed...@us...>
-// $Id$
 
 // License is granted to use or modify this software ("XML-RPC for PHP")
 // for commercial or non-commercial use provided the copyright of the author
@@ -12,146 +12,145 @@
 // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 // IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Adapted to PEAR standards by Stig Sæther Bakken <st...@ph...>
-
-// XML RPC Server class
-// requires: xmlrpc.inc
+// Adapted to PEAR standards by Stig S�her Bakken <st...@ph...>
+// /* $Id$ */
 
-require_once "bundled-libs/XML/RPC.php";
+require_once "XML/RPC.php";
 
 // listMethods: either a string, or nothing
-$GLOBALS['XML_RPC_Server_listMethods_sig']=
-    array(array($GLOBALS['XML_RPC_Array'], $GLOBALS['XML_RPC_String']), 
+$GLOBALS['XML_RPC_Server_listMethods_sig'] =
+    array(array($GLOBALS['XML_RPC_Array'], $GLOBALS['XML_RPC_String']),
           array($GLOBALS['XML_RPC_Array']));
-$GLOBALS['XML_RPC_Server_listMethods_doc']=
+$GLOBALS['XML_RPC_Server_listMethods_doc'] =
     'This method lists all the methods that the XML-RPC server knows how to dispatch';
 
 function XML_RPC_Server_listMethods($server, $m)
 {
     global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-    $v=new XML_RPC_Value();
-    $dmap=$server->dmap;
-    $outAr=array();
-    for(reset($dmap); list($key, $val)=each($dmap); ) {
-        $outAr[]=new XML_RPC_Value($key, "string");
+    $v = new XML_RPC_Value();
+    $dmap = $server->dmap;
+    $outAr = array();
+    for (reset($dmap); list($key, $val) = each($dmap); ) {
+        $outAr[] = new XML_RPC_Value($key, "string");
     }
-    $dmap=$XML_RPC_Server_dmap;
-    for(reset($dmap); list($key, $val)=each($dmap); ) {
-        $outAr[]=new XML_RPC_Value($key, "string");
+    $dmap = $XML_RPC_Server_dmap;
+    for (reset($dmap); list($key, $val) = each($dmap); ) {
+        $outAr[] = new XML_RPC_Value($key, "string");
     }
     $v->addArray($outAr);
     return new XML_RPC_Response($v);
 }
 
-$GLOBALS['XML_RPC_Server_methodSignature_sig']=
+$GLOBALS['XML_RPC_Server_methodSignature_sig'] =
     array(array($GLOBALS['XML_RPC_Array'], $GLOBALS['XML_RPC_String']));
-$GLOBALS['XML_RPC_Server_methodSignature_doc']=
+$GLOBALS['XML_RPC_Server_methodSignature_doc'] =
     'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
 
 function XML_RPC_Server_methodSignature($server, $m)
 {
     global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-    
-    $methName=$m->getParam(0);
-    $methName=$methName->scalarval();
-    if (ereg("^system\.", $methName)) {
-        $dmap=$XML_RPC_Server_dmap; $sysCall=1;
+
+    $methName = $m->getParam(0);
+    $methName = $methName->scalarval();
+    if (strpos($methName, "system.") === 0) {
+        $dmap = $XML_RPC_Server_dmap;
+        $sysCall = 1;
     } else {
-        $dmap=$server->dmap; $sysCall=0;
+        $dmap = $server->dmap;
+        $sysCall = 0;
     }
     //  print "<!-- ${methName} -->\n";
     if (isset($dmap[$methName])) {
         if ($dmap[$methName]["signature"]) {
-            $sigs=array();
-            $thesigs=$dmap[$methName]["signature"];
-            for($i=0; $i<sizeof($thesigs); $i++) {
-                $cursig=array();
-                $inSig=$thesigs[$i];
-                for($j=0; $j<sizeof($inSig); $j++) {
-                    $cursig[]=new XML_RPC_Value($inSig[$j], "string");
+            $sigs = array();
+            $thesigs = $dmap[$methName]["signature"];
+            for ($i = 0; $i < sizeof($thesigs); $i++) {
+                $cursig = array();
+                $inSig = $thesigs[$i];
+                for ($j = 0; $j < sizeof($inSig); $j++) {
+                    $cursig[] = new XML_RPC_Value($inSig[$j], "string");
                 }
-                $sigs[]=new XML_RPC_Value($cursig, "array");
+                $sigs[] = new XML_RPC_Value($cursig, "array");
             }
-            $r=new XML_RPC_Response(new XML_RPC_Value($sigs, "array"));
+            $r = new XML_RPC_Response(new XML_RPC_Value($sigs, "array"));
         } else {
-            $r=new XML_RPC_Response(new XML_RPC_Value("undef", "string"));
+            $r = new XML_RPC_Response(new XML_RPC_Value("undef", "string"));
         }
     } else {
-        $r=new XML_RPC_Response(0,
-                          $XML_RPC_err["introspect_unknown"],
-                          $XML_RPC_str["introspect_unknown"]);
+        $r = new XML_RPC_Response(0, $XML_RPC_err["introspect_unknown"],
+                                     $XML_RPC_str["introspect_unknown"]);
     }
     return $r;
 }
 
-$GLOBALS['XML_RPC_Server_methodHelp_sig']=
+$GLOBALS['XML_RPC_Server_methodHelp_sig'] =
     array(array($GLOBALS['XML_RPC_String'], $GLOBALS['XML_RPC_String']));
-$GLOBALS['XML_RPC_Server_methodHelp_doc']=
+$GLOBALS['XML_RPC_Server_methodHelp_doc'] =
     'Returns help text if defined for the method passed, otherwise returns an empty string';
 
 function XML_RPC_Server_methodHelp($server, $m)
 {
     global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-    
-    $methName=$m->getParam(0);
-    $methName=$methName->scalarval();
-    if (ereg("^system\.", $methName)) {
-        $dmap=$XML_RPC_Server_dmap; $sysCall=1;
+
+    $methName = $m->getParam(0);
+    $methName = $methName->scalarval();
+    if (strpos($methName, "system.") === 0) {
+        $dmap = $XML_RPC_Server_dmap;
+        $sysCall = 1;
     } else {
-        $dmap=$server->dmap; $sysCall=0;
+        $dmap = $server->dmap;
+        $sysCall = 0;
     }
     //  print "<!-- ${methName} -->\n";
     if (isset($dmap[$methName])) {
         if ($dmap[$methName]["docstring"]) {
-            $r=new XML_RPC_Response(new XML_RPC_Value($dmap[$methName]["docstring"]),
-                              "string");
+            $r = new XML_RPC_Response(new XML_RPC_Value($dmap[$methName]["docstring"]), "string");
         } else {
-            $r=new XML_RPC_Response(new XML_RPC_Value("", "string"));
+            $r = new XML_RPC_Response(new XML_RPC_Value("", "string"));
         }
     } else {
-        $r=new XML_RPC_Response(0,
-                          $XML_RPC_err["introspect_unknown"],
-                          $XML_RPC_str["introspect_unknown"]);
+        $r = new XML_RPC_Response(0, $XML_RPC_err["introspect_unknown"],
+                                     $XML_RPC_str["introspect_unknown"]);
     }
     return $r;
 }
 
-$GLOBALS['XML_RPC_Server_dmap']=array(
+$GLOBALS['XML_RPC_Server_dmap'] = array(
     "system.listMethods" =>
-    array("function" => "XML_RPC_Server_listMethods",
-          "signature" => $GLOBALS['XML_RPC_Server_listMethods_sig'],
-          "docstring" => $GLOBALS['XML_RPC_Server_listMethods_doc']),
+        array("function"  => "XML_RPC_Server_listMethods",
+              "signature" => $GLOBALS['XML_RPC_Server_listMethods_sig'],
+              "docstring" => $GLOBALS['XML_RPC_Server_listMethods_doc']),
 
     "system.methodHelp" =>
-    array("function" => "XML_RPC_Server_methodHelp",
-          "signature" => $GLOBALS['XML_RPC_Server_methodHelp_sig'],
-          "docstring" => $GLOBALS['XML_RPC_Server_methodHelp_doc']),
+        array("function"  => "XML_RPC_Server_methodHelp",
+              "signature" => $GLOBALS['XML_RPC_Server_methodHelp_sig'],
+              "docstring" => $GLOBALS['XML_RPC_Server_methodHelp_doc']),
 
     "system.methodSignature" =>
-    array("function" => "XML_RPC_Server_methodSignature",
-          "signature" => $GLOBALS['XML_RPC_Server_methodSignature_sig'],
-          "docstring" => $GLOBALS['XML_RPC_Server_methodSignature_doc'])
+        array("function"  => "XML_RPC_Server_methodSignature",
+              "signature" => $GLOBALS['XML_RPC_Server_methodSignature_sig'],
+              "docstring" => $GLOBALS['XML_RPC_Server_methodSignature_doc'])
 );
 
-$GLOBALS['XML_RPC_Server_debuginfo']="";
+$GLOBALS['XML_RPC_Server_debuginfo'] = "";
 
 function XML_RPC_Server_debugmsg($m)
 {
     global $XML_RPC_Server_debuginfo;
-    $XML_RPC_Server_debuginfo=$XML_RPC_Server_debuginfo . $m . "\n";
+    $XML_RPC_Server_debuginfo = $XML_RPC_Server_debuginfo . $m . "\n";
 }
 
 class XML_RPC_Server
 {
-    var $dmap=array();
+    var $dmap = array();
 
-    function XML_RPC_Server($dispMap, $serviceNow=1)
+    function XML_RPC_Server($dispMap, $serviceNow = 1)
     {
         global $HTTP_RAW_POST_DATA;
         // dispMap is a despatch array of methods
@@ -159,7 +158,7 @@
         // if a method
         // doesn't appear in the map then an unknown
         // method error is generated
-        $this->dmap=$dispMap;
+        $this->dmap = $dispMap;
         if ($serviceNow) {
             $this->service();
         }
@@ -168,129 +167,131 @@
     function serializeDebug()
     {
         global $XML_RPC_Server_debuginfo;
-        if ($XML_RPC_Server_debuginfo!="") 
-            return "<!-- DEBUG INFO:\n\n" .
-                $XML_RPC_Server_debuginfo . "\n-->\n";
-        else
+        if ($XML_RPC_Server_debuginfo != "") {
+            return "<!-- DEBUG INFO:\n\n" . preg_replace('/-(?=-)/', '- ',
+                    $XML_RPC_Server_debuginfo) . "\n-->\n";
+        } else {
             return "";
+        }
     }
 
     function service()
     {
-        $r=$this->parseRequest();
-        $payload="<?xml version=\"1.0\"?>\n" . 
+        $r = $this->parseRequest();
+        $payload = "<?xml version=\"1.0\"?>\n" .
             $this->serializeDebug() .
             $r->serialize();
-        Header("Content-type: text/xml\nContent-length: " . 
-               strlen($payload));
+        header('Content-Length: ' . strlen($payload));
+        header('Content-Type: text/xml');
         print $payload;
     }
 
     function verifySignature($in, $sig)
     {
-        for($i=0; $i<sizeof($sig); $i++) {
+        for ($i = 0; $i < sizeof($sig); $i++) {
             // check each possible signature in turn
-            $cursig=$sig[$i];
-            if (sizeof($cursig)==$in->getNumParams()+1) {
-                $itsOK=1;
-                for($n=0; $n<$in->getNumParams(); $n++) {
-                    $p=$in->getParam($n);
+            $cursig = $sig[$i];
+            if (sizeof($cursig) == $in->getNumParams() + 1) {
+                $itsOK = 1;
+                for ($n = 0; $n < $in->getNumParams(); $n++) {
+                    $p = $in->getParam($n);
                     // print "<!-- $p -->\n";
                     if ($p->kindOf() == "scalar") {
-                        $pt=$p->scalartyp();
+                        $pt = $p->scalartyp();
                     } else {
-                        $pt=$p->kindOf();
+                        $pt = $p->kindOf();
                     }
                     // $n+1 as first type of sig is return type
                     if ($pt != $cursig[$n+1]) {
-                        $itsOK=0;
-                        $pno=$n+1; $wanted=$cursig[$n+1]; $got=$pt;
+                        $itsOK = 0;
+                        $pno = $n+1;
+                        $wanted = $cursig[$n+1];
+                        $got = $pt;
                         break;
                     }
                 }
-                if ($itsOK) 
+                if ($itsOK)
                     return array(1);
             }
         }
         return array(0, "Wanted ${wanted}, got ${got} at param ${pno})");
     }
 
-    function parseRequest($data="")
+    function parseRequest($data = "")
     {
         global $XML_RPC_xh,$HTTP_RAW_POST_DATA;
         global $XML_RPC_err, $XML_RPC_str, $XML_RPC_errxml,
             $XML_RPC_defencoding, $XML_RPC_Server_dmap;
-        
-        if ($data=="") {
-            $data=$HTTP_RAW_POST_DATA;
+
+        if ($data == "") {
+            $data = $HTTP_RAW_POST_DATA;
         }
         $parser = xml_parser_create($XML_RPC_defencoding);
-        
-        $XML_RPC_xh[$parser]=array();
-        $XML_RPC_xh[$parser]['st']="";
-        $XML_RPC_xh[$parser]['cm']=0; 
-        $XML_RPC_xh[$parser]['isf']=0; 
-        $XML_RPC_xh[$parser]['params']=array();
-        $XML_RPC_xh[$parser]['method']="";
-        
+
+        $XML_RPC_xh[$parser] = array();
+        $XML_RPC_xh[$parser]['st'] = "";
+        $XML_RPC_xh[$parser]['cm'] = 0;
+        $XML_RPC_xh[$parser]['isf'] = 0;
+        $XML_RPC_xh[$parser]['params'] = array();
+        $XML_RPC_xh[$parser]['method'] = "";
+
         $plist = '';
 
         // decompose incoming XML into request structure
-        
+
         xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
         xml_set_element_handler($parser, "XML_RPC_se", "XML_RPC_ee");
         xml_set_character_data_handler($parser, "XML_RPC_cd");
         xml_set_default_handler($parser, "XML_RPC_dh");
         if (!xml_parse($parser, $data, 1)) {
             // return XML error as a faultCode
-            $r=new XML_RPC_Response(0,
-                                    $XML_RPC_errxml+xml_get_error_code($parser),
-                                    sprintf("XML error: %s at line %d",
-                                            xml_error_string(xml_get_error_code($parser)),
-                                            xml_get_current_line_number($parser)));
+            $r = new XML_RPC_Response(0,
+                                      $XML_RPC_errxml+xml_get_error_code($parser),
+                                      sprintf("XML error: %s at line %d",
+                                              xml_error_string(xml_get_error_code($parser)),
+                                              xml_get_current_line_number($parser)));
             xml_parser_free($parser);
         } else {
             xml_parser_free($parser);
-            $m=new XML_RPC_Message($XML_RPC_xh[$parser]['method']);
+            $m = new XML_RPC_Message($XML_RPC_xh[$parser]['method']);
             // now add parameters in
-            for($i=0; $i<sizeof($XML_RPC_xh[$parser]['params']); $i++) {
+            for ($i = 0; $i < sizeof($XML_RPC_xh[$parser]['params']); $i++) {
                 // print "<!-- " . $XML_RPC_xh[$parser]['params'][$i]. "-->\n";
-                $plist.="$i - " .  $XML_RPC_xh[$parser]['params'][$i]. " \n";
-                eval('$m->addParam(' . $XML_RPC_xh[$parser]['params'][$i]. ");");
+                $plist .= "$i - " . $XML_RPC_xh[$parser]['params'][$i] . " \n";
+                eval('$m->addParam(' . $XML_RPC_xh[$parser]['params'][$i] . ");");
             }
             XML_RPC_Server_debugmsg($plist);
             // now to deal with the method
-            $methName=$XML_RPC_xh[$parser]['method'];
-            if (ereg("^system\.", $methName)) {
-                $dmap=$XML_RPC_Server_dmap; $sysCall=1;
+            $methName = $XML_RPC_xh[$parser]['method'];
+            if (strpos($methName, "system.") === 0) {
+                $dmap = $XML_RPC_Server_dmap;
+                $sysCall = 1;
             } else {
-                $dmap=$this->dmap; $sysCall=0;
+                $dmap = $this->dmap;
+                $sysCall = 0;
             }
-            if (isset($dmap[$methName]['function'])) {
+            if (isset($dmap[$methName]['function']) && is_callable($dmap[$methName]['function'])) {
                 // dispatch if exists
                 if (isset($dmap[$methName]['signature'])) {
-                    $sr=$this->verifySignature($m, 
-                                               $dmap[$methName]['signature'] );
+                    $sr = $this->verifySignature($m,
+                                                 $dmap[$methName]['signature'] );
                 }
                 if ( (!isset($dmap[$methName]['signature'])) || $sr[0]) {
                     // if no signature or correct signature
-                    if ($sysCall) { 
-                        eval('$r=' . $dmap[$methName]['function'] . 
-                             '($this, $m);');
+                    if ($sysCall) {
+                        $r = call_user_func($dmap[$methName]['function'], $this, $m);
                     } else {
-                        eval('$r=' . $dmap[$methName]['function'] . 
-                             '($m);');
+                        $r = call_user_func($dmap[$methName]['function'], $m);
                     }
                 } else {
-                    $r=new XML_RPC_Response(0,
-                                            $XML_RPC_err["incorrect_params"],
-                                            $XML_RPC_str["incorrect_params"].": ". $sr[1]);
+                    $r = new XML_RPC_Response(0, $XML_RPC_err["incorrect_params"],
+                                                 $XML_RPC_str["incorrect_params"] .
+                                                 ": " . $sr[1]);
                 }
             } else {
                 // else prepare error response
-                $r=new XML_RPC_Response(0,
-                                        $XML_RPC_err["unknown_method"],
-                                        $XML_RPC_str["unknown_method"]);
+                $r = new XML_RPC_Response(0, $XML_RPC_err["unknown_method"],
+                                             $XML_RPC_str["unknown_method"]);
             }
         }
         return $r;
@@ -302,8 +303,8 @@
         // a debugging routine: just echos back the input
         // packet as a string value
 
-        $r=new XML_RPC_Response;
-        $r->xv=new XML_RPC_Value( "'Aha said I: '" . $HTTP_RAW_POST_DATA, "string");
+        $r = new XML_RPC_Response;
+        $r->xv = new XML_RPC_Value("'Aha said I: '" . $HTTP_RAW_POST_DATA, "string");
         print $r->serialize();
   }
 }

[php-blog-cvs] serendipity/bundled-libs/XML RPC.php,1.1.1.1,1.2

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

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

Modified Files:
	RPC.php 
Log Message:
Updating to current Version of XML_RPC

Index: RPC.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/XML/RPC.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RPC.php	28 Mar 2003 20:05:27 -0000	1.1.1.1
+++ RPC.php	26 Jul 2004 15:07:54 -0000	1.2
@@ -1,4 +1,5 @@
 <?php
+// /* vim: set expandtab tabstop=4 shiftwidth=4: */
 // by Edd Dumbill (C) 1999-2001
 // <ed...@us...>
 // $Id$
@@ -18,31 +19,35 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Adapted to PEAR standards by Stig Sæther Bakken <st...@ph...> and
+// Adapted to PEAR standards by Stig S�her Bakken <st...@ph...> and
[...1497 lines suppressed...]
+
+   case "string":
+   case "NULL":
+       $XML_RPC_val->addScalar($php_val, $XML_RPC_String);
+       break;
+
+   // <G_Giunta_2001-02-29>
+   // Add support for encoding/decoding of booleans, since they are supported in PHP
+   case "boolean":
+       $XML_RPC_val->addScalar($php_val, $XML_RPC_Boolean);
+       break;
+   // </G_Giunta_2001-02-29>
+
+   case "unknown type":
+   default:
+       $XML_RPC_val = false;
+       break;
    }
    return $XML_RPC_val;
 }

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.71,1.72 serendipity_functions_installer.inc.php,1.22,1.23

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
fix bug reported by justin - shared installation blogs where attempting to write wrong .htaccess. So now instead of './.htaccess' we use $serendipity['serendipityPath'] which is either set via configuration or as fallback within compat.php.


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_admin_installer.inc.php	19 Jul 2004 08:50:54 -0000	1.71
+++ serendipity_admin_installer.inc.php	26 Jul 2004 14:11:22 -0000	1.72
@@ -41,7 +41,7 @@
             }
 
             /* Next are the files, .htaccess */
-            printf(ATTEMPT_WRITE_FILE, '.htaccess');
+            printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
             $res = serendipity_installFiles();
             if (is_array($res)) {
                 echo '<span class="serendipity_msg_important">- ' . implode('<br />', $res) . '</span><br /><br />';
@@ -90,7 +90,7 @@
         } else {
             /* If we have new rewrite rules, then install them */
             if (isset($_POST['rewrite']) && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN && $oldRewrite != $_POST['rewrite']) {
-                printf(ATTEMPT_WRITE_FILE, '.htaccess');
+                printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
                 $res = serendipity_installFiles();
                 if (is_array($res)) {
                     echo implode('<br />'. $res);

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_functions_installer.inc.php	23 Jul 2004 10:06:39 -0000	1.22
+++ serendipity_functions_installer.inc.php	26 Jul 2004 14:11:22 -0000	1.23
@@ -266,8 +266,8 @@
     // If not yet installed, do some magic:
     $abort = false;
     if (IS_installed !== true && $_abort !== true) {
-        $old_htaccess = @file_get_contents('./.htaccess');
-        $fp = @fopen('./.htaccess', 'w');
+        $old_htaccess = @file_get_contents($serendipity['serendipityPath'] . '.htaccess');
+        $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
         $serendipity_root = str_replace(basename($_SERVER['PHP_SELF']), '', $_SERVER['PHP_SELF']);
         $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
 
@@ -302,11 +302,11 @@
             }
 
             if (!empty($old_htacces)) {
-                $fp = @fopen('./.htaccess', 'w');
+                $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
                 fwrite($fp, $old_htaccess);
                 fclose($fp);
             } else {
-                @unlink('./.htaccess');
+                @unlink($serendipity['serendipityPath'] . '.htaccess');
             }
         }
     }
@@ -581,7 +581,7 @@
 function serendipity_installFiles() {
     global $serendipity;
 
-    $htaccess = @file_get_contents('./.htaccess');
+    $htaccess = @file_get_contents($serendipity['serendipityPath'] . '.htaccess');
 
     // Let this function be callable outside installation and let it use existing settings.
     $import = array('rewrite', 'serendipityHTTPPath', 'indexFile');
@@ -605,7 +605,7 @@
         $err[] = ERROR_TEMPLATE_FILE;
     }
 
-    $fp = @fopen('./.htaccess', 'w');
+    $fp = @fopen($serendipity['serendipityPath'] . '.htaccess', 'w');
 
     $content = str_replace(
                  array(
@@ -646,8 +646,8 @@
               );
 
     if (!$fp) {
-        $errs[] = sprintf(FILE_WRITE_ERROR, '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
-        $errs[] = sprintf(COPY_CODE_BELOW , '.htaccess', 'serendipity', htmlspecialchars($content));
+        $errs[] = sprintf(FILE_WRITE_ERROR, $serendipity['serendipityPath'] . '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
+        $errs[] = sprintf(COPY_CODE_BELOW , $serendipity['serendipityPath'] . '.htaccess', 'serendipity', htmlspecialchars($content));
         return $errs;
     } else {
         // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.