refs #514

* 1.8 branch와 동기화
Needlworks · May 24, 2010 · b956081 · b956081
1 parent 66a0d97
commit b956081
Show file tree

Hide file tree

Showing 31 changed files with 1,874 additions and 1,204 deletions.
diff --git a/framework/data/DBModel.php b/framework/data/DBModel.php
@@ -31,7 +31,7 @@ function doesExistTable($tablename) {
 }
 
 /* DBModel */
-
+/* 1.2.20100429 */
 class DBModel extends Singleton implements IModel {
 	protected $_attributes, $_qualifiers, $_query;
 	protected $_relations, $_filters, $_order, $_limitation, $table, $id, $_reservedFields, $_isReserved, $param;
@@ -147,6 +147,9 @@ public function setQualifier($name, $condition, $value = null, $escape = false)
 				case '<=':
 					$this->_relations[$name] = '<=';
 					break;
+				//case 'hasOneOf':
+				//case 'hasAnyOf':
+				//case 'hasNoneOf':
 				case 'like':
 				default:
 					$this->_relations[$name] = 'LIKE';

diff --git a/interface/blog/comment/comment/index.php b/interface/blog/comment/comment/index.php
@@ -16,9 +16,6 @@
 require ROOT . '/library/preprocessor.php';
 requireModel('blog.comment');
 
-if (false) {
-	fetchConfigVal();
-}
 if ((doesHaveMembership() || !empty($_POST['name'])) && !empty($_POST['comment']) && !empty($_POST['mode']) && ($_POST['mode'] == 'commit') || !Setting::getBlogSettingGlobal('acceptComments',1)) {
 	if (!empty($_POST['name']))
 		setcookie('guestName', $_POST['name'], time() + 2592000, $context->getProperty('uri.blog')."/");

diff --git a/library/model/blog.comment.php b/library/model/blog.comment.php
@@ -405,6 +405,7 @@ function updateCommentsOfEntry($blogid, $entryId) {
 }
 
 function sendCommentPing($entryId, $permalink, $name, $homepage) {
+	return true;
 	global $database, $blog;
 	$blogid = getBlogId();
 	if($slogan = POD::queryCell("SELECT slogan
@@ -509,21 +510,22 @@ function addComment($blogid, & $comment) {
 		)");
 	if ($result) {
 		$id = $insertId;
-		CacheControl::flushCommentRSS($comment['entry']);
-		CacheControl::flushDBCache('comment');
-		if ($parent != 'null' && $comment['secret'] < 1) {
-			$insertId = getCommentsNotifiedQueueMaxId() + 1;
-			POD::execute("INSERT INTO {$database['prefix']}CommentsNotifiedQueue
-					( blogid , id, commentid , sendstatus , checkdate , written )
-				VALUES
-					('".$blogid."' , '".$insertId."', '" . $id . "', '0', '0', UNIX_TIMESTAMP())");
-		}
-		updateCommentsOfEntry($blogid, $comment['entry']);
-		fireEvent($comment['entry'] ? 'AddComment' : 'AddGuestComment', $id, $comment);
-		if ($filtered == 1)
-			return $blockType;
-		else
+		if($filtered != 1) {
+			CacheControl::flushCommentRSS($comment['entry']);
+			CacheControl::flushDBCache('comment');
+			if ($parent != 'null' && $comment['secret'] < 1) {
+				$insertId = getCommentsNotifiedQueueMaxId() + 1;
+				POD::execute("INSERT INTO {$database['prefix']}CommentsNotifiedQueue
+						( blogid , id, commentid , sendstatus , checkdate , written )
+					VALUES
+						('".$blogid."' , '".$insertId."', '" . $id . "', '0', '0', UNIX_TIMESTAMP())");
+			}
+			updateCommentsOfEntry($blogid, $comment['entry']);
+			fireEvent($comment['entry'] ? 'AddComment' : 'AddGuestComment', $id, $comment);
 			return $id;
+		} else {
+			return $blockType;
+		}
 	}
 	return false;
 }
@@ -886,7 +888,6 @@ function notifyComment() {
 			ORDER BY CNQ.id ASC LIMIT 1 OFFSET 0";
 	$queue = POD::queryRow($sql);
 	if (empty($queue) && empty($queue['queueId'])) {
-		//POD::execute("DELETE FROM {$database['prefix']}CommentsNotifiedQueue WHERE id={$queue['queueId']}");
 		return false;
 	}
 	$comments = (POD::queryRow("SELECT * FROM {$database['prefix']}Comments WHERE blogid = $blogid AND id = {$queue['commentid']}"));

diff --git a/plugins/BlogAPI/index.php b/plugins/BlogAPI/index.php
@@ -1,14 +1,14 @@
 <?php
-/* BlogAPI RSD automarker for Textcube 1.1
+/* BlogAPI RSD automarker for Textcube 1.8
    ----------------------------------
-   Version 1.0
-   Tatter and Friends development team.
+   Version 1.8
+   Needlworks development team.
 
    Creator          : coolengineer
    Maintainer       : coolengineer
 
    Created at       : 2006.8.6
-   Last modified at : 2006.10.27
+   Last modified at : 2010.4.30
  
  This plugin adds RSD link into blog skin.
  For the detail, visit http://forum.tattersite.com/ko

diff --git a/plugins/BlogAPI/index.xml b/plugins/BlogAPI/index.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin version="1.0">
-  <title xml:lang="ko">Blog API</title>
-  <title xml:lang="en">Blog API</title>
+  <title xml:lang="ko">Blog API(일본어판)</title>
+  <title xml:lang="en">Blog API(Japanese)</title>
+  <title xml:lang="ja">Blog API(日本語版)</title>
   <link>http://needlworks.org/</link>
-  <version>1.6</version>
+  <version>1.8</version>
   <description xml:lang="en">This helps blog editor discover automatically blog's profile</description>
   <description xml:lang="ko">편집기 환경 설정에 블로그 주소만 입력하여도 자동 설정되도록 합니다.</description>
+  <description xml:lang="ja">ブログのURLだけを入力しても記事作成用ソフトウェアからAPI アドレスを認識できるように設定します。</description>
   <license>GPL</license>
   <author xml:lang="en" link="http://coolengineer.com">Hojin Choi (coolengineer / Needlworks)</author>
   <author xml:lang="ko" link="http://coolengineer.com"><![CDATA[최호진 (coolengineer / Needlworks)]]></author>
+  <author xml:lang="ja" link="http://coolengineer.com">Hojin Choi (coolengineer / Needlworks)</author>
   <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="no" />
   <requirements>
     <textcube>
-		<minVersion>1.8</minVersion>
+	  <minVersion>1.8</minVersion>
 	</textcube>
   </requirements>
   <binding>

diff --git a/plugins/CL_Moblog/index.xml b/plugins/CL_Moblog/index.xml
@@ -2,30 +2,34 @@
 <plugin version="1.0">
   <title xml:lang="ko">모바일 블로그</title>
   <title xml:lang="en">Moblog</title>
+  <title xml:lang="ja">Moblog</title>
   <link>http://www.needlworks.org/</link>
   <version>1.0</version>
   <description xml:lang="en">This plugin enables Mobile blogging</description>
   <description xml:lang="ko">이동전화로 이메일을 보내면 첨부된 사진을 글로 등록합니다. 관리자화면/설정/모바일 메뉴를 확인하세요</description>
+  <description xml:lang="ja">携帯電話からのメール送信で記事作成ができます。</description>
   <license>GPL 2.0</license>
   <author xml:lang="en" link="http://www.needlworks.org/">Hojin Choi</author>
   <author xml:lang="ko" link="http://www.needlworks.org/">Coolengineer</author>
+  <author xml:lang="ja" link="http://www.needlworks.org/">Hojin Choi</author>
   <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="no" />
   <scope>blog</scope>
   <requirements>
     <textcube>
-        <minVersion>1.8</minVersion> 
+	  <minVersion>1.8</minVersion>
 	</textcube>
   </requirements>
   <binding>
-	<listener event="/plugin/moblog/check">moblog_check</listener>
-	<listener event="Cron5m">moblog_check</listener>
-	<listener event="Cron24h">moblog_logrotate</listener>
+	<listener event="/plugin/moblog/check" handler="moblog_check" />
+	<listener event="Cron5m" handler="moblog_check" />
+	<listener event="Cron24h" handler="moblog_logrotate" />
     <adminMenu>
       <viewMethods>
         <method>
           <topMenu>setting</topMenu>
           <title xml:lang="en">Mobile</title>
           <title xml:lang="ko">모바일</title>
+          <title xml:lang="ja">モバイル設定</title>
           <handler>moblog_manage</handler>
           <params>
 			  <param>

diff --git a/plugins/CL_OpenID/index.xml b/plugins/CL_OpenID/index.xml
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin version="1.0">
-  <title xml:lang="ko">OpenID</title>
-  <title xml:lang="en">OpenID</title>
+  <title xml:lang="ko">OpenID(일본어판)</title>
+  <title xml:lang="en">OpenID(Japanese)</title>
+  <title xml:lang="ja">OpenID(日本語版)</title>
   <link>http://www.needlworks.org/</link>
   <version>1.0</version>
   <description xml:lang="en">This plugin enables OpenID facility.</description>
   <description xml:lang="ko"><![CDATA[OpenID 사용을 가능하게 합니다. 오픈아이디 가입링크를 수정하시려면, CL_OpenID 플러그인 디렉토리안의 affiliate.php를 참조하세요.]]></description>
+  <description xml:lang="ja">OpenIDを利用します。OpenID登録サイトへのリンクを変更するためには、CL_OpenID の affiliate.phpから変更してください。</description>
   <license>GPL</license>
   <author xml:lang="en" link="http://coolengineer.com/">Hojin Choi (coolengineer / Needlworks)</author>
   <author xml:lang="ko" link="http://coolengineer.com/"><![CDATA[최호진 (coolengineer / Needlworks)]]></author>
+  <author xml:lang="ja" link="http://www.needlworks.org/">Hojin Choi (coolengineer / Needlworks)</author>
   <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="no" />
   <scope>blog</scope>
   <requirements>
     <textcube>
-		<minVersion>1.8</minVersion>
+	  <minVersion>1.8</minVersion>
 	</textcube>
   </requirements>
   <binding>
-	<listener event="Logout">openid_Logout</listener>
-	<listener event="AddComment">openid_AddComment</listener>
-	<listener event="AddGuestComment">openid_AddComment</listener>
-	<listener event="ViewCommenter">openid_ViewCommenter</listener>
-	<listener event="ViewGuestCommenter">openid_ViewCommenter</listener>
-	<listener event="OpenIDAffiliateLinks">openid_OpenIDAffiliateLinks</listener>
+	<listener event="Logout" handler="openid_Logout" />
+	<listener event="AddComment" handler="openid_AddComment" />
+	<listener event="AddGuestComment" handler="openid_AddComment" />
+	<listener event="ViewCommenter" handler="openid_ViewCommenter" />
+	<listener event="ViewGuestCommenter" handler="openid_ViewCommenter" />
+	<listener event="OpenIDAffiliateLinks" handler="openid_OpenIDAffiliateLinks" />
 
 	<tag name="SKIN_head_start" handler="openid_add_delegate" />
   </binding>

diff --git a/plugins/CT_LinePost/index.xml b/plugins/CT_LinePost/index.xml
@@ -2,16 +2,18 @@
 <plugin version="1.0">
 	<title xml:lang="en">Line Posting</title>
 	<title xml:lang="ko">라인 쓰기</title>
+	<title xml:lang="ja">Line作成(日本語版)</title>
 	<link>http://forest.nubimaru.com/</link>
 	<version>0.1</version>
 	<description xml:lang="en">Quickly writing lines on dashboard</description>
 	<description xml:lang="ko"><![CDATA[재빨리 라인을 쓸 수 있는 위젯을 추가합니다.]]></description>
+	<description xml:lang="ja">Line作成用のウィジェットを利用</description>
 	<license>GPL</license>
 	<author link="http://forest.nubimaru.com">Jeongkyu Shin (inureyes)</author>
 	<safety changeData="yes" exposeData="no" accessLocal="yes" accessRemote="no" accessRaw="yes" />
 	<requirements>
 		<textcube>
-			<minVersion>1.8</minVersion>
+		  <minVersion>1.8</minVersion>
 		</textcube>
 	</requirements>
 	<binding>

diff --git a/plugins/CT_RecentPS_Default/index.xml b/plugins/CT_RecentPS_Default/index.xml
@@ -2,16 +2,21 @@
 <plugin version="1.0">
   <title xml:lang="en">Recent Entries</title>
   <title xml:lang="ko">최근 글</title>
+  <title xml:lang="ja">最新記事</title>
   <link>http://needlworks.org/</link>
   <version>1.6</version>
   <description xml:lang="en">Shows recent entries</description>
   <description xml:lang="ko">최근에 작성된 글들을 보여줍니다</description>
+  <description xml:lang="ja">最新記事を表示します。</description>
   <license>GPL</license>
   <author xml:lang="en" link="http://rsef.net">Peris (Tatter Network Foundation)</author>
   <author xml:lang="ko" link="http://rsef.net">Peris (Tatter Network Foundation)</author>
+  <author xml:lang="ja" link="http://rsef.net">Peris (Tatter Network Foundation)</author>
   <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="yes" />
   <requirements>
-    <textcube>1.6</textcube>
+    <textcube>
+      <minVersion>1.8</minVersion>
+    </textcube>
   </requirements>
   <binding>
 	<center handler="CT_RecentPS_Default" />

diff --git a/plugins/CT_RecentRP_Default/index.xml b/plugins/CT_RecentRP_Default/index.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin version="1.0">
-  <title xml:lang="en">Recent Replies</title>
-  <title xml:lang="ko">최근 댓글</title>
-   <title xml:lang="ja">最新コメント</title>
+  <title xml:lang="en">Recent Replies(Japanese)</title>
+  <title xml:lang="ko">최근 댓글(일본어판)</title>
+  <title xml:lang="ja">新着コメント(日本語版)</title>
   <link>http://needlworks.org/</link>
   <version>1.8</version>
   <description xml:lang="en">Shows recent replies</description>
   <description xml:lang="ko">최근에 작성된 댓글들을 보여줍니다</description>
-  <description xml:lang="ja">最新コメント・プラグ・イン</description>
+  <description xml:lang="ja">新着コメントを表示します。</description>
   <license>GPL</license>
   <author xml:lang="en" link="http://rsef.net">Peris (Tatter Network Foundation)</author>
   <author xml:lang="ko" link="http://rsef.net">Peris (Tatter Network Foundation)</author>
@@ -22,14 +22,14 @@
     <center handler="CT_RecentRP_Default" />
 	<config dataValHandler="CT_RecentRP_Default_DataSet" >
 		<window width="500" height="314" />
-		<fieldset legend="목록 표시설정">
-			<field title="관리자 댓글 :" name="repliesChk" type="radio"  >
-				<op value="1" checked="checked">보이기</op>
-				<op value="2">안보이기</op>
-				<caption><![CDATA['<b>안보이기</b>'를 선택했을 경우 손님댓글에 댓글을 달았는지 표시됩니다.]]></caption>
+		<fieldset legend="表示設定">
+			<field title="管理者コメント :" name="repliesChk" type="radio"  >
+				<op value="1" checked="checked">表示</op>
+				<op value="2">非表示</op>
+				<caption><![CDATA['<b>非表示</b>'で設定したら管理者のコメントは表示しません。]]></caption>
 			</field>
-			<field title="출력될 글수 :" name="repliesList" type="text" size="4" >
-				<caption><![CDATA['<b>공백</b>'이면 기본 출력 글수로 보여줍니다.]]></caption>
+			<field title="表示数 :" name="repliesList" type="text" size="4" >
+				<caption><![CDATA['<b>空白</b>'で置いといたら基本設定で表示します。]]></caption>
 			</field>
 		</fieldset>
 	</config>

diff --git a/plugins/CT_Start_Default/index.xml b/plugins/CT_Start_Default/index.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin version="1.0">
-  <title xml:lang="en">Start</title>
-  <title xml:lang="ko">시작하기</title>
+  <title xml:lang="en">Start(Japanese)</title>
+  <title xml:lang="ko">시작하기(일본어판)</title>
+  <title xml:lang="ja">スタート(日本語版)</title>
   <link>http://needlworks.org/</link>
   <version>1.6</version>
   <description xml:lang="en">Adds shortcuts to start tasks what you want to with Textcube.</description>
   <description xml:lang="ko"><![CDATA[글쓰기, 리더 보기, 다양한 설정 바꾸기 등 여러 일들에 대한 바로가기를 센터에 추가합니다.]]></description>
+  <description xml:lang="ja">Textcube管理者のスタートページを構成します。</description>
   <license>GPL</license>
   <author xml:lang="en" link="http://forest.nubimaru.com">Jeongkyu Shin (inureyes /Needlworks)</author>
   <author xml:lang="ko" link="http://forest.nubimaru.com"><![CDATA[신정규 (inureyes / Needlworks)]]></author>

diff --git a/plugins/CT_Statistics_Default/index.xml b/plugins/CT_Statistics_Default/index.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin version="1.0">
-  <title xml:lang="en">Statistics</title>
-  <title xml:lang="ko">통계</title>
+  <title xml:lang="en">Statistics(Japanese)</title>
+  <title xml:lang="ko">통계(일본어판)</title>
+  <title xml:lang="ja">統計(日本語版)</title>
   <link>http://needlworks.org/</link>
   <version>1.6</version>
   <description xml:lang="en">Default Blog Statistics Plugin</description>
   <description xml:lang="ko">텍스트큐브 통계 알리미</description>
+  <description xml:lang="ja">統計を表示します。</description>
   <license>GPL</license>
   <author xml:lang="en" link="http://needlworks.org">Jeongkyu Shin (inureyes / Needlworks)</author>
   <author xml:lang="ko" link="http://needlworks.org"><![CDATA[신정규 (inureyes / Needlworks)]]></author>
+  <author xml:lang="ja" link="http://needlworks.org">Jeongkyu Shin (inureyes / Needlworks)</author>
   <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="yes" />
   <requirements>
-    <textcube>1.6</textcube>
+    <textcube>
+	  <minVersion>1.6</minVersion>
+	</textcube>
   </requirements>
   <binding>
 	<center handler="CT_Statistics_Default" />