php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/docs NEWS,1.56,1.57

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

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

Modified Files:
	NEWS 
Log Message:
pMachine Pro 2.4 native import


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- NEWS	9 Feb 2005 11:11:24 -0000	1.56
+++ NEWS	14 Feb 2005 12:52:02 -0000	1.57
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Added native import for pMachine Pro 2.4 entries, comments,
+      categories and authors (garvinhicking)
+
     * Remember last state of media library (sort order, files per page,
       directory, sortfield), via JavaScript+Cookies (garvinhicking)
 

[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.8,1.9 nucleus.inc.php,1.2,1.3

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

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

Modified Files:
	wordpress.inc.php nucleus.inc.php 
Log Message:
fix comment counter, fix category detection


Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wordpress.inc.php	26 Jan 2005 14:14:05 -0000	1.8
+++ wordpress.inc.php	14 Feb 2005 12:51:33 -0000	1.9
@@ -233,7 +233,8 @@
                                      'type'      => 'NORMAL');
 
                     serendipity_db_insert('comments', $this->strtrRecursive($comment, $trans_table));
-                    serendipity_approveComment($cid, $id, true);
+                    $cid = serendipity_db_insert_id('comments', 'id');
+                    serendipity_approveComment($cid, $entry['entryid'], true);
                 }
             }
         }

Index: nucleus.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/nucleus.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nucleus.inc.php	30 Jan 2005 18:23:16 -0000	1.2
+++ nucleus.inc.php	14 Feb 2005 12:51:34 -0000	1.3
@@ -178,7 +178,7 @@
 
             /* Entry/category */
             foreach ($categories as $category) {
-                if ($category['cat_ID'] == $entry['icat'] ) {
+                if ($category['cat_ID'] == $entries[$x]['icat'] ) {
                     $data = array('entryid'    => $entries[$x]['entryid'],
                                   'categoryid' => $category['categoryid']);
                     serendipity_db_insert('entrycat', $this->strtrRecursive($data, $trans_table));
@@ -225,7 +225,8 @@
                                      'type'      => 'NORMAL');
 
                     serendipity_db_insert('comments', $this->strtrRecursive($comment, $trans_table));
-                    serendipity_approveComment($cid, $id, true);
+                    $cid = serendipity_db_insert_id('comments', 'id');
+                    serendipity_approveComment($cid, $entry['entryid'], true);
                 }
             }
         }

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock lang_ja.inc.php,1.3,1.4

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:
o updated translation.


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/lang_ja.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lang_ja.inc.php	14 Feb 2005 00:41:15 -0000	1.3
+++ lang_ja.inc.php	14 Feb 2005 10:53:44 -0000	1.4
@@ -13,7 +13,7 @@
 ##########################################################################
 
         @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'スパムプロテクター');
-        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam');
+        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'コメントスパムを防止するさまざまな方法です。');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'スパム防止: 無効なメッセージです。');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'スパム防止: コメントした直後にコメントすることはできません。');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'スパム防止: あなたの投稿したコンピューターの IP アドレスはオープンリレーとして一覧化されています。');
@@ -21,7 +21,7 @@
 
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'このブログは「緊急コメント遮断モード」です。別の機会に来てください。');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', '複製コメントを許可しない');
-        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Do not allow users to submit a comment which contains the same body as an already submitted comment');
+        @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'ユーザーが既に送信したコメントと同じ内容のコメントを送信することを許可しません。');
         @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', '緊急時のコメント遮断する');
         @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH_DESC', 'Temporarily disable comments for all entries. Useful if your blog is under spam attack.');
         @define('PLUGIN_EVENT_SPAMBLOCK_IPFLOOD', 'IP ブロックの間隔');
@@ -38,7 +38,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC2', '入力ボックスにここに見える文字列を入力してください!');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_USERDESC3', '上のスパム予防画像から文字列を入力してください: ');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS', 'You did not enter the correct string displayed in the spam-prevention image box. Please look at the image and enter the values displayed there.');
-        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF', 'Captchas disabled on your server. You need GDLib and freetype libraries compiled to PHP, and need the .TTF files residing in your directory.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_NOTTF', 'Captchas はサーバーで無効化されています。PHP 向けに GD ライブラリと freetype ライブラリがコンパイルされていることと、TTF ファイルがディレクトリに存在している必要があります。');
 
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_TTL', '何日経過したら captcha を強制しますか');
         @define('PLUGIN_EVENT_SPAMBLOCK_CAPTCHAS_TTL_DESC', 'Captchas can be enforced depending on the age of your articles. Enter the amount of days after which entering a correct captcha is necessary. If set to 0, captchas will always be used.');
@@ -75,5 +75,19 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DB', 'データベース');
         @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_NONE', 'ログ記録しない');
 
+        @define('PLUGIN_EVENT_SPAMBLOCK_API_COMMENTS', 'API によってコメントを作成する方法');
+        @define('PLUGIN_EVENT_SPAMBLOCK_API_COMMENTS_DESC', 'This affects the moderation of comments made via API calls (Trackbacks, WFW:commentAPI comments). If set to "moderate", all those comments always need to be approved first. If set to "reject", the are completely disallowed. If set to "none", the comments will be treated as usual comments.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_API_MODERATE', 'モデレート');
+        @define('PLUGIN_EVENT_SPAMBLOCK_API_REJECT', '拒否');
+        @define('PLUGIN_EVENT_SPAMBLOCK_REASON_API', '(トラックバックに似た)API でのコメント作成を許可しません');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE', '単語フィルターを有効にする');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE_DESC', 'Searches comments for certain strings and marks them as spam.');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS', 'URL の単語フィルター');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC', '正規表現が許可されており、セミコロン(;)で文字列を区切ります。');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS', '著者名の単語フィルター');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC', '正規表現が許可されており、セミコロン(;)で文字列を区切ります。');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.49,1.50

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
o fixed typo.


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_event_spamblock.php	9 Feb 2005 16:26:27 -0000	1.49
+++ serendipity_event_spamblock.php	14 Feb 2005 10:53:15 -0000	1.50
@@ -86,7 +86,7 @@
 
     default:
         @define('PLUGIN_EVENT_SPAMBLOCK_TITLE', 'Spam Protector');
-        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A varity of methods to prevent comment spam');
+        @define('PLUGIN_EVENT_SPAMBLOCK_DESC', 'A variety of methods to prevent comment spam');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY', 'Spam Prevention: Invalid message.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_IP', 'Spam Prevention: You cannot post a comment so soon after submitting another one.');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'Spam Prevention: The IP of the computer you are posting from, is listed as an open relay.');

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock lang_ja.inc.php,1.2,1.3

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:
o updated translation.


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/lang_ja.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lang_ja.inc.php	29 Jan 2005 15:04:16 -0000	1.2
+++ lang_ja.inc.php	14 Feb 2005 00:41:15 -0000	1.3
@@ -19,7 +19,7 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_RBL', 'スパム防止: あなたの投稿したコンピューターの IP アドレスはオープンリレーとして一覧化されています。');
         @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_SURBL', 'スパム防止: コメントの URL はSURBL に URL 一覧化されています。');
 
-        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'このブログは「緊急コメントバリケードモード」です。別の機会に来てください。please come back another time');
+        @define('PLUGIN_EVENT_SPAMBLOCK_ERROR_KILLSWITCH', 'このブログは「緊急コメント遮断モード」です。別の機会に来てください。');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE', '複製コメントを許可しない');
         @define('PLUGIN_EVENT_SPAMBLOCK_BODYCLONE_DESC', 'Do not allow users to submit a comment which contains the same body as an already submitted comment');
         @define('PLUGIN_EVENT_SPAMBLOCK_KILLSWITCH', '緊急時のコメント遮断する');

[php-blog-cvs] serendipity/plugins/serendipity_event_htmlvalidator lang_ja.inc.php,1.1,1.2

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:
o updated translation.


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_htmlvalidator/lang_ja.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lang_ja.inc.php	8 Jan 2005 12:25:11 -0000	1.1
+++ lang_ja.inc.php	14 Feb 2005 00:41:14 -0000	1.2
@@ -19,6 +19,6 @@
         @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPE', 'ドキュメントタイプ');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_DOCTYPEDESC', '通常の記事のドキュメントタイプを指定します。');
         @define('PLUGIN_EVENT_HTMLVALIDATOR_VALIDATE', '各プレビュー時に検証する');
-        @define('PLUGIN_EVENT_HTMLVALIDATOR_GOVALIDATE', 'Show HTML-Validator on preview');
+        @define('PLUGIN_EVENT_HTMLVALIDATOR_GOVALIDATE', 'プレビューで HTML 検証を表示');
 
 ?>

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

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_event_entryproperties.php 
Log Message:
o fixed short tag.


Index: serendipity_event_entryproperties.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_event_entryproperties.php	9 Feb 2005 16:26:08 -0000	1.16
+++ serendipity_event_entryproperties.php	13 Feb 2005 15:14:35 -0000	1.17
@@ -214,11 +214,11 @@
                         <legend><?php echo PLUGIN_EVENT_ENTRYPROPERTIES_TITLE; ?></legend>
                             <input type="checkbox" name="serendipity[properties][is_sticky]" id="properties_is_sticky" value="true" <?php echo $is_sticky; ?> />
                                 <label title="<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS; ?>" for="properties_is_sticky">&nbsp;<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_STICKYPOSTS; ?>&nbsp;&nbsp;</label><br />
-<? if (class_exists('serendipity_event_nl2br')){ ?>
+<?php if (class_exists('serendipity_event_nl2br')){ ?>
                             <input type="checkbox" name="serendipity[properties][no_nl2br]" id="properties_no_nl2br" value="true" <?php echo $nl2br; ?> />
                                 <label title="<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_NL2BR; ?>" for="properties_no_nl2br">&nbsp;<?php echo PLUGIN_EVENT_ENTRYPROPERTIES_NL2BR; ?>&nbsp;&nbsp;</label><br />
 
-<? } ?>
+<?php } ?>
 
                             <?php echo PLUGIN_EVENT_ENTRYPROPERTIES_ACCESS; ?>:
 <?php

[php-blog-cvs] serendipity/plugins/serendipity_event_mailer serendipity_event_mailer.php,1.13,1.14

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_event_mailer.php 
Log Message:
o fixed double comment on From field..


Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_event_mailer.php	9 Feb 2005 16:26:24 -0000	1.13
+++ serendipity_event_mailer.php	13 Feb 2005 14:55:04 -0000	1.14
@@ -104,7 +104,8 @@
                       'to'      => $this->get_config('mailto'),
                       'subject' => $eventData['title'],
                       'body'    => $eventData['body'] . $eventData['extended'],
-                      'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
+//                      'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
+                      'from'    => $serendipity['serendipityEmail']
                     );
 
                     if (serendipity_db_bool($this->get_config('striptags', false)) == true) {

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.17,1.18

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

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

Modified Files:
	serendipity_event_blogpdf.php 
Log Message:
spanish translation update


Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_event_blogpdf.php	9 Feb 2005 16:26:05 -0000	1.17
+++ serendipity_event_blogpdf.php	13 Feb 2005 12:49:56 -0000	1.18
@@ -30,8 +30,22 @@
         @define('PLUGIN_EVENT_BLOGPDF_MISSING', 'Ungültiger Plugin-Modus %s');
         break;
 
+    case 'es':
+		@define('PLUGIN_EVENT_BLOGPDF_NAME', ' Exportar el blog como pdf ');  
+		@define('PLUGIN_EVENT_BLOGPDF_DESC', ' Exportar el blog completo como archivo pdf '); 
+		@define('PLUGIN_EVENT_BLOGPDF_DOWNLOAD', ' Descarga este blog como pdf!');  
+		@define('PLUGIN_EVENT_BLOGPDF_PAGE', ' página ');  
+		@define('PLUGIN_EVENT_BLOGPDF_EXPORT', ' Exportar Blog ');
+		
+		@define('PLUGIN_EVENT_BLOGPDF_VIEW', ' Ver como pdf:  ');  
+		@define('PLUGIN_EVENT_BLOGPDF_VIEW_FULL', ' Blog completo ');  
+		@define('PLUGIN_EVENT_BLOGPDF_VIEW_ENTRY', ' esta entrada ');  
+		@define('PLUGIN_EVENT_BLOGPDF_VIEW_CATEGORY', ' categoría %s ');  
+		@define('PLUGIN_EVENT_BLOGPDF_VIEW_MONTH', ' este mes ');  
+		@define('PLUGIN_EVENT_BLOGPDF_MISSING', ' plugin de operacióinválido %s ');
+        break;
+
     case 'en':
-    case 'es':
     default:
         @define('PLUGIN_EVENT_BLOGPDF_NAME', 'Export blog as PDF');
         @define('PLUGIN_EVENT_BLOGPDF_DESC', 'Allows visitors to download your blog in the PDF format');

[php-blog-cvs] serendipity/plugins/serendipity_event_karma lang_ja.inc.php,1.2,1.3

[Tadashi J. <el...@us...>]

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

Modified Files:
	lang_ja.inc.php 
Log Message:
o updated translation.


Index: lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/lang_ja.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lang_ja.inc.php	28 Jan 2005 08:37:48 -0000	1.2
+++ lang_ja.inc.php	12 Feb 2005 03:12:39 -0000	1.3
@@ -33,11 +33,11 @@
         @define('PLUGIN_KARMA_VOTINGTIME_BLAHBLAH', 'Amount of time (in minutes) that needs to be passed from one vote to the other. Is only applied after the time above is expired. Default: 5');
         @define('PLUGIN_KARMA_TIMEOUT', 'Flood protection: Another visitor has just recently voted. Please wait %s minutes.');
         @define('PLUGIN_KARMA_CURRENT', '現在の評価: %2$s / %3$s 回の投票 /');
-        @define('PLUGIN_KARMA_EXTENDEDONLY', 'Only extended article');
+        @define('PLUGIN_KARMA_EXTENDEDONLY', '拡張された記事のみ');
         @define('PLUGIN_KARMA_EXTENDEDONLY_BLAHBLAH', 'Only show karmavoting on extended article view');
         @define('PLUGIN_KARMA_MAXKARMA', 'Karmavoting period');
         @define('PLUGIN_KARMA_MAXKARMA_BLAHBLAH', 'Only allow karmavoting until the article is X days old (Default: 7)');
-        @define('PLUGIN_KARMA_LOGGING', 'Log votes?');
+        @define('PLUGIN_KARMA_LOGGING', '投票をログ記録しますか?');
         @define('PLUGIN_KARMA_LOGGING_BLAHBLAH', 'Should karma votes be logged?');
         @define('PLUGIN_KARMA_ACTIVE', '評価の投票を有効にしますか?');
         @define('PLUGIN_KARMA_ACTIVE_BLAHBLAH', '評価を投票する機能を有効にしますか?');

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.16,1.17

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
flag comments/trackback notification mail with "[requires review]" if they are pending.




Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- functions_comments.inc.php	3 Feb 2005 18:06:49 -0000	1.16
+++ functions_comments.inc.php	10 Feb 2005 15:37:36 -0000	1.17
@@ -442,7 +442,7 @@
     if ($type == 'TRACKBACK') {
 
         /******************* TRACKBACKS *******************/
-        $subject =  NEW_TRACKBACK_TO . ' ' . $title;
+        $subject =  ($moderate_comment ? '[' . REQUIRES_REVIEW . '] ' : '') . NEW_TRACKBACK_TO . ' ' . $title;
         $text = sprintf(A_NEW_TRACKBACK_BLAHBLAH, $title)
               . "\n"
               . "\n" . REQUIRES_REVIEW          . ': ' . (($moderate_comment) ? YES : NO) . (isset($serendipity['moderate_reason']) ? ' (' . $serendipity['moderate_reason'] . ')' : '')
@@ -463,7 +463,7 @@
     } else {
 
         /******************* COMMENTS *********************/
-        $subject = NEW_COMMENT_TO . ' ' . $title;
+        $subject = ($moderate_comment ? '[' . REQUIRES_REVIEW . '] ' : '') . NEW_COMMENT_TO . ' ' . $title;
         $text = sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity['blogTitle'], $title)
               . "\n" . LINK_TO_ENTRY . ': ' . $entryURI
               . "\n"

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.37,1.38

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
fix bug for jayniz :)


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- functions_installer.inc.php	9 Feb 2005 10:19:13 -0000	1.37
+++ functions_installer.inc.php	10 Feb 2005 15:27:18 -0000	1.38
@@ -685,13 +685,17 @@
             if ( !serendipity_checkConfigItemFlags($item, 'configuration') ) {
                 continue;
             }
+            
+            if (!isset($item['userlevel'])) {
+                $item['userlevel'] = USERLEVEL_ADMIN;
+            }
 
-            if ( $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN || IS_installed === false ) {
+            if ( $serendipity['serendipityUserlevel'] >= $item['userlevel'] || IS_installed === false ) {
                 $authorid = 0;
             } else {
                 $authorid = $serendipity['authorid'];
             }
-
+            
             serendipity_set_config_var($item['var'], $_POST[$item['var']], $authorid);
         }
     }

[php-blog-cvs] serendipity serendipity_config.inc.php,1.143,1.144

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Added a new hook so that the multilingual plugin can set the content/display language easier.
Mailinglist posting about this will follow.


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- serendipity_config.inc.php	9 Feb 2005 20:03:04 -0000	1.143
+++ serendipity_config.inc.php	10 Feb 2005 15:03:45 -0000	1.144
@@ -209,6 +209,8 @@
  * If a user is logged in, fetch his preferences. He possibly wants to have a different language
  */
 
+serendipity_plugin_api::hook_event('frontend_configure_start', $serendipity);
+
 if (isset($_SESSION['serendipityAuthorid'])) {
     serendipity_load_configuration($_SESSION['serendipityAuthorid']);
 }

[php-blog-cvs] serendipity/lang serendipity_lang_ja.inc.php,1.30,1.31

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_lang_ja.inc.php 
Log Message:
o updated translation.


Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_lang_ja.inc.php	9 Feb 2005 17:06:10 -0000	1.30
+++ serendipity_lang_ja.inc.php	10 Feb 2005 04:46:57 -0000	1.31
@@ -148,7 +148,7 @@
 @define('COMMENT_ADDED', 'コメントの追加に成功しました。');
 @define('COMMENT_ADDED_CLICK', '%sここへ戻る%s をクリックするとコメントに戻ります。%sここで閉じる%s ウィンドウを閉じます。');
 @define('COMMENT_NOT_ADDED', 'このエントリへのコメントが無効になったのでコメントは追加できませんでした。');
-@define('COMMENT_NOT_ADDED_CLICK', '%s個々へ戻る%s でコメントに戻ります。%sここで閉じる%s でウィンドウを閉じます。');
+@define('COMMENT_NOT_ADDED_CLICK', '%s戻る%s でコメントに戻ります。%s閉じる%s でウィンドウを閉じます。');
 @define('COMMENTS_DISABLE', 'このエントリのコメントを許可しない');
 @define('COMMENTS_ENABLE', 'このエントリへのコメントを許可する');
 @define('COMMENTS_CLOSED', '執筆者はこのエントリへのコメントを許可していません');
@@ -203,7 +203,7 @@
 @define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; 実行 <i>%s %s</i>');
 @define('CANT_EXECUTE_BINARY', '%s バイナリを実行できませんでした。');
 @define('FILE_WRITE_ERROR', 'ファイル %s の書き込みができませんでした。');
-@define('FILE_CREATE_YOURSELF', 'Please create the file yourself or check permissions');
+@define('FILE_CREATE_YOURSELF', '自分でファイルを作成するか、パーミッションを調べてください');
 @define('COPY_CODE_BELOW', '<br />* Just copy the code below and place it in %s in your %s folder:<b><pre>%s</pre></b>' . "\n");
 @define('WWW_USER', 'Change www to the user apache runs as (i.e. nobody).');
 @define('BROWSER_RELOAD', 'Once you\'ve done this, hit your browser\'s "reload" button.');
@@ -238,7 +238,7 @@
 @define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', '購読済みエントリ "%s" に新規コメントです');
 @define('SUBSCRIPTION_MAIL', "こんにちは %s さん。\n監視中のエントリに新しいコメントが作成されました。\n\nブログ名:\n%s\nエントリ名:\n%s\n\n下記でエントリを見つけることができます:\n%s\n\n下記のリンクをクリックすると購読解除することができます:\n%s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
-@define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
+@define('SIGNATURE', "\n-- \n%s は Serendipityを使っています。\n最良の blog を探しているなら <http://s9y.org> を見てください。");
 @define('DATABASE_ALREADY_INSTALLED', '飛ばします: データベースは既にインストール済みです。');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 フィード');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 フォード');
@@ -295,7 +295,7 @@
 @define('SORT_ORDER_DESC', '降順');
 @define('THUMBNAIL_SHORT', 'サムネイル');
 @define('ORIGINAL_SHORT', 'オリジナル');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'HTTP キャッシュを防ぐ');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true", this will modify the link to your RSS feed to NOT include a setting for bandwidth saving caching of RSS feed requests. It is recommended to set this to "false", so that clients can benefit from caching.');
 @define('APPLY_MARKUP_TO', '%s へのマークアップを適用します。');
 @define('CALENDAR_BEGINNING_OF_WEEK', '週の開始曜日');
@@ -676,7 +676,7 @@
 @define('RECHECK_INSTALLATION', 'インストールの再検査');
 @define('IMAGICK_EXEC_ERROR', '実行できませんでした: "%s", エラー: %s, 返り値: %d');
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
-@define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('UNMET_REQUIREMENTS', '要求に失敗: %s');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/templates/default/admin style.css,1.27,1.28

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

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

Modified Files:
	style.css 
Log Message:
- No top border


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- style.css	3 Feb 2005 19:06:32 -0000	1.27
+++ style.css	9 Feb 2005 20:24:52 -0000	1.28
@@ -22,6 +22,7 @@
     margin: auto;
     background-color: #FFFFFF;
     border: 2px solid #0F3353;
+    border-top: 0px;
 }
 
 #serendipityAdminBanner {

[php-blog-cvs] serendipity/templates/moz-modern info.txt,1.1,1.2

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

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

Modified Files:
	info.txt 
Log Message:
- Add template versioncheck to compare required Serendipity version with the installed one

TODO: Smarty :)


Index: info.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/info.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- info.txt	3 Mar 2004 14:45:31 -0000	1.1
+++ info.txt	9 Feb 2005 20:21:29 -0000	1.2
@@ -1,3 +1,4 @@
 Name: Mozilla Modern Tribute
 Author: Garvin Hicking
 Date: 2004-03-02
+Require Serendipity: 0.8

[php-blog-cvs] serendipity/templates/default info.txt,1.3,1.4

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

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

Modified Files:
	info.txt 
Log Message:
- Add template versioncheck to compare required Serendipity version with the installed one

TODO: Smarty :)


Index: info.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/info.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- info.txt	12 Aug 2004 21:39:32 -0000	1.3
+++ info.txt	9 Feb 2005 20:21:29 -0000	1.4
@@ -1,3 +1,4 @@
 Name: Serendipity v2.3
 Author: Tom Sommer
 Date: 12/8-2004
+Require Serendipity: 0.8

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

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

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

Modified Files:
	templates.inc.php 
Log Message:
- Add template versioncheck to compare required Serendipity version with the installed one

TODO: Smarty :)


Index: templates.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/templates.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- templates.inc.php	26 Jan 2005 14:14:05 -0000	1.7
+++ templates.inc.php	9 Feb 2005 20:21:28 -0000	1.8
@@ -39,12 +39,13 @@
             $preview = ' ';
         }
 
-        if (serendipity_get_config_var('template', $serendipity['defaultTemplate']) == $theme) {
-            $is_active = 'checked="checked"';
-        } else {
-            $is_active = '';
+        $unmetRequirements = array();
+        if ( isset($info['require serendipity']) && version_compare($info['require serendipity'], serendipity_getCoreVersion($serendipity['version']), '>') ) {
+            $unmetRequirements[] = 'Serendipity '. $info['require serendipity'];
         }
 
+        /* TODO: Smarty versioncheck */
+
         $class = (($i % 2) ? 'even' : 'uneven');
 
 ?>
@@ -53,9 +54,16 @@
         <tr>
             <td colspan="2"><strong><?php echo $info['name']; ?></strong></td>
             <td valign="middle" align="center" width="70" rowspan="2">
-<?php if ( $serendipity['template'] != $theme ) { ?>
+<?php
+    if ( $serendipity['template'] != $theme ) {
+        if ( !sizeof($unmetRequirements) ) {
+?>
             <a href="?serendipity[adminModule]=templates&amp;serendipity[adminAction]=install&amp;serendipity[theme]=<?php echo $theme ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/install_now.png') ?>" alt="<?php echo SET_AS_TEMPLATE ?>" title="<?php echo SET_AS_TEMPLATE ?>" border="0" /></a>
-<?php } ?>
+<?php   } else { ?>
+        <span style="color: #cccccc"><?php echo sprintf(UNMET_REQUIREMENTS, implode(', ', $unmetRequirements)); ?></span>
+<?php
+        }
+    } ?>
             </td>
         </tr>
 

[php-blog-cvs] serendipity serendipity_config.inc.php,1.142,1.143

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

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

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


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- serendipity_config.inc.php	9 Feb 2005 19:55:02 -0000	1.142
+++ serendipity_config.inc.php	9 Feb 2005 20:03:04 -0000	1.143
@@ -180,7 +180,7 @@
     include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
 }
 
-define('IS_up2date', version_compare($serendipity['version'], $serendipity['versionInstalled']), '<=');
+define('IS_up2date', version_compare($serendipity['version'], $serendipity['versionInstalled'], '<='));
 
 /*
  *  Include main functions

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

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

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

Modified Files:
	compat.inc.php 
Log Message:
- serendipity_version is not used anymore, so don't hack it


Index: compat.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/compat.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- compat.inc.php	9 Feb 2005 17:06:05 -0000	1.5
+++ compat.inc.php	9 Feb 2005 19:55:20 -0000	1.6
@@ -121,15 +121,8 @@
     }
 }
 
-function serendipity_version($version, $stripChars = false) {
-    if ($stripChars) {
-        // Only returns the first version numbers:
-        // 0.8-alpha3 becomes '0.8'
-        // 0.8.1 becomes '0.8.1' and so on
-        $version = preg_replace('@^([0-9\.]+).*$@', '\1', $version);
-    }
-
-    return $version;
+function serendipity_getCoreVersion($version) {
+    return preg_replace('@^([0-9\.]+).*$@', '\1', $version);
 }
 
 /*

[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.22,1.23 upgrader.inc.php,1.14,1.15

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

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

Modified Files:
	plugins.inc.php upgrader.inc.php 
Log Message:
- serendipity_version is not used anymore, so don't hack it


Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- upgrader.inc.php	3 Feb 2005 18:55:19 -0000	1.14
+++ upgrader.inc.php	9 Feb 2005 19:55:21 -0000	1.15
@@ -134,7 +134,7 @@
 while (($file = readdir($dir)) !== false ) {
     if (preg_match('@db_update_(.*)_(.*)_(.*).sql@', $file, $res)) {
         list(, $verFrom, $verTo, $dbType) = $res;
-        if (version_compare($verFrom, serendipity_version($serendipity['versionInstalled'])) >= 0) {
+        if (version_compare($verFrom, $serendipity['versionInstalled']) >= 0) {
             $tmpFiles[$verFrom][$dbType] = $file;
         }
     }
@@ -175,7 +175,7 @@
 
     /* Call functions */
     foreach ($tasks as $task) {
-        if (version_compare(serendipity_version($serendipity['versionInstalled']), $task['version'], '<') ) {
+        if (version_compare($serendipity['versionInstalled'], $task['version'], '<') ) {
             if (is_callable($task['function'])) {
                 echo sprintf('Calling %s ...<br />', (is_array($task['function']) ? $task['function'][0] . '::'. $task['function'][1] : $task['function']));;
 
@@ -252,7 +252,7 @@
     $taskCount = 0;
 
     foreach ( $tasks as $task ) {
-        if (version_compare(serendipity_version($serendipity['versionInstalled']), $task['version'], '<'))  {
+        if (version_compare($serendipity['versionInstalled'], $task['version'], '<'))  {
             echo '<div><strong>'. $task['version'] .' - '. $task['title'] .'</strong></div>';
             echo '<div style="padding-left: 5px">'. nl2br($task['desc']) .'</div><br />';
             $taskCount++;

Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- plugins.inc.php	9 Feb 2005 17:06:06 -0000	1.22
+++ plugins.inc.php	9 Feb 2005 19:55:20 -0000	1.23
@@ -574,16 +574,16 @@
         if (!isset($plug['customURI'])) {
             $plug['customURI'] = '';
         }
-        
-        if ( !empty($plug['requirements']['serendipity']) && version_compare($plug['requirements']['serendipity'], serendipity_version($serendipity['version'], true), '>') ) {
+
+        if ( !empty($plug['requirements']['serendipity']) && version_compare($plug['requirements']['serendipity'], serendipity_getCoreVersion($serendipity['version']), '>') ) {
             $notice['requirements_failures'][] = 's9y ' . $plug['requirements']['serendipity'];
         }
-        
+
         if ( !empty($plug['requirements']['serendipity']) && version_compare($plug['requirements']['php'], phpversion(), '>') ) {
             $notice['requirements_failures'][] = 'PHP ' . $plug['requirements']['php'];
         }
 
-        /* Enable after Smarty 2.6.7 upgrade. 
+        /* Enable after Smarty 2.6.7 upgrade.
          * TODO: How can we get current Smarty version here? $smarty is not created!
         if ( !empty($plug['requirements']['smarty']) && version_compare($plug['requirements']['smarty'], '2.6.7', '>') ) {
             $notice['requirements_failures'][] = 'Smarty: ' . $plug['requirements']['smarty'];

[php-blog-cvs] serendipity serendipity_config.inc.php,1.141,1.142

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
- serendipity_version is not used anymore, so don't hack it


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- serendipity_config.inc.php	3 Feb 2005 18:25:12 -0000	1.141
+++ serendipity_config.inc.php	9 Feb 2005 19:55:02 -0000	1.142
@@ -180,7 +180,7 @@
     include_once(S9Y_INCLUDE_PATH . '/serendipity_config_local.inc.php');
 }
 
-define('IS_up2date', version_compare(serendipity_version($serendipity['version']), serendipity_version($serendipity['versionInstalled']), '<='));
+define('IS_up2date', version_compare($serendipity['version'], $serendipity['versionInstalled']), '<=');
 
 /*
  *  Include main functions

[php-blog-cvs] serendipity/include/admin images.inc.php,1.16,1.17

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

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

Modified Files:
	images.inc.php 
Log Message:
- Clean up serendipity_makeThumbnail() and don't insert image into database from it. Instead serendipity_insertImageInDatabase has to be called "manually" after an image is done being processed.
- serendipity_insertImageInDatabase() now requires far less arguments, as it can calculate them on its own
- Fix E_NOTICE for non-string array element when mime is application/pdf
- Let serendipity_getImageSize do mime calc, so we don't need to clutter the rest of the code with serendipity_guessMime

The latter might need a little tweaking


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- images.inc.php	6 Feb 2005 01:04:52 -0000	1.16
+++ images.inc.php	9 Feb 2005 19:46:10 -0000	1.17
@@ -139,9 +139,11 @@
                 printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
 
                 // Create thumbnail
-                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory']) ) {
                     echo THUMB_CREATED_DONE . '<br />';
                 }
+                // Insert into database
+                $image_id = serendipity_insertImageInDatabase($_FILES['userfile']['name'], $directory, $authorid);
             }
         }
     } else {
@@ -170,9 +172,11 @@
                 @chmod($target, 0664);
 
                 // Create thumbnail
-                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory']) ) {
                     echo THUMB_CREATED_DONE . '<br />';
                 }
+                // Insert into database
+                $image_id = serendipity_insertImageInDatabase($_FILES['userfile']['name'], $directory, $authorid);
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
             }

[php-blog-cvs] serendipity/include functions_images.inc.php,1.30,1.31

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
- Clean up serendipity_makeThumbnail() and don't insert image into database from it. Instead serendipity_insertImageInDatabase has to be called "manually" after an image is done being processed.
- serendipity_insertImageInDatabase() now requires far less arguments, as it can calculate them on its own
- Fix E_NOTICE for non-string array element when mime is application/pdf
- Let serendipity_getImageSize do mime calc, so we don't need to clutter the rest of the code with serendipity_guessMime

The latter might need a little tweaking


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- functions_images.inc.php	9 Feb 2005 17:33:43 -0000	1.30
+++ functions_images.inc.php	9 Feb 2005 19:46:09 -0000	1.31
@@ -124,16 +124,26 @@
     return $images;
 }
 
-function serendipity_insertImageInDatabase($filename, $extension, $mimetype, $filesize, $width, $height, $thumbnail, $date, $authorid, $directory) {
+function serendipity_insertImageInDatabase($filename, $directory, $authorid = 0, $time = NULL) {
     global $serendipity;
 
-    if (empty($width)) {
-        $width = 0;
+    if ( is_null($time) ) {
+        $time = time();
     }
 
-    if (empty($height)) {
-        $height = 0;
-    }
+    $filepath = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $filename;
+    $filesize = @filesize($filepath);
+
+    list($filebase, $extension) = serendipity_parseFileName($filename);
+
+    $thumbpath = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $filebase . '.'. $serendipity['thumbSuffix'] . '.'. $extension;
+    $thumbnail = (file_exists($thumbpath) ? $serendipity['thumbSuffix'] : '');
+
+    $fdim = @serendipity_getimagesize($filepath, '', $extension);
+    $width = $fdim[0];
+    $height = $fdim[1];
+    $mime = $fdim['mime'];
+
 
     $query = sprintf(
       "INSERT INTO {$serendipity['dbPrefix']}images (
@@ -159,14 +169,14 @@
                     %s,
                     '%s'
                    )",
-      serendipity_db_escape_string($filename),
+      serendipity_db_escape_string($filebase),
       serendipity_db_escape_string($extension),
-      serendipity_db_escape_string($mimetype),
+      serendipity_db_escape_string($mime),
       (int)$filesize,
       (int)$width,
       (int)$height,
       serendipity_db_escape_string($thumbnail),
-      (int)$date,
+      (int)$time,
       (int)$authorid,
       serendipity_db_escape_string($directory)
     );
@@ -182,30 +192,29 @@
         return $image_id;
     }
 
-    return true;
+    return 0;
 }
 
 
 /**
 * Generate a thumbnail
 **/
-function serendipity_makeThumbnail($file, $size = false, $authorid = '0', $directory = '', $insertMode = true) {
+function serendipity_makeThumbnail($file, $directory = '', $size = false) {
     global $serendipity;
 
     if ($size === false) {
         $size = $serendipity['thumbSize'];
     }
 
-    // Calculate name of thumbnail
     $t       = serendipity_parseFileName($file);
     $f       = $t[0];
     $suf     = $t[1];
-    $ft_mime = serendipity_guessMime($suf);
+
 
     $infile  = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $file;
     $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $serendipity['thumbSuffix'] . '.' . $suf;
-    $fdim    = @serendipity_getimagesize($infile, $ft_mime);
 
+    $fdim    = @serendipity_getimagesize($infile, '', $suf);
     if (isset($fdim['noimage'])) {
         $r = array(0, 0);
     } else {
@@ -228,11 +237,6 @@
         }
     }
 
-    /* Lets assume we are all done, now we add the image to the image database */
-    if ($insertMode) {
-        serendipity_insertImageInDatabase($f, $suf, $fdim['mime'], filesize($infile), $fdim[0], $fdim[1], $serendipity['thumbSuffix'], time(), $authorid, $directory);
-    }
-
     return $r;
 }
 
@@ -347,12 +351,13 @@
             $fdim = @getimagesize($ffull);
 
             if (!file_exists($oldThumb) && !file_exists($newThumb) && ($fdim[0] > $serendipity['thumbSize'] || $fdim[1] > $serendipity['thumbSize'])) {
-                $returnsize = serendipity_makeThumbnail($filename, false, $file['authorid'], '', false);
-                printf(RESIZE_BLAHBLAH, $filename . ': ' . $returnsize[0] . 'x' . $returnsize[1]);
-                if (!file_exists($newThumb)) {
-                    printf('<span class="serendipityAdminMsgError">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename);
-                } else {
-                    $update = true;
+                if ( $returnsize = serendipity_makeThumbnail($filename, $file['path']) !== false ) {
+                    printf(RESIZE_BLAHBLAH, $filename . ': ' . $returnsize[0] . 'x' . $returnsize[1]);
+                    if (!file_exists($newThumb)) {
+                        printf('<span class="serendipityAdminMsgError">' . THUMBNAIL_FAILED_COPY . '</span><br />', $filename);
+                    } else {
+                        $update = true;
+                    }
                 }
             } elseif (!file_exists($oldThumb) && !file_exists($newThumb) && $fdim[0] <= $serendipity['thumbSize'] && $fdim[1] <= $serendipity['thumbSize']) {
                 $res = @copy($ffull, $newThumb);
@@ -637,12 +642,8 @@
                 $i++;
             }
         } else {
-            if (file_exists($fthumb)) {
-                $thumbnail = $serendipity['thumbSuffix'];
-            }
-
             printf(FOUND_FILE . '<br />', $files[$x]);
-            serendipity_insertImageInDatabase($fbase, $f[1], $fdim['mime'], filesize($ffull), $fdim[0], $fdim[1], $thumbnail, filemtime($ffull), '0', $fdir);
+            serendipity_insertImageInDatabase($files[$x], $fdir, 0, filemtime($ffull));
             $i++;
         }
     }
@@ -1122,12 +1123,12 @@
         $ft_mime = serendipity_guessMime($suf);
     }
 
-    $fdim = @getimagesize($file);
-
     if ($ft_mime == 'application/pdf') {
-       $fdim = array(1000,1000,24, '', 'bits'=> 24, channels => '3', 'mime' => 'application/pdf');
+       $fdim = array(1000,1000,24, '', 'bits'=> 24, 'channels' => '3', 'mime' => 'application/pdf');
     }
 
+    $fdim = @getimagesize($file);
+
     if (is_array($fdim)) {
         if (empty($fdim['mime'])) {
             $fdim['mime'] = $ft_mime;

[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.39,1.40

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

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

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
- Clean up serendipity_makeThumbnail() and don't insert image into database from it. Instead serendipity_insertImageInDatabase has to be called "manually" after an image is done being processed.
- serendipity_insertImageInDatabase() now requires far less arguments, as it can calculate them on its own
- Fix E_NOTICE for non-string array element when mime is application/pdf
- Let serendipity_getImageSize do mime calc, so we don't need to clutter the rest of the code with serendipity_guessMime

The latter might need a little tweaking


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_admin_image_selector.php	26 Jan 2005 16:03:27 -0000	1.39
+++ serendipity_admin_image_selector.php	9 Feb 2005 19:46:09 -0000	1.40
@@ -49,8 +49,8 @@
 
                 case 'add':
                     include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php';
-                    if (isset($created_thumbnail) && is_array($created_thumbnail) && isset($created_thumbnail['image_id'])) {
-                        $serendipity['GET']['image'] = (int)$created_thumbnail['image_id'];
+                    if (isset($created_thumbnail) && is_array($created_thumbnail)) {
+                        $serendipity['GET']['image'] = (int)$image_id; // $image_id is passed from images.inc.php
 
                         if (!empty($serendipity['POST']['htmltarget'])) {
                             $serendipity['GET']['htmltarget'] = $serendipity['POST']['htmltarget'];