php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include functions_smarty.inc.php,1.5,1.6

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

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

Modified Files:
	functions_smarty.inc.php 
Log Message:
allow special file 'smarty.php' in template directories, where one can
setup/change special smarty variables. This is important for making embedded 
mode usable to interact the existing framework with s9y.


Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions_smarty.inc.php	20 Nov 2004 19:26:43 -0000	1.5
+++ functions_smarty.inc.php	23 Nov 2004 11:37:19 -0000	1.6
@@ -108,6 +108,7 @@
     global $serendipity;
 
     if (!isset($serendipity['smarty'])) {
+        $firstcall = true;
         @define('SMARTY_DIR', S9Y_INCLUDE_PATH . 'bundled-libs/Smarty/libs/');
         require_once SMARTY_DIR . 'Smarty.class.php';
         $serendipity['smarty'] = new Smarty;
@@ -134,6 +135,8 @@
         $serendipity['smarty']->register_function('serendipity_getFile', 'serendipity_smarty_getFile');
         $serendipity['smarty']->register_function('serendipity_printComments', 'serendipity_smarty_printComments');
         $serendipity['smarty']->register_function('serendipity_printTrackbacks', 'serendipity_smarty_printTrackbacks');
+    } else {
+        $firstcall = false;
     }
 
     if (!isset($serendipity['smarty_raw_mode'])) {
@@ -176,6 +179,13 @@
         )
     );
 
+    if ($firstcall && file_exists($serendipity['smarty']->template_dir . '/smarty.php')) {
+        // For advanced usage, we allow template authors to create a file 'smarty.php' where they can
+        // setup custom smarty variables, modifieds etc. to use in their templates.
+        // This is especially important in embedded installations.
+        include_once $serendipity['smarty']->template_dir . '/smarty.php';
+    }
+
     return true;
 }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.28,1.29

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
log expected and received captcha in logfile


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_event_spamblock.php	21 Nov 2004 15:32:05 -0000	1.28
+++ serendipity_event_spamblock.php	23 Nov 2004 10:02:59 -0000	1.29
@@ -49,7 +49,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_BODYCLONE', 'Doppelter Kommentar');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_IPFLOOD', 'IP-Block');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_RBL', 'RBL-Block');
-        @define('PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS', 'Captcha ungültig');
+        @define('PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS', 'Captcha ungültig (Eingegeben: %s, Erwartet: %s)');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION', 'Moderation nach X Tagen');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT', 'Zu viele Links');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE', 'Zu viele Links');
@@ -106,7 +106,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_IPFLOOD', 'IP-block');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_RBL', 'RBL-block');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL', 'SURBL-block');
-        @define('PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS', 'Invalid captcha');
+        @define('PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS', 'Invalid captcha (Entered: %s, Expected: %s)');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION', 'Auto-moderation after X days');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT', 'Too many hyperlinks');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE', 'Too many hyperlinks');
@@ -367,7 +367,7 @@
                         // Captcha checking
                         if ($show_captcha && $addData['type'] == 'NORMAL') {
                             if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
-                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $addData);
+                                $this->log($logfile, $eventData['id'], 'REJECTED', sprintf(PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $serendipity['POST']['captcha'], $_SESSION['spamblock']['captcha']), $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
                                 return false;

[php-blog-cvs] serendipity/templates/default commentpopup.tpl,NONE,1.1

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

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

Added Files:
	commentpopup.tpl 
Log Message:
fix comment popup window (hopefully. I hate this window, would someone test if everything works? :-O)


--- NEW FILE: commentpopup.tpl ---
{if $is_xhtml}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
{else}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
           "http://www.w3.org/TR/html4/loose.dtd">
{/if}

<html>
<head>
    <title>{$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if}</title>
    <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" />
    <meta name="Powered-By" content="Serendipity v.{$head_version}" />
    <link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}serendipity.css.php" />
    <link rel="alternate"  type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" />
    <link rel="alternate"  type="application/x.atom+xml"  title="{$blogTitle} Atom feed"  href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" />
</head>

<body class="s9y_wrap" id="serendipity_comment_page">

{if $is_comment_added}

    {$CONST.COMMENT_ADDED}{$comment_string.0}<a href="{$comment_url}">{$comment_string.1}</a>{$comment_string.2}<a href="#" onclick="self.close()">{$comment_string.3}</a>{$comment_string.4}

{elseif $is_comment_notadded}

    {$CONST.COMMENT_NOT_ADDED}{$comment_string.0}<a href="{$comment_url}">{$comment_string.1}</a>{$comment_string.2}<a href="#" onclick="self.close()">{$comment_string.3}</a>{$comment_string.4}

{elseif $is_comment_empty}

    {$CONST.EMPTY_COMMENT}{$comment_string.0}<a href="#" onclick="history.go(-1)">{$comment_string.1}</a>

{elseif $is_showtrackbacks}

    <div class="serendipity_commentsTitle">{$CONST.TRACKBACKS}</div><br />
    <dl>
        <dt><b>{$CONST.TRACKBACK_SPECIFIC}:</b><br /></dt>
        <dd><a href="{$comment_url}">{$comment_url}</a><br /></dd>

        <dt><b>{$CONST.DIRECT_LINK}:</b><br /></dt>
        <dd><a href="{$comment_entryurl}">{$comment_entryurl}</a></dd>
    </dl>

    {serendipity_printTrackbacks entry=$entry_id}

{elseif $is_showcomments}

    <div class="serendipity_commentsTitle">{$CONST.COMMENTS}</div>

    {serendipity_printComments entry=$entry_id}
    {if $is_comment_allowed}
        <div class="serendipity_commentsTitle">{$CONST.ADD_COMMENT}</div>
        {$COMMENTFORM}
    {else}
        <div class="serendipity_center serendipity_msg_important">{$CONST.COMMENTS_CLOSED}</div>
    {/if}

{/if}

</body>
</html>

[php-blog-cvs] serendipity comment.php,1.52,1.53

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

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

Modified Files:
	comment.php 
Log Message:
fix comment popup window (hopefully. I hate this window, would someone test if everything works? :-O)


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- comment.php	19 Nov 2004 11:04:58 -0000	1.52
+++ comment.php	22 Nov 2004 14:34:43 -0000	1.53
@@ -53,8 +53,8 @@
         fwrite($fp, '[' . date('d.m.Y H:i') . '] ID: ' . $id . "\n");
         fclose($fp);
     }
-    if (add_trackback($id, $_REQUEST['title'], $_REQUEST['url'],
-                      $_REQUEST['blog_name'], $_REQUEST['excerpt'])) {
+
+    if (add_trackback($id, $_REQUEST['title'], $_REQUEST['url'], $_REQUEST['blog_name'], $_REQUEST['excerpt'])) {
         if ($tb_logging) {
             $fp = fopen('trackback2.log', 'a');
             fwrite($fp, '[' . date('d.m.Y H:i') . '] TRACKBACK SUCCESS' . "\n");
@@ -72,88 +72,53 @@
         fclose($fp);
     }
 } else if ($type == 'pingback') {
-    if(add_pingback($_REQUEST['entry_id'], $HTTP_RAW_POST_DATA)) {
+    if (add_pingback($_REQUEST['entry_id'], $HTTP_RAW_POST_DATA)) {
         report_pingback_success();
     } else {
         report_pingback_failure();
     }
 } else {
     $id = (int)(!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
+    $serendipity['head_subtitle'] = COMMENTS;
+    $serendipity['smarty_file'] = 'commentpopup.tpl';
+    serendipity_smarty_init();
 
-    $html_header = '';
-
-    if ($serendipity['XHTML11']) {
-        $html_header .= '<?xml version="1.0" encoding="iso-8859-1" ?>' . "\n";
-        $html_header .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">' . "\n";
-    }
-
-    $html_header .= '<html' . ($serendipity['XHTML11'] ? ' xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" dir="ltr"' : '') . '>
-<head>
-    <title>' . COMMENTS . '</title>
-    <link rel="stylesheet" type="text/css" href="' .  $serendipity['serendipityHTTPPath'] . 'serendipity.css.php?mode=comments" />
-    <meta http-equiv="Content-Type" content="text/html; charset=' . LANG_CHARSET . '" />
-</head>
-<body class="s9y_wrap" id="serendipity_comment_page">
-';
     if (isset($_GET['success']) && $_GET['success'] == 'true') {
-        echo $html_header;
-        printf(
-          COMMENT_ADDED . COMMENT_ADDED_CLICK,
-
-          '<a href="' . $_GET['url'] . '&amp;serendipity[entry_id]=' . $_GET['entry_id'] . '">',
-          '</a>',
-          '<a href="#" onclick="self.close()">',
-          '</a>'
+        $serendipity['smarty']->assign(
+            array(
+                'is_comment_added'   => true,
+                'comment_url'        => htmlspecialchars($_GET['url']) . '&amp;serendipity[entry_id]=' . $id,
+                'comment_string'     => explode('%s', COMMENT_ADDED_CLICK)
+            )
         );
     } else if (!isset($serendipity['POST']['submit'])) {
-        echo $html_header;
         if ($serendipity['GET']['type'] == 'trackbacks') {
-            $tbu = $serendipity['baseURL'] . 'comment.php?type=trackback&amp;entry_id=' . (int)$serendipity['GET']['entry_id'];
-            $query = "SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$serendipity['GET']['entry_id'] ."'";
+            $query = "SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id = '". $id ."'";
             $entry = serendipity_db_query($query);
-            $entry = serendipity_archiveURL($serendipity['GET']['entry_id'], $entry[0]['title'], 'baseURL');
-?>
-    <div class="serendipity_commentsTitle"><?php echo TRACKBACKS; ?></div><br />
-    <dl>
-        <dt><b><?php echo TRACKBACK_SPECIFIC; ?>:</b><br /></dt>
-        <dd><a href="<?php echo $tbu; ?>"><?php echo $tbu; ?></a><br /></dd>
+            $entry = serendipity_archiveURL($id, $entry[0]['title'], 'baseURL');
 
-        <dt><b><?php echo DIRECT_LINK; ?>:</b><br /></dt>
-        <dd><a href="<?php echo $entry; ?>"><?php echo $entry; ?></a></dd>
-    </dl>
-    <?php serendipity_printTrackbacks(serendipity_fetchTrackbacks($id)); ?>
-<?php
+            $serendipity['smarty']->assign(
+                array(
+                    'is_showtrackbacks' => true,
+                    'comment_url'       => $serendipity['baseURL'] . 'comment.php?type=trackback&amp;entry_id=' . $id,
+                    'comment_entryurl'  => $entry
+                )
+            );
         } else {
-?>
-    <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>
-<?php
             $query = "SELECT id, last_modified, timestamp, allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '" . $id . "'";
             $ca    = serendipity_db_query($query, true);
+            $comment_allowed = serendipity_db_bool($ca['allow_comments']) || !is_array($ca) ? true : false;
+            $serendipity['smarty']->assign(
+                array(
+                    'is_showcomments'    => true,
+                    'is_comment_allowed' => $comment_allowed
+                )
+            );
 
             serendipity_printComments(serendipity_fetchComments($id));
 
-            if ($serendipity['POST']['preview']) {
-                serendipity_printComments(
-                  array(
-                    array(
-                      'email'     => $serendipity['POST']['email'],
-                      'username'  => $serendipity['POST']['name'],
-                      'body'      => $serendipity['POST']['comment'],
-                      'url'       => $serendipity['POST']['url'],
-                      'timestamp' => time()
-                    )
-                  )
-                );
-            }
-
-            if (serendipity_db_bool($ca['allow_comments']) || !is_array($ca)) {
-?>
-    <div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div>
-<?php
+            if ($comment_allowed) {
                 serendipity_displayCommentForm($id, '?', $comments, $serendipity['POST'], true, serendipity_db_bool($ca['moderate_comments']), $ca);
-            } elseif  (!serendipity_db_bool($ca['allow_comments'])) { ?>
-                <div class="serendipity_center serendipity_msg_important"><?php echo COMMENTS_CLOSED; ?></div>
-<?php
             }
         }
     } else {
@@ -164,37 +129,33 @@
         $comment['subscribe'] = $serendipity['POST']['subscribe'];
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
-            if (serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL')) {
-                $sc_url = $serendipity['baseURL'] . 'comment.php?entry_id=' . $serendipity['POST']['entry_id'] . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
+            if (serendipity_saveComment($id, $comment, 'NORMAL')) {
+                $sc_url = $serendipity['baseURL'] . 'comment.php?entry_id=' . $id . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
                 if (serendipity_isResponseClean($sc_url)) {
                     header('Location: ' . $sc_url);
                 }
                 exit;
             } else {
-                echo $html_header;
-                printf(
-                  COMMENT_NOT_ADDED . COMMENT_NOT_ADDED_CLICK,
-
-                  '<a href="' . $_SERVER['HTTP_REFERER'] . '">',
-                  '</a>',
-                  '<a href="#" onclick="self.close()">',
-                  '</a>'
+                $serendipity['smarty']->assign(
+                    array(
+                        'is_comment_notadded' => true,
+                        'comment_url'         => htmlspecialchars($_SERVER['HTTP_REFERER']),
+                        'comment_string'      => explode('%s', COMMENT_NOT_ADDED_CLICK)
+                    )
                 );
             }
         } else {
-            echo $html_header;
-            printf(
-              EMPTY_COMMENT,
-
-              '<a href="#" onclick="history.go(-1)">',
-              '</a>'
+            $serendipity['smarty']->assign(
+                array(
+                    'is_comment_empty' => true,
+                    'comment_url'      => htmlspecialchars($_SERVER['HTTP_REFERER']),
+                    'comment_string'   => explode('%s', EMPTY_COMMENT)
+                )
             );
         }
     }
-?>
-</body>
-</html>
-<?php
+
+    $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath'));
 }
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.3,1.4

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
fix threaded view


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- functions_entries.inc.php	19 Nov 2004 11:24:35 -0000	1.3
+++ functions_entries.inc.php	22 Nov 2004 13:46:38 -0000	1.4
@@ -573,6 +573,7 @@
             $entry['link_allow_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&serendipity[entry]=' . $entry['id'];
             $entry['link_deny_comments']  = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&serendipity[entry]=' . $entry['id'];
             $entry['allow_comments']      = serendipity_db_bool($entry['allow_comments']);
+            $entry['viewmode']            = ($serendipity['GET']['cview'] == VIEWMODE_LINEAR ? VIEWMODE_LINEAR : VIEWMODE_THREADED);
 
             if (strlen($entry['extended'])) {
                 $entry['has_extended']      = true;

[php-blog-cvs] serendipity/bundled-libs/Net/DNSBL SURBL.php,1.1,1.2

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

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

Modified Files:
	SURBL.php 
Log Message:
MFH

Index: SURBL.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Net/DNSBL/SURBL.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SURBL.php	21 Nov 2004 15:32:06 -0000	1.1
+++ SURBL.php	22 Nov 2004 08:12:52 -0000	1.2
@@ -29,7 +29,7 @@
  * @author  Sebastian Nohn <seb...@no...>
  * @package Net_DNSBL
  * @license http://www.php.net/license/3_0.txt
- * @version 0.2
+ * @version 0.3
  */
 require_once 'Cache.php';
 require_once 'HTTP/Request.php';
@@ -39,19 +39,34 @@
 class Net_DNSBL_SURBL extends Net_DNSBL {
 
     /**     
+     * Array of blacklists.
+     *
+     * Contain 1-n blacklists to use for checking the status of a
+     * host.
+     *
      * @var    string[]
      * @access protected
      */
     var $blacklists = array('multi.surbl.org');
 
     /**
+     * File containing whitelisted hosts
+     *
+     * There are some whitelisted hosts (co.uk for example). This
+     * requires the package to not ask the domain name but the host
+     * name (spammer.co.uk instead of co.uk).
+     * 
      * @var    string
+     * @see    $twoLevelCcTld
      * @access protected
      */
     var $doubleCcTldFile = 'http://spamcheck.freeapp.net/two-level-tlds';
 
     /**
+     * Array of whitelisted hosts
+     *
      * @var    array
+     * @see    $twoLevelCcTldFile
      * @access private
      */
     var $twoLevelCcTld = array();
@@ -59,8 +74,9 @@
     /**
      * Check if the last two parts of the FQDN are whitelisted
      *
-     * @param  $fqdn
+     * @param  string Host to check if it is whitelisted
      * @access protected
+     * @return boolean True if the host is whitelisted
      */
     function isDoubleCcTld($fqdn) {
         // 30 Day should be way enough
@@ -100,8 +116,9 @@
      * (3b2) IS_NOT_2LEVEL: we want the last two names
      * (4) return the FQDN to query
      *
-     * @param  string $uri
+     * @param  string URL to check. 
      * @access protected
+     * @return string Host to lookup
      */
     function getHostForLookup($uri, $blacklist) {
         $host       = '';

[php-blog-cvs] serendipity/bundled-libs/Net DNSBL.php,1.1,1.2

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

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

Modified Files:
	DNSBL.php 
Log Message:
MFH

Index: DNSBL.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/Net/DNSBL.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DNSBL.php	21 Nov 2004 15:32:06 -0000	1.1
+++ DNSBL.php	22 Nov 2004 08:12:51 -0000	1.2
@@ -21,7 +21,8 @@
 /**
  * PEAR::Net_DNSBL
  *
- * This class acts as interface to generic Realtime Blocking Lists (RBL)
+ * This class acts as interface to generic Realtime Blocking Lists
+ * (RBL)
  *
  * Net_RBL looks up an supplied host if it's listed in 1-n supplied
  * Blacklists
@@ -29,14 +30,19 @@
  * @author  Sebastian Nohn <seb...@no...>
  * @package Net_DNSBL
  * @license http://www.php.net/license/3_0.txt
- * @version 0.2
+ * @version 0.3
  */
 require_once 'Net/CheckIP.php';
 
 class Net_DNSBL {
 
     /**     
-     * @var    string[]
+     * Array of blacklists.
+     *
+     * Contain 1-n blacklists to use for checking the status of a
+     * host.
+     *
+     * @var    array
      * @access protected
      */
     var $blacklists = array('sbl-xbl.spamhaus.net',
@@ -44,29 +50,37 @@
 
     /**
      * Set the blacklist to a desired blacklist.
-     * 
-     * @param  string[] $blacklists
+     *
+     * @param  array Array of blacklists to use. May contain only one element.
      * @access public
+     * @return bool true if the operation was successful
      */
     function setRBL($blacklists) {
-        $this->blacklists = $blacklists;
-    }
+        if (is_array($blacklists)) {
+            $this->blacklists = $blacklists;
+            return true;
+        } else {
+            return false;
+        } // if
+    } // function
 
     /**
      * Get the blacklists.
      *
      * @access public
+     * @return array Currently set blacklists.
      */
     function getRBL() {
         return $this->blacklists;
     }
 
-    /**
-     * Checks if the supplied URL is listen in one or more of
-     * the RBLs
+    /** 
+     * Checks if the supplied Host is listen in one or more of the
+     * RBLs
      *
-     * @param  string $host
+     * @param  string Host to check for being listed.
      * @access public
+     * @return boolean true if the checked host is listed in some blacklist.
      */
     function isListed($host) {
         
@@ -77,7 +91,7 @@
             if ($result != $this->getHostForLookup($host, $blacklist)) { 
                 $isListed = true;
                 
-                //if the URL was listed we don't need to check other RBLs,
+                //if the Host was listed we don't need to check other RBLs,
                 break;
                 
             } // if
@@ -85,7 +99,16 @@
         
         return $isListed;
     } // function
-    
+
+    /**
+     * Get thublice host to lookup. Lookup a host if neccessary and get the
+     * complete FQDN to lookup
+     *
+     * @param  string Host OR IP to use for building the lookup.
+     * @param  string Blacklist to use for building the lookup.
+     * @access protected
+     * @return string Ready to use host to lookup
+     */    
     function getHostForLookup($host, $blacklist) {
         if (!Net_CheckIP::check_ip($host)) {
             $ip = gethostbyname($host);
@@ -93,13 +116,28 @@
             $ip = $host;
         }
 
-        return $this->buildLookUpUrl( $ip, $blacklist );
+        return $this->buildLookUpHost($ip, $blacklist);
     } // function
 
-    function buildLookUpUrl($ip, $blacklist) {
+    /**
+     * Build the host to lookup from an IP.
+     *
+     * @param  string IP to use for building the lookup.
+     * @param  string Blacklist to use for building the lookup.
+     * @access protected
+     * @return string Ready to use host to lookup
+     */    
+    function buildLookUpHost($ip, $blacklist) {
         return $this->reverseIp($ip).'.'.$blacklist;        
     } // function
 
+    /**
+     * Reverse the order of an IP. 127.0.0.1 -> 1.0.0.127
+     *
+     * @param  string IP to reverse.
+     * @access protected
+     * @return string Reversed IP
+     */    
     function reverseIp($ip) {        
         return implode('.', array_reverse(explode('.', $ip)));        
     } // function

[php-blog-cvs] serendipity index.php,1.58,1.59

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

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

Modified Files:
	index.php 
Log Message:
we're out of debugging phase (for now). agreed on #s9y.org :)


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- index.php	21 Nov 2004 03:20:01 -0000	1.58
+++ index.php	21 Nov 2004 16:28:54 -0000	1.59
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-$global_debug = true;
+$global_debug = false;
 if ($global_debug) {
     #apd_set_pprof_trace();
 

[php-blog-cvs] serendipity/bundled-libs/Net/DNSBL SURBL.php,NONE,1.1

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

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

Added Files:
	SURBL.php 
Log Message:
Updated serendipity_event_spamblock to the new Networking::Net_DNSBL package

--- NEW FILE: SURBL.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
// +----------------------------------------------------------------------+
// | PEAR::Net_DNSBL_SURBL                                                |
// +----------------------------------------------------------------------+
// | Copyright (c) 2004 Sebastian Nohn <seb...@no...>               |
// +----------------------------------------------------------------------+
// | This source file is subject to version 3.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at the following url:           |
// | http://www.php.net/license/3_0.txt.                                  |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Sebastian Nohn <seb...@no...>                         |
// +----------------------------------------------------------------------+
//
// $Id: SURBL.php,v 1.1 2004/11/21 15:32:06 nohn Exp $

/**
 * PEAR::Net_DNSBL_SURBL
 *
 * This class acts as interface to the SURBL - Spam URI Realtime Blocklists.
 *
 * Services_SURBL looks up an supplied URI if it's listed in a
 * Spam URI Realtime Blocklists.
 *
 * @author  Sebastian Nohn <seb...@no...>
 * @package Net_DNSBL
 * @license http://www.php.net/license/3_0.txt
 * @version 0.2
 */
require_once 'Cache.php';
require_once 'HTTP/Request.php';
require_once 'Net/CheckIP.php';
require_once 'Net/DNSBL.php';

class Net_DNSBL_SURBL extends Net_DNSBL {

    /**     
     * @var    string[]
     * @access protected
     */
    var $blacklists = array('multi.surbl.org');

    /**
     * @var    string
     * @access protected
     */
    var $doubleCcTldFile = 'http://spamcheck.freeapp.net/two-level-tlds';

    /**
     * @var    array
     * @access private
     */
    var $twoLevelCcTld = array();

    /**
     * Check if the last two parts of the FQDN are whitelisted
     *
     * @param  $fqdn
     * @access protected
     */
    function isDoubleCcTld($fqdn) {
        // 30 Day should be way enough
        $options = array('lifeTime' => 2);
        $id = md5($this->doubleCcTldFile);

        $cache = new Cache('file', $options);
        if ($data = $cache->get($id)) {
            // Cache hit
        } else {
            // Cache miss
            $http = &new HTTP_Request($this->doubleCcTldFile);
            if (!PEAR::isError($http->sendRequest())) {
                $data = $http->getResponseBody();
            }
            $data = explode("\n", $data);
            $data = array_flip($data);
            $cache->save($id, $data);
        } // if 
        if (array_key_exists($fqdn, $data)) {
            return true;
        } else {
            return false;
        } // if
    } // function

    /**
     * Get Hostname to ask for
     *
     * Performs the following steps:
     *
     * (1) Extract the hostname from the given URI
     * (2) Check if the "hostname" is an ip
     * (3a) IS_IP Reverse the IP (1.2.3.4 -> 4.3.2.1)
     * (3b) IS_FQDN Check if is in "CC-2-level-TLD"
     * (3b1) IS_IN_2LEVEL: we want the last three names
     * (3b2) IS_NOT_2LEVEL: we want the last two names
     * (4) return the FQDN to query
     *
     * @param  string $uri
     * @access protected
     */
    function getHostForLookup($uri, $blacklist) {
        $host       = '';
        // (1) Extract the hostname from the given URI
        $parsed_uri = parse_url($uri);
        $host       = $parsed_uri['host'];
        // (2) Check if the "hostname" is an ip
        if (Net_CheckIP::check_ip($host)) {
            // (3a) IS_IP Reverse the IP (1.2.3.4 -> 4.3.2.1)
            $host = $this->reverseIp($host);
        } else {
            $host_elements = explode('.', $host);
            while (count($host_elements) > 3) {
                array_shift($host_elements);
            } // while
            $host_3_elements = implode('.', $host_elements);

            $host_elements = explode('.', $host);
            while (count($host_elements) > 2) {
                array_shift($host_elements);
            } // while
            $host_2_elements = implode('.', $host_elements);

            // (3b) IS_FQDN Check if is in "CC-2-level-TLD"
            if ($this->isDoubleCcTld($host_2_elements)) {
                // (3b1) IS_IN_2LEVEL: we want the last three names
                $host = $host_3_elements;
            } else {
                // (3b2) IS_NOT_2LEVEL: we want the last two names
                $host = $host_2_elements;
            } // if
        } // if
        // (4) return the FQDN to query
        $host      .= '.'.$blacklist;
        return $host;
    } // function

} // class
?>

[php-blog-cvs] serendipity/bundled-libs/Services SURBL.php,1.2,NONE

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

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

Removed Files:
	SURBL.php 
Log Message:
Updated serendipity_event_spamblock to the new Networking::Net_DNSBL package

--- SURBL.php DELETED ---

[php-blog-cvs] serendipity/bundled-libs/Net DNSBL.php,NONE,1.1

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

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

Added Files:
	DNSBL.php 
Log Message:
Updated serendipity_event_spamblock to the new Networking::Net_DNSBL package

--- NEW FILE: DNSBL.php ---
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
// +----------------------------------------------------------------------+
// | PEAR::Net_DNSBL                                                      |
// +----------------------------------------------------------------------+
// | Copyright (c) 2004 Sebastian Nohn <seb...@no...>               |
// +----------------------------------------------------------------------+
// | This source file is subject to version 3.0 of the PHP license,       |
// | that is bundled with this package in the file LICENSE, and is        |
// | available through the world-wide-web at the following url:           |
// | http://www.php.net/license/3_0.txt.                                  |
// | If you did not receive a copy of the PHP license and are unable to   |
// | obtain it through the world-wide-web, please send a note to          |
// | li...@ph... so we can mail you a copy immediately.               |
// +----------------------------------------------------------------------+
// | Authors: Sebastian Nohn <seb...@no...>                         |
// +----------------------------------------------------------------------+
//
// $Id: DNSBL.php,v 1.1 2004/11/21 15:32:06 nohn Exp $

/**
 * PEAR::Net_DNSBL
 *
 * This class acts as interface to generic Realtime Blocking Lists (RBL)
 *
 * Net_RBL looks up an supplied host if it's listed in 1-n supplied
 * Blacklists
 *
 * @author  Sebastian Nohn <seb...@no...>
 * @package Net_DNSBL
 * @license http://www.php.net/license/3_0.txt
 * @version 0.2
 */
require_once 'Net/CheckIP.php';

class Net_DNSBL {

    /**     
     * @var    string[]
     * @access protected
     */
    var $blacklists = array('sbl-xbl.spamhaus.net',
                            'bl.spamcop.net');

    /**
     * Set the blacklist to a desired blacklist.
     * 
     * @param  string[] $blacklists
     * @access public
     */
    function setRBL($blacklists) {
        $this->blacklists = $blacklists;
    }

    /**
     * Get the blacklists.
     *
     * @access public
     */
    function getRBL() {
        return $this->blacklists;
    }

    /**
     * Checks if the supplied URL is listen in one or more of
     * the RBLs
     *
     * @param  string $host
     * @access public
     */
    function isListed($host) {
        
        $isListed = false;
        
        foreach ($this->blacklists as $blacklist) {
            $result = gethostbyname($this->getHostForLookup($host, $blacklist));
            if ($result != $this->getHostForLookup($host, $blacklist)) { 
                $isListed = true;
                
                //if the URL was listed we don't need to check other RBLs,
                break;
                
            } // if
        } // foreach
        
        return $isListed;
    } // function
    
    function getHostForLookup($host, $blacklist) {
        if (!Net_CheckIP::check_ip($host)) {
            $ip = gethostbyname($host);
        } else {
            $ip = $host;
        }

        return $this->buildLookUpUrl( $ip, $blacklist );
    } // function

    function buildLookUpUrl($ip, $blacklist) {
        return $this->reverseIp($ip).'.'.$blacklist;        
    } // function

    function reverseIp($ip) {        
        return implode('.', array_reverse(explode('.', $ip)));        
    } // function

} // class
?>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.27,1.28

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
Updated serendipity_event_spamblock to the new Networking::Net_DNSBL package

Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_event_spamblock.php	19 Nov 2004 11:24:57 -0000	1.27
+++ serendipity_event_spamblock.php	21 Nov 2004 15:32:05 -0000	1.28
@@ -310,30 +310,25 @@
                         // Check for IP listed in RBL
                         // Partly based on work done by James Seward (ja...@ja...)
                         if (serendipity_db_bool($this->get_config('rbl_enabled', false))) {
+                            require_once 'bundled-libs/Net/DNSBL.php';
+                            $dnsbl = new Net_DNSBL();
                             $remoteIP = $_SERVER['REMOTE_ADDR'];
                         #    $remoteIP = '81.70.69.193';
 
-                            $rbls = explode(',', $this->get_config('rbllist'));
-                            if (preg_match("/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/", $remoteIP, $res)) {
-                                array_shift($res);
-                                $reverseIP = implode('.', array_reverse($res));
-                                foreach ($rbls as $rbl) {
-                                    $rblhost = $reverseIP .'.'. trim($rbl);
-                                    if (gethostbyname($rblhost) != $rblhost) {
-                                        $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_RBL, $addData);
-                                        $eventData = array('allow_comments' => false);
-                                        $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL;
-                                        return false;
-                                    }
-                                }
+                            $dnsbl->setRBL(explode(',', $this->get_config('rbllist')));
+                            if ($dnsbl->isListed($remoteIP)) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_RBL, $addData);
+                                $eventData = array('allow_comments' => false);
+                                $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL;
+                                return false;
                             }
                         }
 
                         // Check for IP listed in SURBL
                         if (serendipity_db_bool($this->get_config('surbl_enabled', false))) {
-                            require_once 'bundled-libs/Services/SURBL.php';
-                            $surbl = new Services_SURBL();
-                            if ($surbl->isSpam($addData['url'])) {
+                            require_once 'bundled-libs/Net/DNSBL/SURBL.php';
+                            $surbl = new Net_DNSBL_SURBL();
+                            if ($surbl->isListed($addData['url'])) {
                                 $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;
@@ -360,7 +355,7 @@
                                           }x", $addData['comment'], $matches);
                             // END Code copied from http://www.phpfreaks.com/quickcode/Extract_All_URLs_on_a_Page/15.php
                             foreach ($matches[0] as $surbl_check_url) {
-                                if ($surbl->isSpam($surbl_check_url)) {
+                                if ($surbl->isListed($surbl_check_url)) {
                                     $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_SURBL, $addData);
                                     $eventData = array('allow_comments' => false);
                                     $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL;

[php-blog-cvs] serendipity/bundled-libs/Net/DNSBL - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/bundled-libs/Net/DNSBL added to the repository

[php-blog-cvs] serendipity index.php,1.57,1.58

[Evan N. <tad...@us...>]

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

Modified Files:
	index.php 
Log Message:
When the user requests a non-existant resource, we should return a 404, not 200.

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- index.php	20 Nov 2004 19:26:43 -0000	1.57
+++ index.php	21 Nov 2004 03:20:01 -0000	1.58
@@ -186,8 +186,8 @@
     serendipity_plugin_api::hook_event('external_plugin', $matches[1]);
     exit;
 } else if (preg_match(PAT_CATEGORIES, $uri, $matches) ||
-           preg_match('@/(index\.(php|html))?@', $uri) ||
-           preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) {
+           preg_match('@/(index(\.php|\.html)?)|'. preg_quote($serendipity['indexFile']) .'@', $uri) ||
+           preg_match('@^/' . preg_quote(trim($serendipity['serendipityHTTPPath'], '/')) . '/?(\?.*)?$@', $uri)) {
 
     if (count($serendipity['GET']) == 2) {
         if (isset($matches) && is_array($matches) && isset($matches[1])) {
@@ -216,7 +216,9 @@
         include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
     }
 } else {
-    printf(DOCUMENT_NOT_FOUND, $uri);
+    header('HTTP/1.0 404 Not found');
+    include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
+    printf('<div class="serendipity_msg_important">' . DOCUMENT_NOT_FOUND . '</div>', $uri);
 }
 
 if ($track_referer) {

[php-blog-cvs] serendipity/docs NEWS,1.4,1.5

[Evan N. <tad...@us...>]

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

Modified Files:
	NEWS 
Log Message:
When the user requests a non-existant resource, we should return a 404, not 200.

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NEWS	20 Nov 2004 14:09:09 -0000	1.4
+++ NEWS	21 Nov 2004 03:20:01 -0000	1.5
@@ -3,6 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * When a document does not exist and Serendipity has no idea how
+      to create it, a 404 (not found) is sent instead of a 200 (OK)
+      (tadpole9)
+
     * serendipity_config_local.inc.php can now contain user-defined
       variables, which are not overwritten when changing Configuration.
       (garvinhicking)

[php-blog-cvs] serendipity/include functions_smarty.inc.php,1.4,1.5 genpage.inc.php,1.4,1.5

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

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

Modified Files:
	functions_smarty.inc.php genpage.inc.php 
Log Message:
* fix rss feed (thanks tom)
* call serendipity_smarty_init() in genpage.inc, that's safer&better if plugins (like event_staticpage from romulus) call page generation.
* propagate setting of title through serendipity vars, to that plugins can globally access it (missed that part, I already committed part of a fix for that last week)



Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- functions_smarty.inc.php	20 Nov 2004 17:12:00 -0000	1.4
+++ functions_smarty.inc.php	20 Nov 2004 19:26:43 -0000	1.5
@@ -153,7 +153,7 @@
             'head_charset'              => LANG_CHARSET,
             'head_version'              => $serendipity['version'],
             'head_title'                => $serendipity['head_title'],
-            'head_subTitle'             => $serendipity['head_subtitle'],
+            'head_subtitle'             => $serendipity['head_subtitle'],
 
             'CONST'                     => get_defined_constants(),
 

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- genpage.inc.php	20 Nov 2004 17:12:00 -0000	1.4
+++ genpage.inc.php	20 Nov 2004 19:26:43 -0000	1.5
@@ -3,6 +3,8 @@
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php');
 
+serendipity_smarty_init();
+
 $serendipity['smarty']->assign(
     array(
         'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),

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

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

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

Modified Files:
	serendipity_event_entryproperties.php 
Log Message:
* fix rss feed (thanks tom)
* call serendipity_smarty_init() in genpage.inc, that's safer&better if plugins (like event_staticpage from romulus) call page generation.
* propagate setting of title through serendipity vars, to that plugins can globally access it (missed that part, I already committed part of a fix for that last week)



Index: serendipity_event_entryproperties.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_entryproperties.php	19 Nov 2004 11:24:54 -0000	1.3
+++ serendipity_event_entryproperties.php	20 Nov 2004 19:26:44 -0000	1.4
@@ -309,6 +309,8 @@
                     $conds = array();
                     if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) {
                         $conds[] = 'ep_sticky.value IS NULL AS orderkey,';
+                    } else {
+                        $conds[] = '1 AS orderkey,';
                     }
 
                     if ($is_cache && (!isset($addData['noCache']) || !$addData['noCache'])) {
@@ -316,10 +318,6 @@
                         $conds[] = 'ep_cache_body.value     AS ep_cache_body,';
                     }
 
-                    if (count($conds) < 1) {
-                        $conds[] = '1 AS orderkey,';
-                    }
-
                     $cond = implode("\n", $conds);
                     if (empty($eventData['addkey'])) {
                         $eventData['addkey'] = $cond;

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

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

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

Modified Files:
	index.php 
Log Message:
* fix rss feed (thanks tom)
* call serendipity_smarty_init() in genpage.inc, that's safer&better if plugins (like event_staticpage from romulus) call page generation.
* propagate setting of title through serendipity vars, to that plugins can globally access it (missed that part, I already committed part of a fix for that last week)



Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- index.php	20 Nov 2004 17:11:59 -0000	1.56
+++ index.php	20 Nov 2004 19:26:43 -0000	1.57
@@ -93,10 +93,8 @@
         }
     }
 
-    serendipity_smarty_init();
-
     $serendipity['range'] = array($ts, $te);
-    $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
+    $serendipity['head_subtitle'] = sprintf(ENTRIES_FOR, $date);
 
     ob_start();
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
@@ -140,8 +138,6 @@
     serendipity_track_referrer($id);
     $track_referer = false;
 
-    serendipity_smarty_init();
-
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['id']     = $id;
 
@@ -184,7 +180,6 @@
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
     exit;
 } else if (preg_match(PAT_ARCHIVE, $uri)) {
-    serendipity_smarty_init();
     $serendipity['GET']['action'] = 'archives';
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
 } else if (preg_match(PAT_PLUGIN, $uri, $matches)) {
@@ -194,8 +189,6 @@
            preg_match('@/(index\.(php|html))?@', $uri) ||
            preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) {
 
-    serendipity_smarty_init();
-
     if (count($serendipity['GET']) == 2) {
         if (isset($matches) && is_array($matches) && isset($matches[1])) {
             $serendipity['GET']['category'] = $matches[1];

[php-blog-cvs] serendipity/include/admin entries.inc.php,1.3,1.4

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

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

Modified Files:
	entries.inc.php 
Log Message:
- This should go here


Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entries.inc.php	20 Nov 2004 17:12:00 -0000	1.3
+++ entries.inc.php	20 Nov 2004 17:16:00 -0000	1.4
@@ -343,9 +343,8 @@
                 $serendipity['GET']['id'] = 1;
             }
 
-            serendipity_smarty_init();
-
             $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
+            serendipity_smarty_init();
             $serendipity['smarty']->assign('is_preview',  true);
 
             echo '<strong>' . PREVIEW . '</strong>';

[php-blog-cvs] serendipity/include/admin entries.inc.php,1.2,1.3

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

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

Modified Files:
	entries.inc.php 
Log Message:
- Unbreak archives
- Rename serendipity_smarty_assignDefaults() to serendipity_smarty_init()
- Add serendipity_smarty_init() where needed


Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- entries.inc.php	19 Nov 2004 11:05:32 -0000	1.2
+++ entries.inc.php	20 Nov 2004 17:12:00 -0000	1.3
@@ -342,9 +342,11 @@
             } else {
                 $serendipity['GET']['id'] = 1;
             }
+
+            serendipity_smarty_init();
+
             $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
-            $smartyvars = array('is_preview' => true);
-            serendipity_smarty_assignDefaults($smartyvars);
+            $serendipity['smarty']->assign('is_preview',  true);
 
             echo '<strong>' . PREVIEW . '</strong>';
             echo '<div style="border:1px solid #000000; padding: 15px;">';

[php-blog-cvs] serendipity index.php,1.55,1.56

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

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

Modified Files:
	index.php 
Log Message:
- Unbreak archives
- Rename serendipity_smarty_assignDefaults() to serendipity_smarty_init()
- Add serendipity_smarty_init() where needed


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- index.php	19 Nov 2004 11:24:34 -0000	1.55
+++ index.php	20 Nov 2004 17:11:59 -0000	1.56
@@ -93,6 +93,8 @@
         }
     }
 
+    serendipity_smarty_init();
+
     $serendipity['range'] = array($ts, $te);
     $serendipity['smarty']->assign('head_subtitle', sprintf(ENTRIES_FOR, $date));
 
@@ -138,6 +140,8 @@
     serendipity_track_referrer($id);
     $track_referer = false;
 
+    serendipity_smarty_init();
+
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['id']     = $id;
 
@@ -180,6 +184,7 @@
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
     exit;
 } else if (preg_match(PAT_ARCHIVE, $uri)) {
+    serendipity_smarty_init();
     $serendipity['GET']['action'] = 'archives';
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
 } else if (preg_match(PAT_PLUGIN, $uri, $matches)) {
@@ -189,6 +194,8 @@
            preg_match('@/(index\.(php|html))?@', $uri) ||
            preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) {
 
+    serendipity_smarty_init();
+
     if (count($serendipity['GET']) == 2) {
         if (isset($matches) && is_array($matches) && isset($matches[1])) {
             $serendipity['GET']['category'] = $matches[1];

[php-blog-cvs] serendipity/include functions_smarty.inc.php,1.3,1.4 genpage.inc.php,1.3,1.4

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

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

Modified Files:
	functions_smarty.inc.php genpage.inc.php 
Log Message:
- Unbreak archives
- Rename serendipity_smarty_assignDefaults() to serendipity_smarty_init()
- Add serendipity_smarty_init() where needed


Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- functions_smarty.inc.php	19 Nov 2004 11:24:51 -0000	1.3
+++ functions_smarty.inc.php	20 Nov 2004 17:12:00 -0000	1.4
@@ -104,7 +104,7 @@
     return serendipity_printTrackbacks(serendipity_fetchTrackbacks($params['entry']));
 }
 
-function serendipity_smarty_assignDefaults($smartyvars = null) {
+function serendipity_smarty_init() {
     global $serendipity;
 
     if (!isset($serendipity['smarty'])) {
@@ -176,10 +176,6 @@
         )
     );
 
-    if (is_array($smartyvars)) {
-        $serendipity['smarty']->assign($smartyvars);
-    }
-
     return true;
 }
 

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- genpage.inc.php	19 Nov 2004 11:24:51 -0000	1.3
+++ genpage.inc.php	20 Nov 2004 17:12:00 -0000	1.4
@@ -3,8 +3,6 @@
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php');
 
-serendipity_smarty_assignDefaults();
-
 $serendipity['smarty']->assign(
     array(
         'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),

[php-blog-cvs] serendipity/plugins/serendipity_event_livesearch serendipity_event_livesearch.php,1.9,1.10

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

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

Modified Files:
	serendipity_event_livesearch.php 
Log Message:
* fix skipping CSS emitting when already found in template
* use better performing strpos() instead of stristr()



Index: serendipity_event_livesearch.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_livesearch/serendipity_event_livesearch.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_livesearch.php	19 Nov 2004 11:24:55 -0000	1.9
+++ serendipity_event_livesearch.php	20 Nov 2004 15:18:14 -0000	1.10
@@ -50,7 +50,7 @@
         if (isset($hooks[$event])) {
             switch($event) {
                 case 'css':
-                    if (stristr('.serendipity_livesearch_row', $addData)) {
+                    if (strpos($eventData, '.serendipity_livesearch_row')) {
                         // class exists in CSS, so a user has customized it and we don't need default
                         return true;
                     }
@@ -166,4 +166,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.22,1.23

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
* fix skipping CSS emitting when already found in template
* use better performing strpos() instead of stristr()



Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_event_karma.php	19 Nov 2004 11:24:55 -0000	1.22
+++ serendipity_event_karma.php	20 Nov 2004 15:18:13 -0000	1.23
@@ -358,7 +358,7 @@
                     break;
 
                 case 'css':
-                    if (stristr('.serendipity_karmaVoting', $addData)) {
+                    if (strpos($eventData, '.serendipity_karmaVoting')) {
                         // class exists in CSS, so a user has customized it and we don't need default
                         return true;
                     }
@@ -516,7 +516,7 @@
                             $max_karmatime = $karmatime    * 24 * 60 * 60;
                             $now           = time();
 
-                            $url = $_SERVER['REQUEST_URI'] . (stristr($_SERVER['REQUEST_URI'], '?') ? '&' : '?');
+                            $url = $_SERVER['REQUEST_URI'] . (strpos($_SERVER['REQUEST_URI'], '?') !== false ? '&' : '?');
                             $karma = (isset($serendipity['COOKIE']['karmaVote']) ? unserialize($serendipity['COOKIE']['karmaVote']) : array());
 
                             $link_1 = '<a class="serendipity_karmaVoting_link1" href="#" onclick="javascript:location.href=\'%5$sserendipity[karmaVote]=2&amp;serendipity[karmaId]=%1$s#karma_vote%1$s\';" title="' . sprintf(PLUGIN_KARMA_RATE, PLUGIN_KARMA_VOTEPOINT_1) . '">++</a>';
@@ -633,4 +633,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,1.10,1.11

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

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

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
* fix skipping CSS emitting when already found in template
* use better performing strpos() instead of stristr()



Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_event_bbcode.php	19 Nov 2004 11:24:51 -0000	1.10
+++ serendipity_event_bbcode.php	20 Nov 2004 15:18:12 -0000	1.11
@@ -221,7 +221,7 @@
                     break;
 
                 case 'css':
-                    if (stristr('.bb-code', $addData)) {
+                    if (strpos($eventData, '.bb-code') !== false) {
                         // class exists in CSS, so a user has customized it and we don't need default
                         return true;
                     }
@@ -258,4 +258,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>