php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.31,1.32 serendipity_lang_cs.inc.php,1.77,1.78 serendipity_lang_cz.inc.php,1.77,1.78 serendipity_lang_da.inc.php,1.97,1.98 serendipity_lang_fr.inc.php,1.76,1.77 serendipity_lang_it.inc.php,1.17,1.18 serendipity_lang_nl.inc.php,1.53,1.54 serendipity_lang_no.inc.php,1.18,1.19 serendipity_lang_pt.inc.php,1.53,1.54 serendipity_lang_tw.inc.php,1.13,1.14

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_fr.inc.php serendipity_lang_it.inc.php 
	serendipity_lang_nl.inc.php serendipity_lang_no.inc.php 
	serendipity_lang_pt.inc.php serendipity_lang_tw.inc.php 
Log Message:
add missing language strings :)


Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_it.inc.php	3 Dec 2004 10:07:42 -0000	1.17
+++ serendipity_lang_it.inc.php	8 Dec 2004 10:35:48 -0000	1.18
@@ -621,6 +621,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- serendipity_lang_cs.inc.php	3 Dec 2004 10:07:42 -0000	1.77
+++ serendipity_lang_cs.inc.php	8 Dec 2004 10:35:47 -0000	1.78
@@ -621,6 +621,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_no.inc.php	3 Dec 2004 10:07:43 -0000	1.18
+++ serendipity_lang_no.inc.php	8 Dec 2004 10:35:48 -0000	1.19
@@ -616,5 +616,7 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 ?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_lang_fr.inc.php	3 Dec 2004 10:07:42 -0000	1.76
+++ serendipity_lang_fr.inc.php	8 Dec 2004 10:35:47 -0000	1.77
@@ -624,6 +624,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- serendipity_lang_cz.inc.php	3 Dec 2004 10:07:42 -0000	1.77
+++ serendipity_lang_cz.inc.php	8 Dec 2004 10:35:47 -0000	1.78
@@ -619,6 +619,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- serendipity_lang_nl.inc.php	3 Dec 2004 10:07:43 -0000	1.53
+++ serendipity_lang_nl.inc.php	8 Dec 2004 10:35:48 -0000	1.54
@@ -626,6 +626,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_lang_tw.inc.php	3 Dec 2004 10:07:43 -0000	1.13
+++ serendipity_lang_tw.inc.php	8 Dec 2004 10:35:48 -0000	1.14
@@ -619,6 +619,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- serendipity_lang_da.inc.php	3 Dec 2004 10:07:42 -0000	1.97
+++ serendipity_lang_da.inc.php	8 Dec 2004 10:35:47 -0000	1.98
@@ -616,6 +616,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_bg.inc.php	3 Dec 2004 10:07:42 -0000	1.31
+++ serendipity_lang_bg.inc.php	8 Dec 2004 10:35:47 -0000	1.32
@@ -603,6 +603,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- serendipity_lang_pt.inc.php	3 Dec 2004 10:07:43 -0000	1.53
+++ serendipity_lang_pt.inc.php	8 Dec 2004 10:35:48 -0000	1.54
@@ -622,6 +622,8 @@
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
 @define('REFERER', 'Referer'); // Translate
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.39,1.40

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
thanks tom :)


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_event_spamblock.php	8 Dec 2004 00:34:42 -0000	1.39
+++ serendipity_event_spamblock.php	8 Dec 2004 01:03:21 -0000	1.40
@@ -297,13 +297,13 @@
                           body text)";
             $sql = serendipity_db_schema_import($q);
 
-            $q   = "CREATE INDEX kspamidx ON {$serendipity['dbPrefix']}karma (timestamp);";
+            $q   = "CREATE INDEX kspamidx ON {$serendipity['dbPrefix']}spamblocklog (timestamp);";
             $sql = serendipity_db_schema_import($q);
 
-            $q   = "CREATE INDEX kspamtypeidx ON {$serendipity['dbPrefix']}karma (type);";
+            $q   = "CREATE INDEX kspamtypeidx ON {$serendipity['dbPrefix']}spamblocklog (type);";
             $sql = serendipity_db_schema_import($q);
 
-            $q   = "CREATE INDEX kspamentryidx ON {$serendipity['dbPrefix']}karma (entry_id);";
+            $q   = "CREATE INDEX kspamentryidx ON {$serendipity['dbPrefix']}spamblocklog (entry_id);";
             $sql = serendipity_db_schema_import($q);
 
             $this->set_config('version', $maxVersion);

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.38,1.39

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

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
let's make kris a happy guy


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- serendipity_event_spamblock.php	5 Dec 2004 10:53:51 -0000	1.38
+++ serendipity_event_spamblock.php	8 Dec 2004 00:34:42 -0000	1.39
@@ -56,6 +56,12 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL', 'E-Mail-Adressen bei Kommentatoren verstecken');
         @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_DESC', 'Zeigt in den Kommentaren keine E-Mail Adressen der jeweiligen Kommentatoren an');
         @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_NOTICE', 'Die angegebene E-Mail Adressse wird nicht dargestellt, sondern nur für evtl. Benachrichtigungen verwendet');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE', 'Protokollierung von fehlgeschlagenen Kommentaren');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DESC', 'Die Protokollierung von fehlgeschlagenen Kommentaren und deren Gründen kann auf mehrere Arten durchgeführt werden.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_FILE', 'Einfache Datei (siehe Option "Logfile")');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DB', 'Datenbank');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_NONE', 'Keine Protokollierung');
         break;
 
     default:
@@ -112,10 +118,15 @@
         @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');
-        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL', 'Hide E-Mail addresses for commenting users');
-        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_DESC', 'Will show no E-Mail addresses in comments of commenting users');
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL', 'Hide E-Mail addresses of commenting users');
+        @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_DESC', 'Will show no E-Mail addresses of commenting users');
         @define('PLUGIN_EVENT_SPAMBLOCK_HIDE_EMAIL_NOTICE', 'E-Mail addresses will not be displayed and only used for E-Mail notifications');
 
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE', 'Choose logging method');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DESC', 'Logging of rejected comments can be done in Database or to a plaintext file');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_FILE', 'File (see "logfile" option below)');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DB', 'Database');
+        @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_NONE', 'No Logging');
         break;
 }
 
@@ -133,14 +144,14 @@
         $propbag->add('description',   PLUGIN_EVENT_SPAMBLOCK_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Garvin Hicking, Sebastian Nohn');
-        $propbag->add('version',       '1.15');
+        $propbag->add('version',       '1.2');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
             'frontend_comment'     => true,
             'fetchcomments'        => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject', 'logfile', 'hide_email'));
+        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'links_moderate', 'links_reject', 'hide_email', 'logtype', 'logfile'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -183,6 +194,19 @@
                 $propbag->add('default', $serendipity['serendipityPath'] . 'spamblock.log');
                 break;
 
+            case 'logtype':
+                $propbag->add('type', 'radio');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LOGTYPE);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DESC);
+                $propbag->add('default', 'db');
+                $propbag->add('radio',         array(
+                    'value' => array('file', 'db', 'none'),
+                    'desc'  => array(PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_FILE, PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DB, PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_NONE)
+                ));
+                $propbag->add('radio_per_row', '1');
+
+                break;
+
             case 'ipflood':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_IPFLOOD);
@@ -253,6 +277,40 @@
         return true;
     }
 
+    function checkScheme($maxVersion) {
+        global $serendipity;
+
+        $version = $this->get_config('version', '1.0');
+
+        if ($version != $maxVersion) {
+            $q   = "CREATE TABLE {$serendipity['dbPrefix']}spamblocklog (
+                          timestamp int(10) {UNSIGNED} default null,
+                          type varchar(255),
+                          reason text,
+                          entry_id int(10) {UNSIGNED} not null default '0',
+                          author varchar(80),
+                          email varchar(200),
+                          url varchar(200),
+                          useragent varchar(255),
+                          ip varchar(15),
+                          referer varchar(255),
+                          body text)";
+            $sql = serendipity_db_schema_import($q);
+
+            $q   = "CREATE INDEX kspamidx ON {$serendipity['dbPrefix']}karma (timestamp);";
+            $sql = serendipity_db_schema_import($q);
+
+            $q   = "CREATE INDEX kspamtypeidx ON {$serendipity['dbPrefix']}karma (type);";
+            $sql = serendipity_db_schema_import($q);
+
+            $q   = "CREATE INDEX kspamentryidx ON {$serendipity['dbPrefix']}karma (entry_id);";
+            $sql = serendipity_db_schema_import($q);
+
+            $this->set_config('version', $maxVersion);
+        }
+
+        return true;
+    }
 
     function generate_content(&$title) {
         $title = $this->title;
@@ -296,6 +354,10 @@
 
                 case 'frontend_saveComment':
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
+                        if ($this->get_config('logtype', 'db') == 'db' && $this->get_config('version') != $bag->get('version')) {
+                            $this->checkScheme($bag->get('version'));
+                        }
+
                         $serendipity['csuccess'] = 'true';
                         $logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock.log');
 
@@ -570,30 +632,62 @@
     function log($logfile, $id, $switch, $reason, $comment) {
         global $serendipity;
 
-        if (empty($logfile)) {
-            return;
-        }
+        $method = $this->get_config('logtype');
 
-        $fp = @fopen($logfile, 'a+');
-        if (!is_resource($fp)) {
-            return;
-        }
+        switch($method) {
+            case 'file':
+                if (empty($logfile)) {
+                    return;
+                }
 
-        fwrite($fp, sprintf(
-            '[%s] - [%s: %s] - [#%s, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
-            date('Y-m-d H:i:s', serendipity_serverOffsetHour()),
-            $switch,
-            $reason,
-            $id,
-            str_replace("\n", ' ', $comment['name']),
-            str_replace("\n", ' ', $comment['email']),
-            str_replace("\n", ' ', $comment['url']),
-            str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
-            $_SERVER['REMOTE_ADDR'],
-            str_replace("\n", ' ', $comment['comment'])
-        ));
+                $fp = @fopen($logfile, 'a+');
+                if (!is_resource($fp)) {
+                    return;
+                }
 
-        fclose($fp);
+                fwrite($fp, sprintf(
+                    '[%s] - [%s: %s] - [#%s, Name "%s", E-Mail "%s", URL "%s", User-Agent "%s", IP %s] - [%s]' . "\n",
+                    date('Y-m-d H:i:s', serendipity_serverOffsetHour()),
+                    $switch,
+                    $reason,
+                    $id,
+                    str_replace("\n", ' ', $comment['name']),
+                    str_replace("\n", ' ', $comment['email']),
+                    str_replace("\n", ' ', $comment['url']),
+                    str_replace("\n", ' ', $_SERVER['HTTP_USER_AGENT']),
+                    $_SERVER['REMOTE_ADDR'],
+                    str_replace("\n", ' ', $comment['comment'])
+                ));
+
+                fclose($fp);
+                break;
+
+            case 'none':
+                return;
+                break;
+
+            case 'db':
+            default:
+                $q = sprintf("INSERT INTO {$serendipity['dbPrefix']}spamblocklog
+                                          (timestamp, type, reason, entry_id, author, email, url,  useragent, ip,   referer, body)
+                                   VALUES (%d,        '%s',  '%s',  '%s',     '%s',   '%s',  '%s', '%s',      '%s', '%s',    '%s')",
+
+                           serendipity_serverOffsetHour(),
+                           serendipity_db_escape_string($switch),
+                           serendipity_db_escape_string($reason),
+                           serendipity_db_escape_string($id),
+                           serendipity_db_escape_string($comment['name']),
+                           serendipity_db_escape_string($comment['email']),
+                           serendipity_db_escape_string($comment['url']),
+                           serendipity_db_escape_string($_SERVER['HTTP_USER_AGENT']),
+                           serendipity_db_escape_string($_SERVER['REMOTE_ADDR']),
+                           serendipity_db_escape_string(isset($_SESSION['HTTP_REFERER']) ? $_SESSION['HTTP_REFERER'] : $_SERVER['HTTP_REFERER']),
+                           serendipity_db_escape_string($comment['comment'])
+                );
+
+                serendipity_db_query($q);
+                break;
+        }
     }
 }
 

[php-blog-cvs] serendipity/docs NEWS,1.24,1.25

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

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

Modified Files:
	NEWS 
Log Message:
let's make kris a happy guy


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- NEWS	6 Dec 2004 11:09:36 -0000	1.24
+++ NEWS	8 Dec 2004 00:34:41 -0000	1.25
@@ -3,6 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Spam Protector can now log failed comments to either plaintext-
+      file or database. Dedicated to all those trigger-happy logfile-
+      statistic-hunters out there... (garvinhicking)
+
     * When using ImageMagick, create a thumbnail of a PDF for media
       browsing (nohn, garvinhicking)
 

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.15,1.16

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
* fix comparison logic, unset right variable (doesn't work with references inside foreach loop)
* remove categories for which no entries remain

(fixes that a 'chief' user could basically see the same things as 'admin')


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- functions_installer.inc.php	6 Dec 2004 10:57:07 -0000	1.15
+++ functions_installer.inc.php	7 Dec 2004 15:23:23 -0000	1.16
@@ -143,27 +143,31 @@
 function serendipity_parseTemplate($filename, $userlevel=null) {
     global $serendipity;
 
-    if ( is_null($userlevel) ) {
+    if (is_null($userlevel)) {
         $userlevel = $serendipity['serendipityUserlevel'];
     }
 
     $config = include($filename);
 
-    foreach ( $config as $n => $category ) {
-        foreach ( $category['items'] as $i => $item ) {
+    foreach ($config as $n => $category) {
+        foreach ($category['items'] as $i => $item) {
             $items = &$config[$n]['items'][$i];
-            if ( !isset($items['userlevel']) || !is_numeric($items['userlevel']) ) {
+            if (!isset($items['userlevel']) || !is_numeric($items['userlevel'])) {
                 $items['userlevel'] = USERLEVEL_ADMIN;
             }
 
-            if ( !isset($items['flags']) || !is_array($items['flags']) ) {
+            if (!isset($items['flags']) || !is_array($items['flags'])) {
                 $items['flags'] = array();
             }
 
-            if ( $items['userlevel'] < $userlevel ) {
-                unset($items);
+            if ($userlevel < $items['userlevel']) {
+                unset($config[$n]['items'][$i]);
             }
         }
+
+        if (count($config[$n]['items']) < 1) {
+            unset($config[$n]);
+        }
     }
 
     return $config;

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.118,1.119 serendipity_lang_en.inc.php,1.98,1.99

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

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

Modified Files:
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
Log Message:
Closing feature request #1056336

Could someone add the images?


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- serendipity_lang_de.inc.php	3 Dec 2004 10:07:42 -0000	1.118
+++ serendipity_lang_de.inc.php	7 Dec 2004 10:57:12 -0000	1.119
@@ -124,6 +124,8 @@
 @define('SEARCH_TOO_SHORT', 'Bitte geben Sie einen Suchbegriff mit mehr als drei Zeichen an.');
 @define('YOU_CHOSE', 'Sie haben sich für %s entschieden');
 @define('IMAGE_SIZE', 'Bildgröße');
+@define('IMAGE_ROTATE_LEFT', 'Bild 90 Grad gegen den Uhrzeigersinn drehen');
+@define('IMAGE_ROTATE_RIGHT', 'Bild 90 Grad im Uhrzeigersinn drehen');
 @define('IMAGE_AS_A_LINK', 'Bild als Link');
 @define('POWERED_BY', 'Powered by');
 @define('TRACKBACKS', 'Trackbacks');

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- serendipity_lang_en.inc.php	3 Dec 2004 10:07:42 -0000	1.98
+++ serendipity_lang_en.inc.php	7 Dec 2004 10:57:12 -0000	1.99
@@ -126,6 +126,8 @@
 @define('THE_NUGGET', 'The Nugget of HTML!');
 @define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
 @define('YOU_CHOSE', 'You chose %s');
+@define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise');
+@define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise');
 @define('IMAGE_SIZE', 'Image size');
 @define('IMAGE_AS_A_LINK', 'Image insertion');
 @define('POWERED_BY', 'Powered by');

[php-blog-cvs] serendipity/include/admin images.inc.php,1.4,1.5

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

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

Modified Files:
	images.inc.php 
Log Message:
Closing feature request #1056336

Could someone add the images?


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- images.inc.php	6 Dec 2004 09:28:36 -0000	1.4
+++ images.inc.php	7 Dec 2004 10:57:11 -0000	1.5
@@ -352,6 +352,16 @@
 <?php
     break;
 
+    case 'rotateLeft':
+        echo serendipity_rotateImg($serendipity['GET']['fid'], -90) . '<br />';
+        echo DONE . '<br />';
+    break;
+
+    case 'rotateRight':
+        echo serendipity_rotateImg($serendipity['GET']['fid'], 90) . '<br />';
+        echo DONE . '<br />';
+    break;
+
     case 'scale':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
 

[php-blog-cvs] serendipity/include functions_images.inc.php,1.9,1.10

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
Closing feature request #1056336

Could someone add the images?


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- functions_images.inc.php	7 Dec 2004 10:03:14 -0000	1.9
+++ functions_images.inc.php	7 Dec 2004 10:57:11 -0000	1.10
@@ -219,7 +219,7 @@
             } else {
                $newSize = $size . 'x' . $size;
                $cmd     = $serendipity['convert'] . " -antialias -flatten -scale $newSize \"$infile\" \"$outfile.png\" 2>&1";
-	       echo $cmd;
+               echo $cmd;
             }
             $res     = `$cmd`;
         }
@@ -261,6 +261,39 @@
 }
 
 /**
+ * Rotate an Image
+ **/
+function serendipity_rotateImg($id, $degrees) {
+  global $serendipity;
+
+  $file = serendipity_fetchImageFromDatabase($id);
+
+  $admin = '';
+  if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
+    // A non-admin user may not delete private files from other users.
+    return;
+  }
+
+  $infile = $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['extension'];
+  $infileThumb = $outfileThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.'. $file['extension'];
+
+  if ($serendipity['magick'] !== true) {
+    serendipity_rotate_image_gd($infile, $degrees);
+  }
+
+  $cmd = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infile . ' ' . $outfile;
+  $res = `$cmd`;
+  $cmdThumb = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infileThumb . ' ' . $outfileThumb;
+  $resThumb = `$cmdThumb`;
+
+  $fdim = @getimagesize($outfile);
+
+  serendipity_updateImageInDatabase(array('dimensions_width' => $fdim[0], 'dimensions_height' => $fdim[1]), $id);
+  return;
+}
+
+
+/**
 * Creates thumbnails for all images in the upload dir
 **/
 function serendipity_generateThumbs() {
@@ -595,6 +628,63 @@
     return $i;
 }
 
+function serendipity_rotate_image_gd($infilename, $outfilename, $degrees)
+{
+    if (!function_exists('imagecopyresampled')) {
+        return false;
+    }
+
+    $inf = pathinfo(strtolower($infilename));
+    switch ($inf['extension']) {
+    case 'gif':
+        $loadfn = 'imagecreatefromgif';
+        $savefn = 'imagegif';
+        break;
+
+    case 'jpeg':
+    case 'jpg':
+    case 'jfif':
+        $loadfn = 'imagecreatefromjpeg';
+        $savefn = 'imagejpeg';
+        break;
+
+    case 'png':
+        $loadfn = 'imagecreatefrompng';
+        $savefn = 'imagepng';
+        break;
+
+    default:
+        return false;
+    }
+
+    /* If our loader does not exist, we are doomed */
+    if (!function_exists($loadfn)) {
+        return false;
+    }
+
+    /* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG */
+    if (!function_exists($savefn)) {
+        if (function_exists('imagepng')) {
+            $savefn = 'imagepng';
+        } else {
+            return false;
+        }
+    }
+
+    $in        = $loadfn($infilename);
+
+    $out       = imagerotate($in, $degrees, 0);
+    $savefn($out, $outfilename);
+    $out       = null;
+    $in        = null;
+
+    $newwidth  = imagesx($out);
+    $newheight = imagesy($out);
+
+    return array($newwidth, $newheight);
+}
+
+
 function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newheight=null)
 {
     if (!function_exists('imagecopyresampled')) {
@@ -851,6 +941,9 @@
         <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/zoom.png') ?>"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td>
         <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>"   alt="<?php echo MEDIA_RENAME; ?>"   src="<?php echo serendipity_getTemplateFile('img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
         <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo serendipity_getTemplateFile('img/scale.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&amp;serendipity[adminAction]=scaleSelect&amp;serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?>
+        <?php if ($is_image) { ?><td valign="middle" align="center"><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateLeft&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('img/rotate_left.png') ?>" border="0" /></td><?php } ?>
+        <?php if ($is_image) { ?><td valign="middle" align="center"><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateRight&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('img/rotate_right.png') ?>" border="0" /></td><?php } ?>
+        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo serendipity_getTemplateFile('img/delete.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&amp;serendipity[adminAction]=delete&amp;serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
         <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo serendipity_getTemplateFile('img/delete.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&amp;serendipity[adminAction]=delete&amp;serendipity[fid]=<?php echo $file['id']; ?>';" /></td>
 <?php
                 }

[php-blog-cvs] serendipity/include functions_images.inc.php,1.8,1.9

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
Fixing bug that prevented images from being displayed in the media browser


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- functions_images.inc.php	6 Dec 2004 16:45:11 -0000	1.8
+++ functions_images.inc.php	7 Dec 2004 10:03:14 -0000	1.9
@@ -219,6 +219,7 @@
             } else {
                $newSize = $size . 'x' . $size;
                $cmd     = $serendipity['convert'] . " -antialias -flatten -scale $newSize \"$infile\" \"$outfile.png\" 2>&1";
+	       echo $cmd;
             }
             $res     = `$cmd`;
         }
@@ -813,7 +814,7 @@
             $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
             $is_image = serendipity_isImage($file);
 
-            if (!$is_image) {
+            if ($is_image) {
                 $preview .= '<img src="' . $file['imgsrc'] . '" border="0" alt="'. $file['name'] . '" />';
                 if ($url) { $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
             }

[php-blog-cvs] serendipity/include functions_images.inc.php,1.7,1.8

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
those stupid programmers should learn their own camelCasing!


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- functions_images.inc.php	6 Dec 2004 11:09:36 -0000	1.7
+++ functions_images.inc.php	6 Dec 2004 16:45:11 -0000	1.8
@@ -811,7 +811,7 @@
             ++$x; $preview = '';
             $i      = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
             $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
-            $is_image = serendipity_is_image($file);
+            $is_image = serendipity_isImage($file);
 
             if (!$is_image) {
                 $preview .= '<img src="' . $file['imgsrc'] . '" border="0" alt="'. $file['name'] . '" />';

[php-blog-cvs] serendipity/plugins/serendipity_event_entryproperties serendipity_event_entryproperties.php,1.6,1.7

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

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

Modified Files:
	serendipity_event_entryproperties.php 
Log Message:
Fixing broken SQL (works on PostgreSQL now, no strange things on SQLite, so hopefully this works too for other DBs


Index: serendipity_event_entryproperties.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_event_entryproperties.php	6 Dec 2004 10:08:59 -0000	1.6
+++ serendipity_event_entryproperties.php	6 Dec 2004 16:19:33 -0000	1.7
@@ -292,9 +292,9 @@
                 case 'frontend_fetchentry':
                     $conds = array();
                     if ($_SESSION['serendipityAuthedUser'] === true) {
-                        $conds[] = " (ISNULL(ep_access.property) OR ep_access.value = 'member' OR ep_access.value = 'public' OR (ep_access.value = 'private' AND e.authorid = " . (int)$serendipity['authorid'] . ")) ";
+                        $conds[] = " (ep_access.property IS NULL OR ep_access.value = 'member' OR ep_access.value = 'public' OR (ep_access.value = 'private' AND e.authorid = " . (int)$serendipity['authorid'] . ")) ";
                     } else {
-                        $conds[] = " (ISNULL(ep_access.property) OR ep_access.value = 'public') ";
+                        $conds[] = " (ep_access.property IS NULL OR ep_access.value = 'public') ";
                     }
 
                     if (count($conds) > 0) {
@@ -308,7 +308,8 @@
 
                     $conds = array();
                     if (!isset($addData['noSticky']) || $addData['noSticky'] !== true) {
-                        $conds[] = 'ep_sticky.value IS NULL AS orderkey,';
+                        $conds[] = 'ep_sticky.value AS orderkey,';
+			// $conds[] = 'ep_sticky.value IS NULL AS orderkey,';
                     } else {
                         $conds[] = '1 AS orderkey,';
                     }

[php-blog-cvs] serendipity serendipity_config.inc.php,1.110,1.111

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
sorry...


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- serendipity_config.inc.php	6 Dec 2004 15:53:07 -0000	1.110
+++ serendipity_config.inc.php	6 Dec 2004 16:02:01 -0000	1.111
@@ -17,7 +17,7 @@
 
 $serendipity['version']         = '0.8-alpha6';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
-$serendipity['production']      = false; // Setting this to 'false' will enable debugging output
+$serendipity['production']      = true; // Setting this to 'false' will enable debugging output
 $serendipity['rewrite']         = 'none';
 $serendipity['messagestack']    = array();
 

[php-blog-cvs] serendipity serendipity_config.inc.php,1.109,1.110

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Fixing bug in SQL create scripts


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- serendipity_config.inc.php	6 Dec 2004 10:46:30 -0000	1.109
+++ serendipity_config.inc.php	6 Dec 2004 15:53:07 -0000	1.110
@@ -17,7 +17,7 @@
 
 $serendipity['version']         = '0.8-alpha6';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
-$serendipity['production']      = true; // Setting this to 'false' will enable debugging output
+$serendipity['production']      = false; // Setting this to 'false' will enable debugging output
 $serendipity['rewrite']         = 'none';
 $serendipity['messagestack']    = array();
 

[php-blog-cvs] serendipity/sql db.sql,1.25,1.26

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

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

Modified Files:
	db.sql 
Log Message:
Fixing bug in SQL create scripts


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- db.sql	6 Dec 2004 10:46:32 -0000	1.25
+++ db.sql	6 Dec 2004 15:53:08 -0000	1.26
@@ -143,7 +143,7 @@
   placement varchar(6) not null default 'right',
   sort_order int(4) not null default '0',
   authorid int(11) default '0',
-  path varchar(255) default null
+  path varchar(255) default null,
   PRIMARY KEY(name)
 );
 

[php-blog-cvs] serendipity/include functions.inc.php,1.9,1.10 plugin_api.inc.php,1.7,1.8

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

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

Modified Files:
	functions.inc.php plugin_api.inc.php 
Log Message:
* allow unlimited ammount of nested directories inside plugin directory(see mailinglist)
* unify "get current url" for plugins: karma, templatedropdown, shoutbox


Index: plugin_api.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_api.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- plugin_api.inc.php	6 Dec 2004 10:46:32 -0000	1.7
+++ plugin_api.inc.php	6 Dec 2004 12:45:42 -0000	1.8
@@ -65,8 +65,9 @@
 
         $key = $plugin_class_id . ':' . $id;
 
-        // Secure Plugin path. Only one directory level allowed.
-        $pluginPath = str_replace('/', '', serendipity_db_escape_string($pluginPath));
+        // Secure Plugin path. No leading slashes, no backslashes, no "up" directories
+        $pluginPath = preg_replace('@^(/)@', '', $pluginPath);
+        $pluginPath = str_replace(array('..', "\\"), array('', '/'), serendipity_db_escape_string($pluginPath));
 
         $rs = serendipity_db_query("SELECT MAX(sort_order) as sort_order_max FROM {$serendipity['dbPrefix']}plugins WHERE placement = '$default_placement'", true, 'num');
 
@@ -164,7 +165,7 @@
         return $classes;
     }
 
-    function traverse_plugin_dir($ppath, &$classes, $event_only) {
+    function traverse_plugin_dir($ppath, &$classes, $event_only, $maindir = '') {
         $d = @opendir($ppath);
         if ($d) {
             while (($f = readdir($d)) !== false) {
@@ -177,8 +178,17 @@
                     continue;
                 }
 
-                // Instead of only looking for directories, search for whiles within subdirectories
+                // Instead of only looking for directories, search for files within subdirectories
                 while (($subf = readdir($subd)) !== false) {
+                    if ($subf{0} == '.' || $subf == 'CVS') {
+                        continue;
+                    }
+
+                    if (is_dir($ppath . '/' . $f . '/' . $subf) && $maindir != $ppath . '/' . $f) {
+                        // Search for another level of subdirectories
+                        serendipity_plugin_api::traverse_plugin_dir($ppath . '/' . $f, $classes, $event_only, $f . '/');
+                    }
+
                     if (!preg_match('@^[^_]+_(event|plugin)_.+\.php$@i', $subf)) {
                         continue;
                     }
@@ -203,7 +213,7 @@
 
                     $class_name = str_replace('.php', '', $subf);
                     $classes[$class_name] = array('name'       => $class_name,
-                                                  'pluginPath' => $f);
+                                                  'pluginPath' => $maindir . $f);
                 }
             }
         }

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- functions.inc.php	2 Dec 2004 14:11:27 -0000	1.9
+++ functions.inc.php	6 Dec 2004 12:45:30 -0000	1.10
@@ -574,6 +574,25 @@
     return (strpos($d, "\r") === false && strpos($d, "\n") === false);
 }
 
+function serendipity_currentURL() {
+    global $serendipity;
+
+    // All that URL getting humpty-dumpty is necessary to allow a user to change the template in the
+    // articles view. POSTing data to that page only works with mod_rewrite and not the ErrorDocument
+    // redirection, so we need to generate the ErrorDocument-URI here.
+
+    $uri = parse_url($_SERVER['REQUEST_URI']);
+    $qst = '';
+    if (!empty($uri['query'])) {
+        $qst = '&' . str_replace('&', '&', $uri['query']);
+    }
+    $uri['path'] = str_replace($serendipity['serendipityHTTPPath'], '', $uri['path']);
+    $url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?' . $uri['path'] . $qst;
+    $url = str_replace($serendipity['indexFile'] . '&', '', $url); // Kill possible looped repitions which could occur
+
+    return $url;
+}
+
 define("serendipity_FUNCTIONS_LOADED", true);
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_plugin_templatedropdown serendipity_plugin_templatedropdown.php,1.5,1.6

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

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

Modified Files:
	serendipity_plugin_templatedropdown.php 
Log Message:
* allow unlimited ammount of nested directories inside plugin directory(see mailinglist)
* unify "get current url" for plugins: karma, templatedropdown, shoutbox


Index: serendipity_plugin_templatedropdown.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_templatedropdown/serendipity_plugin_templatedropdown.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_plugin_templatedropdown.php	2 Dec 2004 10:55:10 -0000	1.5
+++ serendipity_plugin_templatedropdown.php	6 Dec 2004 12:45:49 -0000	1.6
@@ -65,17 +65,7 @@
 
         $title = $this->get_config('title', $this->title);
 
-        // All that URL getting humpty-dumpty is necessary to allow a user to change the template in the
-        // articles view. POSTing data to that page only works with mod_rewrite and not the ErrorDocument
-        // redirection, so we need to generate the ErrorDocument-URI here.
-        $uri = parse_url($_SERVER['REQUEST_URI']);
-        $qst = '';
-        if (!empty($uri['query'])) {
-            $qst = '&' . str_replace('&', '&', $uri['query']);
-        }
-        $uri['path'] = str_replace($serendipity['serendipityHTTPPath'], '', $uri['path']);
-        $url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?' . $uri['path'] . $qst;
-        $url = str_replace($serendipity['indexFile'] . '&', '', $url); // Kill possible looped repitions which could occur
+        $url = serendipity_currentURL();
 
         echo '<form id="theme_chooser" action="' . $url . '" method="post">';
         echo '<select name="user_template" onchange="document.getElementById(\'theme_chooser\').submit();">';

[php-blog-cvs] serendipity/plugins/serendipity_plugin_shoutbox serendipity_plugin_shoutbox.php,1.16,1.17

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

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

Modified Files:
	serendipity_plugin_shoutbox.php 
Log Message:
* allow unlimited ammount of nested directories inside plugin directory(see mailinglist)
* unify "get current url" for plugins: karma, templatedropdown, shoutbox


Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_plugin_shoutbox.php	2 Dec 2004 10:55:09 -0000	1.16
+++ serendipity_plugin_shoutbox.php	6 Dec 2004 12:45:49 -0000	1.17
@@ -158,7 +158,7 @@
             $dateformat = '%a, %d.%m.%Y %H:%M';
         }
        ?>
-       <form action="<?php echo $_SERVER['REQUEST_URI']; ?>" method="post">
+       <form action="<?php echo serendipity_currentURL(); ?>" method="post">
             <div>
                 <input type="hidden" name="action" value="fillshoutbox" />
                 <textarea name="serendipity[shouttext]" rows="4" cols="15" style="width: 90%"></textarea>

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.25,1.26

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
* allow unlimited ammount of nested directories inside plugin directory(see mailinglist)
* unify "get current url" for plugins: karma, templatedropdown, shoutbox


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_event_karma.php	24 Nov 2004 10:17:16 -0000	1.25
+++ serendipity_event_karma.php	6 Dec 2004 12:45:43 -0000	1.26
@@ -516,7 +516,8 @@
                             $max_karmatime = $karmatime    * 24 * 60 * 60;
                             $now           = time();
 
-                            $url = $_SERVER['REQUEST_URI'] . (strpos($_SERVER['REQUEST_URI'], '?') !== false ? '&' : '?');
+                            $url = serendipity_currentURL() . '&';
+
                             $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>';

[php-blog-cvs] serendipity/include/admin entries.inc.php,1.8,1.9

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

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

Modified Files:
	entries.inc.php 
Log Message:
allow ordering entries by draft/publish state


Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- entries.inc.php	4 Dec 2004 14:43:38 -0000	1.8
+++ entries.inc.php	6 Dec 2004 11:14:20 -0000	1.9
@@ -14,6 +14,7 @@
 }
 
 $sort_order = array('timestamp'     => DATE,
+                    'isdraft'       => PUBLISH . '/' . DRAFT,
                     'username'      => AUTHOR,
                     'category_name' => CATEGORY,
                     'last_modified' => LAST_UPDATED,

[php-blog-cvs] serendipity/include functions_images.inc.php,1.6,1.7

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
touch up sebastians commit; only display img tags if the file is an image, $imgsrc may also be set for other file types.
create a function to check for an image.


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- functions_images.inc.php	5 Dec 2004 15:05:48 -0000	1.6
+++ functions_images.inc.php	6 Dec 2004 11:09:36 -0000	1.7
@@ -269,7 +269,7 @@
     $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total);
 
     foreach ($serendipity['imageList'] as $k => $file) {
-        $is_image = (0 === strpos(strtolower($file['mime']), "image/"));
+        $is_image = serendipity_isImage($file);
 
         if ($is_image) {
             $update   = false;
@@ -810,19 +810,15 @@
         foreach ($serendipity['imageList'] as $k => $file) {
             ++$x; $preview = '';
             $i      = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
-            $imgsrc = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
-	    if ($file['mime'] == 'application/pdf') {
-	       // File is PDF -> Thumb is PNG
-	       $imgsrc .= '.png';
-	    }
-            $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
+            $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+            $is_image = serendipity_is_image($file);
 
-            if (file_exists($imgsrc)) {
-                $preview .= '<img src="' . $imgsrc . '" border="0" alt="'. $file['name'] . '" />';
+            if (!$is_image) {
+                $preview .= '<img src="' . $file['imgsrc'] . '" border="0" alt="'. $file['name'] . '" />';
                 if ($url) { $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
             }
 
-            if (!file_exists($imgsrc)) {
+            if (!file_exists($file['imgsrc'])) {
                 $preview .= '<div class="serendipity_admin_mimetype" style="width: ' . $serendipity['thumbSize'] . 'px; height: ' . $serendipity['thumbSize'] . 'px; border: 1px solid; text-align: center;"><br /><br /><br />' . $file['mime'];
                 if ($url) { $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>'; }
                 $preview .= '</div>';
@@ -890,6 +886,18 @@
 }
 } // End serendipity_displayImageList()
 
+function serendipity_isImage(&$file) {
+    $file['displaymime'] = $file['mime'];
+
+    // File is PDF -> Thumb is PNG
+    if ($file['mime'] == 'application/pdf') {
+       $file['imgsrc']     .= '.png';
+       $file['displaymime'] = 'image/png';
+    }
+
+    return (0 === strpos(strtolower($file['displaymime']), 'image/'));
+}
+
 function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
 static $n = "<br />\n";
 static $serious = true;

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.35,1.36

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

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

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
touch up sebastians commit; only display img tags if the file is an image, $imgsrc may also be set for other file types.
create a function to check for an image.


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_admin_image_selector.php	5 Dec 2004 15:05:50 -0000	1.35
+++ serendipity_admin_image_selector.php	6 Dec 2004 11:09:37 -0000	1.36
@@ -79,21 +79,21 @@
         }
 
         $file          = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
-        $imgsrc        = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $file['imgsrc']= $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
         $imgName       = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] .'.'. $file['extension'];
         $thumbbasename = $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
         $thumbName     = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $thumbbasename;
         $thumbsize     = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
-        $is_image      = (preg_match('@^image/@i', $file['mime']) ? true : false);
+        $is_image      = serendipity_isImage($file);
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
 
 <div>
 <?php
-        if (!file_exists($imgsrc)) {
+        if (!file_exists($file['imgsrc'])) {
 ?>
-    <img align="right" src="<?php echo $imgsrc; ?>">
+    <img align="right" src="<?php echo $file['imgsrc']; ?>">
     <h1><?php printf(YOU_CHOSE, $file['name']); ?></h1>
     <p>
         <form action="#" method="GET" name="serendipity[selForm]" onSubmit="serendipity_imageSelector_done()">

[php-blog-cvs] serendipity/docs NEWS,1.23,1.24

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

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

Modified Files:
	NEWS 
Log Message:
touch up sebastians commit; only display img tags if the file is an image, $imgsrc may also be set for other file types.
create a function to check for an image.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- NEWS	6 Dec 2004 10:46:31 -0000	1.23
+++ NEWS	6 Dec 2004 11:09:36 -0000	1.24
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * When using ImageMagick, create a thumbnail of a PDF for media
+      browsing (nohn, garvinhicking)
+
     * More than one plugin cannow be saved per plugin/ subdirectory,
       event + sidebar plugins can be put together in one directory.
       Names of subdirectores are irrelevant now, but the filenames

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

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

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

Modified Files:
	configuration.inc.php 
Log Message:
better idea for non-js folding, so that users WITH javascript may use folding


Index: configuration.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/configuration.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configuration.inc.php	4 Dec 2004 14:43:37 -0000	1.2
+++ configuration.inc.php	6 Dec 2004 10:57:08 -0000	1.3
@@ -109,7 +109,7 @@
         break;
 
     default:
-        /*  Is serendipity already installed=  */
+        /*  Is serendipity already installed?  */
         if (file_exists('./serendipity_config_local.inc.php')) {
             $from = &$serendipity;
         } else {
@@ -124,7 +124,7 @@
 
         $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
 
-        serendipity_printConfigTemplate($t, $from, false, false);
+        serendipity_printConfigTemplate($t, $from, false, true);
 }
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.14,1.15

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
better idea for non-js folding, so that users WITH javascript may use folding


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- functions_installer.inc.php	5 Dec 2004 09:54:33 -0000	1.14
+++ functions_installer.inc.php	6 Dec 2004 10:57:07 -0000	1.15
@@ -219,7 +219,7 @@
     }
 }
 
-function serendipity_printConfigTemplate($config, $from = false, $noForm = false, $folding = false) {
+function serendipity_printConfigTemplate($config, $from = false, $noForm = false, $folding = true) {
     global $serendipity;
     if (!isset($serendipity['XHTML11'])) {
         $serendipity['XHTML11'] = FALSE;
@@ -293,7 +293,7 @@
 <?php   } ?>
             <tr>
                 <td>
-                    <table width="100%" cellspacing="0" cellpadding="3" style="<?php echo ($folding === true ? 'display: none;' : ''); ?>" id="el<?php echo $el_count; ?>">
+                    <table width="100%" cellspacing="0" cellpadding="3" id="el<?php echo $el_count; ?>">
                         <tr>
                             <td style="padding-left: 20px;" colspan="2">
                                 <?php echo $category['description'] ?>
@@ -347,6 +347,14 @@
 <?php
     }
 
+    if ($folding) {
+        echo '<script type="text/javascript" language="JavaScript">';
+        for ($i = 1; $i <= $el_count; $i++) {
+            echo 'document.getElementById("el' . $i . '").style.display = "none";' . "\n";
+        }
+        echo '</script>';
+    }
+
     if (!$noForm) {
 ?>
         <input type="submit" value="<?php echo CHECK_N_SAVE; ?>" />

[php-blog-cvs] serendipity/sql db_update_0.8-alpha5_0.8-alpha6_mysql.sql,NONE,1.1 db_update_0.8-alpha5_0.8-alpha6_postgres.sql,NONE,1.1 db_update_0.8-alpha5_0.8-alpha6_sqlite.sql,NONE,1.1

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

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

Added Files:
	db_update_0.8-alpha5_0.8-alpha6_mysql.sql 
	db_update_0.8-alpha5_0.8-alpha6_postgres.sql 
	db_update_0.8-alpha5_0.8-alpha6_sqlite.sql 
Log Message:
db update files. did I mention sqlite sucks at adding columns? ;)


--- NEW FILE: db_update_0.8-alpha5_0.8-alpha6_postgres.sql ---
ALTER TABLE {PREFIX}plugins ADD COLUMN path varchar(255);

--- NEW FILE: db_update_0.8-alpha5_0.8-alpha6_sqlite.sql ---
create table {PREFIX}tempplugins (
  name varchar(128) not null,
  placement varchar(6) not null default 'right',
  sort_order int(4) not null default '0',
  authorid int(11) default '0',
  PRIMARY KEY(name)
);

INSERT INTO {PREFIX}tempplugins (name, placement, sort_order, authorid) SELECT name, placement, sort_order, authorid FROM {PREFIX}plugins;
DROP TABLE plugins;

create table {PREFIX}plugins (
  name varchar(128) not null,
  placement varchar(6) not null default 'right',
  sort_order int(4) not null default '0',
  authorid int(11) default '0',
  path varchar(255) default null,
  PRIMARY KEY(name)
);

INSERT INTO {PREFIX}plugins (name, placement, sort_order, authorid) SELECT name, placement, sort_order, authorid FROM {PREFIX}plugins;
DROP TABLE tempplugins;

--- NEW FILE: db_update_0.8-alpha5_0.8-alpha6_mysql.sql ---
ALTER TABLE {PREFIX}plugins ADD path varchar(255) default null;