From 6e44fda3374cb64cb270a0fd7f4c35768d2c6eba Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 12 Dec 2007 06:56:36 +0000
Subject: [PATCH] =?UTF-8?q?springnote=EB=AA=A8=EB=93=88=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=EB=8B=A4=EB=A5=B8=20springnote=EC=9D=98=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=EC=9D=84=20=EC=84=A4=EC=A0=95=ED=95=98?=
 =?UTF-8?q?=EC=97=AC=20=EB=B3=B4=EC=97=AC=EC=A4=84=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3312 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/springnote/lang/en.lang.php                 | 2 ++
 modules/springnote/lang/jp.lang.php                 | 2 ++
 modules/springnote/lang/ko.lang.php                 | 2 ++
 modules/springnote/lang/ru.lang.php                 | 2 ++
 modules/springnote/springnote.model.php             | 6 ++++--
 modules/springnote/springnote.view.php              | 2 +-
 modules/springnote/tpl/filter/insert_springnote.xml | 1 +
 modules/springnote/tpl/springnote_info.html         | 4 ++++
 modules/springnote/tpl/springnote_insert.html       | 7 +++++++
 9 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/modules/springnote/lang/en.lang.php b/modules/springnote/lang/en.lang.php
index e285f9078..a16369642 100644
--- a/modules/springnote/lang/en.lang.php
+++ b/modules/springnote/lang/en.lang.php
@@ -9,6 +9,7 @@
     $lang->springnote_openid = "OpenID";
     $lang->springnote_userkey = "User Key";
     $lang->springnote_pageid = "Page Number";
+    $lang->springnote_domain = "도메인 지정";
 
     $lang->page_url = "Original URL";
     $lang->page_modified = "Last Modification";
@@ -21,4 +22,5 @@
     $lang->about_springnote_openid = "Please input your OpenID that created Springnote";
     $lang->about_springnote_userkey = 'User Key is needed to enable Springnote module.<br />Please input generated User Key after entering your OpenID at [<a href="https://api.openmaru.com/delegate_key/springnote?app_id=www.zeroboard.com&openid=" onclick="window.open(this.href);return false;">Get User Key</a>] .';
     $lang->about_springnote_pageid = 'Please input pageid if you want to display specific page first.';
+    $lang->about_springnote_domain = '자신의 스프링노트가 아닌 다른 도메인의 스프링노트를 입력할 수 있습니다.  (http://도메인.springnote.com 에서 도메인값만 입력해주세요)';
 ?>
diff --git a/modules/springnote/lang/jp.lang.php b/modules/springnote/lang/jp.lang.php
index 436380fc7..88e663f6a 100644
--- a/modules/springnote/lang/jp.lang.php
+++ b/modules/springnote/lang/jp.lang.php
@@ -9,6 +9,7 @@
     $lang->springnote_openid = "オープンID";
     $lang->springnote_userkey = "ユーザーKey";
     $lang->springnote_pageid = "ページ番号";
+    $lang->springnote_domain = "도메인 지정";
 
     $lang->page_url = "元のURL";
     $lang->page_modified = "最終修正";
@@ -21,4 +22,5 @@
     $lang->about_springnote_openid = "スプリングノートでページを作成したオープンIDを入力してください。";
     $lang->about_springnote_userkey = 'スプリングノートとの連動するためのユーザKeyを入力してください。<br />[<a href="https://api.openmaru.com/delegate_key/springnote?app_id=www.zeroboard.com&openid=" onclick="window.open(this.href);return false;">ユーザーキー受信</a>]をクリックして入力して生成されるキーの値を入力してください。';
     $lang->about_springnote_pageid = '使用するスプリングノートの中の特定ページを出力したい場合、「pageid」の値を入力してください。';
+    $lang->about_springnote_domain = '자신의 스프링노트가 아닌 다른 도메인의 스프링노트를 입력할 수 있습니다.  (http://도메인.springnote.com 에서 도메인값만 입력해주세요)';
 ?>
diff --git a/modules/springnote/lang/ko.lang.php b/modules/springnote/lang/ko.lang.php
index b33da5dff..772df5f56 100644
--- a/modules/springnote/lang/ko.lang.php
+++ b/modules/springnote/lang/ko.lang.php
@@ -9,6 +9,7 @@
     $lang->springnote_openid = "오픈아이디";
     $lang->springnote_userkey = "사용자 Key";
     $lang->springnote_pageid = "페이지 번호";
+    $lang->springnote_domain = "도메인 지정";
 
     $lang->page_url = "원본 URL";
     $lang->page_modified = "최종 수정";
@@ -21,4 +22,5 @@
     $lang->about_springnote_openid = "스프링노트에서 페이지를 제작한 오픈아이디를 입력해주세요";
     $lang->about_springnote_userkey = '스프링노트 연동을 위한 사용자 Key값을 입력해주셔야 합니다.<br />[<a href="https://api.openmaru.com/delegate_key/springnote?app_id=www.zeroboard.com&openid=" onclick="window.open(this.href);return false;">사용자 키 받기</a>] 를 클릭하셔서 오픈아이디를 입력하시고 생성되는 키값을 입력해주세요.';
     $lang->about_springnote_pageid = '사용하시려는 스프링노트 중 특정 페이지를 먼저 출력하고자 하실때 pageid값을 입력해주세요';
+    $lang->about_springnote_domain = '자신의 스프링노트가 아닌 다른 도메인의 스프링노트를 입력할 수 있습니다.  (http://도메인.springnote.com 에서 도메인값만 입력해주세요)';
 ?>
diff --git a/modules/springnote/lang/ru.lang.php b/modules/springnote/lang/ru.lang.php
index 2712c473e..0f6ba9963 100644
--- a/modules/springnote/lang/ru.lang.php
+++ b/modules/springnote/lang/ru.lang.php
@@ -9,6 +9,7 @@
     $lang->springnote_openid = "Открытый ID";
     $lang->springnote_userkey = "Ключ юзера";
     $lang->springnote_pageid = "Номер страницы";
+    $lang->springnote_domain = "도메인 지정";
 
     $lang->page_url = "Оригинальный URL";
     $lang->page_modified = "Последняя модификация";
@@ -21,4 +22,5 @@
     $lang->about_springnote_openid = "Пожалуйста, введите Ваш OpenID, который создал Springnote.";
     $lang->about_springnote_userkey = 'Ключ юзера нужен для того, чтобы включить Springnote модуль.<br />Пожалуйста, введите сгенерированный Ключ Юзера после ввода Вашего OpenID на [<a href="https://api.openmaru.com/delegate_key/springnote?app_id=www.zeroboard.com&openid=" onclick="window.open(this.href);return false;">Получить Ключ Юзера</a>] .';
     $lang->about_springnote_pageid = 'Пожалуйста, введите pageid, если вы хотите отобразить определенную страницу сначала.';
+    $lang->about_springnote_domain = '자신의 스프링노트가 아닌 다른 도메인의 스프링노트를 입력할 수 있습니다.  (http://도메인.springnote.com 에서 도메인값만 입력해주세요)';
 ?>
diff --git a/modules/springnote/springnote.model.php b/modules/springnote/springnote.model.php
index 581bd267f..868a01750 100644
--- a/modules/springnote/springnote.model.php
+++ b/modules/springnote/springnote.model.php
@@ -16,6 +16,7 @@
         var $appkey = '82dee99105c92c166bb8586415d47283b9a54cd2';
         var $server = 'api.springnote.com';
         var $port = 80;
+        var $domain = '';
 
         /**
          * @brief 초기화
@@ -26,16 +27,17 @@
         /**
          * @brief 스프링노트 페이지를 가져오기 위한 기본 값 설정
          **/
-        function setInfo($userid, $userkey) {
+        function setInfo($userid, $userkey, $domain = '') {
             $this->userid = $userid;
             $this->userkey = $userkey;
+            $this->domain = $domain;
         }
 
         /**
          * @brief url 생성
          **/
         function getUrl($pageid = null) {
-            return sprintf('http://%s:%s/pages%s.xml', $this->server, $this->port, $pageid?'/'.$pageid:'');
+            return sprintf('http://%s:%s/pages%s.xml%s', $this->server, $this->port, $pageid?'/'.$pageid:'', $this->domain?'?domain='.$this->domain:'');
         }
 
         /**
diff --git a/modules/springnote/springnote.view.php b/modules/springnote/springnote.view.php
index 6bd46c186..91e4fa6f8 100644
--- a/modules/springnote/springnote.view.php
+++ b/modules/springnote/springnote.view.php
@@ -43,7 +43,7 @@
             $q = Context::get('q');
 
             $oSpringnoteModel = &getModel('springnote');
-            $oSpringnoteModel->setInfo($this->module_info->openid, $this->module_info->userkey);
+            $oSpringnoteModel->setInfo($this->module_info->openid, $this->module_info->userkey, $this->module_info->domain);
             
             // 특정 페이지 선택시 페이지 정보 가져오기
             if($this->grant->view && $pageid) {
diff --git a/modules/springnote/tpl/filter/insert_springnote.xml b/modules/springnote/tpl/filter/insert_springnote.xml
index 4dc48181f..844415934 100644
--- a/modules/springnote/tpl/filter/insert_springnote.xml
+++ b/modules/springnote/tpl/filter/insert_springnote.xml
@@ -10,6 +10,7 @@
         <param name="openid" target="springnote_openid" />
         <param name="userkey" target="springnote_userkey" />
         <param name="pageid" target="springnote_pageid" />
+        <param name="domain" target="springnote_domain" />
         <param name="springnote_name" target="mid" />
         <param name="module_srl" target="module_srl" />
         <param name="module_category_srl" target="module_category_srl" />
diff --git a/modules/springnote/tpl/springnote_info.html b/modules/springnote/tpl/springnote_info.html
index 0f3140299..7bd2c3531 100644
--- a/modules/springnote/tpl/springnote_info.html
+++ b/modules/springnote/tpl/springnote_info.html
@@ -25,6 +25,10 @@
     <th scope="row">{$lang->springnote_pageid}</th>
     <td>{$module_info->pageid}&nbsp;</td>
 </tr>
+<tr>
+    <th scope="row">{$lang->springnote_domain}</th>
+    <td>{$module_info->domain}&nbsp;</td>
+</tr>
 <tr>
     <th scope="row">{$lang->layout}</th>
     <td>
diff --git a/modules/springnote/tpl/springnote_insert.html b/modules/springnote/tpl/springnote_insert.html
index 0b967ec99..dd537cee4 100644
--- a/modules/springnote/tpl/springnote_insert.html
+++ b/modules/springnote/tpl/springnote_insert.html
@@ -65,6 +65,13 @@
             <p>{$lang->about_springnote_pageid}</p>
         </td>
     </tr>
+    <tr>
+        <th scope="row">{$lang->springnote_domain}</th>
+        <td>
+            <input type="text" name="springnote_domain" value="{htmlspecialchars($module_info->domain)}"  class="inputTypeText w300" />
+            <p>{$lang->about_springnote_domain}</p>
+        </td>
+    </tr>
 
     <tr>
         <th scope="row">{$lang->browser_title}</th>